update to EAPI 4.

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

6 files changed, 23 insertions, 95 deletions

diff --git a/app-editors/ee/ChangeLog b/app-editors/ee/ChangeLog
index a1d9f6ec29c3..02f6aa542215 100644
--- a/app-editors/ee/ChangeLog
+++ b/app-editors/ee/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/ee
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/ee/ChangeLog,v 1.3 2011/05/07 21:12:14 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/ee/ChangeLog,v 1.4 2011/08/13 12:29:33 hattya Exp $
+
+  13 Aug 2011; Akinori Hattori <hattya@gentoo.org> ee-1.4.6.ebuild,
+  -ee-1.4.7.ebuild, ee-1.5.2.ebuild, files/ee-init-location.diff:
+  update to EAPI 4.
 
   07 May 2011; Ulrich Mueller <ulm@gentoo.org> ee-1.4.6.ebuild,
   ee-1.4.7.ebuild, ee-1.5.2.ebuild:
diff --git a/app-editors/ee/Manifest b/app-editors/ee/Manifest
index 8e95929ea4f7..b3ec43a92927 100644
--- a/app-editors/ee/Manifest
+++ b/app-editors/ee/Manifest
@@ -1,19 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX ee-init-location.diff 1450 RMD160 28e1c02acd8c8634a79fe9e05cb881dd0401005b SHA1 c5bb61aca17672d309ff2806933203b65ea6b82b SHA256 6e3640641fcc33407924fbdb6d61f702f8535f1079260f6998a61199eed0c728
+AUX ee-init-location.diff 1342 RMD160 62617d56a5b9f91abeedb5ca249318ef833f3c18 SHA1 a7ddc85fdec7d20536bda2d14c9d7b6da6566f23 SHA256 d4f327ef5ab1aecd1b8a6d386361318acba65aa3573b9bb07671fe5a243cfe57
 DIST ee-1.4.6.src.tgz 70511 RMD160 2ed8ad3123c5443b29f5db142ad367d67028da27 SHA1 6be7d03eade441a6c409b9d441ba2c144e26b157 SHA256 a85362dbc24c2bd0f675093fb593ba347b471749c0a0dbefdc75b6334a7b6e4c
-DIST ee-1.4.7.src.tgz 70936 RMD160 03ecef414431c6bcfae8564516322519dc0341c3 SHA1 0604b204f3c8735e9d4018a813c36b613feb5451 SHA256 f53010c69258b1b5a65870afe1938134bec01bb1f605b890ca474bcb03265189
 DIST ee-1.5.2.src.tgz 69651 RMD160 af1ecc2c826ef3129af3a568d563b5c4bb47ba14 SHA1 da0697f34e407c010754922531b2f94bd7a589f8 SHA256 e08d7511a48b43ee354042fe3fe7d9cb3431238caedcf4ac729c61a447003918
-EBUILD ee-1.4.6.ebuild 925 RMD160 10e7c84eef3b2ad10bcc34f9ebc757ed49d149e0 SHA1 97efebb864987afe2387e440501e6293ae301824 SHA256 aedac2298df0045710f9f76b50f579fd446c9651495daebbc5d73bc9802d0b5f
-EBUILD ee-1.4.7.ebuild 1025 RMD160 ec857e8fe36f7c31cd4f07592aaac0cc5a471401 SHA1 5032f661a41fb640487065ce922f3d8271bdea0a SHA256 c3caf1439d19be5ea94e83031e174eb0fd92cc0d077594443d49ec7f1bb0111e
-EBUILD ee-1.5.2.ebuild 1074 RMD160 4ea78df239f5ac4dfebbae6d360957e030aa1f1a SHA1 9cf84beb5e2b2df8b6991ff97aea3f8cd2439449 SHA256 1a64d86d8278901ed93df628fb78c572bc1ab46b53187601d64a3df43b86ee69
-MISC ChangeLog 3137 RMD160 fbe45bb0f93d30b1cfa78fd3ed4fe8ff8b215a66 SHA1 3c28946f15835096cadfe8b869a6fc22226aea59 SHA256 880fe49180ef3c4c234a0254a0772393b4ac60f58badb2a5e7edb267cc77370d
+EBUILD ee-1.4.6.ebuild 869 RMD160 dfd2a097f0d10803c2102d95fa0878a8fa3f34df SHA1 8cc6a7b1bba9a5e3d661eddb8ac988e9f96042fc SHA256 dbd14189bb26dbb1d2950518ba6973951c633b46c5c35e85c78185ece65c49c7
+EBUILD ee-1.5.2.ebuild 1043 RMD160 4b8f3be5aad6e92a4aed57bb6e91e2aa5c125431 SHA1 d81bd3bb6d13da1e68b5c6f1a97d5a57078cfc17 SHA256 7d684bd4377907cb0de2013e79296b562c4db8844151e22a9449c4b604043514
+MISC ChangeLog 3295 RMD160 35dce55c601b104aea2ec3ad887c6c73d9608a57 SHA1 5b0e02269c0f1633b1e61b546ff90b8877516db0 SHA256 046bb1f13c8c46bb18eda61891e10333bbf32c0edcc4e74fe3f70a78ef2ac9d5
 MISC metadata.xml 230 RMD160 8e45109dbaf3c193afdb318002c1def7cb62dfa1 SHA1 9bd7aea9376c216b3f55303d1334a337cd6f06a2 SHA256 87fc07a55ee7814a0505ae1c24a871ac29ae7691c5383550647382a2b26277ae
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3Fti8ACgkQOeoy/oIi7uzoTwCg2OBI80FVDcRb5g3jN/i2svpJ
-aAAAniGXxZjMRlDKJSkJDDBn+EB0jvkU
-=1XAb
+iEYEARECAAYFAk5GbjsACgkQL46suuyRem0m2gCfR8KgXNe6g3XmZAsnh1TMny1T
+FV4An2wImWfxm7M+MAgCZUw/UW770mco
+=g6lS
 -----END PGP SIGNATURE-----
diff --git a/app-editors/ee/ee-1.4.6.ebuild b/app-editors/ee/ee-1.4.6.ebuild
index 52fd7c6b8387..9ed3201b5e7a 100644
--- a/app-editors/ee/ee-1.4.6.ebuild
+++ b/app-editors/ee/ee-1.4.6.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/ee/ee-1.4.6.ebuild,v 1.2 2011/05/07 21:12:15 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/ee/ee-1.4.6.ebuild,v 1.3 2011/08/13 12:29:33 hattya Exp $
 
-EAPI="3"
+EAPI="4"
 
 inherit toolchain-funcs
 
@@ -15,37 +15,26 @@ SLOT="0"
 KEYWORDS="~amd64 ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
-DEPEND=">=sys-libs/ncurses-5.0"
-RDEPEND="${DEPEND}
-	!app-editors/ersatz-emacs"
-
+RDEPEND="!app-editors/ersatz-emacs"
 S="${WORKDIR}/easyedit-${PV}"
 
 src_prepare() {
-
 	sed -i \
 		-e "s/\tcc /\t\\\\\$(CC) /" \
 		-e "/other_cflag/s/ *-s//" \
 		create.make
-
 }
 
 src_configure() {
-
 	emake localmake
-
 }
 
 src_compile() {
-
-	emake -f make.local CC="$(tc-getCC)" || die
-
+	emake -f make.local CC="$(tc-getCC)"
 }
 
 src_install() {
-
 	dobin ee
 	doman ee.1
-	dodoc README.ee Changes ee.i18n.guide ee.msg
-
+	dodoc Changes README.ee ee.i18n.guide ee.msg
 }
diff --git a/app-editors/ee/ee-1.4.7.ebuild b/app-editors/ee/ee-1.4.7.ebuild
deleted file mode 100644
index 2871ff5222d4..000000000000
--- a/app-editors/ee/ee-1.4.7.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/ee/ee-1.4.7.ebuild,v 1.2 2011/05/07 21:12:15 ulm Exp $
-
-EAPI="3"
-
-inherit toolchain-funcs
-
-DESCRIPTION="An easy to use text editor. Intended to be usable with little or no instruction."
-HOMEPAGE="http://mahon.cwx.net/"
-SRC_URI="http://mahon.cwx.net/sources/${P}.src.tgz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-DEPEND=">=sys-libs/ncurses-5.0"
-RDEPEND="${DEPEND}
-	!app-editors/ersatz-emacs"
-
-S="${WORKDIR}/easyedit-${PV}"
-
-src_prepare() {
-
-	sed -i \
-		-e "s/\tcc /\t\\\\\$(CC) /" \
-		-e "/other_cflag/s/ *-s//" \
-		create.make
-
-}
-
-src_configure() {
-
-	emake localmake
-	sed -i -e '/^all/s/ee/curses/' make.local
-
-}
-
-src_compile() {
-
-	emake -f make.local CC="$(tc-getCC)" || die
-
-}
-
-src_install() {
-
-	dobin ee
-	doman ee.1
-	dodoc README.ee Changes ee.i18n.guide ee.msg
-
-}
diff --git a/app-editors/ee/ee-1.5.2.ebuild b/app-editors/ee/ee-1.5.2.ebuild
index e30a86b2868d..af4e0845f4f8 100644
--- a/app-editors/ee/ee-1.5.2.ebuild
+++ b/app-editors/ee/ee-1.5.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/ee/ee-1.5.2.ebuild,v 1.2 2011/05/07 21:12:14 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/ee/ee-1.5.2.ebuild,v 1.3 2011/08/13 12:29:33 hattya Exp $
 
-EAPI="3"
+EAPI="4"
 
 inherit eutils toolchain-funcs
 
@@ -16,39 +16,30 @@ KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-interix ~amd64-
 IUSE=""
 
 RDEPEND="!app-editors/ersatz-emacs"
-
 S="${WORKDIR}/easyedit-${PV}"
 
 src_prepare() {
-
 	epatch "${FILESDIR}"/${PN}-*.diff
 
 	sed -i \
 		-e "s/make -/\$(MAKE) -/g" \
 		-e "/^buildee/s/$/ localmake/" \
-		Makefile \
-		|| die
+		Makefile
 
 	sed -i \
 		-e "s/\tcc /\t\\\\\$(CC) /" \
 		-e "/CFLAGS =/s/\" >/ \\\\\$(LDFLAGS)\" >/" \
 		-e "/other_cflag/s/ *-s//" \
-		create.make \
-		|| die
-
+		create.make
 }
 
 src_compile() {
-
-	emake CC="$(tc-getCC)" || die
-
+	emake CC="$(tc-getCC)"
 }
 
 src_install() {
-
 	dobin ee
 	doman ee.1
 	dodoc Changes README.ee ee.i18n.guide ee.msg
-	dodir /usr/share/${PN}
-
+	keepdir /usr/share/${PN}
 }
diff --git a/app-editors/ee/files/ee-init-location.diff b/app-editors/ee/files/ee-init-location.diff
index c623bcdba807..9d6179a03a59 100644
--- a/app-editors/ee/files/ee-init-location.diff
+++ b/app-editors/ee/files/ee-init-location.diff
@@ -1,4 +1,3 @@
-diff -ur easyedit-1.5.2.orig/ee.1 easyedit-1.5.2/ee.1
 --- easyedit-1.5.2.orig/ee.1
 +++ easyedit-1.5.2/ee.1
 @@ -406,7 +406,7 @@
@@ -28,7 +27,6 @@ diff -ur easyedit-1.5.2.orig/ee.1 easyedit-1.5.2/ee.1
  .br
  .I $HOME/.init.ee
  .br
-diff -ur easyedit-1.5.2.orig/ee.c easyedit-1.5.2/ee.c
 --- easyedit-1.5.2.orig/ee.c
 +++ easyedit-1.5.2/ee.c
 @@ -4124,7 +4124,7 @@