Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/x11-wm
diff options
context:
space:
mode:
Diffstat (limited to 'x11-wm')
-rw-r--r--x11-wm/xpra/ChangeLog8
-rw-r--r--x11-wm/xpra/xpra-0.10.7.ebuild104
-rw-r--r--x11-wm/xpra/xpra-0.11.0.ebuild (renamed from x11-wm/xpra/xpra-0.10.4.ebuild)13
-rw-r--r--x11-wm/xpra/xpra-0.7.8.ebuild87
4 files changed, 14 insertions, 198 deletions
diff --git a/x11-wm/xpra/ChangeLog b/x11-wm/xpra/ChangeLog
index fed2117e91ea..9e1e81cbf719 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.89 2014/01/19 22:01:35 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/ChangeLog,v 1.90 2014/01/23 00:49:06 xmw Exp $
+
+*xpra-0.11.0 (23 Jan 2014)
+
+ 23 Jan 2014; Michael Weber <xmw@gentoo.org> +xpra-0.11.0.ebuild,
+ -xpra-0.10.4.ebuild, -xpra-0.10.7.ebuild, -xpra-0.7.8.ebuild:
+ Version bump, drop old ones.
*xpra-0.10.12-r1 (19 Jan 2014)
diff --git a/x11-wm/xpra/xpra-0.10.7.ebuild b/x11-wm/xpra/xpra-0.10.7.ebuild
deleted file mode 100644
index 789035702be2..000000000000
--- a/x11-wm/xpra/xpra-0.10.7.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/xpra-0.10.7.ebuild,v 1.1 2013/10/22 18:49:13 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.bz2"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+client +clipboard csc dec_av 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
-}
-
-python_configure_all() {
- mydistutilsargs=(
- $(use_with client)
- $(use_with clipboard)
- $(use_with csc csc_swscale)
- $(use_with dec_av dec_avcodec)
- $(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
- --without-csc_nvcuda
- --with-cyxor
- --with-gtk2
- --without-gtk3
- --without-qt4
- --with-nvenc
- --with-strict
- --with-warn
- --with-x11
- --without-PIC
- --without-debug )
-}
diff --git a/x11-wm/xpra/xpra-0.10.4.ebuild b/x11-wm/xpra/xpra-0.11.0.ebuild
index 34fcd0a664ad..ca6ff7510db2 100644
--- a/x11-wm/xpra/xpra-0.10.4.ebuild
+++ b/x11-wm/xpra/xpra-0.11.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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.4.ebuild,v 1.1 2013/09/24 23:55:48 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/xpra-0.11.0.ebuild,v 1.1 2014/01/23 00:49:06 xmw Exp $
EAPI=5
@@ -9,12 +9,12 @@ 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"
+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 opengl pulseaudio +rencode server sound vpx webp x264"
+IUSE="+client +clipboard csc dec_av dec_av2 opengl pulseaudio +rencode server sound vpx webp x264"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
clipboard? ( || ( server client ) )
@@ -71,6 +71,8 @@ python_prepare_all() {
epatch patches/old-libav.patch
fi
fi
+
+ distutils-r1_python_prepare_all
}
python_configure_all() {
@@ -79,6 +81,7 @@ python_configure_all() {
$(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)
@@ -90,12 +93,10 @@ python_configure_all() {
$(use_with x264 enc_x264)
--with-Xdummy
--with-argb
- --without-csc_nvcuda
--with-cyxor
--with-gtk2
--without-gtk3
--without-qt4
- --with-nvenc
--with-strict
--with-warn
--with-x11
diff --git a/x11-wm/xpra/xpra-0.7.8.ebuild b/x11-wm/xpra/xpra-0.7.8.ebuild
deleted file mode 100644
index 440881e613cc..000000000000
--- a/x11-wm/xpra/xpra-0.7.8.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/xpra-0.7.8.ebuild,v 1.3 2013/02/25 11:39:24 ago Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="*"
-#dev-python/pygobject and dev-python/pygtk do not support python3
-RESTRICT_PYTHON_ABIS="2.4 2.5 3.*"
-DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES="1"
-SUPPORT_PYTHON_ABIS="1"
-inherit distutils 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 +rencode server vpx webp x264"
-
-COMMON_DEPEND="dev-python/pygobject:2
- dev-python/pygtk:2
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXdamage
- x11-libs/libXfixes
- x11-libs/libXrandr
- x11-libs/libXtst
- vpx? ( media-libs/libvpx
- virtual/ffmpeg )
- webp? ( media-libs/libwebp )
- x264? ( media-libs/x264
- virtual/ffmpeg )"
-
-RDEPEND="${COMMON_DEPEND}
- dev-python/dbus-python
- dev-python/imaging
- dev-python/ipython
- virtual/ssh
- x11-apps/setxkbmap
- x11-apps/xmodmap
- server? ( x11-base/xorg-server[-minimal]
- x11-drivers/xf86-input-void
- x11-drivers/xf86-video-dummy
- )"
-DEPEND="${COMMON_DEPEND}
- virtual/pkgconfig
- >=dev-python/cython-0.16"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-0.7.1-ignore-gentoo-no-compile.patch
- epatch "${FILESDIR}"/${PN}-0.7.4-prefix.patch
-
- use clipboard || epatch patches/disable-clipboard.patch
- use rencode || epatch patches/disable-rencode.patch
- use server || epatch patches/disable-posix-server.patch
- use vpx || epatch patches/disable-vpx.patch
- use webp || epatch patches/disable-webp.patch
- use x264 || epatch patches/disable-x264.patch
-
- distutils_src_prepare
-
- patching() {
- [[ "${PYTHON_ABI}" == 2.* ]] && return
- 2to3 --no-diffs -x all -f except -w -n .
- }
- python_execute_function --action-message \
- 'Applying patches with $(python_get_implementation) $(python_get_version)' \
- -s patching
-}
-
-src_install() {
- distutils_src_install
- rm -v "${ED}"usr/share/parti/{parti.,}README \
- "${ED}"usr/share/xpra/{webm/LICENSE,xpra.README} \
- "${ED}"usr/share/wimpiggy/wimpiggy.README
- dodoc {parti.,wimpiggy.,xpra.,}README
-
- einfo
- elog "please make your Xorg binary readable for users of xpra"
- elog " chmod a+r /usr/bin/Xorg"
- elog "and think about the security impact"
- elog "A copy at ~/.xpra/Xorg matching the current modules is sufficient."
- einfo
-}