summaryrefslogtreecommitdiff
path: root/x11-wm
diff options
context:
space:
mode:
authorMichael Weber <xmw@gentoo.org>2012-10-29 19:01:29 +0000
committerMichael Weber <xmw@gentoo.org>2012-10-29 19:01:29 +0000
commit2c815a176f92736401c6d04e4804df41d94ef9d2 (patch)
tree71f02683de0ce40715c1b504821b5efb04056664 /x11-wm
parentVersion bump, drop old (diff)
downloadgentoo-2-2c815a176f92736401c6d04e4804df41d94ef9d2.tar.gz
gentoo-2-2c815a176f92736401c6d04e4804df41d94ef9d2.tar.bz2
gentoo-2-2c815a176f92736401c6d04e4804df41d94ef9d2.zip
Revbump to address .so situation.
(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)
Diffstat (limited to 'x11-wm')
-rw-r--r--x11-wm/xpra/ChangeLog8
-rw-r--r--x11-wm/xpra/files/xpra-0.7.1-ignore-gentoo-no-compile.patch11
-rw-r--r--x11-wm/xpra/xpra-0.7.1-r1.ebuild (renamed from x11-wm/xpra/xpra-0.7.1.ebuild)4
3 files changed, 21 insertions, 2 deletions
diff --git a/x11-wm/xpra/ChangeLog b/x11-wm/xpra/ChangeLog
index 31ff3a514001..39b2a10ac462 100644
--- a/x11-wm/xpra/ChangeLog
+++ b/x11-wm/xpra/ChangeLog
@@ -1,6 +1,12 @@
# 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.34 2012/10/22 23:15:48 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/ChangeLog,v 1.35 2012/10/29 19:01:28 xmw Exp $
+
+*xpra-0.7.1-r1 (29 Oct 2012)
+
+ 29 Oct 2012; Michael Weber <xmw@gentoo.org> -xpra-0.7.1.ebuild,
+ +xpra-0.7.1-r1.ebuild, +files/xpra-0.7.1-ignore-gentoo-no-compile.patch:
+ Revbump to address .so situation.
*xpra-0.7.1 (22 Oct 2012)
diff --git a/x11-wm/xpra/files/xpra-0.7.1-ignore-gentoo-no-compile.patch b/x11-wm/xpra/files/xpra-0.7.1-ignore-gentoo-no-compile.patch
new file mode 100644
index 000000000000..31d619daddc9
--- /dev/null
+++ b/x11-wm/xpra/files/xpra-0.7.1-ignore-gentoo-no-compile.patch
@@ -0,0 +1,11 @@
+--- xpra-0.7.1/setup.py
++++ xpra-0.7.1/setup.py
+@@ -135,7 +135,7 @@
+ #then expects to find the cython modules!? ie:
+ #python2.7 setup.py build -b build-2.7 install --no-compile --root=/var/tmp/portage/x11-wm/xpra-0.7.0/temp/images/2.7
+ if "--no-compile" in sys.argv and not ("build" in sys.argv and "install" in sys.argv):
+- return
++ pass
+ global ext_modules, cmdclass
+ cython_version_check(min_version)
+ from Cython.Distutils import build_ext
diff --git a/x11-wm/xpra/xpra-0.7.1.ebuild b/x11-wm/xpra/xpra-0.7.1-r1.ebuild
index 840be38ecfff..151d12b8245f 100644
--- a/x11-wm/xpra/xpra-0.7.1.ebuild
+++ b/x11-wm/xpra/xpra-0.7.1-r1.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.7.1.ebuild,v 1.1 2012/10/22 23:15:48 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/xpra-0.7.1-r1.ebuild,v 1.1 2012/10/29 19:01:28 xmw Exp $
EAPI=3
@@ -50,6 +50,8 @@ DEPEND="${COMMON_DEPEND}
>=dev-python/cython-0.16"
src_prepare() {
+ epatch "${FILESDIR}"/${P}-ignore-gentoo-no-compile.patch
+
use clipboard || epatch patches/disable-clipboard.patch
use rencode || epatch patches/disable-rencode.patch
use server || epatch patches/disable-posix-server.patch