Convert to EAPI=3 for Prefix, bug #364305

Package-Manager: portage-2.2.01.18252-prefix/cvs/Darwin powerpc
author: Fabian Groffen <grobian@gentoo.org> 2011-04-22 07:17:44 +0000
committer: Fabian Groffen <grobian@gentoo.org> 2011-04-22 07:17:44 +0000
commit: 2284597506a47ab5239ebabde138a2ee64d216b1 (patch)
tree: 3c4d130d910af0de6aacf198ed7e9b21cda5779d /app-shells
parent: drop citadel from RDEPEND - bug #364445 (diff)
download: historical-2284597506a47ab5239ebabde138a2ee64d216b1.tar.gz
historical-2284597506a47ab5239ebabde138a2ee64d216b1.tar.bz2
historical-2284597506a47ab5239ebabde138a2ee64d216b1.zip
4 files changed, 34 insertions, 22 deletions
diff --git a/app-shells/tcsh/ChangeLog b/app-shells/tcsh/ChangeLog
index 86c621123e67..d29b3bb618d0 100644
--- a/app-shells/tcsh/ChangeLog
+++ b/app-shells/tcsh/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-shells/tcsh
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/ChangeLog,v 1.100 2011/02/06 22:03:07 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/ChangeLog,v 1.101 2011/04/22 07:17:44 grobian Exp $
+
+  22 Apr 2011; Fabian Groffen <grobian@gentoo.org> tcsh-6.16.ebuild,
+  tcsh-6.17-r1.ebuild:
+  Convert to EAPI=3 for Prefix, bug #364305
 
   06 Feb 2011; Mart Raudsepp <leio@gentoo.org> tcsh-6.15-r2.ebuild:
   Drop to ~mips
diff --git a/app-shells/tcsh/Manifest b/app-shells/tcsh/Manifest
index 11b087dce460..c204e4592fe3 100644
--- a/app-shells/tcsh/Manifest
+++ b/app-shells/tcsh/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX tcsh-6.14-makefile.patch 482 RMD160 ef0aa8ec9a43218532588bc1b755e2c2f69c9ea8 SHA1 b26685966259b02d5a1f0f8994c0741e50841a31 SHA256 7036e1d68ce181405800d78b33f9884da6e36f590f5287190911ddec65a540ce
 AUX tcsh-6.14-r2.patch 2057 RMD160 8fba8a743944e04e8f03525ee0f8763576d251ec SHA1 361e3187c00f401183ea20247fb99fd1a33b3047 SHA256 cdc6f499a9eef1876604a0072562aad4b594e12c6073a98ea7a2f33d88aa21c5
 AUX tcsh-6.14-r4.patch 1030 RMD160 58af5c8fafcaa7ef8bb96bb2687422b93a4b61ea SHA1 c3db204db1d075ff83134428b0cfd62f99792b56 SHA256 909df93052f8af0a3d2d83125894db774509d3c22cc495fe266484529eb1f6d9
@@ -13,7 +16,14 @@ DIST tcsh-config-1.6.tar.bz2 2352 RMD160 28bc4d50211ee247f7202a4b49267d745142ef6
 DIST tcsh-gentoo-patches-r1.8.tar.bz2 2484 RMD160 d2ac41730bbbdfb8db77a67a0104edc08bb4570e SHA1 9059e209f433a023f264907d84d55824ec6854f0 SHA256 77fa4ae60090ad5a6ec50185eec9070757eedb798b1c29327d27fc582cb59f37
 EBUILD tcsh-6.14-r5.ebuild 1871 RMD160 6665ba481944e7f3f8dd8ca9142f6c04f667c55f SHA1 3b07f6f86dace5700d7206134ade426ce2c03b13 SHA256 1932e60386b6c5a09b15c682cbe32a661c495c10db507d86286bb75531ee47e2
 EBUILD tcsh-6.15-r2.ebuild 2100 RMD160 9f1c1e4e751b6100280b148b33dab18c9bc7dd5e SHA1 8d56947fff644a6ab0f7c06bfaf202d62af74c90 SHA256 05b9a965321a0cbf92762ca44b0d9a575387bd920039ca0395465c8d1a814da5
-EBUILD tcsh-6.16.ebuild 2662 RMD160 9512171bec0190ccd79f500a9940faf134f21296 SHA1 a18682a8d7492ef24785193e8ab7bb0db552e527 SHA256 5064287273f39087a7fc85484b4dbf3252735a6ac8ecd9bf9bdf224623b3a9b5
-EBUILD tcsh-6.17-r1.ebuild 2731 RMD160 ea77cdf59e8c8abfeeffaa804352b47fb20b2c5d SHA1 3c12cd8cda69314e53c4ea3b9fb769c6d4a870b4 SHA256 e0ee2a4ee093399032f4c08dfeecfe76260573f3f46340ff74b9e90b1b92b387
-MISC ChangeLog 14919 RMD160 a40408ff7277a4d7fca4949f434d42e67795423c SHA1 9f111150401738a4c60cb379af237994463aa6d0 SHA256 a1cc7a66e3781f75a348cc229b85973cf73f6ba989d66290c5614776cbc90654
+EBUILD tcsh-6.16.ebuild 2606 RMD160 510ed6f0b2e0d7d4c0de6726ae0e238f31c20234 SHA1 35692fd2bf23a451272ebe9cd8010038122b474f SHA256 bebfd92ea8bdd8fe4fa1f91cdeec4620562bbc2849273247e4df48375fe1ca97
+EBUILD tcsh-6.17-r1.ebuild 2675 RMD160 8c0c1301b1cc69769c412675c92f08a818696653 SHA1 8bbde1042573de84cd8786460154eb9369b99099 SHA256 cc4126b91f811357b52f07d58515b1ea1611b8857365ea8d6bd846e288f2b647
+MISC ChangeLog 15059 RMD160 36b1098959b5e67736b5704f03174ca84b650dab SHA1 1868e2b8fab3df7b2598b4335f217e11ecf1b264 SHA256 d56dd888f8b886ab107b74e2069d39f01391e6c96964d363959667e60db37c7a
 MISC metadata.xml 728 RMD160 c51803104a894333f5a72d04295b412759c22625 SHA1 0861e219b4c1aa25f4813e70fdc4b6f427ba4ba2 SHA256 2bed723ea437a754e4e189c2456afb40193190c5126bf88008a8b234a62f44f1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (Darwin)
+
+iEYEARECAAYFAk2xK54ACgkQX3X2B8XHTonPGgCfVj3O1ktFOafGUIFTYDhuXXkV
+re4AnjWxeltb9ZDzjM8xCgu+36MQhZrP
+=+7e9
+-----END PGP SIGNATURE-----
diff --git a/app-shells/tcsh/tcsh-6.16.ebuild b/app-shells/tcsh/tcsh-6.16.ebuild
index 87d59b43cf48..14e1f2e096d0 100644
--- a/app-shells/tcsh/tcsh-6.16.ebuild
+++ b/app-shells/tcsh/tcsh-6.16.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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.11 2010/10/08 14:29:18 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/tcsh-6.16.ebuild,v 1.12 2011/04/22 07:17:44 grobian Exp $
+
+EAPI=3
 
 inherit eutils flag-o-matic autotools prefix
 
@@ -9,7 +11,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
+SRC_URI="ftp://ftp.astron.com/pub/tcsh/old/${MY_P}.tar.gz
 	http://www.gentoo.org/~grobian/distfiles/tcsh-gentoo-patches-r${CONFVER}.tar.bz2"
 
 LICENSE="BSD"
@@ -28,9 +30,7 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${MY_P}
 CONFDIR=${WORKDIR}/tcsh-gentoo-patches-r${CONFVER}
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	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
@@ -60,7 +60,7 @@ src_unpack() {
 	fi
 }
 
-src_compile() {
+src_configure() {
 	# 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"'"'"
@@ -68,8 +68,7 @@ src_compile() {
 	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"
+	econf --prefix="${EPREFIX:-/}" || die
 }
 
 src_install() {
diff --git a/app-shells/tcsh/tcsh-6.17-r1.ebuild b/app-shells/tcsh/tcsh-6.17-r1.ebuild
index 4504751197a2..eb36fcaa755f 100644
--- a/app-shells/tcsh/tcsh-6.17-r1.ebuild
+++ b/app-shells/tcsh/tcsh-6.17-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/tcsh-6.17-r1.ebuild,v 1.2 2010/10/06 07:45:27 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/tcsh-6.17-r1.ebuild,v 1.3 2011/04/22 07:17:44 grobian Exp $
+
+EAPI=3
 
 inherit eutils flag-o-matic autotools prefix
 
@@ -9,7 +11,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
+SRC_URI="ftp://ftp.astron.com/pub/tcsh/old/${MY_P}.tar.gz
 	http://www.gentoo.org/~grobian/distfiles/tcsh-gentoo-patches-r${CONFVER}.tar.bz2"
 
 LICENSE="BSD"
@@ -28,9 +30,7 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${MY_P}
 CONFDIR=${WORKDIR}/tcsh-gentoo-patches-r${CONFVER}
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}/${MY_P/17/14}"-debian-dircolors.patch # bug #120792
 	epatch "${FILESDIR}"/${PN}-6.14-makefile.patch # bug #151951
 	epatch "${FILESDIR}"/${PN}-6.14-use-ncurses.patch
@@ -60,7 +60,7 @@ src_unpack() {
 	fi
 }
 
-src_compile() {
+src_configure() {
 	# 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"'"'"
@@ -71,8 +71,7 @@ src_compile() {
 	econf \
 		--prefix="${EPREFIX:-/}" \
 		--datarootdir='${prefix}/usr/share' \
-		|| die "econf failed"
-	emake || die "compile problem"
+		|| die
 }
 
 src_install() {
author	Fabian Groffen <grobian@gentoo.org>	2011-04-22 07:17:44 +0000
committer	Fabian Groffen <grobian@gentoo.org>	2011-04-22 07:17:44 +0000
commit	2284597506a47ab5239ebabde138a2ee64d216b1 (patch)
tree	3c4d130d910af0de6aacf198ed7e9b21cda5779d /app-shells
parent	drop citadel from RDEPEND - bug #364445 (diff)
download	historical-2284597506a47ab5239ebabde138a2ee64d216b1.tar.gz historical-2284597506a47ab5239ebabde138a2ee64d216b1.tar.bz2 historical-2284597506a47ab5239ebabde138a2ee64d216b1.zip