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

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

4 files changed, 12 insertions, 69 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/Manifest b/x11-wm/xpra/Manifest
index bc082d18fdde..1eab20eae822 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,16 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST xpra-0.4.0.tar.bz2 1128877 SHA256 b3ffb0521d2e3c57d6aeeaa6c37eba1cd641f87483b4d087192e8110843fee24 SHA512 ca27c60381bf64b5283bf3021d093c83395f66311c271de0ef4e6819fd8435ac07f17810634c1487a04262e2a0b9b39e47649c75b72337bd0cd566827e494611 WHIRLPOOL acc54947bc4f3a8db1c181d7cca047a9a18085dec38a6b0753d55629fc849ba7496451742947eb9041047d14e2ba1a301c16b4d432ba2e53ea03f8f15468247e
 DIST xpra-0.4.1.tar.bz2 1125896 SHA256 0ab93cf2abab8520290271d9a5597f1fbde17377c0f759a027633d2333039680 SHA512 93d36e164095406d2d92c23d6b2b54cd9e1d559aaf6dfafb55fd052b90e2dd1c16ae071115c365de861d0b3511bae2edb16adc76ba846ded47b4a7bf2af001cc WHIRLPOOL 841f3c2eba8c885f99386e2896033bc1d9272b854caf7e934c764ee3fefed29e4186f5fe740ca392300889a84090867a726e1a4e6d480a617ac3ac1255f0d431
-EBUILD xpra-0.4.0.ebuild 1557 SHA256 fa6c2fc28ee08b55380fb18d17b1cd7027f932be79cecce30a5b39783320fcee SHA512 f348fdad580ee2e0b4bbb3a71ce8b8d6e9957184b49ff2fd0722f0dcee0002b1a2319a00f70289d1f9fcdf500f56f6f4d48ea91969fdd29a14aebdf9d991ae99 WHIRLPOOL 114043493915d23dbafcdee063e943711e1812180536f4a8da5041634c3c74f73ff3384d22d76e4102c376338d2958eb0bf7d8a54a38f45689040af04cfa08a1
-EBUILD xpra-0.4.1.ebuild 1557 SHA256 88a698db8da3c676ec8a17add9ce21006147c012c4c4377d2d5ee2fcd9749fec SHA512 00761b9698ae744b4535d7d014cd966a69de29da2c03fa85594da8b040d4cf98657bca82dfb3fa25da43a75b6ac7705ec49a53d8cda9a259df9894f3fb74aed1 WHIRLPOOL 608832b4bd55a2a95a7e07c536e318ea9013fd1aaa7d0caceba244683e67118261a83893dd3b2d50bbc49cf07a8b571ccff60c6fd7993dc75744c395c0bf07b0
-MISC ChangeLog 2754 SHA256 b164745254ceee2260b35617d36191f24f09f1f5b729bf8716c52336cb249d86 SHA512 8d8ca9f4b53c9951b2e48bd9b7f4f6896b9315c84a326c4bfa47b3879fb1c6337b9ff616d9ce9e2352dadca9023d821b327d7959e96bb3d821a83de4a44519e7 WHIRLPOOL 88e609408c3b1a0c3d136dcca6a12302e2ef30313386cfc55c624304de456ab4b9647073be3f08a6efd5704d105b1009b3864ff9c8e30e4c8dbd0bc89d381dd9
+EBUILD xpra-0.4.1.ebuild 1564 SHA256 49f80b40c050b866f591509718087745a0d3aae78806445cf92e13b8c9419f75 SHA512 3829a1040fcc519a2fe40e7d32ebbae1261022d77c2db07ae6873944c678ccd5dca89367e9cc3a516b87b99e07d29b021b88573b83b7ca9a6540c78457643c1a WHIRLPOOL b624ca49145a983c7709bbf85a89891e09a608366b5242fde14851f99a5a23ad4f03717cfb62a24327d5ef48357ad70c804a502d878f3532893296a6bf557d3c
+MISC ChangeLog 2906 SHA256 cc8a21e01f0822f4e189d83358a1b39c29260d2f1d73e458ef5d6178f35de4f3 SHA512 1a057b3a76a77f415790e10928651eba920e09f5f42114a3b9358044cb82cde16e25eee8b83ba4223943ef3feb24f1544bf4ecb88697e61fcb6943ee996d9ba8 WHIRLPOOL 7668f11d2ef5583ddf94d93114b72bd62a526caaddd156cba8d7837e37c8b2d49104c7682ee2804b0bcf6bce5786ffb4ebe6aabab4df66b31fdb3519343fc368
 MISC metadata.xml 434 SHA256 f62a17ffbfedc2e09061cd87a2bcf6e72b3e913a5b1fe6d78df31ace921f99bf SHA512 16e0f70192d49933ef49fad7b7783aa3650c5d220f1a18372a7870da0ea0e6001729ea737871e78c1053b2a65158f00721e1c538a734fb654d49fb44a2d73ea9 WHIRLPOOL 189c0d1f562d6bc2740f2e6750b2495e4bcf9a6541e731c181611e8de881cf02dab6407b24928cd45a0527df000eea8fce2d72d873585950df300f4e1b632fa5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlAY10MACgkQknrdDGLu8JDySQD+Mik62f2nbRyDikeCVBfdXI1G
-HAkC5yjUFDsLvgIIBF8A+gK5CJDLQyPLrKhR8RlVlmTQsqqrryza36h8T3BZP1mv
-=Rq+/
+iF4EAREIAAYFAlAc8ZwACgkQknrdDGLu8JBzRwD+I0rTEfXPfDpt5e1vDdmtMlt0
+DdRnF2ecA78fyUwOqfMA/ibJuZfta6T1C/u31kU9E4TMXIb9PJ2clMY2+zDdTv1k
+=Pfil
 -----END PGP SIGNATURE-----
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