Bump to EAPI 3 and fix for prefix.

Package-Manager: portage-2.2.0_alpha47/cvs/Linux i686

3 files changed, 15 insertions, 12 deletions

diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog
index 7fbd37dd8e60..697d228076b6 100644
--- a/sys-apps/util-linux/ChangeLog
+++ b/sys-apps/util-linux/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/util-linux
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.345 2011/07/12 03:32:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.346 2011/07/26 19:17:23 zmedico Exp $
+
+  26 Jul 2011; Zac Medico <zmedico@gentoo.org> util-linux-2.19.1-r1.ebuild:
+  Bump to EAPI 3 and fix for prefix.
 
 *util-linux-2.19.1-r1 (12 Jul 2011)
 
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index f2c078d090f4..72061f2a0861 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX crypto-loop.confd 412 RMD160 5e65febe9641a8362078fdae39b4ac955fb2e63b SHA1 2f881a24ff67115e74de7a11c66a34a745060864 SHA256 188c945e5e6c54cb14874057c625ff30b72fb33d3d5648e53de2f231a3375600
 AUX crypto-loop.initd 1729 RMD160 fa53920677d793cf98cad994e4dabd53e53d8d04 SHA1 19d3b7c4aa95cdadde2f6fb81a391081eae04f42 SHA256 b8329250c865e79a1e761d713c2270c99d5fe96e0d5a7ca646946fab65c4b810
@@ -19,16 +19,16 @@ DIST util-linux-ng-2.18-20100706.diff.bz2 58805 RMD160 5b1d645ecf33af652c7be704f
 DIST util-linux-ng-2.18.tar.bz2 7669676 RMD160 4781871a8f86195b886e81d364d41a57d67869e3 SHA1 154db0512caae0b6e90eee4b7312d4caf3d6b978 SHA256 b8c5c07c763888aa712b4585393346667a00793127c54cef0470cfa456b031cc
 EBUILD util-linux-2.17.2.ebuild 3015 RMD160 57dac717c0d9f30dbfa07cd40dec812d18c0cfe3 SHA1 903a657757ee19a86e1f6109d0ef36c3a10e6bb7 SHA256 c2bc733ccecd90d10664a821ab7c56cb26be6e0fa8448b3fd26878241bce6d20
 EBUILD util-linux-2.18-r1.ebuild 3271 RMD160 998c66452f87b053114d10625cc4f2e39ae4bd00 SHA1 14d9df40e418ec6155ba2dfc7b5ca2b30eb6f3d6 SHA256 7e6cca4e22388a373cf61538b4ff9973f706a71119e4bb66bef556175dde0170
-EBUILD util-linux-2.19.1-r1.ebuild 3285 RMD160 fb438544b0805a66562fc48a478e16641c22b78e SHA1 4912c1df68923f0ac6ed5d9674826c25586eaefc SHA256 72644721d68496ee6053e06ed5dfe0bf7f46eaadf5b6144ff9910b5dabda813c
+EBUILD util-linux-2.19.1-r1.ebuild 3289 RMD160 988ba69e54b1bd99b608f08b2e98f09695c4d5b3 SHA1 04a0fec13f143774fb759636af9d5c0823bd2ab0 SHA256 bec19791808035508f61558c4fef6a4c3a6b54490091d6f3b4758c72dc3c05ca
 EBUILD util-linux-2.19.1.ebuild 3162 RMD160 dd57955b2e9ebbc7717d2b8ce12cbdceb64e2e8d SHA1 567fcdf55eb499143aef82e34aa8cf620e5abe77 SHA256 70630679959a63448654b9152d67a2ed5a05c251f5bd08bf3a1ac77bfc6ebcad
 EBUILD util-linux-2.19.ebuild 3059 RMD160 29645f9660d0caf38bd2eb3d7a97d1d0ba544e94 SHA1 e3df015f117c4867f04abc3b8b1e1be82d8cbea5 SHA256 224395e264f11496a12b8f150022bf408428fbac16b893106dbddca5d77e1724
 EBUILD util-linux-9999.ebuild 3031 RMD160 b1eddac0ae658878c594fe4c96b2afc4cf079c7d SHA1 1f1d1db0be4cf4e93ef722ec177fff16a9b12272 SHA256 2ce236723ff8e5795d7187eda8b48bd3287be219a0be01d251241725dbb2d6bd
-MISC ChangeLog 52108 RMD160 cd852fda9909d4c022fdb36a9913fc74bd7b1427 SHA1 7467919a0512c080d1884cc7a4369313da2cbf27 SHA256 88cce518181a071e2471963fb1e1b9c93212724f6036d491035baec4a97765fa
+MISC ChangeLog 52223 RMD160 0d260acbcd951a8733907d668719a8200fa42cfc SHA1 072f3a67b9e3534ae595c444a7f663fe60e25c25 SHA256 b2dd9d984a477b48f93eb7041c873dbe6bdef548dd4fa1a4de60475b05c4b367
 MISC metadata.xml 516 RMD160 cd7ff3c0fbcf9c078d67e1cf164493c4d42f8c8b SHA1 8fb4ca9b1cf683a6b0da4bdc0b0551a1a057ea6b SHA256 70df7021a278c482dce7e20ae97550d7dbbf05e1bf612ac7780a28108bbfe702
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk4bwEIACgkQaC/OocHi7JYIrAEAjgaKj/7xTpxFaWFt8QRmYhmQ
-EkvWFxhKO264PQE1hvYA/iH6q+4PRbmaoV+7Pzhq9BM6Zvxy395u4C1jMpxe3KFF
-=nniF
+iEYEARECAAYFAk4vEsoACgkQ/ejvha5XGaPn1wCg2/4ArOx5UhLLfYv1gooqOQ+a
+DLUAmwU/e4Fuur0ci9UwHdasjHLlfBLa
+=05v0
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/util-linux/util-linux-2.19.1-r1.ebuild b/sys-apps/util-linux/util-linux-2.19.1-r1.ebuild
index 14d3b970af7a..475827c24c58 100644
--- a/sys-apps/util-linux/util-linux-2.19.1-r1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.19.1-r1.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/sys-apps/util-linux/util-linux-2.19.1-r1.ebuild,v 1.1 2011/07/12 03:32:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.19.1-r1.ebuild,v 1.2 2011/07/26 19:17:23 zmedico Exp $
 
-EAPI="2"
+EAPI="3"
 
 EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
 inherit eutils toolchain-funcs libtool flag-o-matic
@@ -99,14 +99,14 @@ src_install() {
 	dodoc AUTHORS NEWS README* TODO docs/*
 
 	if ! use perl ; then #284093
-		rm "${D}"/usr/bin/chkdupexe || die
-		rm "${D}"/usr/share/man/man1/chkdupexe.1 || die
+		rm "${ED}"/usr/bin/chkdupexe || die
+		rm "${ED}"/usr/share/man/man1/chkdupexe.1 || die
 	fi
 
 	# need the libs in /
 	gen_usr_ldscript -a blkid uuid
 	# e2fsprogs-libs didnt install .la files, and .pc work fine
-	rm -f "${D}"/usr/$(get_libdir)/*.la
+	rm -f "${ED}"/usr/$(get_libdir)/*.la
 
 	if use crypt ; then
 		newinitd "${FILESDIR}"/crypto-loop.initd crypto-loop || die