Prefix support for env.d files, bug 485580.

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

4 files changed, 18 insertions, 27 deletions

diff --git a/x11-misc/xdg-utils/ChangeLog b/x11-misc/xdg-utils/ChangeLog
index e1ba4aea25d7..9c02621e3b34 100644
--- a/x11-misc/xdg-utils/ChangeLog
+++ b/x11-misc/xdg-utils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/xdg-utils
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdg-utils/ChangeLog,v 1.108 2013/09/21 15:02:54 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdg-utils/ChangeLog,v 1.109 2013/09/22 01:59:37 heroxbd Exp $
+
+  22 Sep 2013; Benda Xu <heroxbd@gentoo.org>
+  xdg-utils-1.1.0_rc1_p20120916.ebuild, xdg-utils-1.1.0_rc1_p20130921.ebuild:
+  Prefix support for env.d files, bug 485580.
 
 *xdg-utils-1.1.0_rc1_p20130921 (21 Sep 2013)
 
diff --git a/x11-misc/xdg-utils/Manifest b/x11-misc/xdg-utils/Manifest
index 77cff6c78de1..64da9887bb2c 100644
--- a/x11-misc/xdg-utils/Manifest
+++ b/x11-misc/xdg-utils/Manifest
@@ -1,22 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST xdg-utils-1.1.0_rc1_p20120319.tar.xz 268720 SHA256 e9d9db6662ba2674fbd7f2534c6e4cb9512aed07d9b98072ea4e883715bb8c07
 DIST xdg-utils-1.1.0_rc1_p20120916.tar.xz 269232 SHA256 fc90b530eac4c24c76b975ae667aff573908b08159cdabf687a1835ab60586b0 SHA512 4797644b8dbcb5b3c5a8c626e625dacdb7470b8f751f831aa968c2d4d7d08019e3d764e57fbc554d999f45386a4e389cdff796c6cef85005ee9fda747dde5ee6 WHIRLPOOL 1d68500d127b7b2ca42eb6831e4c80f4461b3090042a1b6148ed72c431989e8c6c3f1b198725dda9e24e079e4373e67a23f47a7cd50f45e443fa935d73c65748
 DIST xdg-utils-1.1.0_rc1_p20130921.tar.xz 270508 SHA256 707e91f88a481faca5059844e32e24ed414788790336375947b8a80c0acda3e8 SHA512 b96f67f1a4ca1328295a9d14bc96273c776cc683b7b2be028a2ba4f92cba433558bec700f97dc4696751a115bac708e0dbaccda4ebd52a0fa55d50d3cbe62b66 WHIRLPOOL 05f1cd35bda0ae0e636c835b3a4ed2d4e639f7b637f070d10330ffeb023527f8d2efa2a3e9d51b2ed353c4ad3fef06ed7f70ca68ae93457b3f21df3eae245b3b
 EBUILD xdg-utils-1.1.0_rc1_p20120319.ebuild 1760 SHA256 31dea5c6ba69357a071425d2c427612045dab5d4ba45ad202f68868a9c919bc3 SHA512 62159f4bf0bb9465fc753e5cc9796ddb4c50f37177a33a609d5fb43dce0844b5ffe7e7c5fdf8679a3cae74c6ec0627bf64a0087490adb03fc27b1e18e7336ef1 WHIRLPOOL ec35571d18a206b7257629d119fdc221fb1e588f7380135422d9d68839edddd94942177a787a467e742108f0bec370739fa8f5a3b7d8c1916793d45d2d06a9e8
-EBUILD xdg-utils-1.1.0_rc1_p20120916.ebuild 2028 SHA256 622b17eff3e24da2cbffe1f74af8f4d229ddf42beb0a1034f7f0cec3d564ab0a SHA512 c84367ff751a924e73e4a6971d05a5d231bcdb8292c682625a0dc6ed0480360eabd2c139c57834cb9905be9af0d17e259b4ca60d6f3a15eebf1266f68ca20bf3 WHIRLPOOL c2261e9acdf0050583d381d416476edf631b0df42efbe8898e7cb6914ad4a957229d79d03514cd1c8409509a6617c56968902817c2d6f4a6add825ddd7b0a2c2
-EBUILD xdg-utils-1.1.0_rc1_p20130921.ebuild 1964 SHA256 c9861c66f73311d9d68b391f3a3c780709b2aaf64d01675950f69163d371d02d SHA512 036021d6a7a2e8b696b546aba1bb8321744b5dc9ab8a6bae5c6b8fd34177c98cf68f2c0a40d64422d60f204324583527684b123dcc5797131b277a453199bba9 WHIRLPOOL 37aab09a22b8664ca5602a03ed2645e5a295d895f5ef014f35d98b726a92d3d259e58428e6b4921fc2843bf2ad8e443aaa934cb98195d4e366cb40a07d00dd8a
-MISC ChangeLog 14535 SHA256 5862babe9b153b4c0f445fb58716a62e069928b36fd3a749a24b1b830ec65c7b SHA512 8dad584aa663a3f0f89a04e9c2e424526d919a93f0134a5e5891b89da16ae79e37fcd1960c2999718283737ee36402742bf5d7d154ca5332923a1941bd1187b7 WHIRLPOOL ae56dcc36566c893a081da94447e8e64568858dc6a3a0251f8ca169ed3d5874259663a6d7bdd499e02ce4e9e71f66bff6527b830244e17d48ef978429b36358c
+EBUILD xdg-utils-1.1.0_rc1_p20120916.ebuild 2056 SHA256 d0eba37d329488a54ed9abd37e93b67b1a6022187b3914ff04a514c2a66cd876 SHA512 7d0cf53adfbf1df202571ff7626ec61545c4ffa62ca5b51badac6512e45169d0baff10cdc39a4a7268b5f2b28ff3e7785c73a3ddb134b89de558f0a64ae8835c WHIRLPOOL 7c5fccd2d7cd9bb5074732c2e5b8aa423d5d0a63a4219b23200677428b99d77060b8bb01b7105f0cd60635761990f458c47ea117f0889ca3e5b691cae7298689
+EBUILD xdg-utils-1.1.0_rc1_p20130921.ebuild 1992 SHA256 d8b1b36cf6eba845de24ffb6eb5d690409531f5d04a18cda377af7bcebb5f5c5 SHA512 7f77670d7b2dd54fdf1a873995933b52608c03e4205034776183f595511ce8f913ccf70fdbb855f965cdad6ac011e2fdbfb0ecbd279d00297e3057fe25344397 WHIRLPOOL 6a9a35a5a6159bd8328eee758e234b7d913fc6ac6c39a72bb7bc09f6f939ff88ec740288b9fad5430666847705c4a444e28e60ac323c0f70384424d5e2638c77
+MISC ChangeLog 14703 SHA256 40f319f5e58692f3d1de330297fab20e2cfc9e27cb5447375d1feb41e5751cf8 SHA512 cd599f3ab0c7bf9d7d083a83c23f5c33a6519f42417d9b01c935f263f571b955cf3fd8addef6a18050ad4e8f3249ac21960618988ef1f40005149335f5dfe2af WHIRLPOOL 190feda8197d91948cf204491735f7aa90f6b019e991beff657a98f50d4b7b116b6274c4118cebffe6a1989be3fecf9ec30d868333f5989db7726976fe1f39ee
 MISC metadata.xml 234 SHA256 3018e3b31ed690a57bfc14e35699dd20ea3b352fc28b918f699e6955b57a2d97 SHA512 eed880663c66280f6688f896bd6b82d600cac0063eb79da7b1be0fe3bf866e7289edb389a505dfbf45bd9c7e5282748dadd7bf3477759788c1024300796545c3 WHIRLPOOL 79028c7efb93b6255351aebe7f35d1587d07ec1405e8fbee4fd874e42e57e6d10368b0f4ab60c89e115493a094f36af8be1bc2fe79fc2d34daae83dc0f8d7b16
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
-
-iQEcBAEBCAAGBQJSPbTmAAoJEEdUh39IaPFNYW0H/2BGV53PUNhgGjn2Z3VsBh1Y
-4AyvluaIW2zKy0izOfFAOD5K5Grie+YoAsSG0ZHj+/Fi/MqWm6o6qoG0bQs5nad5
-yCRBPgkeqiHiwsx35KAjdqWOPrS7cDJLUbw7S19P/znFb1qoWuKnlVszsev4/Yha
-ZfLwiF9qAIRSuLcVZGNMtS2Zr/GZs4tO0JEVuvRE+jKCyrKqaaE8jKNEX3AlA26t
-LNaIMrkEmt2o3CKdwgjHuno2vLbDUk0YCdmtI9VNSlsVcR1O49pq5PuHPds945KP
-kKxDpRNVoWTJS85zzSSzmTCjuLVqfikNPcEPjgCHEyKg9y9chxe1UsIxwfS0xJ4=
-=JiRv
------END PGP SIGNATURE-----
+MISC xdg-utils-1.1.0_rc1_p20130921.ebuild.orig 1964 SHA256 c9861c66f73311d9d68b391f3a3c780709b2aaf64d01675950f69163d371d02d SHA512 036021d6a7a2e8b696b546aba1bb8321744b5dc9ab8a6bae5c6b8fd34177c98cf68f2c0a40d64422d60f204324583527684b123dcc5797131b277a453199bba9 WHIRLPOOL 37aab09a22b8664ca5602a03ed2645e5a295d895f5ef014f35d98b726a92d3d259e58428e6b4921fc2843bf2ad8e443aaa934cb98195d4e366cb40a07d00dd8a
diff --git a/x11-misc/xdg-utils/xdg-utils-1.1.0_rc1_p20120916.ebuild b/x11-misc/xdg-utils/xdg-utils-1.1.0_rc1_p20120916.ebuild
index 756d42fe8575..49708f1ba914 100644
--- a/x11-misc/xdg-utils/xdg-utils-1.1.0_rc1_p20120916.ebuild
+++ b/x11-misc/xdg-utils/xdg-utils-1.1.0_rc1_p20120916.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdg-utils/xdg-utils-1.1.0_rc1_p20120916.ebuild,v 1.1 2012/09/29 17:05:16 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdg-utils/xdg-utils-1.1.0_rc1_p20120916.ebuild,v 1.2 2013/09/22 01:59:37 heroxbd Exp $
 
 # See .spec in http://pkgs.fedoraproject.org/gitweb/?p=xdg-utils.git;a=summary
 # The source tree MUST be cleaned before rolling a snapshot tarball:
@@ -48,12 +48,12 @@ src_install() {
 	use doc && dohtml -r scripts/html
 
 	# Install default XDG_DATA_DIRS, bug #264647
-	echo 'XDG_DATA_DIRS="/usr/local/share"' > 30xdg-data-local
+	echo XDG_DATA_DIRS=\"${EPREFIX}/usr/local/share\" > 30xdg-data-local
 	echo 'COLON_SEPARATED="XDG_DATA_DIRS XDG_CONFIG_DIRS"' >> 30xdg-data-local
 	doenvd 30xdg-data-local
 
-	echo 'XDG_DATA_DIRS="/usr/share"' > 90xdg-data-base
-	echo 'XDG_CONFIG_DIRS="/etc/xdg"' >> 90xdg-data-base
+	echo XDG_DATA_DIRS=\"${EPREFIX}/usr/share\" > 90xdg-data-base
+	echo XDG_CONFIG_DIRS=\"${EPREFIX}/etc/xdg\" >> 90xdg-data-base
 	doenvd 90xdg-data-base
 }
 
diff --git a/x11-misc/xdg-utils/xdg-utils-1.1.0_rc1_p20130921.ebuild b/x11-misc/xdg-utils/xdg-utils-1.1.0_rc1_p20130921.ebuild
index 4755a09f7bae..8229065fdf88 100644
--- a/x11-misc/xdg-utils/xdg-utils-1.1.0_rc1_p20130921.ebuild
+++ b/x11-misc/xdg-utils/xdg-utils-1.1.0_rc1_p20130921.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/x11-misc/xdg-utils/xdg-utils-1.1.0_rc1_p20130921.ebuild,v 1.1 2013/09/21 15:02:54 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdg-utils/xdg-utils-1.1.0_rc1_p20130921.ebuild,v 1.2 2013/09/22 01:59:37 heroxbd Exp $
 
 # See .spec in http://pkgs.fedoraproject.org/gitweb/?p=xdg-utils.git;a=summary
 # The source tree MUST be cleaned before rolling a snapshot tarball:
@@ -46,12 +46,12 @@ src_install() {
 	use doc && dohtml -r scripts/html
 
 	# Install default XDG_DATA_DIRS, bug #264647
-	echo 'XDG_DATA_DIRS="/usr/local/share"' > 30xdg-data-local
+	echo XDG_DATA_DIRS=\"${EPREFIX}/usr/local/share\" > 30xdg-data-local
 	echo 'COLON_SEPARATED="XDG_DATA_DIRS XDG_CONFIG_DIRS"' >> 30xdg-data-local
 	doenvd 30xdg-data-local
 
-	echo 'XDG_DATA_DIRS="/usr/share"' > 90xdg-data-base
-	echo 'XDG_CONFIG_DIRS="/etc/xdg"' >> 90xdg-data-base
+	echo XDG_DATA_DIRS=\"${EPREFIX}/usr/share\" > 90xdg-data-base
+	echo XDG_CONFIG_DIRS=\"${EPREFIX}/etc/xdg\" >> 90xdg-data-base
 	doenvd 90xdg-data-base
 }