Bump to EAPI 3, fix for prefix, and add ~x86-linux keyword.

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

4 files changed, 20 insertions, 16 deletions

diff --git a/x11-libs/libfm/ChangeLog b/x11-libs/libfm/ChangeLog
index c66bdf4808af..0c2dd2c692b5 100644
--- a/x11-libs/libfm/ChangeLog
+++ b/x11-libs/libfm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/libfm
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/ChangeLog,v 1.45 2011/07/29 12:22:23 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/ChangeLog,v 1.46 2011/08/06 07:11:01 zmedico Exp $
+
+  06 Aug 2011; Zac Medico <zmedico@gentoo.org>
+  libfm-0.1.15_pre20110614.ebuild, libfm-9999.ebuild:
+  Bump to EAPI 3, fix for prefix, and add ~x86-linux keyword.
 
   29 Jul 2011; Samuli Suominen <ssuominen@gentoo.org>
   libfm-0.1.15_pre20110422.ebuild:
diff --git a/x11-libs/libfm/Manifest b/x11-libs/libfm/Manifest
index 211f0895588a..e6103406947f 100644
--- a/x11-libs/libfm/Manifest
+++ b/x11-libs/libfm/Manifest
@@ -1,19 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 DIST libfm-0.1.12.tar.gz 607593 RMD160 5c7da7e3e4717b1a147a4fc9b066e58f7bfc2b92 SHA1 15b9d56c2ddf26838217764c95ab739b6b25e7c7 SHA256 9746ce0c1771c7156214058f6972f6e3594d9612c2b4915836164e0e79efbe19
 DIST libfm-0.1.15_pre20110422.tar.gz 398538 RMD160 23679c5983985b1d1ca56f0fa298948d13082e6c SHA1 4735ff64db3a157cd1bbe40e6519870ade23c29a SHA256 e98826385f1d61e47137add4062e553858854802f3589ee866c853a7fd3df9ee
 DIST libfm-0.1.15_pre20110614.tar.gz 420471 RMD160 09a8ee902290af47bafef1087a593c9969aa83dc SHA1 7f7fe26546c28d586beb1353966ebea75f530ecd SHA256 5cb5f956d54665649c179354f7686655e40695c13590c45b71a853477a458efc
 EBUILD libfm-0.1.12.ebuild 921 RMD160 05bdd7cfd75d8673b5d5c610d90d5140128e3f51 SHA1 32a6f91844046a8012e0074e809947c7911bef68 SHA256 147ac1d0a5cff245c74f66bddd95ff82712655fc668398a65c96650d9e10f25f
 EBUILD libfm-0.1.15_pre20110422.ebuild 2062 RMD160 bb9b26762fa3303b76b7a31fffb45355763c4578 SHA1 91984c1d795fefd07ccabcd8eb03649e6f27921e SHA256 4c2b2d1733afd9770102f1752d071f72e3e43b65e6b0761ad4c5bd2d25cfcefa
-EBUILD libfm-0.1.15_pre20110614.ebuild 2065 RMD160 8c36f33e103abb33f7296c553d822a0b9b304012 SHA1 8969e4f3c35cde76c4822dd0cbdadef0b23a64aa SHA256 51edc1235b53b58ea40db2c4a4c4689bba6a776fc2d2cc2ee0f749bb0450dcf1
-EBUILD libfm-9999.ebuild 2045 RMD160 501b54d5be348bb44b2eaf345d03ab162e30a62c SHA1 38da620ee7367a330dc8abe517e212bc12fdf3a7 SHA256 b0ca66e5eaa6df6abd411b57be6052e3b1ed7275733b1c2ee881cd89c5a67836
-MISC ChangeLog 6494 RMD160 9e8a35b55556c64e9ab69a04c2cf9ca206dc47a1 SHA1 13357d20418020c50a1a8a52a72c66f7a1a09028 SHA256 2369fe50f1c6555137504b1a1c89f1abeed53a93195af5e95b33fe1ccdc3e6c5
+EBUILD libfm-0.1.15_pre20110614.ebuild 2087 RMD160 3ef78129cba1100e567afa887a16d1fe82095e53 SHA1 7a3b4686f01beed7c2a97b3de7704e5858aad4a1 SHA256 c3e9bc3dab647a2936987dbccdba75e6378051adbb9cd512c298e7f01c9a3b66
+EBUILD libfm-9999.ebuild 2067 RMD160 a60735a56f3d55727ba282e85281bbaa25c0887d SHA1 3ce792fcce7a775e4078d1ae58e5f4d827900f69 SHA256 dc6f145d20308fde408575ddaba11f4931435a2534f9b2a3e9f6f989627b469e
+MISC ChangeLog 6656 RMD160 e326ae8bf52769daf7e396f1e00dd2c355096e86 SHA1 71ffd98764ca8cf415cad7f8b7cc5b93264c0781 SHA256 cbf6298bde6e43cfd7345f1a95459fe07776242704c5a3fe09410b884371fd1d
 MISC metadata.xml 315 RMD160 b97bee0eac6e3d997d55ef2f1f56df0ea4b81650 SHA1 8a2649a802082dd219590897d39798a0e14bff02 SHA256 1fc7172db4f825aa57aad8210f32c984d470b65c608f2e3cb6bda786c5902cef
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk4ypYAACgkQXkR9YqOcLPFSPQD/TCNzZV942bjnu5KICDLowYD3
-OFM9BRgIaIUeapmKPNYA/jtlUkgnu/V4Icv9XFYILjm2s/iu659PGCcxX3SstvY8
-=WFI6
+iEYEARECAAYFAk486QwACgkQ/ejvha5XGaPvBgCg4skHTPcjRIUuSWh7/ZY9Rila
+DPkAn28ATXDhWrpIsOQGQnk+V9WKBkIU
+=n1rq
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/libfm/libfm-0.1.15_pre20110614.ebuild b/x11-libs/libfm/libfm-0.1.15_pre20110614.ebuild
index dd47c2eff850..d79077dab549 100644
--- a/x11-libs/libfm/libfm-0.1.15_pre20110614.ebuild
+++ b/x11-libs/libfm/libfm-0.1.15_pre20110614.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/x11-libs/libfm/libfm-0.1.15_pre20110614.ebuild,v 1.2 2011/06/25 18:11:18 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/libfm-0.1.15_pre20110614.ebuild,v 1.3 2011/08/06 07:11:01 zmedico Exp $
 
-EAPI=2
+EAPI=3
 
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="git://pcmanfm.git.sourceforge.net/gitroot/pcmanfm/${PN}"
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	inherit autotools
 	SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86 ~x86-linux"
 	S="${WORKDIR}"
 fi
 
@@ -58,7 +58,7 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--sysconfdir=/etc \
+		--sysconfdir="${EPREFIX}/etc" \
 		--disable-dependency-tracking \
 		--disable-static \
 		$(use_enable udev udisks) \
diff --git a/x11-libs/libfm/libfm-9999.ebuild b/x11-libs/libfm/libfm-9999.ebuild
index 90291e09a5db..c4eac2e854bf 100644
--- a/x11-libs/libfm/libfm-9999.ebuild
+++ b/x11-libs/libfm/libfm-9999.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/x11-libs/libfm/libfm-9999.ebuild,v 1.15 2011/06/25 18:11:18 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/libfm-9999.ebuild,v 1.16 2011/08/06 07:11:01 zmedico Exp $
 
-EAPI=2
+EAPI=3
 
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="git://pcmanfm.git.sourceforge.net/gitroot/pcmanfm/${PN}"
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	inherit autotools
 	SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc ~x86"
+	KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-linux"
 	S="${WORKDIR}"
 fi
 
@@ -58,7 +58,7 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--sysconfdir=/etc \
+		--sysconfdir="${EPREFIX}/etc" \
 		--disable-dependency-tracking \
 		--disable-static \
 		$(use_enable udev udisks) \