Cleanup a bit to eapi4

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

3 files changed, 36 insertions, 15 deletions

diff --git a/sys-apps/ifplugd/ChangeLog b/sys-apps/ifplugd/ChangeLog
index af70103c89aa..d43450cbab50 100644
--- a/sys-apps/ifplugd/ChangeLog
+++ b/sys-apps/ifplugd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/ifplugd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ifplugd/ChangeLog,v 1.52 2011/12/28 14:41:56 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ifplugd/ChangeLog,v 1.53 2011/12/28 14:47:06 scarabeus Exp $
+
+  28 Dec 2011; Tomáš Chvátal <scarabeus@gentoo.org> ifplugd-0.28-r9.ebuild:
+  Cleanup a bit to eapi4
 
   28 Dec 2011; Fabio Erculiani <lxnay@gentoo.org> ifplugd-0.28-r9.ebuild:
   seems to work on ~arm
diff --git a/sys-apps/ifplugd/Manifest b/sys-apps/ifplugd/Manifest
index fdab4e7c068f..9d5f7c6f621a 100644
--- a/sys-apps/ifplugd/Manifest
+++ b/sys-apps/ifplugd/Manifest
@@ -1,9 +1,29 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX ifplugd-0.28-interface.patch 314 RMD160 279d2241107413a3d818f7ec3658898a41300dae SHA1 5e139adab498de8b4e775f2a16673ee2a7717826 SHA256 1bdbe17f26f467be2a5f300f20f2f8aa332ffa48cbe50bfc4bbff37de8f1bc67
 AUX ifplugd-0.28-nlapi.diff 639 RMD160 2fbf6329fb16118de0f1122aa41bca6a2906d0f3 SHA1 396bef6f2b478b3244fe68689b7246b422142d23 SHA256 f648c027fb446d0b25cc5dbca9db57dc33f5b8bff8dfbf1009847504f2229dfb
 AUX ifplugd-0.28-noip.patch 707 RMD160 014184b097659fef27b2a4728ae20bd9f5c69380 SHA1 e9460111f86ad118b25713bc25d0bd829ce9f47f SHA256 b072728dea9ab0945d257ce28262514282227394aaee9772204c903d2b21a6ee
 AUX ifplugd-0.28-strictalias.patch 1658 RMD160 2873f0375385d8a305c265bda4ea391156697086 SHA1 1b824596ca1184fcc6caac68417f03e79885c831 SHA256 733b317baa5b819b1f4191a0d5829411e41291997e0bf6cc3920cb9c834d1452
 AUX ifplugd.action 891 RMD160 1ee45a699b2402598cc4c6a18a3d294c4914a105 SHA1 e59bf81beb02b4ebf9c1d6538e00c473e3b78bf2 SHA256 55c88d2c773bc242e81f9fe310cd48999e69543fa8e0b2389c054e8890260015
 DIST ifplugd-0.28.tar.gz 142677 RMD160 09914a1914a4432822bb660d6aef194debe688f1 SHA1 0f00e6b544c0b7ed6c66fc58cb74f038d3fba77a SHA256 474754ac4ab32d738cbf2a4a3e87ee0a2c71b9048a38bdcd7df1e4f9fd6541f0
-EBUILD ifplugd-0.28-r9.ebuild 2029 RMD160 d8fd7bc2abcf366b5e85f7c12520fb0376861bd0 SHA1 7760bf560474dd7432cf234f56c8c3a34238a4c7 SHA256 550500b47501e11cc487a05454bbeb03d9b152f9c78bd7b3ab658773cc8958c5
-MISC ChangeLog 8747 RMD160 b15a0876e55975b736fb0ef73702fc1dbd15c560 SHA1 86f76942f33e4308a9229e18a8ff0db8303f8f71 SHA256 41472cdfdebb57de53cfe3e2eaddad4c82db1268ded9ca61be406ae8b82cc2e4
+EBUILD ifplugd-0.28-r9.ebuild 1893 RMD160 fc20e35ffe915472f4b5d2bc9cf6c2b03b89590b SHA1 86d27cb2b5945831575aa57e51d78ecaa12c2f29 SHA256 b31c80e16956e4438306004a767eec5aaaf0e5348b476b860dde39b9a619453a
+MISC ChangeLog 8856 RMD160 141a0e5aba546525acf701d8f81ffbf7419f49ec SHA1 1ac802efa06a953740462302fff259bf8aa2e34a SHA256 cc1229d13c850ef46afaabe503d8e171d1b7a3363ca84a9d54c041c80fdc3282
 MISC metadata.xml 281 RMD160 787ed71d23c1cffb4c79b49d1e1c2313b04676ca SHA1 cb5b250ae412b780798ce777e3351c787d527795 SHA256 1ba07a0fc2398616150381cbcd59bed37c710a49b382c487cc24678a30bf5042
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQIcBAEBAgAGBQJO+yvsAAoJEOSiRoyO7jvoPSsQAKn4/maRwE4wqvKyk/BK7D9W
+EEc+RG3kUkX8WcsL/oqudr5xXPDX9TjT7ownXAmzjs0OvK/5ZtGKCi+AFk3CHkQ9
+SWXw5UgH4s+mwGU1vd/arG4Le7Y2ZGs9ORFSdoORYPqPNoWW6DHnz45HxOJxXvr/
+PBdDlgdNbPHke+hVVAQ6LX3BBUVGrZxHdgBtMctTO9eOJvltujp+lCby/0MjF7qT
+IgQPa3MVBO/xPHWGY5Ut7piu7BUdx5ymDMnY5QPkAgQLGLOiDWRLrAVlbjc6axmj
+0W1vGpuljOr5svIntI6SWT0wLSca3lJitOa2ucfg5RJGRbHaO0sHGFCrh7TbAKbh
+gdrxqNaW3vqd5MPKOUH7n9AddaWhkbXcqs3QigdX1vy5yu40nGHDzGK/hPsKEkG4
+pom9zSdTjHuEQxyeTggT6lAF5f29WCy1PNuX7tltd4N6AyYTTUrFT6tH1QMP74Ck
+aKlXNPt1dWqPwyhTYrlRj4IMDG+axuk6L9F133iPuxI+PZaTWtfjaWIUwwQ+WNdn
+OGFgRO8KNBCOWm1Lvv+5hca5tzqR0yl1jwFTsBUbEZVaVEFAVW0fqg3ujH1wZbQh
+fDiGLmFJGC/4eEAcKWPk/qcPirg0NBHS+jxmnfgsWcSI28tbJjSNPj0VEyXxpHCw
+COZO3U7FXDe3CDw+zbLH
+=oTSI
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/ifplugd/ifplugd-0.28-r9.ebuild b/sys-apps/ifplugd/ifplugd-0.28-r9.ebuild
index 335e312de8ba..50ef4e0d4bc5 100644
--- a/sys-apps/ifplugd/ifplugd-0.28-r9.ebuild
+++ b/sys-apps/ifplugd/ifplugd-0.28-r9.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ifplugd/ifplugd-0.28-r9.ebuild,v 1.6 2011/12/28 14:41:56 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ifplugd/ifplugd-0.28-r9.ebuild,v 1.7 2011/12/28 14:47:06 scarabeus Exp $
+
+EAPI=4
 
 inherit eutils
 
@@ -19,33 +21,29 @@ DEPEND="dev-util/pkgconfig
 RDEPEND=">=dev-libs/libdaemon-0.5
 	>=sys-apps/baselayout-1.12"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}/${P}-nlapi.diff"
 	epatch "${FILESDIR}/${P}-interface.patch"
 	epatch "${FILESDIR}/${P}-strictalias.patch"
 	epatch "${FILESDIR}/${P}-noip.patch"
 }
 
-src_compile() {
-	econf $(use_enable doc lynx) \
+src_configure() {
+	econf \
+		$(use_enable doc lynx) \
 		--with-initdir=/etc/init.d \
 		--disable-xmltoman \
-		--disable-subversion \
-		|| die "econf failed"
-	emake || die "emake failed"
+		--disable-subversion
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
+	default
 
 	# Remove init.d configuration as we no longer use it
 	rm -rf "${D}/etc/ifplugd" "${D}/etc/init.d/${PN}"
 
-	dodir "/etc/${PN}"
 	exeinto "/etc/${PN}"
-	newexe "${FILESDIR}/${PN}.action" "${PN}.action" || die
+	newexe "${FILESDIR}/${PN}.action" "${PN}.action"
 
 	cd "${S}/doc"
 	dodoc README SUPPORTED_DRIVERS