patch runtime /etc directory for Prefix. bug 482988. Thanks to Michael for reviewing.

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

4 files changed, 41 insertions, 15 deletions

diff --git a/x11-wm/xpra/ChangeLog b/x11-wm/xpra/ChangeLog
index 892d1bf21b45..45ff2da0687d 100644
--- a/x11-wm/xpra/ChangeLog
+++ b/x11-wm/xpra/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-wm/xpra
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/ChangeLog,v 1.79 2013/08/22 06:46:07 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/ChangeLog,v 1.80 2013/08/30 08:36:50 heroxbd Exp $
+
+  30 Aug 2013; Benda Xu <heroxbd@gentoo.org> +files/xpra-0.10.1-prefix.patch,
+  xpra-0.10.1.ebuild:
+  patch runtime /etc directory for Prefix. bug 482988. Thanks to Michael for
+  reviewing.
 
 *xpra-0.10.1 (22 Aug 2013)
 
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index e97358a2ccbc..473ae0b498b6 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,6 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
+AUX xpra-0.10.1-prefix.patch 1166 SHA256 e2911ac5672e5823ee4a7ce94d9de62f9cf62d6528f91faebe61597416d8ff89 SHA512 923758dcda91f9f1ce9697fbd06cc10029aedd5a630f12ec211633847b4311c61c428e512eff9000bf6263343c49ee5eaed65b486db21595f05d5ddaa8fd90ce WHIRLPOOL 3f30ae5bdebded222e4f0a499a00fd1988aef0d5a1ae6930876632588b567a334d2e70c811a6feb1ecada8d8745e3a2904010590ef130c3fb9e6a2520cd00cb0
 AUX xpra-0.7.1-ignore-gentoo-no-compile.patch 482 SHA256 32c4a3819b0035ecdeeab72a15b183a894226c300bc5159a419251440f070195 SHA512 e22bfbcf6402e179d86fa4128b96d47e2ad4373ea2aa22a877ca3a3573ed56fbbf20ce66c2e94713a1d2d7b53dfa3339fd2f481f57e14770e09e1c0435bbc693 WHIRLPOOL 152c1c9ff623afd1d29dd7678f5ba44524e60b1cdbafd7f5779f1f8e53ea33015afa2476926aa91ef587131e0b1a6504cf9ffa149c3b72fd2fa62e7838152201
 AUX xpra-0.7.4-prefix.patch 478 SHA256 3a3e1914a82c71050891a31aad14360666c73bbc620a5d2da5d24391064bbca4 SHA512 b738ef53d05e2daf101eb2ea68f754db88f16c68e23177bcd87e96a2ce3336c40526bc1bafb25917c349484ac6bb92ff228b686fc6fff4fc281b0b5797b479e4 WHIRLPOOL ffae9d84515ba6784921ae1983c95520384f7dad7795ca1bbdbb4c8f99459633bd6f49b9c4babb2ce5ca7bde553ffb3ee7c64e559867cdb1a8b1e739d3fc5a09
 AUX xpra-0.8.0-prefix.patch 463 SHA256 5c05c47154751e68ea91a3988d17baa06a027370bddaf857f269cc2a0cabde77 SHA512 a18b61923f2ffc34a1a17de20705bee587804e3ed597c6092495f513e061255b0c412873b3c01a849c1fc19ca82a2b4aa95dc9add4e971a9e922074f6abcf0a2 WHIRLPOOL 64471baa063b0a1355b7c110be5f9febe9beaa8416377c98f418e2cf0ad14ecaf37267d3bf1175b0197ee38ecd15dec1da7953415d9818bc2d86fee99334ea56
@@ -12,16 +10,9 @@ DIST xpra-0.7.8.tar.bz2 471147 SHA256 27f5d0bc2a369a93076ef90fad46a6354e0327033b
 DIST xpra-0.8.8.tar.bz2 581029 SHA256 248bac50c78eccfbc7f728667f9d0ef26b101b288193fa286881cda452e63683 SHA512 b3d2121c13e293cca466997af1b49069ced0012c6692cfac375e9990d62efc916b44f2641a4e9c5e04e425d19c14e85e1521ae1832aa3ea02fcc46ac29672a63 WHIRLPOOL b1f654542e8e89ce89ffb6fac9ee3a42f0c88e6d9ce0fdc1573b28c0b117e970f7e96484eadf7552c35e6dd3064f37495a4eb2cdb1c51c2dc0a8ded8877ba321
 DIST xpra-0.9.8.tar.bz2 607316 SHA256 6c33f2da404209158a4684d26365bac56c77d3f158b95710a482e3a813178884 SHA512 324eeb09a2f948ded76a6cb53180ee68dedbce1c9f11736475e43551f9f27cb09949f1f8c1cdc1f5eb5000070a73e58593fac74d7ca3e24d2ddbc69bdf57d70e WHIRLPOOL 77dc3f3e27e1914d4691eb08247d1025a42d438167db178e59a3befdab44c8c02618f46968f5805af886aafb0129c1461a4843cd753f79d10e4bd9c4a07eeb9a
 EBUILD xpra-0.10.0.ebuild 2830 SHA256 4221d98255a925d6a57bfc28425398018ae7b9b48ddc78d60bb11417a94833e8 SHA512 b7b93c9b933e6c85a997f4e23f0cf3c54eed11358d9f8817172458442e5a67dd4d42947468e208e61358df0311c3fa47382f2b5b16669d550c46145994331a7d WHIRLPOOL ebf4d3116d2508cc56ed3b0804821e8cbf416648f1439fb26412a95796d0ede98c0707b95b1c6488ac2d31ef4b7507666e2b58d1ff749a362468c9f2030b8d91
-EBUILD xpra-0.10.1.ebuild 2830 SHA256 c83c9a5092d49b05637a1f7179dcbd6364970bebabcd03513b8d97f25bd45285 SHA512 273636203f748f18da11e96a85f8198de58a0e5980108b2c19e6fe325a0373c8a05be700f3d1e18b70d44d8e86e6e72f3300a7e8bb2d99d6fbdfe7682ce3317e WHIRLPOOL 40cab326029fabe2f2caccbb911640d14871a631ef455ca8b19a9fe40019e6887fe9df72349b4568310c2f0cc9e64ddc912864f2a4b39ab6038b6ffc9c6bef50
+EBUILD xpra-0.10.1.ebuild 2835 SHA256 056595fccac36f7786f61c3da1f48eb2500aaacdfdce8fd4ec4269e64089e66e SHA512 b437f6a69a9cc760264c686badcfa7a32406b00489f070808c0e845ab21da73abcac8349cd61418d043b423fb30803b14d1323e691c3c727f249605c23759410 WHIRLPOOL ab6c125a5e01e72610405b3b00aad12fc9111c4c430eca6bdf959af7a08886082e8c2eb5fafd75c99008fa68c4e40d2467721a3b50f5aa64badaf8864470c66a
 EBUILD xpra-0.7.8.ebuild 2520 SHA256 be7b5830ac406d6021ae56feee6549bf1e78f3623109c55d95b55b284bd2fbf3 SHA512 9a94a50c0e4f111e333b4545dbcbfd7b54e24e132e40bf57ab9aab881ea2e45127df71f84341fa5eed8e0aef1a6395861759881e537c97586ff9783c664f9838 WHIRLPOOL 1d00d061266bbd8935d37403a470a863af628127fe23b96ab258ab5595c0e9ad28bc7d7f3f011583b211c3758e320ce6c3c9f2f81e3a7424a753620f841769f5
 EBUILD xpra-0.8.8.ebuild 2263 SHA256 72bd40980609937092391960f5962683b3ec77304a76f902ba3a9b3dd6b8ffdd SHA512 c609633d6fbb8e3971b589646f3ad010698270287e68bb735df19294600ee893f00f6841495d703bf0dd642d26965a10a8a4f84158e1422c4228b6d16ebcc52c WHIRLPOOL 794fe466f3bd64e1739abaa54bd822b2b0d65c86b2eeb8c19e583a54bd41058159d1a771f8d0a36b602889057941a0cd2edbc7d8133118758a38560411a79030
 EBUILD xpra-0.9.8.ebuild 2646 SHA256 d56daad0cdd0ca7a07c98058e95e4a3f447e3866f9af6346782f7062285d6180 SHA512 b768650888ccbf9cbf2f6a2f5bb6e1bcab350d0111e33b178cca75fe80a0bd264ff1abbc1767d573ea0cc93edff6929a2db656360183a15d0618266c379dac49 WHIRLPOOL a57eb703e69b601e4e00506c9fb5cec605879dfa93c8b2b5d91c12f5c1f4dc6ae3b943e3551b44e92d178b264187748c38c09bd0cc8e3baa5010026011eac4e7
-MISC ChangeLog 11561 SHA256 f0f6cadb007e27da197d5476d3ead8417651b871d2983f6d7257fbe24d151bed SHA512 8265a8ddf9132c4c9e284c86863895ba2888563a58939e0fea389f5dc8f2bcde070c8945d549602af6007e0cd78d399b94201b445f4b8b8103c7988db6522a3b WHIRLPOOL dff372208002f66a8a1fc9c9bcdcde35a1e263e9a21e6fcddfaad20b751f04bada50dbd24035814928f51031b3b9cd2bb459c1ccd8b3c9b3bbef8d9f36cfb85f
+MISC ChangeLog 11756 SHA256 0c6edb5f91ab41636c5149cafa9c0b1daa95cd65ebbe1ca2fa49634a5e67264e SHA512 a1f0a114208b510730e12f941b04f2eecb46db1f7cb2da8dc25bf2155c76911a2d5cebf1a84209e476f4b1f662acfd2eaa14639a58d15365f8403ec124a36037 WHIRLPOOL 9d9c3063b458d524563d86850e37e8ddf671d9eadd3de46b870df14017402f44a720dab4d6be4c9f1e2359dfff56175a87d018077196ebdbc57b62ca6a36429b
 MISC metadata.xml 750 SHA256 520a2fa41f7d77740b88be12b182f4eb4bbd38b2e8fcbc7e3b6fee104febe4d6 SHA512 3a8bcebe6a9c51100166601bdbdfab2cd67c455ef1f549ce3014dd2a17109273ba7849bdf70ae2077d48cb957b2f7a27e9d6213017fec6db6a5ef509985d8281 WHIRLPOOL cfd580b41e3eec89c58a7b6da0788b61906f91dd673eccd2b9b0219edbb328780cd6294958fb68f52e0dfffdf52c60d9454dd02dfd996644b9b2e2ca3014edd0
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
-
-iF4EAREIAAYFAlIVs7AACgkQknrdDGLu8JAU8AD/br29Kkfk13dzfB01IgohoJSc
-2uKoUb3jWfzdHAuVFQUBAJbZhy4mOJXWSBOJFBWAb3Y0U7EsuhvRQLPx4Qx/w3fF
-=YeWs
------END PGP SIGNATURE-----
diff --git a/x11-wm/xpra/files/xpra-0.10.1-prefix.patch b/x11-wm/xpra/files/xpra-0.10.1-prefix.patch
new file mode 100644
index 000000000000..1e8e759abaca
--- /dev/null
+++ b/x11-wm/xpra/files/xpra-0.10.1-prefix.patch
@@ -0,0 +1,30 @@
+Index: xpra-0.10.1/setup.py
+===================================================================
+--- xpra-0.10.1.orig/setup.py
++++ xpra-0.10.1/setup.py
+@@ -896,8 +896,8 @@ else:
+             return {}
+     if "install" in sys.argv:
+         #prepare default [/usr/local]/etc configuration files:
+-        if sys.prefix == '/usr':
+-            etc_prefix = '/etc/xpra'
++        if sys.prefix[-4:] == '/usr':
++            etc_prefix = sys.prefix[:-4] + '/etc/xpra'
+         else:
+             etc_prefix = sys.prefix + '/etc/xpra'
+ 
+Index: xpra-0.10.1/xpra/scripts/config.py
+===================================================================
+--- xpra-0.10.1.orig/xpra/scripts/config.py
++++ xpra-0.10.1/xpra/scripts/config.py
+@@ -344,8 +344,8 @@ def read_xpra_defaults():
+     #first, read the global defaults:
+     if sys.platform.startswith("win"):
+         conf_dir = os.path.dirname(os.path.abspath(sys.executable))
+-    elif sys.prefix == '/usr':
+-        conf_dir = '/etc/xpra'
++    elif sys.prefix[-4:] == '/usr':
++        conf_dir = sys.prefix[:-4] + '/etc/xpra'
+     else:
+         conf_dir = sys.prefix + '/etc/xpra/'
+     defaults = read_xpra_conf(conf_dir)
diff --git a/x11-wm/xpra/xpra-0.10.1.ebuild b/x11-wm/xpra/xpra-0.10.1.ebuild
index 07038387d23e..b752bda32cc3 100644
--- a/x11-wm/xpra/xpra-0.10.1.ebuild
+++ b/x11-wm/xpra/xpra-0.10.1.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-wm/xpra/xpra-0.10.1.ebuild,v 1.1 2013/08/22 06:46:07 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/xpra-0.10.1.ebuild,v 1.2 2013/08/30 08:36:50 heroxbd Exp $
 
 EAPI=5
 
@@ -63,7 +63,7 @@ DEPEND="${COMMON_DEPEND}
 python_prepare_all() {
 	epatch \
 		"${FILESDIR}"/${PN}-0.7.1-ignore-gentoo-no-compile.patch \
-		"${FILESDIR}"/${PN}-0.8.0-prefix.patch
+		"${FILESDIR}"/${PN}-0.10.1-prefix.patch
 
 	#assuming ffmpeg and libav mutual exclusive installs
 	if has_version "media-video/libav" ; then