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

[Michael Weber]

commit:     2af42ded5bf1269982f90979283c15bb523b17e9
Author:     Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 10 12:17:31 2017 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Fri Mar 10 12:17:46 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2af42ded

x11-wm/xpra: Remove old versions.

Package-Manager: Portage-2.3.4, Repoman-2.3.2

 x11-wm/xpra/Manifest                            |   2 -
 x11-wm/xpra/files/xpra-0.14.0-prefix.patch      |  27 -----
 x11-wm/xpra/files/xpra-1.0.1-cflags-param.patch |  17 ----
 x11-wm/xpra/metadata.xml                        |   2 -
 x11-wm/xpra/xpra-0.14.27.ebuild                 | 120 ----------------------
 x11-wm/xpra/xpra-0.14.36.ebuild                 | 126 ------------------------
 6 files changed, 294 deletions(-)

diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index c24987a13c7..d92829160b1 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,3 +1 @@
-DIST xpra-0.14.27.tar.xz 1123504 SHA256 9d51d6e656a9afc6559ec4b671a706ba134257c8e6d909d2514a3ca653502efb SHA512 5f195b211b8e78091ba42661c08f367d66e2a34ebcea9e5df57f0408cf1c4232294d38692171abbfe7396a1da28b2cc4100252dc034872a278530c48282db5cf WHIRLPOOL b14d58cddd03093a598e99d69fb145a5a04347f48fc0ec0b0311efa7bc75f5a51be5db93a361032ead2e021d2c8ead13986a3bd7434108506bbc4b601556141b
-DIST xpra-0.14.36.tar.xz 1128276 SHA256 f929a9d05e2bc95cd7316efb839b8b1bcb88917ea513aa0c17adac4674702142 SHA512 bec07df063e72c42d2d2b4fff74ec01a6db8d97dae8c8f38ef0c994988ebcb8ee38363028eb7b64b562a540574f084e00a84f1c6e9e03bdbc47bfcd4d38a29aa WHIRLPOOL 650aa8d0c11114141c3ae44ccf8216a06812986fdf923334c025126c4341e686cdf65a00789d1b24895bc056b47b113c2c9474b60ed2e041a0b5b6619f6f7cda
 DIST xpra-1.0.3.tar.xz 1888908 SHA256 f83c5946f67fe26eee8b44fba0fa30bca9fbc7aa58ee66b903b7385c2d332166 SHA512 3b6371d478147a5d932df1c8428e9132831fcbf17e51f48fb384c30548efee9758c94a6781c255b5fe211c5040993f30b054aa33f3fced85484fcc9d2ca009a1 WHIRLPOOL 989db8ac2caa3a5a0e1294754cabe6bc8cadb087a6ffa24de3039c674126886a41ecab930c46700dccdf3adc738572e04652123c9523512c050ffdff3d295b02

diff --git a/x11-wm/xpra/files/xpra-0.14.0-prefix.patch b/x11-wm/xpra/files/xpra-0.14.0-prefix.patch
deleted file mode 100644
index 140abbbbbc0..00000000000
--- a/x11-wm/xpra/files/xpra-0.14.0-prefix.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- xpra-0.14.0/xpra/platform/paths.py
-+++ xpra-0.14.0/xpra/platform/paths.py
-@@ -22,9 +22,9 @@
- 
- def get_system_conf_dir():
-     #the system wide configuration directory
--    if sys.prefix == '/usr':
-+    if sys.prefix[-4:] == '/usr':
-         #default posix config location:
--        default_conf_dir = '/etc/xpra'
-+        default_conf_dir = sys.prefix[:-4] + '/etc/xpra'
-     else:
-         #hope the prefix is something like "/usr/local":
-         default_conf_dir = sys.prefix + '/etc/xpra/'
---- xpra-0.14.0/setup.py
-+++ xpra-0.14.0/setup.py
-@@ -1470,8 +1470,8 @@
-         #prepare default [/usr/local]/etc configuration files:
-         if '--user' in sys.argv:
-             etc_prefix = 'etc/xpra'
--        elif sys.prefix == '/usr':
--            etc_prefix = '/etc/xpra'
-+        elif 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-1.0.1-cflags-param.patch b/x11-wm/xpra/files/xpra-1.0.1-cflags-param.patch
deleted file mode 100644
index 11dbb81ae7b..00000000000
--- a/x11-wm/xpra/files/xpra-1.0.1-cflags-param.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- xpra-1.0.1/setup.py
-+++ xpra-1.0.1/setup.py
-@@ -696,7 +696,14 @@
-         for s in (pkg_config_out, env_cflags, env_ldflags):
-             if not s:
-                 continue
-+            ahead = False
-             for token in s.split():
-+                if token == '--param':
-+                    ahead = True
-+                    continue
-+                if ahead:
-+                    ahead = False
-+                    continue
-                 if token[:2] in ignored_flags:
-                     pass
-                 elif token[:2] in flag_map:

diff --git a/x11-wm/xpra/metadata.xml b/x11-wm/xpra/metadata.xml
index f8a239bbf46..3ac00fd3656 100644
--- a/x11-wm/xpra/metadata.xml
+++ b/x11-wm/xpra/metadata.xml
@@ -12,11 +12,9 @@
 	<flag name="client">Build client-side code</flag>
 	<flag name="clipboard">Enable clipboard support</flag>
 	<flag name="csc">Enable csc softscaler support</flag>
-	<flag name="dec_av">Enable dec_avcodec support</flag>
 	<flag name="dec_av2">Enable dec_avcodec2 support</flag>
 	<flag name="enc_ffmpeg">Enable advanced ffmpeg/libav encoder support</flag>
 	<flag name="lz4">Enable support for lz4 compression</flag>
-	<flag name="rencode">Enable rencode support</flag>
 	<flag name="server">Build server-side code</flag>
 	<flag name="vpx">Enable vpx image format support</flag>
 	<flag name="webp">Enable webp image format support</flag>

diff --git a/x11-wm/xpra/xpra-0.14.27.ebuild b/x11-wm/xpra/xpra-0.14.27.ebuild
deleted file mode 100644
index 2823a4e53d3..00000000000
--- a/x11-wm/xpra/xpra-0.14.27.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-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 libav opengl pulseaudio +rencode server sound vpx webp x264 x265"
-
-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? (
-		!libav? ( >=media-video/ffmpeg-1.2.2:0= )
-		libav? ( media-video/libav:0= )
-	)
-	dec_av? (
-		!libav? ( >=media-video/ffmpeg-1.2.2:0= )
-		libav? ( media-video/libav:0= )
-	)
-	dec_av2? (
-		!libav? ( >=media-video/ffmpeg-2:0= )
-		libav? ( media-video/libav:0= )
-	)
-	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
-		!libav? ( >=media-video/ffmpeg-1.0.4:0= )
-		libav? ( media-video/libav:0= )
-	)
-	x265? ( media-libs/x265
-		!libav? ( >=media-video/ffmpeg-2:0= )
-		libav? ( media-video/libav:0= )
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/ipython[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pillow[${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.14.0-prefix.patch
-
-	if use 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)
-		$(use_with x265 enc_x265)
-		--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.14.36.ebuild b/x11-wm/xpra/xpra-0.14.36.ebuild
deleted file mode 100644
index 0b26a1e3eea..00000000000
--- a/x11-wm/xpra/xpra-0.14.36.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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 libav lz4 lzo opengl pulseaudio +rencode server sound vpx webp x264 x265"
-
-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? (
-		!libav? ( >=media-video/ffmpeg-1.2.2:0= )
-		libav? ( media-video/libav:0= )
-	)
-	dec_av? (
-		!libav? ( >=media-video/ffmpeg-1.2.2:0= )
-		libav? ( media-video/libav:0= )
-	)
-	dec_av2? (
-		!libav? ( >=media-video/ffmpeg-2:0= )
-		libav? ( media-video/libav:0= )
-	)
-	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
-		!libav? ( >=media-video/ffmpeg-1.0.4:0= )
-		libav? ( media-video/libav:0= )
-	)
-	x265? ( media-libs/x265
-		!libav? ( >=media-video/ffmpeg-2:0= )
-		libav? ( media-video/libav:0= )
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/ipython[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	virtual/ssh
-	x11-apps/setxkbmap
-	x11-apps/xmodmap
-	lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
-	lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] )
-	opengl? (
-		client? ( dev-python/pyopengl_accelerate[${PYTHON_USEDEP}] )
-	)
-	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.14.0-prefix.patch
-
-	if use 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)
-		$(use_with x265 enc_x265)
-		--with-Xdummy
-		--with-argb
-		--with-cyxor
-		--with-gtk2
-		--without-gtk3
-		--without-qt4
-		--with-strict
-		--with-warn
-		--with-x11
-		--without-PIC
-		--without-debug )
-}