[gentoo-commits] repo/gentoo:master commit in: x11-wm/xpra/files/, x11-wm/xpra/

[Michael Weber]

commit:     d0509b7aa104fb67fd388f6f8d1e432d11005ca2
Author:     Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 20 21:26:57 2015 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Sun Sep 20 21:28:27 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0509b7a

x11-wm/xpra: drop old version.

Package-Manager: portage-2.2.20.1

 x11-wm/xpra/Manifest                               |   3 -
 x11-wm/xpra/files/xpra-0.10.1-prefix.patch         |  30 ------
 x11-wm/xpra/files/xpra-0.10.12-launcher.patch      |  10 --
 x11-wm/xpra/files/xpra-0.12.0-prefix.patch         |  27 ------
 .../xpra-0.7.1-ignore-gentoo-no-compile.patch      |  11 ---
 x11-wm/xpra/xpra-0.11.6.ebuild                     | 105 --------------------
 x11-wm/xpra/xpra-0.12.7.ebuild                     | 105 --------------------
 x11-wm/xpra/xpra-0.13.9.ebuild                     | 106 ---------------------
 8 files changed, 397 deletions(-)

diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 59194e9..a4ff7f3 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,6 +1,3 @@
-DIST xpra-0.11.6.tar.xz 928652 SHA256 8e67681bd6313049e2b452734459d65b16e8c08c6273abfccade91d868ce0aea SHA512 4d276d99bdb1c3f9c95e44720552e401d251511f6d90f7cc86cc655b0fd841b7a3fbc919dd091f67e50e2530abb5943c7af9b36477347b013efe58d55b87da30 WHIRLPOOL 5f44b2e850bf0a6d8ae4a25284d7b2adba3e0c50b1211e248472b1fa715ec907cf7e16724a2c89f7bed0e29cb7fd85e219d7aaf0e0b0a6b7daa160a6a1ab570a
-DIST xpra-0.12.7.tar.xz 982888 SHA256 906265da543d4346bfe5c17ea0848368e481c391fbb9583aefb37cafc3db6c32 SHA512 c144df93ba9ef004b8f2966fe7fdaa695342e91b5788e980860b82edd8f624c0dd2df6ad99860fc05e1b586db9223f59d3a04e338aea3bbec111b8abf17f70b1 WHIRLPOOL 139d9ffed14bda69ad3fd2eaf6d99c5d9d769740a5301d25959f192b36ac817cbb57295d03559f5fc7ea82f6613945c9bff19caf4fb63af0aaf910f1e421f172
-DIST xpra-0.13.9.tar.xz 1539976 SHA256 0d9a02c07bb500ad32e9c82d168d1b71d0f77ee070ca18fab0dc6cc2fc970104 SHA512 32d28df224ed6cc0cd4c0e51f58d81ce0a07de4cd09b142b7f09a9d023632e42ba1589f215d57d7e75e8922d0a1c023e0495b07f09aee3899f3cd6ae8de51ca0 WHIRLPOOL a401fa77e3404c6c1d748a02214c060df2078c199de1141c331251d7364028520f3408d99366c063a1fd64f8375037bfcbb89b0bced34477365512acfe69bb7b
 DIST xpra-0.14.27.tar.xz 1123504 SHA256 9d51d6e656a9afc6559ec4b671a706ba134257c8e6d909d2514a3ca653502efb SHA512 5f195b211b8e78091ba42661c08f367d66e2a34ebcea9e5df57f0408cf1c4232294d38692171abbfe7396a1da28b2cc4100252dc034872a278530c48282db5cf WHIRLPOOL b14d58cddd03093a598e99d69fb145a5a04347f48fc0ec0b0311efa7bc75f5a51be5db93a361032ead2e021d2c8ead13986a3bd7434108506bbc4b601556141b
 DIST xpra-0.15.4.tar.xz 1194484 SHA256 29be80b8987dd131058aab0a1c8d456a7ac67ad56c54d2b5e72472ff003799a2 SHA512 3c0c3f9f5658fdb02d8c80efd5367c91cf771adf96d42f286e2079cb36b4446610e4e388bb7b241fa7704db4f621aac14959b04fe3466cf61b6a73d542971eb4 WHIRLPOOL 6646e889ea6a5e2eb1b6d0480b78f2ff3cf9c0ba5ccdca4531aa3b31e3f650f463a0da0d0013592586b2fc0c56d4a54385f4a38e921c7e62a4c706f6ad8b9d42
 DIST xpra-0.15.6.tar.xz 1196700 SHA256 cebd8d22d4173610258c835f175ad3781cf49bf91b3d6d3c36c35a825228fa32 SHA512 750b24d06b6af93757e54651c0e5e55192280715c4439e56881824da90dcea25460631c993bf239c6f9023e74dce5063e32688e31c616d036da16fa3da8c304a WHIRLPOOL 66cdc20662ba4251506e03a969332996870e37fe6f60becd3f2feed7b24e1410bc793f5f4679a0dc58940bda52d26563f9db10f8ae3fd83fb60cb89988be38a0

diff --git a/x11-wm/xpra/files/xpra-0.10.1-prefix.patch b/x11-wm/xpra/files/xpra-0.10.1-prefix.patch
deleted file mode 100644
index 1e8e759..0000000
--- a/x11-wm/xpra/files/xpra-0.10.1-prefix.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: xpra-0.10.1/setup.py
-===================================================================
---- xpra-0.10.1.orig/setup.py
-+++ xpra-0.10.1/setup.py
-@@ -896,8 +896,8 @@ else:
-             return {}
-     if "install" in sys.argv:
-         #prepare default [/usr/local]/etc configuration files:
--        if sys.prefix == '/usr':
--            etc_prefix = '/etc/xpra'
-+        if sys.prefix[-4:] == '/usr':
-+            etc_prefix = sys.prefix[:-4] + '/etc/xpra'
-         else:
-             etc_prefix = sys.prefix + '/etc/xpra'
- 
-Index: xpra-0.10.1/xpra/scripts/config.py
-===================================================================
---- xpra-0.10.1.orig/xpra/scripts/config.py
-+++ xpra-0.10.1/xpra/scripts/config.py
-@@ -344,8 +344,8 @@ def read_xpra_defaults():
-     #first, read the global defaults:
-     if sys.platform.startswith("win"):
-         conf_dir = os.path.dirname(os.path.abspath(sys.executable))
--    elif sys.prefix == '/usr':
--        conf_dir = '/etc/xpra'
-+    elif sys.prefix[-4:] == '/usr':
-+        conf_dir = sys.prefix[:-4] + '/etc/xpra'
-     else:
-         conf_dir = sys.prefix + '/etc/xpra/'
-     defaults = read_xpra_conf(conf_dir)

diff --git a/x11-wm/xpra/files/xpra-0.10.12-launcher.patch b/x11-wm/xpra/files/xpra-0.10.12-launcher.patch
deleted file mode 100644
index edd42a8..0000000
--- a/x11-wm/xpra/files/xpra-0.10.12-launcher.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/xpra/client/gtk_base/client_launcher.py
-+++ src/xpra/client/gtk_base/client_launcher.py
-@@ -18,5 +18,6 @@
- import pygtk
- pygtk.require('2.0')
--import gtk.gdk
-+import gtk
-+from gtk import gdk
- import gobject
- gobject.threads_init()

diff --git a/x11-wm/xpra/files/xpra-0.12.0-prefix.patch b/x11-wm/xpra/files/xpra-0.12.0-prefix.patch
deleted file mode 100644
index cce5e9d..0000000
--- a/x11-wm/xpra/files/xpra-0.12.0-prefix.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- xpra-0.12.0/xpra/scripts/config.py
-+++ xpra-0.12.0/xpra/scripts/config.py
-@@ -188,9 +188,9 @@
-         #OSX and win32 use binary installers,
-         #we must look for the default config in the bundled resource location:
-         conf_dir = get_resources_dir()
--    elif sys.prefix == '/usr':
-+    elif sys.prefix[-4:] == '/usr':
-         #default posix config location:
--        conf_dir = '/etc/xpra'
-+        conf_dir = sys.prefix[:-4] + '/etc/xpra'
-     else:
-         #hope the prefix is something like "/usr/local":
-         conf_dir = sys.prefix + '/etc/xpra/'
---- xpra-0.12.0/setup.py
-+++ xpra-0.12.0/setup.py
-@@ -990,8 +990,8 @@
-             return {}
-     if "install" in sys.argv:
-         #prepare default [/usr/local]/etc configuration files:
--        if sys.prefix == '/usr':
--            etc_prefix = '/etc/xpra'
-+        if sys.prefix[-4:] == '/usr':
-+            etc_prefix = sys.prefix[:-4] + '/etc/xpra'
-         else:
-             etc_prefix = sys.prefix + '/etc/xpra'
- 

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
deleted file mode 100644
index 31d619d..0000000
--- a/x11-wm/xpra/files/xpra-0.7.1-ignore-gentoo-no-compile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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.11.6.ebuild b/x11-wm/xpra/xpra-0.11.6.ebuild
deleted file mode 100644
index 47ecf97..0000000
--- a/x11-wm/xpra/xpra-0.11.6.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1 eutils
-
-DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy"
-HOMEPAGE="http://xpra.org/ http://xpra.org/src/"
-SRC_URI="http://xpra.org/src/${P}.tar.xz"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="+client +clipboard csc dec_av dec_av2 opengl pulseaudio +rencode server sound vpx webp x264"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	clipboard? ( || ( server client ) )
-	opengl? ( client )
-	|| ( client server )"
-
-# 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/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libXtst
-	csc? ( || ( >=media-video/ffmpeg-1.2.2 media-video/libav ) )
-	dec_av? ( || ( >=media-video/ffmpeg-1.2.2 media-video/libav ) )
-	opengl? ( dev-python/pygtkglext )
-	pulseaudio? ( media-sound/pulseaudio )
-	sound? ( media-libs/gstreamer:0.10
-		media-libs/gst-plugins-base:0.10
-		dev-python/gst-python:0.10 )
-	vpx? ( media-libs/libvpx virtual/ffmpeg )
-	webp? ( media-libs/libwebp )
-	x264? ( media-libs/x264
-		|| ( >=media-video/ffmpeg-1.0.4:0 media-video/libav ) )"
-
-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.10.1-prefix.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
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	mydistutilsargs=(
-		$(use_with client)
-		$(use_with clipboard)
-		$(use_with csc csc_swscale)
-		$(use_with dec_av dec_avcodec)
-		$(use_with dec_av2 dec_avcodec2)
-		$(use_with opengl)
-		$(use_with rencode)
-		$(use_with server cymaths)
-		$(use_with server shadow)
-		$(use_with server)
-		$(use_with sound)
-		$(use_with vpx)
-		$(use_with webp)
-		$(use_with x264 enc_x264)
-		--with-Xdummy
-		--with-argb
-		--with-cyxor
-		--with-gtk2
-		--without-gtk3
-		--without-qt4
-		--with-strict
-		--with-warn
-		--with-x11
-		--without-PIC
-		--without-debug )
-}

diff --git a/x11-wm/xpra/xpra-0.12.7.ebuild b/x11-wm/xpra/xpra-0.12.7.ebuild
deleted file mode 100644
index 80f5ca7..0000000
--- a/x11-wm/xpra/xpra-0.12.7.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1 eutils
-
-DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy"
-HOMEPAGE="http://xpra.org/ http://xpra.org/src/"
-SRC_URI="http://xpra.org/src/${P}.tar.xz"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+client +clipboard csc dec_av dec_av2 opengl pulseaudio +rencode server sound vpx webp x264"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	clipboard? ( || ( server client ) )
-	opengl? ( client )
-	|| ( client server )"
-
-# 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/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libXtst
-	csc? ( || ( >=media-video/ffmpeg-1.2.2 media-video/libav ) )
-	dec_av? ( || ( >=media-video/ffmpeg-1.2.2 media-video/libav ) )
-	opengl? ( dev-python/pygtkglext )
-	pulseaudio? ( media-sound/pulseaudio )
-	sound? ( media-libs/gstreamer:0.10
-		media-libs/gst-plugins-base:0.10
-		dev-python/gst-python:0.10 )
-	vpx? ( media-libs/libvpx virtual/ffmpeg )
-	webp? ( media-libs/libwebp )
-	x264? ( media-libs/x264
-		|| ( >=media-video/ffmpeg-1.0.4:0 media-video/libav ) )"
-
-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.12.0-prefix.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
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	mydistutilsargs=(
-		$(use_with client)
-		$(use_with clipboard)
-		$(use_with csc csc_swscale)
-		$(use_with dec_av dec_avcodec)
-		$(use_with dec_av2 dec_avcodec2)
-		$(use_with opengl)
-		$(use_with rencode)
-		$(use_with server cymaths)
-		$(use_with server shadow)
-		$(use_with server)
-		$(use_with sound)
-		$(use_with vpx)
-		$(use_with webp)
-		$(use_with x264 enc_x264)
-		--with-Xdummy
-		--with-argb
-		--with-cyxor
-		--with-gtk2
-		--without-gtk3
-		--without-qt4
-		--with-strict
-		--with-warn
-		--with-x11
-		--without-PIC
-		--without-debug )
-}

diff --git a/x11-wm/xpra/xpra-0.13.9.ebuild b/x11-wm/xpra/xpra-0.13.9.ebuild
deleted file mode 100644
index 950e825..0000000
--- a/x11-wm/xpra/xpra-0.13.9.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# PyCObject_Check and PyCObject_AsVoidPtr vanished with python 3.3, and setup.py not python3.2 copmat
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1 eutils
-
-DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy"
-HOMEPAGE="http://xpra.org/ http://xpra.org/src/"
-SRC_URI="http://xpra.org/src/${P}.tar.xz"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+client +clipboard csc dec_av dec_av2 opengl pulseaudio +rencode server sound vpx webp x264"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	clipboard? ( || ( server client ) )
-	opengl? ( client )
-	|| ( client server )"
-
-# 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/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libXtst
-	csc? ( || ( >=media-video/ffmpeg-1.2.2 media-video/libav ) )
-	dec_av? ( || ( >=media-video/ffmpeg-1.2.2 media-video/libav ) )
-	opengl? ( dev-python/pygtkglext )
-	pulseaudio? ( media-sound/pulseaudio )
-	sound? ( media-libs/gstreamer:0.10
-		media-libs/gst-plugins-base:0.10
-		dev-python/gst-python:0.10 )
-	vpx? ( media-libs/libvpx virtual/ffmpeg )
-	webp? ( media-libs/libwebp )
-	x264? ( media-libs/x264
-		|| ( >=media-video/ffmpeg-1.0.4:0 media-video/libav ) )"
-
-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.13.1-ignore-gentoo-no-compile.patch \
-		"${FILESDIR}"/${PN}-0.12.0-prefix.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
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	mydistutilsargs=(
-		$(use_with client)
-		$(use_with clipboard)
-		$(use_with csc csc_swscale)
-		$(use_with dec_av dec_avcodec)
-		$(use_with dec_av2 dec_avcodec2)
-		$(use_with opengl)
-		$(use_with rencode)
-		$(use_with server cymaths)
-		$(use_with server shadow)
-		$(use_with server)
-		$(use_with sound)
-		$(use_with vpx)
-		$(use_with webp)
-		$(use_with x264 enc_x264)
-		--with-Xdummy
-		--with-argb
-		--with-cyxor
-		--with-gtk2
-		--without-gtk3
-		--without-qt4
-		--with-strict
-		--with-warn
-		--with-x11
-		--without-PIC
-		--without-debug )
-}