Fix patch location (thanks redneb, bug 438472), reestablish USE server

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

4 files changed, 55 insertions, 46 deletions

diff --git a/x11-wm/xpra/ChangeLog b/x11-wm/xpra/ChangeLog
index c45ea2a21090..565cb75673c2 100644
--- a/x11-wm/xpra/ChangeLog
+++ b/x11-wm/xpra/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-wm/xpra
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/ChangeLog,v 1.31 2012/10/16 12:14:14 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/ChangeLog,v 1.32 2012/10/16 12:51:17 xmw Exp $
+
+  16 Oct 2012; Michael Weber <xmw@gentoo.org> xpra-0.6.4.ebuild,
+  xpra-0.7.0.ebuild:
+  Fix patch location (thanks redneb, bug 438472), reestablish USE server
 
   16 Oct 2012; Michael Weber <xmw@gentoo.org> xpra-0.7.0.ebuild:
   Fix src_install (thanks Gary E. Miller, bug 438526)
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 71280272636c..8a236e4236a0 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -8,14 +8,14 @@ DIST xpra-0.6.4.tar.bz2 456613 SHA256 3c47e16555325417e8be19dfcfd0c9c9f07d7a6e2e
 DIST xpra-0.7.0.tar.bz2 475193 SHA256 d31e4d960985730c683a204fc24511261a2d689cf5ddeed845b9ac859f3154a6 SHA512 cb8188e5d91136433bdbcfa452c084912905bc2d839c043a68280b8ca1f618f978dae1896b5041730edea5da226d5b975163f705dc4bf23e2c55b9ffce29fa58 WHIRLPOOL a8ff905162744ecf570a09658b3d9dffd635b43ec4e54db911ded363849eaf1b403c91a000ea59bfa8d4c2b2a26e8abfde2c02acf9179545a53cfb369157b459
 EBUILD xpra-0.4.2.ebuild 1828 SHA256 c0c09c7a6d1a743483967d4192abb170bbba401c54690a60083a2d093d2a9ac1 SHA512 c27f8a04ee4691965f25550de4a7259d0989b0a1acc0932ae657c14058b950131ccf399ba2d70cf189634c63f3214f41f92b0a672573ace4d54eba2370be1ba0 WHIRLPOOL 2a564e02cade0bf9c927609f8891ee6f4b510f6e56083273d45aa138eb5452ca2e73186373728be6647673ec5197177bb408a08a6c2756391d9a3d9db6326893
 EBUILD xpra-0.5.6.ebuild 1828 SHA256 292708e70121ed60d33cc7a701556cc8faae1c7d12b460cc71fd090580f3ad9a SHA512 b159ba30224ff658e9b49e2e72d8b788f008d5876a525c5795225e9e88fc64d0efb86d4478735588704fb87c980989b443b767a0eaebe24166a3c6b6e55bb898 WHIRLPOOL 796ddbcbbaca1a80f18e781e048db43512d351c6bd4560baf02691ab46ea5e2ddde66eefa6ca6e2e3578f436e5dbd875782cb43438e9b0a39a0b7dece65205b3
-EBUILD xpra-0.6.4.ebuild 1962 SHA256 311b5e55b824642a51dc46efe9ede3d75190086e14381870507f04bd34284882 SHA512 de2d8ad1a4ba6a737c45ffbbe2a5ce1f361ada8aec3f0b81478cd2bd3687ee8833ed51d2f1f63612054a82ce7c08bf95c088f7d4e6258214828bedbc0279d70c WHIRLPOOL 2a4245636a015b94e786ffb1ced2d23fd4c216effdfc7e62a07c9e2347253bd3693e20dc040009e95e58deb5c4fd21885f8e14066d0e136d1e35ead2e41d90bd
-EBUILD xpra-0.7.0.ebuild 2031 SHA256 2bcb34c9f91936b29717c9c35d3ecf59621cb20fc9f5f98c4212620705de358a SHA512 7094337615dd829e2bfad2fcc0bd0a1a891b0f3299f264a1eea263b9b0956863d5e456c8afa31e003207286aa1b7dc97c81a75fb360c1918b9b5d7617bc194c1 WHIRLPOOL 62052a211942136d4310648f7bb161e2ff5ff295ea9ca85477881243a51adb7b78ce3e83aa8951b929cb9ff6dee88931ab9ab2e85a5863e369e4a9bf4c4b83c2
-MISC ChangeLog 4473 SHA256 59b3ccb4c3a04c1901a5ba5c6a94365ab514365356ca42c882441834d115f4cd SHA512 4f4f4693944da89cc23216358cd52e55ae95618e403768a24c9c1cff20d0bfd73ca19b805ffc6e3dc6a0b42f41c20e5adfcee250f0b58c488077a4733ff0a862 WHIRLPOOL 0f989af9b8ce32db7a0cce3cea6c3b3449cc5196cb538d624a561ab0215320a4cb88928a38b82f1378fe4c5cb639bb54251d02065944869f4affaa5753fe33eb
+EBUILD xpra-0.6.4.ebuild 1918 SHA256 67ea25d4baea8c5ded69b71a2afc957adbb07df170f5937c2f62b6aaaedaaaed SHA512 5718d2998b5acbb79430bfc46fe73f67d6b0c0c7d02bf04921fe0342f485a9cb41793cb1985418b7e244df04ac7d9d9becc9a136f42e48e3e70b02cf1617760f WHIRLPOOL 2f5dc079404edb2de183e870350b89695e7e572b769a89fad0f038e1a35dca98d106700474b207f752942178179a2bf9add0fd54f28de660e2ed1979e8f6949b
+EBUILD xpra-0.7.0.ebuild 2114 SHA256 33af419d3cbd4e495b05cf80e93bbeb0773625e0952c9879091df4a6b609cf08 SHA512 af1a4c16474914fca8132c0759d5c74dcfc219c3d8071dcd768b86575cdadab39881ab760a1dc3e73f417a257a0d525f55efb478c03a7676090a29ae7798bb81 WHIRLPOOL 32f39acd66e349157a9b05a360df44b8134cd8793c229c3765ee0fe8901bc6a53c1ad0ec84858af0631196315228df761163b8d0de5fad6b93d4e736f4bede39
+MISC ChangeLog 4633 SHA256 d485bab09264c084509903275feb028f58681a1f84aa1a8099427da5e993ae33 SHA512 b7a0399e33a1f0fd1d7d7f280c2c119b2c321f0559c4d269639825eeeb116780d499663a9ccdcaed2f385ebc68a007c1848e9c9cd4b85a7eece1e40b7907af14 WHIRLPOOL 98771a297713bbd69fc12661c7bb1e1e0c64245036cf3b8a361bd16ea3ea2b378de206d5e020c13f3b6f9ba3d75c0fcadb0cb85646e82c8c3b08b232be4d0261
 MISC metadata.xml 658 SHA256 6aef86c970695b5c01220804072b2eccf90d1b9338d8a44e22ca2a72b067bc0a SHA512 71abc8d4880b0ff4e793c7f402090bc3e77e785c596ca6ebba76f4054628fb679aecb015971718f164ad095a081ed4d279d87e5a4660d3978c17ac232a532365 WHIRLPOOL b0ccd330fef2d9ca77bd617f3e11dc6d08481181481abf6941969a62e837331d3b06e82cf89504cc928b5df3abaee05f9f3b2d0c7aadd6ca67cebdd4275b28a8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlB9T70ACgkQknrdDGLu8JAyNQEAiwKGTYPx9WrIgkOBBnJWDzEk
-TVRkr6WpyJUeQ2pEl1QA/17f0Y0vq+d96u15RX9Ne/52QBlrjmyhYn5UGfIXqOES
-=ta8Q
+iF4EAREIAAYFAlB9WGYACgkQknrdDGLu8JCE0AD/U9crpAJkm5fuO02jeC4qh/uL
+GNklrap73+Dq7/Vbk28A/jbjD6DBFifIXIaFOFHZOZ9G27zFuOJnddki+j8Pfp7e
+=k2n7
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/xpra/xpra-0.6.4.ebuild b/x11-wm/xpra/xpra-0.6.4.ebuild
index da492eccd9ed..5c390c9b1cc7 100644
--- a/x11-wm/xpra/xpra-0.6.4.ebuild
+++ b/x11-wm/xpra/xpra-0.6.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/xpra-0.6.4.ebuild,v 1.2 2012/10/14 21:40:38 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/xpra-0.6.4.ebuild,v 1.3 2012/10/16 12:51:17 xmw Exp $
 
 EAPI=3
 
@@ -16,55 +16,58 @@ SRC_URI="http://xpra.org/src/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~amd64-linux ~x86 ~x86-linux"
-IUSE="+clipboard ffmpeg jpeg libnotify parti png +rencode server ssh x264"
+IUSE="+clipboard +rencode server vpx x264"
 
-COMMON_DEPEND="dev-python/pygtk:2
+COMMON_DEPEND="dev-python/pygobject:2
+	dev-python/pygtk:2
 	x11-libs/libX11
 	x11-libs/libXcomposite
 	x11-libs/libXdamage
-	ffmpeg? (
-		virtual/ffmpeg
-		x264? ( media-libs/x264 )
-	)
-	server? ( x11-libs/libXtst )
-	!x11-wm/parti"
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libXtst
+	vpx? ( media-libs/libvpx
+		virtual/ffmpeg )
+	x264? ( media-libs/x264
+		virtual/ffmpeg )"
 
 RDEPEND="${COMMON_DEPEND}
+	dev-python/dbus-python
+	dev-python/imaging
+	dev-python/ipython
+	virtual/ssh
 	x11-apps/setxkbmap
 	x11-apps/xmodmap
-	parti? ( dev-python/ipython
-		 dev-python/dbus-python )
-	libnotify? ( dev-python/dbus-python )
-	jpeg? ( dev-python/imaging )
-	png? ( dev-python/imaging )
-	ssh? ( virtual/ssh )
-	server? ( x11-base/xorg-server[xvfb,-minimal] )"
+	server? ( x11-base/xorg-server[-minimal] 
+		x11-drivers/xf86-input-void
+		x11-drivers/xf86-video-dummy
+	)"
 DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 	>=dev-python/cython-0.16"
 
 src_prepare() {
-	use server || epatch disable-posix-server.patch
-	if use ffmpeg ; then
-		use x264 || epatch disable-x264.patch
-	else
-		epatch disable-vpx.patch disable-x264.patch
-	fi
-	use clipboard || epatch disable-clipboard.patch
-	use rencode || epatch disable-rencode.patch
-
-	$(PYTHON -2) make_constants_pxi.py wimpiggy/lowlevel/constants.txt wimpiggy/lowlevel/constants.pxi || die
+	use clipboard || epatch patches/disable-clipboard.patch
+	use rencode   || epatch patches/disable-rencode.patch
+	use server    || epatch patches/disable-posix-server.patch
+	use vpx       || epatch patches/disable-vpx.patch
+	use x264      || epatch patches/disable-x264.patch
 
-	#python_copy_sources
-	#
-	#patching() {
-	#    [[ "${PYTHON_ABI}" == 2.* ]] && return
-	#	2to3 --no-diffs -x all -f except -w -n .
-	#}
-	#python_execute_function --action-message 'Applying patches with $(python_get_implementation) $(python_get_version)' -s patching
+	distutils_src_prepare
 }
 
 src_install() {
 	distutils_src_install
-	rm -vf "${ED}"usr/share/{parti,wimpiggy,xpra}/{README*,COPYING} || die
+	rm -v "${D}"usr/share/parti/{parti.,}README \
+		"${D}"usr/share/xpra/{webm/LICENSE,xpra.README} \
+		"${D}"usr/share/wimpiggy/wimpiggy.README
+	dodoc {parti.,wimpiggy.,xpra.,}README
+
+	if use server ; then
+		einfo
+		elog "please make your Xorg binary readable for users of xpra"
+		elog "  chmod a+r /usr/bin/Xorg"
+		elog "and think about the security impact"
+		einfo
+	fi
 }
diff --git a/x11-wm/xpra/xpra-0.7.0.ebuild b/x11-wm/xpra/xpra-0.7.0.ebuild
index 43b1510ec0cf..06d9d472a5fc 100644
--- a/x11-wm/xpra/xpra-0.7.0.ebuild
+++ b/x11-wm/xpra/xpra-0.7.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/xpra-0.7.0.ebuild,v 1.3 2012/10/16 12:14:14 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/xpra-0.7.0.ebuild,v 1.4 2012/10/16 12:51:17 xmw Exp $
 
 EAPI=3
 
@@ -16,12 +16,10 @@ SRC_URI="http://xpra.org/src/${P}.tar.bz2"
 LICENSE="GPL-2 BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+clipboard +rencode vpx webp x264"
+IUSE="+clipboard +rencode server vpx webp x264"
 
 COMMON_DEPEND="dev-python/pygobject:2
 	dev-python/pygtk:2
-	x11-drivers/xf86-input-void
-	x11-drivers/xf86-video-dummy
 	x11-libs/libX11
 	x11-libs/libXcomposite
 	x11-libs/libXdamage
@@ -41,7 +39,10 @@ RDEPEND="${COMMON_DEPEND}
 	virtual/ssh
 	x11-apps/setxkbmap
 	x11-apps/xmodmap
-	x11-base/xorg-server[-minimal]"
+	server? ( x11-base/xorg-server[-minimal] 
+		x11-drivers/xf86-input-void
+		x11-drivers/xf86-video-dummy
+	)"
 DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 	>=dev-python/cython-0.16"
@@ -53,6 +54,7 @@ src_prepare() {
 
 	use clipboard || epatch patches/disable-clipboard.patch
 	use rencode   || epatch patches/disable-rencode.patch
+	use server    || epatch patches/disable-posix-server.patch
 	use vpx       || epatch patches/disable-vpx.patch
 	use webp      || epatch patches/disable-webp.patch
 	use x264      || epatch patches/disable-x264.patch