Transfer prefix keywords, bump to EAPI=3

Package-Manager: portage-v2.2_rc67-475-g06c7c90/cvs/Linux i686

3 files changed, 39 insertions, 17 deletions

diff --git a/x11-terms/aterm/ChangeLog b/x11-terms/aterm/ChangeLog
index e9a784b57e79..6c15404d0657 100644
--- a/x11-terms/aterm/ChangeLog
+++ b/x11-terms/aterm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-terms/aterm
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/aterm/ChangeLog,v 1.114 2010/01/22 16:50:50 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/aterm/ChangeLog,v 1.115 2010/08/17 05:12:04 abcd Exp $
+
+  17 Aug 2010; Jonathan Callen <abcd@gentoo.org> aterm-1.0.1-r2.ebuild:
+  Transfer prefix keywords, bump to EAPI=3
 
   22 Jan 2010; Samuli Suominen <ssuominen@gentoo.org> aterm-1.0.1-r2.ebuild:
   Require SLOT="0" of media-libs/jpeg for headers.
diff --git a/x11-terms/aterm/Manifest b/x11-terms/aterm/Manifest
index 09a582425364..b3bfcc41404e 100644
--- a/x11-terms/aterm/Manifest
+++ b/x11-terms/aterm/Manifest
@@ -1,7 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX aterm-1.0.1-deadkeys.patch 1358 RMD160 cf30459951d2b7c4c9d37074669619722478807f SHA1 e9ce3ac47e7f8076928bdc60bb13d03c473c8493 SHA256 5611f694ee0368c46e45389e87cfc8f66a8d4e7ad3b6141098ce7f325cf89640
 AUX aterm-1.0.1-display-security-issue.patch 797 RMD160 fa20d35058d625e487feb75c8053782c4645f60d SHA1 11f7a0e6c2bc6fa7400d4c3f360d0da331a5b816 SHA256 2fa7012ff386d4bc4b7f1b42ce0ddf75243bc6c9bb48b4c7ed009d6651b63ff4
 DIST aterm-1.0.1.tar.bz2 276810 RMD160 74c46af824c19d0c24c26178f0cb38c2d4e66e21 SHA1 a975753b415306a0734efc3773de8a86129bb54b SHA256 a161c3b2d9c7149130a41963899993af21eae92e8e362f4b5b3c7c4cb16760ce
 EBUILD aterm-1.0.1-r1.ebuild 1863 RMD160 c66744585cda70c42cbe6164a052f3dc1efaa11b SHA1 bdf4b58ccbc92a309230ad409114673bb7186421 SHA256 bbd3d153609f3bfcd01bb5d76ae9065a251c44fe3659bb70c40f46a3cfdc49d8
-EBUILD aterm-1.0.1-r2.ebuild 2040 RMD160 4a3b19770d37525138221725d7322c6ad1d0f98d SHA1 d71db73c648870b7db13e46212678ee12fcd6462 SHA256 4334dbbf121be1c94fa681174f063082e7363099aa5518b8743fb8f94477f6aa
-MISC ChangeLog 18744 RMD160 7b3c4335d479fe54eec0cc5809e2a8b912f0aaaf SHA1 a7c675a76a51ae4f9a6fcc726cc559eecdf3a091 SHA256 8cd8190e8112e5946b6c471a582bdecb6d6aead3c5a8edd5af2940996b1e4e7f
+EBUILD aterm-1.0.1-r2.ebuild 2145 RMD160 f19bc4ea89fc4e4385a533e854114f6219d83aea SHA1 ba52dd72735edb0446d784a46554b97a7eb94409 SHA256 67a0652a3f43f1892e3a253ec640c34f29d28964ece29b0c751a7bb0e45d9911
+MISC ChangeLog 18855 RMD160 532e216c98540069141ea54bfedf478fba4ab82a SHA1 cb760f03854b7f37056fc8731e3f7fad62e3ab5c SHA256 c3b564b0c4dff38c30d75e5546a54dcc1d38da34096f8fec2370fc844f01e23d
 MISC metadata.xml 450 RMD160 24f8a5cb2a00373b59ed5c12cc41010a069c8bfe SHA1 a70590ecba34c465bf70b89a76245915ff3232f9 SHA256 c310a050aab86e09333dcfc239ec10a78397796441274ab0cd93b725cb4e9a0e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iQIcBAEBCAAGBQJMahotAAoJELHSF2kinlg4LcUQAJGkT1CNrE3Cy/JLlS9zSqhG
+BcbwSIaR1yv5fLRiOD/aQcv+6X2bIe2eOYQVRth5ffBej8TEtCpIbZ5OjADgT6Mq
+0HQSDs2kVB/yXmogPVMDADv/4zeG0RGwKW6iskyWFP7r9DWiyy67nFFipTs4h49V
+1T/Uh3eWaQ9HYiq6GO7FaMTNd1HlnCzq1Q67ZlMfpic3iCW3Rh9KsW4pWLsk7mGj
+CRNx2PsQq9ZUqjl8XiIjoGXcxAVirtM+lLCpa/3D5N/ug1QXvstYyCwK5xrQLlaR
+XTwrnNBm6KCX1RqqJnMLRzXOgn4Wp0g7aFFDXFL6sfN5lkBxd7ACrUswvW6/cAYJ
+z8WNkELvVKi8pjC1jH8i5JEnTDhQhnp/m/z8Nb5eMns6pM5Aq2st05omu/OPZnJ1
+xu2qWY7S/H3K2DzK9zoeqe0APjVppeMN8Ri1hNpRo4zn8/b2ww71XhLGnqpK5hbv
+2bYfIl7q28b0qiLi3YyQGWHfhmxlAD3LL50jKRK8GRAWbUf71z5PXh2WF7fO2lxd
+kUJ8KSisOBPkcF1+d09HjenfNqhqJCnD5w27gttqZQIlo9rbkiXIMnjvV3x/IRuO
+IiT4+xMaDBGqnk3UEwHGKr4rWerAduw8A+rsMnDneZJZojjzrjW0gUcJ/c8MFyeZ
+4Y7VMg2hYzqt+paQNvVC
+=iOVT
+-----END PGP SIGNATURE-----
diff --git a/x11-terms/aterm/aterm-1.0.1-r2.ebuild b/x11-terms/aterm/aterm-1.0.1-r2.ebuild
index a78e0853062e..190fa8498753 100644
--- a/x11-terms/aterm/aterm-1.0.1-r2.ebuild
+++ b/x11-terms/aterm/aterm-1.0.1-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/aterm/aterm-1.0.1-r2.ebuild,v 1.3 2010/01/22 16:50:50 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/aterm/aterm-1.0.1-r2.ebuild,v 1.4 2010/08/17 05:12:04 abcd Exp $
 
-EAPI=1
+EAPI=3
 inherit flag-o-matic
 
 DESCRIPTION="A terminal emulator with transparency support as well as rxvt backwards compatibility"
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.afterstep.org/apps/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE="background cjk xgetdefault"
 
 RDEPEND="media-libs/jpeg:0
@@ -25,10 +25,7 @@ DEPEND="${RDEPEND}
 	x11-libs/libXt
 	x11-proto/xproto"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	# Security bug #219746
 	epatch "${FILESDIR}/${P}-display-security-issue.patch"
 	epatch "${FILESDIR}"/${P}-deadkeys.patch
@@ -38,7 +35,7 @@ src_unpack() {
 	failed"
 }
 
-src_compile() {
+src_configure() {
 	local myconf
 
 	use cjk && myconf="$myconf
@@ -46,21 +43,23 @@ src_compile() {
 		--enable-thai
 		--enable-big5"
 
+	case "${CHOST}" in
+		*-darwin*) myconf="${myconf} --enable-wtmp" ;;
+		*-interix*) ;;
+		*) myconf="${myconf} --enable-utmp --enable-wtmp"
+	esac
+
 	econf \
 		$(use_enable xgetdefault) \
 		$(use_enable background background-image) \
-		--with-terminfo=/usr/share/terminfo \
+		--with-terminfo="${EPREFIX}"/usr/share/terminfo \
 		--enable-transparency \
 		--enable-fading \
 		--enable-background-image \
 		--enable-menubar \
 		--enable-graphics \
-		--enable-utmp \
-		--enable-wtmp \
 		--with-x \
-		${myconf} || die "econf failed"
-
-	emake || die "emake failed"
+		${myconf}
 }
 
 src_install() {