Remove trailing backslash from ROOT only if EPREFIX is set. This guarantees

that EROOT is equal to ROOT for empty EPREFIX, which is assumed by at least
one external module. See also bug 434956.

Package-Manager: portage-2.1.11.16/cvs/Linux x86_64

4 files changed, 42 insertions, 18 deletions

diff --git a/app-admin/eselect/ChangeLog b/app-admin/eselect/ChangeLog
index 2581b7311001..1cce4aaf651e 100644
--- a/app-admin/eselect/ChangeLog
+++ b/app-admin/eselect/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-admin/eselect
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/ChangeLog,v 1.208 2012/09/13 17:11:50 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/ChangeLog,v 1.209 2012/09/14 21:22:34 ulm Exp $
+
+*eselect-1.3.2-r1 (14 Sep 2012)
+
+  14 Sep 2012; Ulrich Müller <ulm@gentoo.org> -eselect-1.3.2.ebuild,
+  +eselect-1.3.2-r1.ebuild, +files/eselect-1.3.2-eroot.patch:
+  Remove trailing backslash from ROOT only if EPREFIX is set. This guarantees
+  that EROOT is equal to ROOT for empty EPREFIX, which is assumed by at least
+  one external module. See also bug 434956.
 
 *eselect-1.3.2 (13 Sep 2012)
 
diff --git a/app-admin/eselect/Manifest b/app-admin/eselect/Manifest
index 60585e6f9881..1c3f00593ff4 100644
--- a/app-admin/eselect/Manifest
+++ b/app-admin/eselect/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX eselect-1.3.2-eroot.patch 293 SHA256 00c582b963e40aedcf161a51ec5de1cf0226b0efa13222224d7bb0314f0f4b12 SHA512 06b618c1a70b48569348024aac870a2abc71af7f1294dbc75326ed90bbbeca42755ca193514f2000f9fd63e66592e5313bf86418c60abc01340aae0bb24a4bc5 WHIRLPOOL a3776ff015222be921da4d40c2c829ea2fa1a0938e23b18bb172b37be7056eba59dcefd45c6bb8996f69419bd4fba6f37e2bf0553e9d1bee66cb4be6633606fc
 DIST eselect-1.2.15.tar.bz2 169358 SHA256 fa8e3b2af2bc4a951ddb6067ba1e786a04681555ab7e83d50d4eb85047f2e7d7 SHA512 228b1a3a8e8fee6ede929c8d36532ca58537ea59f1e9d055c9ca49049949ffc76dde2c04d684c63ec2df451bda5f0ee3d38e3a1c56d13f671be88f0f9fbb3dee WHIRLPOOL b4972c570038c2e27e61002ba008d17eeab102316cb49e1118b02387b14b9f4cc1b6032ed0654c6ba4f8f60eb15dea0677e147cd47137b93c9f66832339649af
 DIST eselect-1.2.18.tar.bz2 170120 SHA256 68581af8f7ca427dbd726b766071c833918fb5ae25ad03224def7e1599297b3c SHA512 e73c2503163e4c3400885ada32d4c7a4a2a511d7747c9add92522a9f3117eff6174092310ee0b5d56fb25546d11a881c643e00ef653d00d58e07a7742a1b5004 WHIRLPOOL 37b1bf6917b8e3dff48153a0c7af72d0b991392de79c95e3dcf484ed98077e20626ff967d6a0887167ec77536e12ac3fc4699e2d1b9f1d2c6fdce81f3218ef4d
 DIST eselect-1.3.1.tar.xz 163908 SHA256 4fc1c3f1b021dd8d28475ab2115f6a2de843bbbb941a0f70999389d1e0d56444 SHA512 b62e3e9f9c145a92625d136ea14ffa9705fa312971160ee3bb33f285dd67f6e6f415c7b9909b902b872500663a7a79c6fe53f52d179de7b7e120c5de994effd3 WHIRLPOOL a04a20c25617c3a53b0937c7f01f6dc89677beb5e1917a8d078a7f4403d4d77b7342da47766a061bc9158962ada190901db5b99d4b9603c49d9b90d3ad57feb5
@@ -8,24 +9,24 @@ DIST eselect-1.3.2.tar.xz 164168 SHA256 8b3906133090229defd6c5017fac0049e14cc0a5
 EBUILD eselect-1.2.15.ebuild 1775 SHA256 50952b211d338b44a98b02485080ef4ebc7a9ea0c3d00bb60b0a08447e356d43 SHA512 57f357853480c2051ed75f4b56a1b5e990b6c5f458550a9634f971e85ace22980ef0cc049596cb38ff24e32a2b77283a8c31a58f0742360b73f539fca65aa6f7 WHIRLPOOL bbab1d2901899463b4171395dc1c0bd1b9498f4ab994c7accc491baf76673b47453dfa75d37120d4abf0e10e290709fb13f6d48855b1b2b5b51c385c4e72766a
 EBUILD eselect-1.2.18.ebuild 1834 SHA256 0f66865cc3088a9541e9d4b2195022f42e3f0da76f2213df18fae2dd5178a60f SHA512 560ecf1011e137d12c61c1ddee676e5eee194f63ba4b5ce89f44f0f966d641cb14b5b99d6f75696dd4132ab2602286b55f33c4e98569e0384a78402ddf19a465 WHIRLPOOL 48a3f7bcd7cc4bd9effff81c2b54fcf079b0839e10fe802aeea609849eede76fb2a95a0e128471a5fa9ed03cb8cfb3ab5563acd0ebe6d4e4e9d15e359911dc4f
 EBUILD eselect-1.3.1.ebuild 1880 SHA256 a0f43750b814546df0a7b19cf4f4e7bc6a7653ab73c30733171b0a89a38e8651 SHA512 9b3f77c30ae2472f5ef368c477b6ac67348d1860ad6e68de05c7e73013c98e4e7c4b6097b833aabaae1795122d7c63f27d2363db311cb1d1e12736fd784e85dc WHIRLPOOL 6cdffec00682e3781f55de208db0706292b87914f42fb1dc1041cefad027e75107421f3297fe47378511ba0ef4918bd090ec38b746876f05a6d22037a5e3fdca
-EBUILD eselect-1.3.2.ebuild 1891 SHA256 895e96034c6c964c5724a8163ddceacf44555c5f310ba768bb400a4ac934a653 SHA512 12570b6ca7c2d92b848cf3b403de1d109d1d3b8a564d3459a289ae1ebf37cf7f8a84e7c7db3b52684a2bd1d45836cf541340ad15e244d6f40ebaf6344c691d7e WHIRLPOOL 35faa6d9747cc3a069511f788103c854950d424026c7dbc8bd2f1a24c9b3655acf41c7848783bff38948142808144d0b844adc9e9b02bc36cc76eae2cad76ad8
+EBUILD eselect-1.3.2-r1.ebuild 1959 SHA256 3f9a728f14882920f0da2bd4799fb7c6c1e6ec9d324844db8c8fa50f39f35bd2 SHA512 05061ea8b4322c875668685cfcb6e013ede0730638e8780a62c5be7bf33fd0345d4ba8839b02cb087864934688996328ad91298187bb48f841d3329862e447f4 WHIRLPOOL 80eb4fd9f5a1eaa0631c9a305a7cebe9e173194370ec146826e08535aef6bbd084d3df4b7be0bcba24a732c5fc7f019a80253f1a55e67597b490bbafaaef38da
 EBUILD eselect-9999.ebuild 1501 SHA256 39958a20f5f295d03ce761694d42da3b9c7fa5fff201a5dc30551ebd8df92a4a SHA512 c1f7cc26c27a8c78125eeff17015f05626bdbbf770c43ebba69d84ba38f390b66f3eb25b7b0b0649c6b48a542378e3353d554b63870605271bc8773046dcb4dd WHIRLPOOL 3acce8f025b9d8a8c5d4e35180ced8e85350fc1ceb51b88f5a5631cec823d9dcda00849cd878e1f2636ce783342b24f78d8fe0976dff9593dbea4141006a7e41
-MISC ChangeLog 29262 SHA256 0b9d27d6ea39a53dc70657784bdce4a4628cee62c617de694e5822c5449b47f3 SHA512 679232ce41cc27241e76837d35566429e317f599b9aa12c40d7036f982562e0293ba295cf74d8014060eeb3d7a120352cf907337e10f7af8cd1c7a8fef0a6581 WHIRLPOOL cf5bd5ed012ad916e1c5ec2328bb1863c4dd5f46da738e968123a8a4fc00ffcfc9d5cb649afb5638e6314adabd9ab472e9e4063de48392bc825c210c439e2819
+MISC ChangeLog 29628 SHA256 614d2186ed81a25c0890951bc3a04f6cbd746fbcd7132acfa01fff924deca94b SHA512 1799cbf95558f7ccdeea57956458d7e0cf26134886b73e6ced46543c698c78de3438687443bd76ed5ea0484b24a0fde373f1108059a1a78287ff2c2c848c6f95 WHIRLPOOL 5b00dbd1be7e5e85f6587e636d576ef282df241b1173d21ba8832c74861d88c8d30350597e6489289d3bef4a48586a1b27e76fb467252edde0224e308570657f
 MISC metadata.xml 202 SHA256 4734bc1332c7d5cb2724d9266d647c195fa114a891f503e04bda1ff96e63b596 SHA512 bdd75d28e57f8855efb6e66f0a1e67a8344b6dc2b95391e75d446d272bcc04170c83dc84f447cf957e020799a41e40a2e7cb55a2fdec4f2ea87039f70572bbf6 WHIRLPOOL 20cbbba5aabed9f251e6c5239a24290461ce961adddc218cd029dcb2efc2382a26282cc9dfed3c7bd82a6181ac76acbfd3ab74daab38a6ea4f9d432d2254c36b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQUhPfAAoJEDxpGckxwJCBxFwQALYMKkTsXLkt3TL5k8XvOHAO
-5TZIXnboIvB4Nl4EjEFHioHNyR2dEYeQfbeZtE9RwjjTifCBYzsm6e8wFfRJl6bC
-ZW3l8aWsPB2GroAFM2nUg+PcrNWE8ARCJqeKCMHOgAHJecMREv/OIE0wLJ/B/hjV
-4dXYZNUeDvZXx8vJAY+UCawhG18v3U7F8kESMzS7RiIHISiKfxpX8OljkgeKy63A
-wPnTMfTCHO5CRV82qq92ZscxPg3PWiL3QkKUeCqB/QbsoDCOZm7/HGoq+w9qKJV2
-qXgbLRPjavS4YIqIC2GMCJaXKkooWUsBGqnMKuAhv1znv0Gpj31Q88LFexjUZNDu
-ttQD0CY7uY4pABI5c1D+zIaqbluU/8l0waaT8z0l9YvQ4DjGjyU/ZqhVY2JIq6Gj
-RcJM1ZfdIXBrxvAsQkLQhCGXlCWeoFYqYIj7HXiDjCIXiTzyWZPy5CmMCY5BmNGR
-PskmGhXeC3TYJwd6eIQlCXNYlMxlrpJbaV38+aF6LkCkCzdmhF7ofvzMaqwBSeV6
-QSji4F58JokDLuegoS2rjXaLe/kMt2s8Ek6QVICjCZX0D7cmBVPDXwi7NDLvHOlO
-zXWgEcLZErcALiyTNK5TRNAxeyGA7A3xpWfat8NPeYGHR7Dln4gVJvhEAhGRPQ8b
-/hMHNNDpw2p4UvmAC3Ko
-=Lnp8
+iQIcBAEBCAAGBQJQU6A9AAoJEDxpGckxwJCBzIMP/23s+TLh2rfn3cFpDELyPrea
+kVqVc+fb01ZiZwrsWGDCv9+bpCCMNlqYBvcNKbiZusihaNqI/wU3Qg6FXlYBbjax
+3qbBkMM0kkaTxo916mvWshdg1fUo6E2nJ5KVjBZFMeKdHGq48Q7RjZtbErb7mBpQ
+imBNi3iBC1ospPqnxFjfc7SqbwbnfRCdEvd1wUMbJWKrYlck3WjQw0afDYV4wqsB
+4LxU/+Bg5HkMShYpL4Z8gVYDYeRvwqA+upkzRXYLntQXKsaCcicJ3SbBghzPU9Ng
+Kj6d0EMa3JCc67Jd0DGbR142i5kaEWe9RRFn/5mYBiKv4UG+Vkkvq5JrjNE3ojP1
+5itvtUoZeWGAqSsT3UcFxPaQ7zzhtRKQA26XE+yhvjEqTvw1jShf+5PIn52SjYfW
+gldPaPQp5Jh8/HXHACZuBD+9XFUn/mjhL9pz5C1N9Zoer0sUeVESEQRba3g0M6Ym
+l2QH2aL/UFIG5OgC4OLzWlsOUfWIm7SYCkJl/tYZzfxMhbzpoeXaGfLUCcxGf4tU
+0IKAX8cFpPgh55xWGqBtSnTvTt1dnAHNv4Zdq6sVmiNkPvUAuP9I8uOTFCaQJnzA
+GBubWynZnfwjqdL8LRlWVLu0uqIwATQah9LjQGu8UwUPRHRbTQv15vUDibvd2Kuj
+qz8WhtWtxPo9UZhAYytJ
+=oQW7
 -----END PGP SIGNATURE-----
diff --git a/app-admin/eselect/eselect-1.3.2.ebuild b/app-admin/eselect/eselect-1.3.2-r1.ebuild
index 3bb334a94213..84f37080ca4c 100644
--- a/app-admin/eselect/eselect-1.3.2.ebuild
+++ b/app-admin/eselect/eselect-1.3.2-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/eselect-1.3.2.ebuild,v 1.1 2012/09/13 17:11:50 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/eselect-1.3.2-r1.ebuild,v 1.1 2012/09/14 21:22:34 ulm Exp $
 
 EAPI=3
 
-inherit bash-completion-r1
+inherit eutils bash-completion-r1
 
 DESCRIPTION="Gentoo's multi-purpose configuration and management tool"
 HOMEPAGE="http://www.gentoo.org/proj/en/eselect/"
@@ -33,6 +33,10 @@ RDEPEND="!app-admin/eselect-news
 #PDEPEND="emacs? ( app-emacs/gentoo-syntax )
 #	vim-syntax? ( app-vim/eselect-syntax )"
 
+src_prepare() {
+	epatch "${FILESDIR}/${P}-eroot.patch"
+}
+
 src_compile() {
 	emake || die
 
diff --git a/app-admin/eselect/files/eselect-1.3.2-eroot.patch b/app-admin/eselect/files/eselect-1.3.2-eroot.patch
new file mode 100644
index 000000000000..81e5bb65e8a8
--- /dev/null
+++ b/app-admin/eselect/files/eselect-1.3.2-eroot.patch
@@ -0,0 +1,11 @@
+--- a/bin/eselect.in
++++ b/bin/eselect.in
+@@ -43,7 +43,7 @@
+ 
+ # Support variables for Gentoo Prefix
+ EPREFIX="@EPREFIX@"
+-EROOT="${ROOT%/}${EPREFIX}"
++EROOT="${ROOT%${EPREFIX:+/}}${EPREFIX}"
+ 
+ # Remove all alias definitions. Unset functions and variables that are
+ # known to cause trouble.