update to EAPI 4.

(Portage version: 2.1.10.3/cvs/Linux i686)

5 files changed, 32 insertions, 44 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/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@