Bump to EAPI 3 and fix for prefix.

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

3 files changed, 19 insertions, 25 deletions

diff --git a/sys-fs/lvm2/ChangeLog b/sys-fs/lvm2/ChangeLog
index 7a4287f752d5..6bfb1fdd2efc 100644
--- a/sys-fs/lvm2/ChangeLog
+++ b/sys-fs/lvm2/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-fs/lvm2
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.244 2011/05/02 06:27:41 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.245 2011/07/27 08:01:51 zmedico Exp $
+
+  27 Jul 2011; Zac Medico <zmedico@gentoo.org> lvm2-2.02.85.ebuild:
+  Bump to EAPI 3 and fix for prefix.
 
 *lvm2-2.02.85 (02 May 2011)
 
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index df0e4c017586..ff26f6682b51 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX 1.02.22-dmeventd.initd 536 RMD160 2f65a288b735035e6b2451c71ab432a525b19b3a SHA1 5413ad7eaf63a5e7c52f1b21138422f9e4fd6186 SHA256 c9dcee15ce55961e5df7928c350ae1c6db6e78c30d87f7fafa6ba4b016dd9191
 AUX 64-device-mapper.rules-1.02.22-r5 1010 RMD160 3dbb70b60b0c86a77fb9d0e8a0a9cd16a7dd03cc SHA1 fec62b9d4357fe4160e3d017c103767b6c9bf232 SHA256 7c92c2ff3c8dee6588ac51f8367a7b4bcb31d42f2d306ed08ce01be809b9ffcd
@@ -121,23 +121,13 @@ EBUILD lvm2-2.02.73.ebuild 8614 RMD160 257fc6784c5c027f487dad7e3c5e4e8fc077976d
 EBUILD lvm2-2.02.74.ebuild 8706 RMD160 495c5b9bc446eabfb6e485e9c010effc24358623 SHA1 814c9db645c74500b6e84d057b3b97e1f937b1c2 SHA256 f85a1bb5cff58280af40e37fea329ecbe6a3c7760d8987cef827a0bb68a3a8fb
 EBUILD lvm2-2.02.83.ebuild 8726 RMD160 63e4b84622f240b67fe877957563de0e068c3647 SHA1 d8fefdc661cd86febfd9454f9e2087b1596665e5 SHA256 cc18cdd6d63e6ca445fc470a054e887740f3d91c2235e13a631bb38a52a108e2
 EBUILD lvm2-2.02.84.ebuild 8797 RMD160 524b85dedef94030590e4bc6a5b9b2e9f31a6633 SHA1 3e4edeccee6693ed15d4f80260d8d492c960c5fb SHA256 d973bd93ea11ae47fac023841668e0563c3a3921560a62d49a9d5f9cdf1d134e
-EBUILD lvm2-2.02.85.ebuild 8813 RMD160 945d48141f88d79696f8e6d49dc24cdccc31b817 SHA1 ba331d1f7bc20998cccbf90c7f43d113118c327c SHA256 333c42295290c378b0c2d469ec24e8e144dbbb29444298c66e9b1be7953333d2
-MISC ChangeLog 43288 RMD160 eccfae852b95638ef610a3c3193ed490982c9772 SHA1 b2343dbe65a146c6cfd8d4176ec9887fa39442bb SHA256 9ad6cb502d884d0fa7ab8ab1be6b16d91f928fb92529b8175539d17d9c4026a0
+EBUILD lvm2-2.02.85.ebuild 8912 RMD160 54405a81d7a8750c5b1beb180803fbe2892924f2 SHA1 6f7787325ba1104cd39eab69efd37bdb06f1efaa SHA256 e888fd617c7d51d265e3ad24c4d7c584c29063b1ec73107b6e91534d0450b3df
+MISC ChangeLog 43394 RMD160 9683b5a9f7b34dbc213b0b37a733470e5846a477 SHA1 69e14daf11d6d764efbc1f15de2d2a9ce27b1414 SHA256 49530b4a83e83b65333a71c9bc91469b42debc19d8c75b1e82efacf81bab93ac
 MISC metadata.xml 792 RMD160 f60db9169ee273ca2f97fa5e69d4e5329e988164 SHA1 42f85f30477c65a164a11e172db7e250f442dca5 SHA256 87ced5a3a6102985f7c2a619dd52f65e62ae916f8921c8e7115a25452cd44b7f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJNvpyVAAoJEPqDWhW0r/LC5e0QAKuWJQGPb7hUkVmUAy9oo3v5
-iwTWOpyEcjh1LbA3bvHQI+3YdzNqHN94wSbnMf4jVbLlUTuMH19jKgzdqb0dmzm6
-MtPkWSHUgyuBB4ZUdE3YUdDVu8FGcXEd4BJWbVFeK1Mrv1V9CICMinLjUAV6ZxPS
-8p0JIKRZxg44SeRfwiI0dIv//mOYbZjpyPn/DCm+AefrwGPXLI11mf0a07WlzL6T
-dbXB5PTbkUJ5ebf4OrAQXVvn/ApqW08MdWFnAF+0WpVVTK+HtQdNDl4YxwU1xqjS
-iUDRKHG1V1pW8IeFgvRIuctrBtiADzQFpfDZTDJyyurCQlnFlME7QeIVB1mzvnwk
-1t+y3eUqujhkXfJTv3CODogwcZMu18gw/D98g2GhqfIZXdWHPVdhnImUaPxLJo7o
-4GVTS3rmt1DpGFMLIUhRmNeeS4f5b5RUHbNJfhvF0/CPCgr6CbaTUlONXgy8gPF7
-eMCEtaFeTky2k4A2sJqHasD3jp43+ZVRClGV9RZCEj3iNDLRtu1OAmgSkN4h48ky
-7bNBysBo+Z4YNdbqEtSz7kcmAJpwSylvo15Sy22Q/mGw5Gg8fju/OrcSAVO6ljz6
-aDdqsglSds4iY9mwxQ/Xip1M9FFz4HmT7Gdsjq0mnCxkxXAcVe5oD/Wdd09k5wUF
-lho3SppoC/XvfipysBox
-=ZF2M
+iEYEARECAAYFAk4vxfYACgkQ/ejvha5XGaPv/gCfftAUUQ4QaaaSb+IzoyiW93Rl
+m8oAoMp7w7o6MjlEsOLgG9NKnyHVAiwx
+=9LPS
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/lvm2/lvm2-2.02.85.ebuild b/sys-fs/lvm2/lvm2-2.02.85.ebuild
index 3554e38501a5..47a4d2da72c9 100644
--- a/sys-fs/lvm2/lvm2-2.02.85.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.85.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-fs/lvm2/lvm2-2.02.85.ebuild,v 1.1 2011/05/02 06:27:41 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.85.ebuild,v 1.2 2011/07/27 08:01:51 zmedico Exp $
 
-EAPI=2
+EAPI=3
 inherit eutils multilib toolchain-funcs autotools linux-info
 
 DESCRIPTION="User-land utilities for LVM2 (device-mapper) software."
@@ -154,17 +154,18 @@ src_configure() {
 	fi
 
 	myconf="${myconf}
-			--sbindir=/sbin
-			--with-staticdir=/sbin
 			--with-dmeventd-path=/sbin/dmeventd"
 	econf $(use_enable readline) \
 		$(use_enable selinux) \
 		--enable-pkgconfig \
-		--libdir=/$(get_libdir) \
-		--with-usrlibdir=/usr/$(get_libdir) \
+		--with-confdir="${EPREFIX}/etc" \
+		--sbindir="${EPREFIX}/sbin" \
+		--with-staticdir="${EPREFIX}/sbin" \
+		--libdir="${EPREFIX}/$(get_libdir)" \
+		--with-usrlibdir="${EPREFIX}/usr/$(get_libdir)" \
 		--enable-udev_rules \
 		--enable-udev_sync \
-		--with-udevdir=/lib/udev/rules.d/ \
+		--with-udevdir="${EPREFIX}/lib/udev/rules.d/" \
 		${myconf} \
 		CLDFLAGS="${LDFLAGS}" || die
 }
@@ -249,7 +250,7 @@ src_install() {
 	#newins "${FILESDIR}"/64-device-mapper.rules-2.02.56-r3 64-device-mapper.rules || die
 
 	# do not rely on /lib -> /libXX link
-	sed -e "s-/lib/rcscripts/-/$(get_libdir)/rcscripts/-" -i "${D}"/etc/init.d/*
+	sed -e "s-/lib/rcscripts/-/$(get_libdir)/rcscripts/-" -i "${ED}"/etc/init.d/*
 
 	elog "USE flag nocman is deprecated and replaced"
 	elog "with the cman USE flag."