Define cython dependency (bug 429624, thanks igel), drop old.

(Portage version: 2.1.11.9/cvs/Linux x86_64)

3 files changed, 7 insertions, 62 deletions

diff --git a/x11-wm/xpra/ChangeLog b/x11-wm/xpra/ChangeLog
index 93fc2a2e0db6..2bdb3baa6bed 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.20 2012/08/01 07:15:22 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/ChangeLog,v 1.21 2012/08/04 09:56:55 xmw Exp $
+
+  04 Aug 2012; Michael Weber <xmw@gentoo.org> -xpra-0.4.0.ebuild,
+  xpra-0.4.1.ebuild:
+  Define cython dependency (bug 429624, thanks igel), drop old.
 
 *xpra-0.4.1 (01 Aug 2012)
 
diff --git a/x11-wm/xpra/xpra-0.4.0.ebuild b/x11-wm/xpra/xpra-0.4.0.ebuild
deleted file mode 100644
index 30a0990e5566..000000000000
--- a/x11-wm/xpra/xpra-0.4.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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.0.ebuild,v 1.1 2012/07/23 09:11:48 xmw Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="2"
-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="ffmpeg jpeg libnotify parti png 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"
-
-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
-
-	$(PYTHON -2) make_constants_pxi.py wimpiggy/lowlevel/constants.txt wimpiggy/lowlevel/constants.pxi || die
-}
-
-src_install() {
-	distutils_src_install
-	rm -vf "${ED}"usr/share/{parti,wimpiggy,xpra}/{README*,COPYING} || die
-}
diff --git a/x11-wm/xpra/xpra-0.4.1.ebuild b/x11-wm/xpra/xpra-0.4.1.ebuild
index 3199af50586c..c2c77ed7d0cd 100644
--- a/x11-wm/xpra/xpra-0.4.1.ebuild
+++ b/x11-wm/xpra/xpra-0.4.1.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.4.1.ebuild,v 1.1 2012/08/01 07:15:21 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/xpra-0.4.1.ebuild,v 1.2 2012/08/04 09:56:55 xmw Exp $
 
 EAPI=3
 
@@ -40,7 +40,7 @@ RDEPEND="${COMMON_DEPEND}
 	server? ( x11-base/xorg-server[xvfb,-minimal] )"
 DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
-	dev-python/cython"
+	>=dev-python/cython-0.16"
 
 src_prepare() {
 	use server || epatch disable-posix-server.patch