summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'x11-wm/xpra')
-rw-r--r--x11-wm/xpra/ChangeLog8
-rw-r--r--x11-wm/xpra/xpra-0.11.1.ebuild105
-rw-r--r--x11-wm/xpra/xpra-0.11.2.ebuild (renamed from x11-wm/xpra/xpra-0.11.0.ebuild)2
3 files changed, 8 insertions, 107 deletions
diff --git a/x11-wm/xpra/ChangeLog b/x11-wm/xpra/ChangeLog
index 9f1a2b1823a0..d46eef9d6adf 100644
--- a/x11-wm/xpra/ChangeLog
+++ b/x11-wm/xpra/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for x11-wm/xpra
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/ChangeLog,v 1.91 2014/01/27 07:39:31 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/ChangeLog,v 1.92 2014/02/06 10:19:57 xmw Exp $
+
+*xpra-0.11.2 (06 Feb 2014)
+
+ 06 Feb 2014; Michael Weber <xmw@gentoo.org> +xpra-0.11.2.ebuild,
+ -xpra-0.11.0.ebuild, -xpra-0.11.1.ebuild:
+ Version bump including patches mentioned on bug 499530, thanks all.
*xpra-0.11.1 (27 Jan 2014)
diff --git a/x11-wm/xpra/xpra-0.11.1.ebuild b/x11-wm/xpra/xpra-0.11.1.ebuild
deleted file mode 100644
index 6bc8a6787446..000000000000
--- a/x11-wm/xpra/xpra-0.11.1.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.11.1.ebuild,v 1.1 2014/01/27 07:39:31 xmw Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_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
- media-libs/gst-plugins-base
- dev-python/gst-python )
- 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.11.0.ebuild b/x11-wm/xpra/xpra-0.11.2.ebuild
index ca6ff7510db2..cbaa0bb95e9c 100644
--- a/x11-wm/xpra/xpra-0.11.0.ebuild
+++ b/x11-wm/xpra/xpra-0.11.2.ebuild
@@ -1,6 +1,6 @@
# 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.11.0.ebuild,v 1.1 2014/01/23 00:49:06 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/xpra-0.11.2.ebuild,v 1.1 2014/02/06 10:19:57 xmw Exp $
EAPI=5