update to EAPI 4.

Package-Manager: portage-2.1.10.3/cvs/Linux i686

4 files changed, 21 insertions, 34 deletions

diff --git a/app-editors/aee/ChangeLog b/app-editors/aee/ChangeLog
index 464aae4a7ff5..04455e756391 100644
--- a/app-editors/aee/ChangeLog
+++ b/app-editors/aee/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/aee
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/aee/ChangeLog,v 1.2 2011/06/30 12:55:40 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/aee/ChangeLog,v 1.3 2011/08/23 12:33:28 hattya Exp $
+
+  23 Aug 2011; Akinori Hattori <hattya@gentoo.org> aee-2.2.15b.ebuild,
+  files/aee-ae-location.diff:
+  update to EAPI 4.
 
   30 Jun 2011; Akinori Hattori <hattya@gentoo.org> aee-2.2.15b.ebuild:
   stable on x86 and add ~amd64. fixes bug #372579.
diff --git a/app-editors/aee/Manifest b/app-editors/aee/Manifest
index c39a5f6fb8c5..deba47a05051 100644
--- a/app-editors/aee/Manifest
+++ b/app-editors/aee/Manifest
@@ -1,15 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX aee-ae-location.diff 3120 RMD160 2d700010ce3c4ddb6b013df05cac188bc5289976 SHA1 f944f804078de109ea4a9a99e93088fd3d21ec80 SHA256 895f87be977ae3e9ea4d266b582f38b3a82c85ccf392ea22e303aa78d4fa60c5
+AUX aee-ae-location.diff 2806 RMD160 0b63ab72f75506f13255831d8d34f50eae0e3e1d SHA1 41f28ce5df5d28779b8fd69032854250644398ad SHA256 b653ec893ade01cb19ef3fd9440511dce307d3a76df4fbe8f9379e4f4eef6e1e
 DIST aee-2.2.15b.tar.gz 184218 RMD160 b8b74c7714fcfa915eee5e88482c4ec47887133a SHA1 63ba64fe43e7c0d0b0b55d6ffd3a6b54ed47316c SHA256 7abbaffe35018f9de87c8685f9bee2ea3f261e88ce60674f1a5a9a3a0f54d752
-EBUILD aee-2.2.15b.ebuild 1166 RMD160 edb4ec4cefd23b5c1b2644aa6f7fc48fecd9bbbc SHA1 14043ee08ce473e3382c1fe26c916d6b8a31d4dd SHA256 29c2a9351ac88dead5e868853da236756382dd0cc85d5207de46795d78badeaf
-MISC ChangeLog 493 RMD160 988b4dbfd166f42f28cd869d01fe6f4cc82df033 SHA1 35c18dac901d8bcddc949a157122f434d62197e4 SHA256 528fa31f63aac7b7c9ba2d5ec018f28f22a417f6ea07ba7b7c0e23643205d9dc
+EBUILD aee-2.2.15b.ebuild 1138 RMD160 fe0c863019acfb286958b6d8e00a982443f688ce SHA1 49b1d2a52dcfa66332501143d559030c4c930d9a SHA256 ccc78056cad19d447c7783414e07322b79b7c5b936fb454d808fb0e14cf5b34d
+MISC ChangeLog 615 RMD160 7ba6b3e248131c206c2c5497f02b1be64aa7bd7c SHA1 3e8721e98168f3c275b04acf7397d8d067235116 SHA256 d1fbe5188e36eccb8b39e390f709957a700148c8a1b382e328e7418df7151092
 MISC metadata.xml 230 RMD160 8e45109dbaf3c193afdb318002c1def7cb62dfa1 SHA1 9bd7aea9376c216b3f55303d1334a337cd6f06a2 SHA256 87fc07a55ee7814a0505ae1c24a871ac29ae7691c5383550647382a2b26277ae
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4MclUACgkQL46suuyRem0K/QCfSNN9qGzC9qreYZjdHB/zLLeX
-4hcAniwyr1YzMxV01XqfTQ7f0sBQO1YX
-=bZ0O
+iEYEARECAAYFAk5TniAACgkQL46suuyRem2I7gCePXBw2zYIfT06ywvKw03iDhwm
+yKcAn1pdz6S1PqYZRpSkt2VJZ5gZmLP9
+=lsou
 -----END PGP SIGNATURE-----
diff --git a/app-editors/aee/aee-2.2.15b.ebuild b/app-editors/aee/aee-2.2.15b.ebuild
index eee6aae4eadb..15989f9dfed7 100644
--- a/app-editors/aee/aee-2.2.15b.ebuild
+++ b/app-editors/aee/aee-2.2.15b.ebuild
@@ -1,57 +1,47 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/aee/aee-2.2.15b.ebuild,v 1.2 2011/06/30 12:55:40 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/aee/aee-2.2.15b.ebuild,v 1.3 2011/08/23 12:33:28 hattya Exp $
 
-EAPI="3"
+EAPI="4"
 
 inherit eutils toolchain-funcs
 
-IUSE="X"
-
 DESCRIPTION="An easy to use text editor."
 HOMEPAGE="http://mahon.cwx.net/"
 SRC_URI="http://mahon.cwx.net/sources/${P}.tar.gz"
 
 LICENSE="Artistic"
-KEYWORDS="~amd64 x86"
 SLOT="0"
+KEYWORDS="~amd64 x86"
+IUSE="X"
 
-DEPEND="X? ( x11-libs/libX11 )"
+RDEPEND="X? ( x11-libs/libX11 )"
+DEPEND="${RDEPEND}"
 
 src_prepare() {
-
 	epatch "${FILESDIR}"/${PN}-*.diff
 
 	sed -i \
 		-e "s/make -/\$(MAKE) -/g" \
 		-e "/^buildaee/s/$/ localaee/" \
 		-e "/^buildxae/s/$/ localxae/" \
-		Makefile \
-		|| die
+		Makefile
 
 	sed -i \
 		-e "s/\([\t ]\)cc /\1\\\\\$(CC) /" \
 		-e "/CFLAGS =/s/\" >/ \\\\\$(LDFLAGS)\" >/" \
 		-e "/other_cflag/s/ \${strip_option}//" \
-		create.mk.{aee,xae} \
-		|| die
-
+		create.mk.{aee,xae}
 }
 
 src_compile() {
-
 	local target="aee"
+	use X && target="both"
 
-	if use X; then
-		target="both"
-	fi
-
-	emake ${target} || die
-
+	emake ${target}
 }
 
 src_install() {
-
 	dobin aee
 	dosym aee /usr/bin/rae
 	doman aee.1
@@ -64,5 +54,4 @@ src_install() {
 		dobin xae
 		dosym xae /usr/bin/rxae
 	fi
-
 }
diff --git a/app-editors/aee/files/aee-ae-location.diff b/app-editors/aee/files/aee-ae-location.diff
index 86022005cb50..9bc6cd5421c0 100644
--- a/app-editors/aee/files/aee-ae-location.diff
+++ b/app-editors/aee/files/aee-ae-location.diff
@@ -1,4 +1,3 @@
-diff -u aee-2.2.15b.orig/aee.1 aee-2.2.15b/aee.1
 --- aee-2.2.15b.orig/aee.1
 +++ aee-2.2.15b/aee.1
 @@ -678,7 +678,7 @@
@@ -28,7 +27,6 @@ diff -u aee-2.2.15b.orig/aee.1 aee-2.2.15b/aee.1
  .br
  .I $HOME/.aeeinfo
  .br
-diff -u aee-2.2.15b.orig/aee.c aee-2.2.15b/aee.c
 --- aee-2.2.15b.orig/aee.c
 +++ aee-2.2.15b/aee.c
 @@ -2612,7 +2612,7 @@
@@ -40,7 +38,6 @@ diff -u aee-2.2.15b.orig/aee.c aee-2.2.15b/aee.c
  	NULL, 
  	".init.ae"
  	};
-diff -u aee-2.2.15b.orig/aee.msg aee-2.2.15b/aee.msg
 --- aee-2.2.15b.orig/aee.msg
 +++ aee-2.2.15b/aee.msg
 @@ -2,7 +2,7 @@
@@ -52,7 +49,6 @@ diff -u aee-2.2.15b.orig/aee.msg aee-2.2.15b/aee.msg
  2 "main"
  3 "modes menu"
  4 "tabs to spaces        " 
-diff -u aee-2.2.15b.orig/help.ae aee-2.2.15b/help.ae
 --- aee-2.2.15b.orig/help.ae
 +++ aee-2.2.15b/help.ae
 @@ -1058,11 +1058,11 @@
@@ -69,7 +65,6 @@ diff -u aee-2.2.15b.orig/help.ae aee-2.2.15b/help.ae
  .init.ae, then the current directory.  The settings from each file are read, 
  so that the directives from the most recently read file will take precedence 
  over previously read files.  This allows, for example, the .init.ae file in 
-diff -u aee-2.2.15b.orig/help.c aee-2.2.15b/help.c
 --- aee-2.2.15b.orig/help.c
 +++ aee-2.2.15b/help.c
 @@ -12,7 +12,7 @@
@@ -81,7 +76,6 @@ diff -u aee-2.2.15b.orig/help.c aee-2.2.15b/help.c
  	"~/.help.ae", 
  	"help.ae" 
  	};
-diff -u aee-2.2.15b.orig/localize.c aee-2.2.15b/localize.c
 --- aee-2.2.15b.orig/localize.c
 +++ aee-2.2.15b/localize.c
 @@ -64,7 +64,7 @@