Version bump, add references to upstream bug reports.

(Portage version: 2.2.0_alpha183/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)

4 files changed, 113 insertions, 1 deletions

diff --git a/x11-wm/xpra/ChangeLog b/x11-wm/xpra/ChangeLog
index 379594ead7ab..65fa6981d8f9 100644
--- a/x11-wm/xpra/ChangeLog
+++ b/x11-wm/xpra/ChangeLog
@@ -1,6 +1,12 @@
 # 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.71 2013/06/24 15:41:19 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/ChangeLog,v 1.72 2013/07/03 11:49:13 xmw Exp $
+
+*xpra-0.9.6 (03 Jul 2013)
+
+  03 Jul 2013; Michael Weber <xmw@gentoo.org> +xpra-0.9.6.ebuild,
+  files/xpra-0.9.5-PIL.patch, files/xpra-0.9.5-opengl-auto.patch:
+  Version bump, add references to upstream bug reports.
 
 *xpra-0.9.5-r2 (24 Jun 2013)
 
diff --git a/x11-wm/xpra/files/xpra-0.9.5-PIL.patch b/x11-wm/xpra/files/xpra-0.9.5-PIL.patch
index 1e17af291348..b0a9649febc9 100644
--- a/x11-wm/xpra/files/xpra-0.9.5-PIL.patch
+++ b/x11-wm/xpra/files/xpra-0.9.5-PIL.patch
@@ -1,3 +1,7 @@
+https://bugs.gentoo.org/show_bug.cgi?id=471566
+submitted to https://www.xpra.org/trac/ticket/354#ticket
+accepted as https://www.xpra.org/trac/changeset/3600/xpra
+
 --- xpra-0.9.5/xpra/server.py
 +++ xpra-0.9.5/xpra/server.py
 @@ -610,11 +610,11 @@
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
index 29a3ca067a5e..c5e8db9a9f5d 100644
--- a/x11-wm/xpra/files/xpra-0.9.5-opengl-auto.patch
+++ b/x11-wm/xpra/files/xpra-0.9.5-opengl-auto.patch
@@ -1,3 +1,5 @@
+reported upstream as https://www.xpra.org/trac/ticket/367#ticket
+
 --- xpra-0.9.5/xpra/scripts/config.py
 +++ xpra-0.9.5/xpra/scripts/config.py
 @@ -117,9 +117,10 @@
diff --git a/x11-wm/xpra/xpra-0.9.6.ebuild b/x11-wm/xpra/xpra-0.9.6.ebuild
new file mode 100644
index 000000000000..1619b794f4a6
--- /dev/null
+++ b/x11-wm/xpra/xpra-0.9.6.ebuild
@@ -0,0 +1,100 @@
+# 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.6.ebuild,v 1.1 2013/07/03 11:49:13 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-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
+}