[patch] xpra Prefix patch

xpra-prefix.patch (text/plain), 1.69 KB, created by Benda Xu on 2012-11-30 12:31:54 UTC

diff -Naurp xpra.old/files/xpra-0.7.4-prefix.patch xpra/files/xpra-0.7.4-prefix.patch
--- xpra.old/files/xpra-0.7.4-prefix.patch	1970-01-01 09:00:00.000000000 +0900
+++ xpra/files/xpra-0.7.4-prefix.patch	2012-11-30 20:07:46.670205000 +0900
@@ -0,0 +1,13 @@
+--- xpra-0.7.4/setup.py	2012-11-30 14:10:10.000000000 +0900
++++ xpra-0.7.4-2.7/setup.py	2012-11-30 20:06:05.000000000 +0900
+@@ -459,8 +459,8 @@
+ 
+         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'
+             etc_files = ["etc/xpra/xorg.conf"]
diff -Naurp xpra.old/xpra-0.7.4.ebuild xpra/xpra-0.7.4.ebuild
--- xpra.old/xpra-0.7.4.ebuild	2012-11-19 03:24:47.000000000 +0900
+++ xpra/xpra-0.7.4.ebuild	2012-11-30 20:14:26.471322000 +0900
@@ -51,6 +51,7 @@ DEPEND="${COMMON_DEPEND}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-0.7.1-ignore-gentoo-no-compile.patch
+	epatch "${FILESDIR}"/${PN}-0.7.4-prefix.patch
 
 	use clipboard || epatch patches/disable-clipboard.patch
 	use rencode   || epatch patches/disable-rencode.patch
@@ -72,9 +73,9 @@ src_prepare() {
 
 src_install() {
 	distutils_src_install
-	rm -v "${D}"usr/share/parti/{parti.,}README \
-		"${D}"usr/share/xpra/{webm/LICENSE,xpra.README} \
-		"${D}"usr/share/wimpiggy/wimpiggy.README
+	rm -v "${ED}"usr/share/parti/{parti.,}README \
+		"${ED}"usr/share/xpra/{webm/LICENSE,xpra.README} \
+		"${ED}"usr/share/wimpiggy/wimpiggy.README
 	dodoc {parti.,wimpiggy.,xpra.,}README
 
 	einfo