Merge Prefix changes, no differences in functionality or behaviour

Package-Manager: portage-2.2.00.14456-prefix/cvs/Darwin powerpc

3 files changed, 45 insertions, 16 deletions

diff --git a/app-shells/tcsh/ChangeLog b/app-shells/tcsh/ChangeLog
index 26a75257c657..5c485dd9bc5c 100644
--- a/app-shells/tcsh/ChangeLog
+++ b/app-shells/tcsh/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-shells/tcsh
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/ChangeLog,v 1.94 2009/04/10 19:52:35 grobian Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/ChangeLog,v 1.95 2009/09/30 20:13:37 grobian Exp $
+
+  30 Sep 2009; Fabian Groffen <grobian@gentoo.org> tcsh-6.16.ebuild:
+  Merge Prefix changes, no differences in functionality or behaviour
 
   10 Apr 2009; Fabian Groffen <grobian@gentoo.org> tcsh-6.16.ebuild:
   Bump patchset to remove cr0 from stty call, since this is non-POSIX, and
diff --git a/app-shells/tcsh/Manifest b/app-shells/tcsh/Manifest
index a119347006d5..a5d545bf3512 100644
--- a/app-shells/tcsh/Manifest
+++ b/app-shells/tcsh/Manifest
@@ -9,9 +9,9 @@ DIST tcsh-6.14.00.tar.gz 859780 RMD160 fa7635225ceb0225aedcfad5dd9d8e17d8d70849
 DIST tcsh-6.15.00.tar.gz 870886 RMD160 8065279e93bd3fddb2a95a3f74a680858d36508c SHA1 d24f7bf27e80222a6293b6629c14db547f0b7387 SHA256 dca83e59025f18a9811895cd7cf2a760ab1750240ea7c8c86ea21e24f783acdc
 DIST tcsh-6.16.00.tar.gz 886468 RMD160 ed23351273bb737c184658235f33869488e64696 SHA1 3d3536bbb9201abdf39b8b364b95e0a218970a5c SHA256 7603b8d67553e0a83159f0f463b642e3679a878a70743285bb7b288b314517d4
 DIST tcsh-config-1.6.tar.bz2 2352 RMD160 28bc4d50211ee247f7202a4b49267d745142ef6e SHA1 5056d00da21cfad4550028821ebde49574244d87 SHA256 af86d79921c446b1ad4f8d665168ff6fd3fb24a875abde81e336ba91644c5160
-DIST tcsh-config-1.7.tar.bz2 2352 RMD160 23ebe94a560d4e94d500ff9cb25667572a3e5bf7 SHA1 eae4a08b0dd8eb789419d26f2992e139cf4558e7 SHA256 bf4bba92fb04c3d8112987b366a95951c4be1be3246ac4730048db5b909a38f4
+DIST tcsh-gentoo-patches-r1.8.tar.bz2 2484 RMD160 d2ac41730bbbdfb8db77a67a0104edc08bb4570e SHA1 9059e209f433a023f264907d84d55824ec6854f0 SHA256 77fa4ae60090ad5a6ec50185eec9070757eedb798b1c29327d27fc582cb59f37
 EBUILD tcsh-6.14-r5.ebuild 1850 RMD160 89490fdfd3ea32d7376c6bca456f0c2c52fdd890 SHA1 9193c2c73fe99eff2cf04c7a5f61156e8ae0c686 SHA256 f4cc6d5b8aa6878ac38ab090e945292871b2fbb6e9db06cf70623100326f453d
 EBUILD tcsh-6.15-r2.ebuild 2081 RMD160 7c3c62264463fb1a55bfa8ea0ef2795fdae92b35 SHA1 665b93c2dcdadc3ce73a986ac428122b66cd2636 SHA256 8bf3f8f3f884b115675b9338d35fe1a52f6b99095404bfc22e91e8ff89341e2c
-EBUILD tcsh-6.16.ebuild 1619 RMD160 9a0badb800d6f66df5941aee85214cd0d9522a4a SHA1 a6dc0d84cc42787ece9365dd0c46da7b6893e43c SHA256 dc435a20cfe34707f4169fec036f6a868a95fd3dda63d249ef4d741cb5f49e0f
-MISC ChangeLog 14024 RMD160 84033f7ff746778ff5ec2a13fecf48d302fee630 SHA1 6e5aeaec9b0f7d04b8a2097fb6b3f8cd1151d118 SHA256 6c17c55181203f6144c323cf971a1f7b5d76dc7e264cc5716c5cb6aaac42152e
+EBUILD tcsh-6.16.ebuild 2642 RMD160 de811469dd14ab91f817359bc00b84119fd71bab SHA1 aff1746557b90db2a09561f298682f7516424c83 SHA256 0e333f5b9685c4a501728991a36972d89df5c4f220ad81eac57cc40c44dfec3f
+MISC ChangeLog 14163 RMD160 a5a2bb43df5da5764bd0d778c509935e20d44c7c SHA1 b93ff3733cef6c7aeb0d1ad2fcabe40462ddf8ff SHA256 1fd3bfb71c9987b85903fad7e295598be6a2277ba862f09d568032a3ca32669d
 MISC metadata.xml 728 RMD160 c51803104a894333f5a72d04295b412759c22625 SHA1 0861e219b4c1aa25f4813e70fdc4b6f427ba4ba2 SHA256 2bed723ea437a754e4e189c2456afb40193190c5126bf88008a8b234a62f44f1
diff --git a/app-shells/tcsh/tcsh-6.16.ebuild b/app-shells/tcsh/tcsh-6.16.ebuild
index f2ec87507aa1..2de51f3a3c7a 100644
--- a/app-shells/tcsh/tcsh-6.16.ebuild
+++ b/app-shells/tcsh/tcsh-6.16.ebuild
@@ -1,36 +1,39 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/tcsh-6.16.ebuild,v 1.8 2009/04/10 19:52:35 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/tcsh-6.16.ebuild,v 1.9 2009/09/30 20:13:37 grobian Exp $
 
-inherit eutils
+inherit eutils flag-o-matic autotools prefix
 
-CONFVER="1.7"
+CONFVER="1.8"
 
 MY_P="${P}.00"
 DESCRIPTION="Enhanced version of the Berkeley C shell (csh)"
 HOMEPAGE="http://www.tcsh.org/"
 SRC_URI="ftp://ftp.astron.com/pub/tcsh/${MY_P}.tar.gz
-	mirror://gentoo/tcsh-config-${CONFVER}.tar.bz2
-	http://www.gentoo.org/~grobian/distfiles/tcsh-config-${CONFVER}.tar.bz2"
+	http://www.gentoo.org/~grobian/distfiles/tcsh-gentoo-patches-r${CONFVER}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="perl catalogs"
 RESTRICT="test"
 
+# we need gettext because we run autoconf
 DEPEND=">=sys-libs/ncurses-5.1
-	perl? ( dev-lang/perl )
-	!app-shells/csh" # bug #119703
+	sys-devel/gettext
+	perl? ( dev-lang/perl )"
 RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${MY_P}
+CONFDIR=${WORKDIR}/tcsh-gentoo-patches-r${CONFVER}
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}/${MY_P/16/14}"-debian-dircolors.patch # bug #120792
 	epatch "${FILESDIR}"/${PN}-6.14-makefile.patch # bug #151951
+	epatch "${FILESDIR}"/${PN}-6.14-use-ncurses.patch
+	eautoreconf
 
 	if use catalogs ; then
 		einfo "enabling NLS catalogs support..."
@@ -38,10 +41,33 @@ src_unpack() {
 			config_f.h || die
 		eend $?
 	fi
+
+	# unify ECHO behaviour
+	echo "#undef ECHO_STYLE" >> config_f.h
+	echo "#define ECHO_STYLE      BOTH_ECHO" >> config_f.h
+
+	eprefixify "${CONFDIR}"/*
+	# activate the right default PATH
+	if [[ -z ${EPREFIX} ]] ; then
+		sed -i \
+			-e 's/^#MAIN//' -e '/^#PREFIX/d' \
+			"${CONFDIR}"/csh.login || die
+	else
+		sed -i \
+			-e 's/^#PREFIX//' -e '/^#MAIN/d' \
+			"${CONFDIR}"/csh.login || die
+	fi
 }
 
 src_compile() {
-	econf --prefix=/ || die "econf failed"
+	# make tcsh look and live along the lines of the prefix
+	append-flags -D_PATH_DOTCSHRC="'"'"${EPREFIX}/etc/csh.cshrc"'"'"
+	append-flags -D_PATH_DOTLOGIN="'"'"${EPREFIX}/etc/csh.login"'"'"
+	append-flags -D_PATH_DOTLOGOUT="'"'"${EPREFIX}/etc/csh.logout"'"'"
+	append-flags -D_PATH_USRBIN="'"'"${EPREFIX}/usr/bin"'"'"
+	append-flags -D_PATH_BIN="'"'"${EPREFIX}/bin"'"'"
+
+	econf --prefix="${EPREFIX:-/}" || die "econf failed"
 	emake || die "compile problem"
 }
 
@@ -55,8 +81,8 @@ src_install() {
 
 	insinto /etc
 	doins \
-		"${WORKDIR}"/tcsh-config/csh.cshrc \
-		"${WORKDIR}"/tcsh-config/csh.login
+		"${CONFDIR}"/csh.cshrc \
+		"${CONFDIR}"/csh.login
 
 	dodoc FAQ Fixes NewThings Ported README WishList Y2K