update to EAPI 4.

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

6 files changed, 47 insertions, 49 deletions

diff --git a/media-libs/compface/ChangeLog b/media-libs/compface/ChangeLog
index 7a443d307d96..5fddcba18575 100644
--- a/media-libs/compface/ChangeLog
+++ b/media-libs/compface/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/compface
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/compface/ChangeLog,v 1.47 2010/09/26 22:51:55 xmw Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/compface/ChangeLog,v 1.48 2011/08/13 13:25:59 hattya Exp $
+
+  13 Aug 2011; Akinori Hattori <hattya@gentoo.org> compface-1.5.1.ebuild,
+  files/compface-1.5.1-destdir.diff, compface-1.5.2.ebuild,
+  files/compface-1.5.2-destdir.diff:
+  update to EAPI 4.
 
   26 Sep 2010; Michael Weber <xmw@gentoo.org> compface-1.5.2.ebuild:
   Added ~arm keyword
diff --git a/media-libs/compface/Manifest b/media-libs/compface/Manifest
index e1508a82a5d1..3ed0c1fafbd9 100644
--- a/media-libs/compface/Manifest
+++ b/media-libs/compface/Manifest
@@ -1,8 +1,18 @@
-AUX compface-1.5.1-destdir.diff 1648 RMD160 981cb938240501a14c607f635564a9245671eb65 SHA1 62e6589bc4d12bb9924e2bf3caa2b8dd2e927d08 SHA256 16d9dd6936615ed7a569e383ba4ec538b2340b2b50e96ec9637b75284783af5e
-AUX compface-1.5.2-destdir.diff 549 RMD160 76a86e2c9b6d2a3e3859c3e0c22bb3e3b8a1ecae SHA1 22948391acfad8b2f66886f6915fab40c4c4edbd SHA256 d0c2a59db5b3e957b62fad1dcee7342a28cbb7561ede7059c03ba67ca42d1b2a
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX compface-1.5.1-destdir.diff 1507 RMD160 496bc7b2c73f9dbc0eb9c276af196a9e9baf69b7 SHA1 e586c2abf8ba90c68139187e381d3f6c1ec9d430 SHA256 abf5ac33501d615673033eb9f73e0dd2d0e3ccf81c11f7dcc5b5816ca3e02faf
+AUX compface-1.5.2-destdir.diff 408 RMD160 c5aa9f0b1fcab79a886fab8721c18014d25f9792 SHA1 63aa380a75d8114923f24d8341bdacae515a4ea5 SHA256 ebe58419e6dc0eeb246eb07c3897c13bf2d574d01aebb953de4a8d83bfd1c3ce
 DIST compface-1.5.1.tar.gz 30565 RMD160 97eedb887cca3f1bce5f087b142dbf794b128c38 SHA1 d97f3dd098da94e6869a8a82c225a902fe297b2b SHA256 bd2a0ea6866d5b34220ef66f8aeca9ec5faa310f210ef6e45277c9b534447ac6
 DIST compface-1.5.2.tar.gz 46970 RMD160 17174e8c263ae3984dd74fa7e93f8835773cd742 SHA1 72dad8774b3301a1562bdbd5b3c5536ebf86a03d SHA256 a6998245f530217b800f33e01656be8d1f0445632295afa100e5c1611e4f6825
-EBUILD compface-1.5.1.ebuild 835 RMD160 42b226edeb62cbd5c1590fcc0e0a7613e7b53808 SHA1 e899113ded5a75d845f3889df3b5f34ba10313bc SHA256 65873f219793a65a4faf9562b808350cbf0fb5b8a23e4233f8d58613f8d9a615
-EBUILD compface-1.5.2.ebuild 792 RMD160 ba14e089e3fc6b1851457507bd1d8d4bdb2f5ed2 SHA1 567570428dab9a0397da0ccde4bbbe2cd27e639e SHA256 a6261db5d7951fc30049131cbc7af9716ba8aa1872b9298b64078dc7cae6a544
-MISC ChangeLog 5329 RMD160 7362592f401798c1e0e941e769ade4e82a261a2d SHA1 86562ccac7b99f077a42cc58755885970aa9c4c4 SHA256 611835f22b6667a20793fd75da7ab5e2c42f2cfa15317ba1e0ce3d2017571db6
+EBUILD compface-1.5.1.ebuild 804 RMD160 ed80997e28073bcc0bd9305bdda4a6af1eebcf6c SHA1 338314f0bf715f38a792b783e440a560bc28fcac SHA256 8fd59824f5b7eaddfed6fc706a3497689ed3e480979e51e6665176e49a8b8090
+EBUILD compface-1.5.2.ebuild 757 RMD160 21fff453df1acf4b9a9c2607de1021d9291d60d4 SHA1 52f35b20e3a25fbd5e86c3a7e85237d7484d7b7a SHA256 a1e7194b20a09d254a86ccbdf1fef9cf24dc88ec775eda63e87c8c71dc0dc0b3
+MISC ChangeLog 5524 RMD160 7050aca29b59fa108c958b6e62b90cd0e6cf1e6e SHA1 28fe9b383a2a81fb8244586547ac13715947839b SHA256 ee7eff08ec9a29e2f80c3f0c76d8d2962c7af8b82f72871436a376dfcaa4c7d8
 MISC metadata.xml 226 RMD160 60e5239c3ffd0d48507c1cf25fb3dbfdf1f58c82 SHA1 aba64c9f48ea16298586f436894927ff108483d0 SHA256 2e0e5482071e686d7f2f8d8cc147e478fb66a3cab9dc9aad33a3ab90d8d8bec8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk5Ge30ACgkQL46suuyRem08JQCfYeLrbecvwRqINaMm5gcnW41q
+OmQAn0PtynIhmnTWhRyVLMlbJemFz/ro
+=p8YG
+-----END PGP SIGNATURE-----
diff --git a/media-libs/compface/compface-1.5.1.ebuild b/media-libs/compface/compface-1.5.1.ebuild
index 103c58406b54..ffd2e2554eda 100644
--- a/media-libs/compface/compface-1.5.1.ebuild
+++ b/media-libs/compface/compface-1.5.1.ebuild
@@ -1,36 +1,29 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/compface/compface-1.5.1.ebuild,v 1.12 2007/02/17 17:26:13 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/compface/compface-1.5.1.ebuild,v 1.13 2011/08/13 13:25:59 hattya Exp $
 
-inherit eutils
+EAPI="4"
 
-IUSE=""
+inherit autotools eutils
 
 DESCRIPTION="Utilities and library to convert to/from X-Face format"
 HOMEPAGE="http://www.xemacs.org/Download/optLibs.html"
 SRC_URI="http://ftp.xemacs.org/pub/xemacs/aux/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+IUSE=""
 
-src_unpack() {
-
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	sed -i "s:\r::" Makefile.in xbm2xface.pl
-	epatch ${FILESDIR}/${P}-destdir.diff
-	WANT_AUTOCONF=2.5 autoconf
-
+	epatch "${FILESDIR}"/${P}-destdir.diff
+	eautoreconf
 }
 
 src_install() {
-
 	dodir /usr/share/man/man{1,3} /usr/{bin,include,$(get_libdir)}
-	emake DESTDIR="${D}" install || die
-
+	emake DESTDIR="${D}" install
+	dodoc ChangeLog README
 	newbin xbm2xface{.pl,}
-	dodoc README ChangeLog
-
 }
diff --git a/media-libs/compface/compface-1.5.2.ebuild b/media-libs/compface/compface-1.5.2.ebuild
index 3be867b934d6..228faa7faacb 100644
--- a/media-libs/compface/compface-1.5.2.ebuild
+++ b/media-libs/compface/compface-1.5.2.ebuild
@@ -1,35 +1,27 @@
-# 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/media-libs/compface/compface-1.5.2.ebuild,v 1.14 2010/09/26 22:51:55 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/compface/compface-1.5.2.ebuild,v 1.15 2011/08/13 13:25:59 hattya Exp $
 
-inherit eutils
+EAPI="4"
 
-IUSE=""
+inherit eutils
 
 DESCRIPTION="Utilities and library to convert to/from X-Face format"
 HOMEPAGE="http://www.xemacs.org/Download/optLibs.html"
 SRC_URI="http://ftp.xemacs.org/pub/xemacs/aux/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 SLOT="0"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
 
-src_unpack() {
-
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	epatch "${FILESDIR}"/${P}-destdir.diff
-
-	sed -i -e '/strip/d' Makefile.in || die
-
+	sed -i "/strip/d" Makefile.in
 }
 
 src_install() {
-
-	emake DESTDIR="${D}" install || die
-
+	emake DESTDIR="${D}" install
+	dodoc ChangeLog README
 	newbin xbm2xface{.pl,}
-	dodoc README ChangeLog
-
 }
diff --git a/media-libs/compface/files/compface-1.5.1-destdir.diff b/media-libs/compface/files/compface-1.5.1-destdir.diff
index bae43f84a281..6727ea16e0ee 100644
--- a/media-libs/compface/files/compface-1.5.1-destdir.diff
+++ b/media-libs/compface/files/compface-1.5.1-destdir.diff
@@ -1,6 +1,5 @@
-diff -urN compface-1.5.1.orig/Makefile.in compface-1.5.1/Makefile.in
---- compface-1.5.1.orig/Makefile.in	2005-01-26 17:00:32.140000192 +0900
-+++ compface-1.5.1/Makefile.in	2005-01-26 17:00:17.788182000 +0900
+--- compface-1.5.1.orig/Makefile.in
++++ compface-1.5.1/Makefile.in
 @@ -71,18 +71,16 @@
  		$(RM) -rf `cat .fname` .fname
  
diff --git a/media-libs/compface/files/compface-1.5.2-destdir.diff b/media-libs/compface/files/compface-1.5.2-destdir.diff
index 617b0d843331..18ecfd1b4e5f 100644
--- a/media-libs/compface/files/compface-1.5.2-destdir.diff
+++ b/media-libs/compface/files/compface-1.5.2-destdir.diff
@@ -1,6 +1,5 @@
-diff -urN compface-1.5.2.orig/Makefile.in compface-1.5.2/Makefile.in
---- compface-1.5.2.orig/Makefile.in	2005-10-04 21:59:49.000000000 +0900
-+++ compface-1.5.2/Makefile.in	2005-11-13 19:15:24.220000000 +0900
+--- compface-1.5.2.orig/Makefile.in
++++ compface-1.5.2/Makefile.in
 @@ -1,10 +1,10 @@
  prefix          = @prefix@
  exec_prefix     = @exec_prefix@