Revbump to add IUSE=opengl (bug 470274, thanks Oliver Freyermuth). Make opengl default to auto and improve --help output. Replace configuration patches with setup.py --with/--without syntax. IUSE=sound adopted from upstream, but untested.

Package-Manager: portage-2.2.0_alpha184/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090

4 files changed, 167 insertions, 5 deletions

diff --git a/x11-wm/xpra/ChangeLog b/x11-wm/xpra/ChangeLog
index d71d5f53aca2..379594ead7ab 100644
--- a/x11-wm/xpra/ChangeLog
+++ b/x11-wm/xpra/ChangeLog
@@ -1,6 +1,15 @@
 # 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.70 2013/06/17 08:03:09 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/ChangeLog,v 1.71 2013/06/24 15:41:19 xmw Exp $
+
+*xpra-0.9.5-r2 (24 Jun 2013)
+
+  24 Jun 2013; Michael Weber <xmw@gentoo.org>
+  +files/xpra-0.9.5-opengl-auto.patch, +xpra-0.9.5-r2.ebuild:
+  Revbump to add IUSE=opengl (bug 470274, thanks Oliver Freyermuth). Make opengl
+  default to auto and improve --help output. Replace configuration patches with
+  setup.py --with/--without syntax. IUSE=sound adopted from upstream, but
+  untested.
 
   17 Jun 2013; Michael Weber <xmw@gentoo.org> -xpra-0.9.4-r1.ebuild,
   -xpra-0.9.4.ebuild, -xpra-0.9.5.ebuild:
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index f88e42636b76..deab6fdc2398 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -5,18 +5,20 @@ AUX xpra-0.7.1-ignore-gentoo-no-compile.patch 482 SHA256 32c4a3819b0035ecdeeab72
 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
 AUX xpra-0.9.5-PIL.patch 4033 SHA256 cb46783967532c5689da368ae5f0770a123dff1f65716723d833ad9f1f3c4a9d SHA512 8427686a10179317d254c3a80edbc5947aa2f1c6747de4c1363cb61c9b96dd5aa8bff67a36cf75ba1e597e04f6bebaffb5c5367efeee33268bcdbc6c95c5dbf9 WHIRLPOOL f7d10791add68e6111aaa4b8f24fa96d47d0169d50016a20edfa4af414d899fef20b8b12fecf5eb99c3254471b83eece672f3fc0adab999e44153f80abb7269e
+AUX xpra-0.9.5-opengl-auto.patch 2016 SHA256 0fa3ad5e8e3159e01d6407404818ce1fa1d95793133dfafc96ba16bac5069eb4 SHA512 51e90f39c119175b78c70ada2257356adf07ed930d4f7a9353c263849a1045f88f960e5e89617ab8f3ee4b38bd079c5faa13bee5e5099dadefa1cd857d1e40d5 WHIRLPOOL ef126290717837f674ad653ff9a80db3b74b1fc8e207c7d97b4d1ca86bff83c0a66beba0efa88c8f3cf0b046caf3c49a29eb95e65afdf6c40bea5c37ad4555ec
 DIST xpra-0.7.8.tar.bz2 471147 SHA256 27f5d0bc2a369a93076ef90fad46a6354e0327033b9139b659d602e9e32c17cb SHA512 d14fdd75c7fd494f4aaae8740ce1a5a7880ae70109ffa7989d346d1b5add56a8117a5851132140f2e8a3aad0f7f3f4a9fe6e2b2f3e9666e469f35fc179fd0af2 WHIRLPOOL c0ed83f90ade9b3a7b0ab728ab090d73277fecb56edc4943295fa19f211b3e41c12dcad6eec9b01932c0a2bb1a6402f8f88deaf25c7f88be01fcf986778c4fd0
 DIST xpra-0.8.8.tar.bz2 581029 SHA256 248bac50c78eccfbc7f728667f9d0ef26b101b288193fa286881cda452e63683 SHA512 b3d2121c13e293cca466997af1b49069ced0012c6692cfac375e9990d62efc916b44f2641a4e9c5e04e425d19c14e85e1521ae1832aa3ea02fcc46ac29672a63 WHIRLPOOL b1f654542e8e89ce89ffb6fac9ee3a42f0c88e6d9ce0fdc1573b28c0b117e970f7e96484eadf7552c35e6dd3064f37495a4eb2cdb1c51c2dc0a8ded8877ba321
 DIST xpra-0.9.5.tar.bz2 606452 SHA256 3c56a9bb766c08d287f02f9c2ee75ab0fbd96488130b9e61d25e4deb6a7f29e3 SHA512 c056b978083d088008289261a15e3b4baaf8ff7f93771bc55b120924359a6da3d47295b4d778bf772f158cc86d0318e33d37e9f7d7ad76badc9ea7c6f7a70979 WHIRLPOOL 30435735f9e02848fc85fc0788ecf1733bd0aeded58ac2961718009d40be95838bc5a28253e36e14003b77373d8c191ad8cc177646fa5275b2b22885ce8c6a47
 EBUILD xpra-0.7.8.ebuild 2520 SHA256 be7b5830ac406d6021ae56feee6549bf1e78f3623109c55d95b55b284bd2fbf3 SHA512 9a94a50c0e4f111e333b4545dbcbfd7b54e24e132e40bf57ab9aab881ea2e45127df71f84341fa5eed8e0aef1a6395861759881e537c97586ff9783c664f9838 WHIRLPOOL 1d00d061266bbd8935d37403a470a863af628127fe23b96ab258ab5595c0e9ad28bc7d7f3f011583b211c3758e320ce6c3c9f2f81e3a7424a753620f841769f5
 EBUILD xpra-0.8.8.ebuild 2256 SHA256 a3dd42fd2649a57eae026f027c0b0e9769c85af5f45af537edab0ecb80acc240 SHA512 e8ec733fa29a7c1ede09362122ef46167046e0aa89b27690ee3931661168f33b25b56dd8860ac110de88a84e8f3a2ab7037a48f8dd4ec6b9b236fab6a768ffdc WHIRLPOOL a6c0038b983d6bef22fe7632a609942cdea71255489d10f9f768dbe31eadbd0b4ec4214b432f80ed360177e5b0d19d457b318ddc1f21f6a8073bb3e7a25f99b3
 EBUILD xpra-0.9.5-r1.ebuild 2476 SHA256 435a0d03537a5066c421ac1b2e74796485ad8555daba9e9fd9efca84627b0277 SHA512 2d456caaa0d6f73d81ef7e06cafc467c2d148f4e545089d91d6605d2ba9c258594e841694b2ea2413e76fc733d4c2a6038adffb4f1ea45093dc5482ba4938249 WHIRLPOOL 46c4ca53ef13594c7b55857ea87052248ecb0c8fcb5b46bd02db825ea9764a49ee42d0c312d957b25cc262e77b6579c353cc5c4f7ae60f6ac170bb1322b308a1
-MISC ChangeLog 9914 SHA256 bb0940dbb2b1171fa385fe5d1016db3b3e80d49d3c86f5134e15be45ff5b5e75 SHA512 7680bfc6176bf7b4bfd0839c4b1a9aacf4c28cc06aa8c441cbb271c3f3d0783ca2e57f6fe6fad4477f3562df6f0303d455193233556b4c9fd82c876a3f257b8e WHIRLPOOL edbe1bf530d23cb541b4c3e01a78cef170242b104eb38bf1de1efed7b2f94ac32a422774f2c9e00fe0c17fb043370dadb6b93167f5278bc2ee66cdc0e0881f72
+EBUILD xpra-0.9.5-r2.ebuild 2682 SHA256 543dd6f30343dc33df4eea488675516dd31fc327bbf14c3e98888849f14bf5f3 SHA512 e71a2ae6ad8ef0053970a7e6815a62fc8543cdc579253dd738f14523b9c84a4460faeb77001e22ef65bc533f1f2145ed844ad433f6ffcc8846b9db5cbbfe57e1 WHIRLPOOL 7e7c3ea967243f7915567e2e26e4b3b4438a00f566264612615ec12b6d2a70f97460a9c73d88b5264e5d667dca42fc1160e6cae0a0ffbec7501b9641e3aee765
+MISC ChangeLog 10300 SHA256 95ea2bc03943ea18319266d38ae386750b96da8d0d167096905c139a05767aec SHA512 3d830fe8dfc44d2238718b713d8d8ebaf468944ed08253bf6d9756a9c0420506aca41112f7fc907dbee41e193b85be08fbf18f30575883d1239e8ae4000683d7 WHIRLPOOL 1f912b9a365ffaf3aa6c80a6bcf231207e63b1ff0bb6cc5e8eb9dfebba472de71ca297fde05c06bba7f9d617f455b1bce9fc7491c9d024894af53f4703a8de6b
 MISC metadata.xml 589 SHA256 df65c9cf53ad1e420dfb543e0bf04b69f123fb58b67f079178d33bde7d2da5e6 SHA512 73250ca89a9caad4304d9f300a945750f73c86d0b946fb4f78521531c76f7e43f4a2328e0aeab9168b01e4a4042f8015f85c3480418c6b169ed9461dce144097 WHIRLPOOL bb8c795a6846b66a5104ca57a5a7974b0a2c6e788a64259062f914272cd15cc92deab55b370a9b937673dad8a660d8c839d4a2c9675dd84c9c2bad21115528ea
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlG+wroACgkQknrdDGLu8JDfXQD/SVfdG28eh15b/TiOx1P6SWWU
-ALEshlgUVXZrH6nHbMcA/iP/yZ3i2j60dtQOBDLeBjG9aQzhNcqWweiHfqtwzGgz
-=KM3r
+iF4EAREIAAYFAlHIaJsACgkQknrdDGLu8JDBXQD9FTHOWgZpJxi7XMz+CBS8CA8a
+wTJ3dYdHNeKyde/kaX4BAJEbcFfNtIABHRVvM9mitntaE816qCSowjmJBR8vagXb
+=c84Z
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/xpra/files/xpra-0.9.5-opengl-auto.patch b/x11-wm/xpra/files/xpra-0.9.5-opengl-auto.patch
new file mode 100644
index 000000000000..29a3ca067a5e
--- /dev/null
+++ b/x11-wm/xpra/files/xpra-0.9.5-opengl-auto.patch
@@ -0,0 +1,50 @@
+--- xpra-0.9.5/xpra/scripts/config.py
++++ xpra-0.9.5/xpra/scripts/config.py
+@@ -117,9 +117,10 @@
+         if e.args[0]==errno.EACCES:
+             return "VirtualBox is present (VBoxMiniRdrDN)"
+     return None
+-OPENGL_DEFAULT = False
+-#if OpenGL_safety_check() is not None:
+-#    OPENGL_DEFAULT = False
++if OpenGL_safety_check() is not None:
++    OPENGL_DEFAULT = False
++else:
++    OPENGL_DEFAULT = None
+ 
+ 
+ 
+@@ -452,6 +453,13 @@
+     else:
+         warn("Warning: cannot parse value '%s' for '%s' as a boolean" % (v, k))
+ 
++def print_bool(k, v):
++    if type(v)==type(None):
++	return 'auto'
++    if type(v)==bool:
++	return v and 'yes' or 'no'
++    warn("Warning: cannot print value '%s' for '%s' as a boolean" % (v, k))
++
+ def parse_number(numtype, k, v, auto=-1):
+     if type(v)==str:
+         v = v.lower()
+--- xpra-0.9.5/xpra/scripts/main.py
++++ xpra-0.9.5/xpra/scripts/main.py
+@@ -24,7 +24,7 @@
+                            get_default_socket_dir,
+                            init as platform_init)
+ from xpra.bytestreams import TwoFileConnection, SocketConnection
+-from xpra.scripts.config import ENCODINGS, ENCRYPTION_CIPHERS, make_defaults_struct, show_codec_help, parse_bool
++from xpra.scripts.config import ENCODINGS, ENCRYPTION_CIPHERS, make_defaults_struct, show_codec_help, parse_bool, print_bool
+ from wimpiggy.gobject_compat import import_gobject
+ 
+ SIGNAMES = {signal.SIGINT:"SIGINT", signal.SIGTERM:"SIGTERM"}
+@@ -253,7 +253,7 @@
+                 "These options control client features that affect the appearance or the keyboard.")
+     parser.add_option_group(group)
+     group.add_option("--opengl", action="store",
+-                      dest="opengl", default=defaults.opengl,
++                      dest="opengl", default=print_bool('opengl', defaults.opengl),
+                       help="Use OpenGL accelerated rendering, options: yes,no,auto. Default: %default.")
+     group.add_option("--no-windows", action="store_false",
+                       dest="windows", default=defaults.windows,
diff --git a/x11-wm/xpra/xpra-0.9.5-r2.ebuild b/x11-wm/xpra/xpra-0.9.5-r2.ebuild
new file mode 100644
index 000000000000..174d19799943
--- /dev/null
+++ b/x11-wm/xpra/xpra-0.9.5-r2.ebuild
@@ -0,0 +1,101 @@
+# 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.9.5-r2.ebuild,v 1.1 2013/06/24 15:41:19 xmw Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+inherit distutils-r1 eutils
+
+DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy"
+HOMEPAGE="http://xpra.org/"
+SRC_URI="http://xpra.org/src/${P}.tar.bz2"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+clipboard opengl pulseaudio +rencode server sound vpx webp x264"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# x264/old-libav.path situation see bug 459218
+COMMON_DEPEND=""${PYTHON_DEPS}"
+	dev-python/pygobject:2[${PYTHON_USEDEP}]
+	dev-python/pygtk:2[${PYTHON_USEDEP}]
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libXtst
+	opengl? ( dev-python/pygtkglext )
+	pulseaudio? ( media-sound/pulseaudio )
+	sound? ( media-libs/gstreamer
+		media-libs/gst-plugins-base
+		dev-python/gst-python )
+	vpx? ( media-libs/libvpx
+		virtual/ffmpeg )
+	webp? ( media-libs/libwebp )
+	x264? ( media-libs/x264
+		|| ( >=media-video/ffmpeg-1.0.4 media-video/libav )
+		virtual/ffmpeg )"
+
+RDEPEND="${COMMON_DEPEND}
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/ipython[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	virtual/python-imaging[${PYTHON_USEDEP}]
+	virtual/ssh
+	x11-apps/setxkbmap
+	x11-apps/xmodmap
+	server? ( x11-base/xorg-server[-minimal,xvfb]
+		x11-drivers/xf86-input-void
+		x11-drivers/xf86-video-dummy
+	)"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	>=dev-python/cython-0.16[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	epatch \
+		"${FILESDIR}"/${PN}-0.7.1-ignore-gentoo-no-compile.patch \
+		"${FILESDIR}"/${PN}-0.8.0-prefix.patch \
+		"${FILESDIR}"/${PN}-0.9.5-PIL.patch \
+		"${FILESDIR}"/${PN}-0.9.5-opengl-auto.patch
+
+	#assuming ffmpeg and libav mutual exclusive installs
+	if has_version "media-video/libav" ; then
+		if ! has_version ">=media-video/libav-9" ; then
+			epatch patches/old-libav.patch
+		fi
+	fi
+}
+
+python_configure_all() {
+	mydistutilsargs=(
+		$(use_with clipboard)
+		$(use_with opengl)
+		$(use_with rencode)
+		$(use_with server)
+		$(use_with sound)
+		$(use_with vpx)
+		$(use_with webp)
+		$(use_with x264)
+		--with-cymaths
+		--with-cyxor
+		--with-parti
+		--with-shadow
+		--with-strict
+		--with-warn
+		--without-PIC
+		--without-debug )
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	rm -vf "${ED}"usr/share/parti/{parti.,}README \
+		"${ED}"usr/share/xpra/{webm/LICENSE,xpra.README} \
+		"${ED}"usr/share/wimpiggy/wimpiggy.README || die
+	dodoc {parti.,wimpiggy.,xpra.,}README
+}