Version bump

(Portage version: 2.1.11.11/cvs/Linux x86_64)

4 files changed, 89 insertions, 3 deletions

diff --git a/x11-wm/xpra/ChangeLog b/x11-wm/xpra/ChangeLog
index d58a0e7b73a6..0318d5c14f62 100644
--- a/x11-wm/xpra/ChangeLog
+++ b/x11-wm/xpra/ChangeLog
@@ -1,6 +1,13 @@
 # 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.24 2012/08/20 21:18:40 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/ChangeLog,v 1.25 2012/08/27 20:10:45 xmw Exp $
+
+*xpra-0.6.0 (27 Aug 2012)
+*xpra-0.5.1 (27 Aug 2012)
+
+  27 Aug 2012; Michael Weber <xmw@gentoo.org> +xpra-0.5.1.ebuild,
+  +xpra-0.6.0.ebuild, -xpra-0.4.1.ebuild, metadata.xml:
+  Version bump
 
 *xpra-0.5.0 (20 Aug 2012)
 
diff --git a/x11-wm/xpra/metadata.xml b/x11-wm/xpra/metadata.xml
index 0d263bef99e9..b5be2b825935 100644
--- a/x11-wm/xpra/metadata.xml
+++ b/x11-wm/xpra/metadata.xml
@@ -9,5 +9,7 @@
 	<flag name='parti'>Runtime support for partioning window manager</flag>
 	<flag name='server'>Build server-side code</flag>
 	<flag name='ssh'>Runtime support for secure shell communication</flag>
+	<flag name='clipboard'>Enable clipboard support</flag>
+	<flag name='rencode'>Enable rencode support</flag>
 </use>
 </pkgmetadata>
diff --git a/x11-wm/xpra/xpra-0.4.1.ebuild b/x11-wm/xpra/xpra-0.5.1.ebuild
index c2c77ed7d0cd..ac62aefe3262 100644
--- a/x11-wm/xpra/xpra-0.4.1.ebuild
+++ b/x11-wm/xpra/xpra-0.5.1.ebuild
@@ -1,10 +1,10 @@
 # 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.4.1.ebuild,v 1.2 2012/08/04 09:56:55 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/xpra-0.5.1.ebuild,v 1.1 2012/08/27 20:10:45 xmw Exp $
 
 EAPI=3
 
-PYTHON_DEPEND="2"
+PYTHON_DEPEND="*"
 RESTRICT_PYTHON_ABIS="2.4 2.5 3.*"
 SUPPORT_PYTHON_ABIS="1"
 inherit distutils eutils
@@ -51,6 +51,14 @@ src_prepare() {
 	fi
 
 	$(PYTHON -2) make_constants_pxi.py wimpiggy/lowlevel/constants.txt wimpiggy/lowlevel/constants.pxi || die
+
+	#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
 }
 
 src_install() {
diff --git a/x11-wm/xpra/xpra-0.6.0.ebuild b/x11-wm/xpra/xpra-0.6.0.ebuild
new file mode 100644
index 000000000000..8c3b7355dca7
--- /dev/null
+++ b/x11-wm/xpra/xpra-0.6.0.ebuild
@@ -0,0 +1,69 @@
+# 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.0.ebuild,v 1.1 2012/08/27 20:10:45 xmw Exp $
+
+EAPI=3
+
+PYTHON_DEPEND="*"
+RESTRICT_PYTHON_ABIS="2.4 2.5 3.*"
+SUPPORT_PYTHON_ABIS="1"
+inherit distutils 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"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+clipboard ffmpeg jpeg libnotify parti png +rencode server ssh x264"
+
+COMMON_DEPEND="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"
+
+RDEPEND="${COMMON_DEPEND}
+	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] )"
+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
+
+	#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
+}
+
+src_install() {
+	distutils_src_install
+	rm -vf "${ED}"usr/share/{parti,wimpiggy,xpra}/{README*,COPYING} || die
+}