diff options
author | Michael Weber <xmw@gentoo.org> | 2015-06-07 15:44:12 +0000 |
---|---|---|
committer | Michael Weber <xmw@gentoo.org> | 2015-06-07 15:44:12 +0000 |
commit | 40d9dfdb467fe60268492d352f802cf3494ba95f (patch) | |
tree | 864fbb4dbfd4cfce907e08c90e7615d1165e29bd /x11-wm | |
parent | Add github to remote-id in metadata.xml (diff) | |
download | gentoo-2-40d9dfdb467fe60268492d352f802cf3494ba95f.tar.gz gentoo-2-40d9dfdb467fe60268492d352f802cf3494ba95f.tar.bz2 gentoo-2-40d9dfdb467fe60268492d352f802cf3494ba95f.zip |
Drop old versions
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)
Diffstat (limited to 'x11-wm')
-rw-r--r-- | x11-wm/xpra/ChangeLog | 8 | ||||
-rw-r--r-- | x11-wm/xpra/files/xpra-0.7.4-prefix.patch | 13 | ||||
-rw-r--r-- | x11-wm/xpra/files/xpra-0.8.0-prefix.patch | 13 | ||||
-rw-r--r-- | x11-wm/xpra/files/xpra-0.9.5-PIL.patch | 107 | ||||
-rw-r--r-- | x11-wm/xpra/files/xpra-0.9.5-opengl-auto.patch | 53 | ||||
-rw-r--r-- | x11-wm/xpra/xpra-0.10.12-r1.ebuild | 106 | ||||
-rw-r--r-- | x11-wm/xpra/xpra-0.14.12-r1.ebuild | 112 | ||||
-rw-r--r-- | x11-wm/xpra/xpra-0.14.12.ebuild | 105 | ||||
-rw-r--r-- | x11-wm/xpra/xpra-0.9.8.ebuild | 100 |
9 files changed, 7 insertions, 610 deletions
diff --git a/x11-wm/xpra/ChangeLog b/x11-wm/xpra/ChangeLog index 3ef23b546e80..ccb1422e4558 100644 --- a/x11-wm/xpra/ChangeLog +++ b/x11-wm/xpra/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-wm/xpra # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/ChangeLog,v 1.118 2015/06/06 16:42:58 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/ChangeLog,v 1.119 2015/06/07 15:44:12 xmw Exp $ + + 07 Jun 2015; Michael Weber <xmw@gentoo.org> -files/xpra-0.7.4-prefix.patch, + -files/xpra-0.8.0-prefix.patch, -files/xpra-0.9.5-PIL.patch, + -files/xpra-0.9.5-opengl-auto.patch, -xpra-0.10.12-r1.ebuild, + -xpra-0.14.12-r1.ebuild, -xpra-0.14.12.ebuild, -xpra-0.9.8.ebuild: + Drop old versions 06 Jun 2015; Mike Gilbert <floppym@gentoo.org> -xpra-0.8.8.ebuild: Remove old version depending on dev-python/imaging, bug 471566. diff --git a/x11-wm/xpra/files/xpra-0.7.4-prefix.patch b/x11-wm/xpra/files/xpra-0.7.4-prefix.patch deleted file mode 100644 index ee4495dce2a9..000000000000 --- a/x11-wm/xpra/files/xpra-0.7.4-prefix.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- xpra-0.7.4/setup.py -+++ xpra-0.7.4/setup.py -@@ -459,8 +459,8 @@ - - 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' - etc_files = ["etc/xpra/xorg.conf"] diff --git a/x11-wm/xpra/files/xpra-0.8.0-prefix.patch b/x11-wm/xpra/files/xpra-0.8.0-prefix.patch deleted file mode 100644 index 13db42f0b967..000000000000 --- a/x11-wm/xpra/files/xpra-0.8.0-prefix.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- xpra-0.8.0/setup.py -+++ xpra-0.8.0/setup.py -@@ -582,8 +582,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' - etc_files = ["etc/xpra/xorg.conf"] diff --git a/x11-wm/xpra/files/xpra-0.9.5-PIL.patch b/x11-wm/xpra/files/xpra-0.9.5-PIL.patch deleted file mode 100644 index b0a9649febc9..000000000000 --- a/x11-wm/xpra/files/xpra-0.9.5-PIL.patch +++ /dev/null @@ -1,107 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=471566 -submitted to https://www.xpra.org/trac/ticket/354#ticket -accepted as https://www.xpra.org/trac/changeset/3600/xpra - ---- xpra-0.9.5/xpra/server.py -+++ xpra-0.9.5/xpra/server.py -@@ -610,11 +610,11 @@ - width = maxx-minx - height = maxy-miny - log("screenshot: %sx%s, min x=%s y=%s", width, height, minx, miny) -- import Image -- image = Image.new("RGBA", (width, height)) -+ import PIL.Image -+ image = PIL.Image.new("RGBA", (width, height)) - for wid, x, y, w, h, pixmap in reversed(all_regions): - _, _, wid, _, _, w, h, _, raw_data, rowstride, _, _ = get_rgb_rawdata(0, 0, wid, pixmap, 0, 0, w, h, "rgb24", -1, None, logger=log.debug) -- window_image = Image.fromstring("RGB", (w, h), raw_data, "raw", "RGB", rowstride) -+ window_image = PIL.Image.fromstring("RGB", (w, h), raw_data, "raw", "RGB", rowstride) - tx = x-minx - ty = y-miny - image.paste(window_image, (tx, ty)) ---- xpra-0.9.5/xpra/window_source.py -+++ xpra-0.9.5/xpra/window_source.py -@@ -1024,8 +1024,8 @@ - - def PIL_encode(self, w, h, coding, data, rowstride, options): - assert coding in ENCODINGS -- import Image -- im = Image.fromstring("RGB", (w, h), data, "raw", "RGB", rowstride) -+ import PIL.Image -+ im = PIL.Image.fromstring("RGB", (w, h), data, "raw", "RGB", rowstride) - buf = StringIO() - client_options = {} - if coding=="jpeg": ---- xpra-0.9.5/xpra/window_backing.py -+++ xpra-0.9.5/xpra/window_backing.py -@@ -32,7 +32,7 @@ - #have/use PIL? - has_PIL = False - try: -- import Image -+ import PIL.Image - has_PIL = True - except: - pass -@@ -91,7 +91,7 @@ - - def jpegimage(self, img_data, width, height): - buf = IOClass(img_data) -- return Image.open(buf) -+ return PIL.Image.open(buf) - - def rgb24image(self, img_data, width, height, rowstride): - assert has_PIL -@@ -99,7 +99,7 @@ - assert len(img_data) == rowstride * height - else: - assert len(img_data) == width * 3 * height -- return Image.fromstring("RGB", (width, height), img_data, 'raw', 'RGB', rowstride, 1) -+ return PIL.Image.fromstring("RGB", (width, height), img_data, 'raw', 'RGB', rowstride, 1) - - def process_delta(self, raw_data, width, height, rowstride, options): - """ -@@ -395,7 +395,7 @@ - if use_PIL: - #try PIL first since it doesn't need the UI thread until the actual do_paint_rgb24 call - buf = IOClass(img_data) -- img = Image.open(buf) -+ img = PIL.Image.open(buf) - if img.mode=="RGB": - raw_data = img.tostring("raw", "RGB") - #PIL flattens the data to a continuous straightforward RGB format: ---- xpra-0.9.5/xpra/scripts/config.py -+++ xpra-0.9.5/xpra/scripts/config.py -@@ -18,8 +18,8 @@ - from wimpiggy.gobject_compat import import_gobject, is_gtk3 - gobject = import_gobject() - try: -- import Image -- assert Image -+ import PIL.Image -+ assert PIL.Image - _has_PIL = True - except: - _has_PIL = False ---- xpra-0.9.5/xpra/server_source.py -+++ xpra-0.9.5/xpra/server_source.py -@@ -696,8 +696,8 @@ - def make_window_icon(self, pixel_data, pixel_format, stride, w, h): - log("found new window icon: %sx%s, sending as png=%s", w, h, self.png_window_icons) - if self.png_window_icons: -- import Image -- img = Image.frombuffer("RGBA", (w,h), pixel_data, "raw", "BGRA", 0, 1) -+ import PIL.Image -+ img = PIL.Image.frombuffer("RGBA", (w,h), pixel_data, "raw", "BGRA", 0, 1) - MAX_SIZE = 64 - if w>MAX_SIZE or h>MAX_SIZE: - #scale icon down -@@ -708,7 +708,7 @@ - w = int(w*MAX_SIZE/h) - h = MAX_SIZE - log("scaling window icon down to %sx%s", w, h) -- img = img.resize((w,h), Image.ANTIALIAS) -+ img = img.resize((w,h), PIL.Image.ANTIALIAS) - output = StringIO() - img.save(output, 'PNG') - raw_data = output.getvalue() diff --git a/x11-wm/xpra/files/xpra-0.9.5-opengl-auto.patch b/x11-wm/xpra/files/xpra-0.9.5-opengl-auto.patch deleted file mode 100644 index 32c671f8320c..000000000000 --- a/x11-wm/xpra/files/xpra-0.9.5-opengl-auto.patch +++ /dev/null @@ -1,53 +0,0 @@ -reported upstream as https://www.xpra.org/trac/ticket/367#ticket -upstream adapted the print_bool part in https://www.xpra.org/trac/changeset/3761/xpra - ---- xpra-0.9.5/xpra/scripts/config.py -+++ xpra-0.9.5/xpra/scripts/config.py -@@ -117,9 +117,10 @@ - if e.args[0]==errno.EACCES: - return "VirtualBox is present (VBoxMiniRdrDN)" - return None --OPENGL_DEFAULT = False --#if OpenGL_safety_check() is not None: --# OPENGL_DEFAULT = False -+if OpenGL_safety_check() is not None: -+ OPENGL_DEFAULT = False -+else: -+ OPENGL_DEFAULT = None - - - -@@ -452,6 +453,13 @@ - else: - warn("Warning: cannot parse value '%s' for '%s' as a boolean" % (v, k)) - -+def print_bool(k, v): -+ if type(v)==type(None): -+ return 'auto' -+ if type(v)==bool: -+ return v and 'yes' or 'no' -+ warn("Warning: cannot print value '%s' for '%s' as a boolean" % (v, k)) -+ - def parse_number(numtype, k, v, auto=-1): - if type(v)==str: - v = v.lower() ---- xpra-0.9.5/xpra/scripts/main.py -+++ xpra-0.9.5/xpra/scripts/main.py -@@ -24,7 +24,7 @@ - get_default_socket_dir, - init as platform_init) - from xpra.bytestreams import TwoFileConnection, SocketConnection --from xpra.scripts.config import ENCODINGS, ENCRYPTION_CIPHERS, make_defaults_struct, show_codec_help, parse_bool -+from xpra.scripts.config import ENCODINGS, ENCRYPTION_CIPHERS, make_defaults_struct, show_codec_help, parse_bool, print_bool - from wimpiggy.gobject_compat import import_gobject - - SIGNAMES = {signal.SIGINT:"SIGINT", signal.SIGTERM:"SIGTERM"} -@@ -253,7 +253,7 @@ - "These options control client features that affect the appearance or the keyboard.") - parser.add_option_group(group) - group.add_option("--opengl", action="store", -- dest="opengl", default=defaults.opengl, -+ dest="opengl", default=print_bool('opengl', defaults.opengl), - help="Use OpenGL accelerated rendering, options: yes,no,auto. Default: %default.") - group.add_option("--no-windows", action="store_false", - dest="windows", default=defaults.windows, diff --git a/x11-wm/xpra/xpra-0.10.12-r1.ebuild b/x11-wm/xpra/xpra-0.10.12-r1.ebuild deleted file mode 100644 index 8afc56dd4ba8..000000000000 --- a/x11-wm/xpra/xpra-0.10.12-r1.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/xpra-0.10.12-r1.ebuild,v 1.3 2014/04/26 08:32:58 pacho Exp $ - -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.bz2" - -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 \ - "${FILESDIR}"/${PN}-0.10.12-launcher.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.14.12-r1.ebuild b/x11-wm/xpra/xpra-0.14.12-r1.ebuild deleted file mode 100644 index bb0a9fe3c5a4..000000000000 --- a/x11-wm/xpra/xpra-0.14.12-r1.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/xpra-0.14.12-r1.ebuild,v 1.1 2015/02/01 23:31:53 mgorny Exp $ -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" - -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= ) - ) - 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= ) - )" - -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.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) - --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.12.ebuild b/x11-wm/xpra/xpra-0.14.12.ebuild deleted file mode 100644 index 6f9d967be466..000000000000 --- a/x11-wm/xpra/xpra-0.14.12.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/xpra-0.14.12.ebuild,v 1.2 2014/11/26 02:11:39 mrueg Exp $ -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.14.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.9.8.ebuild b/x11-wm/xpra/xpra-0.9.8.ebuild deleted file mode 100644 index 1751d629df00..000000000000 --- a/x11-wm/xpra/xpra-0.9.8.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/xpra-0.9.8.ebuild,v 1.4 2014/04/26 08:32:58 pacho Exp $ - -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/" -SRC_URI="http://xpra.org/src/${P}.tar.bz2" - -LICENSE="GPL-2 BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="+clipboard opengl pulseaudio +rencode server sound vpx webp x264" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -# 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/libX11 - x11-libs/libXcomposite - x11-libs/libXdamage - x11-libs/libXfixes - x11-libs/libXrandr - x11-libs/libXtst - 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 ) - virtual/ffmpeg )" - -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.8.0-prefix.patch \ - "${FILESDIR}"/${PN}-0.9.5-opengl-auto.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 -} - -python_configure_all() { - mydistutilsargs=( - $(use_with clipboard) - $(use_with opengl) - $(use_with rencode) - $(use_with server) - $(use_with sound) - $(use_with vpx) - $(use_with webp) - $(use_with x264) - --with-cymaths - --with-cyxor - --with-parti - --with-shadow - --with-strict - --with-warn - --without-PIC - --without-debug ) -} - -src_install() { - distutils-r1_src_install - - rm -vf "${ED}"usr/share/parti/{parti.,}README \ - "${ED}"usr/share/xpra/{webm/LICENSE,xpra.README} \ - "${ED}"usr/share/wimpiggy/wimpiggy.README || die - dodoc {parti.,wimpiggy.,xpra.,}README -} |