fixed double-prefixed install paths, bug 336528

Package-Manager: portage-2.1.11.38/cvs/Linux x86_64
Manifest-Sign-Key: 0x2B6559ED

4 files changed, 26 insertions, 22 deletions

diff --git a/sys-fs/eudev/ChangeLog b/sys-fs/eudev/ChangeLog
index 6a2dd857c965..44886e65168e 100644
--- a/sys-fs/eudev/ChangeLog
+++ b/sys-fs/eudev/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/eudev
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/ChangeLog,v 1.17 2013/01/23 17:49:13 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/ChangeLog,v 1.18 2013/01/24 20:22:57 axs Exp $
+
+  24 Jan 2013; Ian Stakenvicius <axs@gentoo.org> eudev-1_beta2.ebuild,
+  eudev-9999.ebuild:
+  fixed double-prefixed install paths, bug 336528
 
   23 Jan 2013; Jeroen Roovers <jer@gentoo.org> eudev-1_beta2.ebuild:
   Marked ~hppa too.
diff --git a/sys-fs/eudev/Manifest b/sys-fs/eudev/Manifest
index c9710106311c..1adf74da5d67 100644
--- a/sys-fs/eudev/Manifest
+++ b/sys-fs/eudev/Manifest
@@ -3,14 +3,14 @@ Hash: SHA256
 
 AUX 40-gentoo.rules 349 SHA256 5d618b899475925ceccc330b6a738644aedd582d039f0cc404502637351347ea SHA512 b8d90037c08f30c9fb9e22a43c59a3627c218313b0421d4b70feba1731cda76ddc4ee6bdb99dca8df61e11f8d656a8769e172f0a584d7620213973dacfbbb4aa WHIRLPOOL a4086cd5f0e8849369389aa29ec42f5d906b00e3d650724d38ff8b4df4e36de7d3a37393b14f2f30a7102d6f2859b6847b5f4b7813be12d945ce1515494ce120
 DIST eudev-1_beta2.tar.gz 1671231 SHA256 359ed1a6d8e48599c1337f54a5c796fe3195f210f89ff22b352f622afe112fd6 SHA512 7a63d411221f4e267de95f500d1f4c69017abd26af212dbaf0af770346ad3942bd1af125a525fe1a57185f085710495369dd1495ee2df714f7dbbdca12fa4717 WHIRLPOOL a43777891fe303d68ba59f221c1698e450ab346392a157e82f750e0a7698c35a31801d4f0876b546b4c486b548eb10394e0c5a517af28762edaf2df09745aa32
-EBUILD eudev-1_beta2.ebuild 5923 SHA256 6113790288783a931e04c74dc63ae88ce2f806f8ce1becdf273713197ead0875 SHA512 37b5ebe6a6f76aaa295fb1a4784bd5cb051a097886e3334c6adf893de620f94caf0752e45faf1c98f9ce8a66da1f01df8db86b5311319bcfac6816cebde23023 WHIRLPOOL 118aaf03b5fa6e02724a2098a228ee624a904f37e9850081cc3095d870298e1ab0c71adcf6f66b23c13ef7354995485696dfb6e46a2934c67b133620b0c7751f
-EBUILD eudev-9999.ebuild 5915 SHA256 c0cdd6cfaeb77129cd0c2b2531ce431f1f1dc4f5f3f12a51250095420c8a8401 SHA512 924ef81057892cb770c8693d8b7abdf0d4b02c8dee261822a8777d4bb99fa65f3a2205ad0dd668caf73f8e453b9244fd069d2de43036fb8f402acac8565aaf25 WHIRLPOOL cd179f3d69844f75b216aed2e8eebc79efb83ec46b1670c2474f4b56ec2c39a450083c78eac0599a78faca9e43bce01eeadfe47fd790032b4d5bd172a1f37b4d
-MISC ChangeLog 3287 SHA256 2c1c06135cf231b5f8a6ac5610725563ec9fa4ae2b9d36df8badc05868ecb9aa SHA512 4b5af7ee966b3c207a1ccc2557c3d35e82d934e8c092e958ff5522340caa87fa3ecea3ef4619d433d5a0cc97e11be53090b9e6cf3b9b7dd2859266d5f581a272 WHIRLPOOL a36259be5b9b87d0ff6dbb38bf4202e756b6d74ce07c1773d2d27a90801a691c29ea25a7075c84b17fdb6bdb886f7d7506681749ef5bb66317414a5aef35810a
+EBUILD eudev-1_beta2.ebuild 5881 SHA256 97b1da85718da0065761584efea1e2caea2524b738f3930f72d5d11d123af056 SHA512 957d73ec22482629e16fa94280305b1224b86bb41873b8d176611dcfe1c6234b316c4e268cd7d8c61ba3306eff988fddc3f5ad7c5c1c2d41f07ad5dbb6346812 WHIRLPOOL 5bd3aaeaeb0d99e00c10b8219995588e6bcc9f5ce93cd9d1f277beb79acde403a3d4e9ae2f4da63ea911515c160775bdab17ff6c34abd41eb3935a16d1ee7058
+EBUILD eudev-9999.ebuild 5879 SHA256 26b39f3319934c8bd73e731f866c979892f54d023f7fe86757d9a7204e9d14d5 SHA512 e448e763009d407113d6d5edde2f8a3c269e4e0a678cff19da414071d85e079026150d5027b69e1a76501ec1c152f7272b0d5c6f478ac7ae7ee7bf7803a5f328 WHIRLPOOL 60f6694cfce1c9c29a21e6cd7d0f3daa7e986950b9e8f382684a9ccc5812afef9fb5e031879faa4090d77b911a7d0e58bc9304274520595f64fb844c07173933
+MISC ChangeLog 3430 SHA256 553e23b56ad85ed9f86570491940244a7f89e800872b0c575a7fec479cb563a7 SHA512 afd32ef7b14c049c288a38ada930385e771d639ccfa201f96955b823337089640f100010bb60285a409fc1ec48d2f673717478f199f70067fb8867c85f02f321 WHIRLPOOL 944b7bed0e33ba09e21b1336ecf87db3b95e4d40c2a6f94f511e2d7b34e90c6335587615d40435d737ce52384a6d4b8fc00d6c67759d9ab5768d75179f3f00ad
 MISC metadata.xml 1437 SHA256 746c57ca543652d7d4bf03da9ad30b43ee4dae3389935224d7d95fabca73b06f SHA512 dd410f423a9273c0b9ec9468be19c4e659cdbf9e968aaba1ef184933e2cc91ee57d2484ad3b9b6919a8173f88aa8aba8f2ca48888070495beeec5ecb80537b88 WHIRLPOOL f16ea7d0535586cb97a932159596fa222f703c38ec23f43acbc6625e72f22fce705fd0d57e25a88634f745fee70df60cbc2a7d0799b1c83e548a9e22bf33c741
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEAIpoACgkQVWmRsqeSphPDFQCbB+k9ia8WDLLpoaei1v57ayZh
-ZYwAn0bfK7Pbfpb3OKhiWUsuhn0qxU8W
-=WuAn
+iF4EAREIAAYFAlEBmDQACgkQ2ugaI38ACPDRtQEAmnjPwUm4so7DN+k3Z3ljUVAV
+rckBVYBhjvIUodC576EA/239iMVkPxGhOvLEhMndWmiC2L1VlCE71SWF3Vb2/Udm
+=55+1
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/eudev/eudev-1_beta2.ebuild b/sys-fs/eudev/eudev-1_beta2.ebuild
index 68177d785935..77882571e8e0 100644
--- a/sys-fs/eudev/eudev-1_beta2.ebuild
+++ b/sys-fs/eudev/eudev-1_beta2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-1_beta2.ebuild,v 1.4 2013/01/23 17:49:13 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-1_beta2.ebuild,v 1.5 2013/01/24 20:22:57 axs Exp $
 
 EAPI=4
 
@@ -138,13 +138,13 @@ src_configure()
 		ac_cv_header_sys_capability_h=yes
 		DBUS_CFLAGS=' '
 		DBUS_LIBS=' '
-		--with-rootprefix="${EROOT}"
-		--docdir="${EROOT}usr/share/doc/${PF}"
-		--libdir="${EROOT}usr/$(get_libdir)"
+		--with-rootprefix="/"
+		--docdir="/usr/share/doc/${PF}"
+		--libdir="/usr/$(get_libdir)"
 		--with-firmware-path="${EROOT}usr/lib/firmware/updates:${EROOT}usr/lib/firmware:${EROOT}lib/firmware/updates:${EROOT}lib/firmware"
-		--with-html-dir="${EROOT}usr/share/doc/${PF}/html"
-		--with-rootlibdir="${EROOT}$(get_libdir)"
-		--exec-prefix="${EROOT}"
+		--with-html-dir="/usr/share/doc/${PF}/html"
+		--with-rootlibdir="/$(get_libdir)"
+		--exec-prefix="/"
 		--enable-split-usr
 		$(use_enable doc gtk-doc)
 		$(use_enable gudev)
diff --git a/sys-fs/eudev/eudev-9999.ebuild b/sys-fs/eudev/eudev-9999.ebuild
index 61ead1dd45f1..fe0e5491be55 100644
--- a/sys-fs/eudev/eudev-9999.ebuild
+++ b/sys-fs/eudev/eudev-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-9999.ebuild,v 1.14 2013/01/22 21:29:06 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-9999.ebuild,v 1.15 2013/01/24 20:22:57 axs Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@ then
 	inherit git-2
 else
 	SRC_URI="http://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
+	KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~x86"
 fi
 
 DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
@@ -138,13 +138,13 @@ src_configure()
 		ac_cv_header_sys_capability_h=yes
 		DBUS_CFLAGS=' '
 		DBUS_LIBS=' '
-		--with-rootprefix="${EROOT}"
-		--docdir="${EROOT}usr/share/doc/${PF}"
-		--libdir="${EROOT}usr/$(get_libdir)"
+		--with-rootprefix="/"
+		--docdir="/usr/share/doc/${PF}"
+		--libdir="/usr/$(get_libdir)"
 		--with-firmware-path="${EROOT}usr/lib/firmware/updates:${EROOT}usr/lib/firmware:${EROOT}lib/firmware/updates:${EROOT}lib/firmware"
-		--with-html-dir="${EROOT}usr/share/doc/${PF}/html"
-		--with-rootlibdir="${EROOT}$(get_libdir)"
-		--exec-prefix="${EROOT}"
+		--with-html-dir="/usr/share/doc/${PF}/html"
+		--with-rootlibdir="/$(get_libdir)"
+		--exec-prefix="/"
 		--enable-split-usr
 		$(use_enable doc gtk-doc)
 		$(use_enable gudev)