diff options
author | Michael Weber <xmw@gentoo.org> | 2013-02-26 09:01:33 +0000 |
---|---|---|
committer | Michael Weber <xmw@gentoo.org> | 2013-02-26 09:01:33 +0000 |
commit | a4a070f5744dbcf82a4eee18b104b2ac9db69efb (patch) | |
tree | 64aa259ec2103642252cd42cf7adf9a31393e5f2 /x11-wm | |
parent | Version bump, drop old (diff) | |
download | gentoo-2-a4a070f5744dbcf82a4eee18b104b2ac9db69efb.tar.gz gentoo-2-a4a070f5744dbcf82a4eee18b104b2ac9db69efb.tar.bz2 gentoo-2-a4a070f5744dbcf82a4eee18b104b2ac9db69efb.zip |
Revbump to address x264 libav situation (bug 459218, thanks Oliver Freyermuth). Drop old versions.
(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)
Diffstat (limited to 'x11-wm')
-rw-r--r-- | x11-wm/xpra/ChangeLog | 9 | ||||
-rw-r--r-- | x11-wm/xpra/xpra-0.8.5.ebuild | 78 | ||||
-rw-r--r-- | x11-wm/xpra/xpra-0.8.6-r1.ebuild (renamed from x11-wm/xpra/xpra-0.8.4.ebuild) | 12 | ||||
-rw-r--r-- | x11-wm/xpra/xpra-0.8.6.ebuild | 78 |
4 files changed, 17 insertions, 160 deletions
diff --git a/x11-wm/xpra/ChangeLog b/x11-wm/xpra/ChangeLog index 93b97efb9021..546129b50985 100644 --- a/x11-wm/xpra/ChangeLog +++ b/x11-wm/xpra/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for x11-wm/xpra # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/ChangeLog,v 1.54 2013/02/25 11:39:24 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/ChangeLog,v 1.55 2013/02/26 09:01:33 xmw Exp $ + +*xpra-0.8.6-r1 (26 Feb 2013) + + 26 Feb 2013; Michael Weber <xmw@gentoo.org> -xpra-0.8.4.ebuild, + -xpra-0.8.5.ebuild, -xpra-0.8.6.ebuild, +xpra-0.8.6-r1.ebuild: + Revbump to address x264 libav situation (bug 459218, thanks Oliver + Freyermuth). Drop old versions. 25 Feb 2013; Agostino Sarubbo <ago@gentoo.org> xpra-0.7.8.ebuild: Stable for x86, wrt bug #459110 diff --git a/x11-wm/xpra/xpra-0.8.5.ebuild b/x11-wm/xpra/xpra-0.8.5.ebuild deleted file mode 100644 index c3bc792481fc..000000000000 --- a/x11-wm/xpra/xpra-0.8.5.ebuild +++ /dev/null @@ -1,78 +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.8.5.ebuild,v 1.2 2013/02/23 14:48:11 xmw Exp $ - -EAPI=5 - -#dev-python/pygobject and dev-python/pygtk do not support python3 -PYTHON_COMPAT=( python{2_5,2_6,2_7} ) -inherit distutils-r1 eutils readme.gentoo - -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" - -python_prepare_all() { - epatch "${FILESDIR}"/${PN}-0.7.1-ignore-gentoo-no-compile.patch - epatch "${FILESDIR}"/${PN}-0.8.0-prefix.patch - if ! has_version ">=media-video/libav-9" ; then - epatch patches/old-libav.patch - fi - - 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 -} - -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 - - DOC_CONTENTS="""please make your Xorg binary readable for users of xpra - chmod a+r /usr/bin/Xorg -and think about the security impact -A copy at ~/.xpra/Xorg matching the current modules is sufficient.""" - - readme.gentoo_src_install -} diff --git a/x11-wm/xpra/xpra-0.8.4.ebuild b/x11-wm/xpra/xpra-0.8.6-r1.ebuild index ddad4644ad52..ace36e09e32d 100644 --- a/x11-wm/xpra/xpra-0.8.4.ebuild +++ b/x11-wm/xpra/xpra-0.8.6-r1.ebuild @@ -1,6 +1,6 @@ # 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.8.4.ebuild,v 1.2 2013/02/23 14:48:11 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/xpra-0.8.6-r1.ebuild,v 1.1 2013/02/26 09:01:33 xmw Exp $ EAPI=5 @@ -17,6 +17,7 @@ SLOT="0" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="+clipboard +rencode server vpx webp x264" +# x264/old-libav.path situation see bug 459218 COMMON_DEPEND="dev-python/pygobject:2 dev-python/pygtk:2 x11-libs/libX11 @@ -29,6 +30,7 @@ COMMON_DEPEND="dev-python/pygobject:2 virtual/ffmpeg ) webp? ( media-libs/libwebp ) x264? ( media-libs/x264 + || ( >=media-video/ffmpeg-1.0.4 media-video/libav ) virtual/ffmpeg )" RDEPEND="${COMMON_DEPEND} @@ -49,8 +51,12 @@ DEPEND="${COMMON_DEPEND} python_prepare_all() { epatch "${FILESDIR}"/${PN}-0.7.1-ignore-gentoo-no-compile.patch epatch "${FILESDIR}"/${PN}-0.8.0-prefix.patch - if ! has_version ">=media-video/libav-9" ; then - epatch patches/old-libav.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 use clipboard || epatch patches/disable-clipboard.patch diff --git a/x11-wm/xpra/xpra-0.8.6.ebuild b/x11-wm/xpra/xpra-0.8.6.ebuild deleted file mode 100644 index 628e09b8c933..000000000000 --- a/x11-wm/xpra/xpra-0.8.6.ebuild +++ /dev/null @@ -1,78 +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.8.6.ebuild,v 1.1 2013/02/25 06:39:39 xmw Exp $ - -EAPI=5 - -#dev-python/pygobject and dev-python/pygtk do not support python3 -PYTHON_COMPAT=( python{2_5,2_6,2_7} ) -inherit distutils-r1 eutils readme.gentoo - -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" - -python_prepare_all() { - epatch "${FILESDIR}"/${PN}-0.7.1-ignore-gentoo-no-compile.patch - epatch "${FILESDIR}"/${PN}-0.8.0-prefix.patch - if ! has_version ">=media-video/libav-9" ; then - epatch patches/old-libav.patch - fi - - 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 -} - -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 - - DOC_CONTENTS="""please make your Xorg binary readable for users of xpra - chmod a+r /usr/bin/Xorg -and think about the security impact -A copy at ~/.xpra/Xorg matching the current modules is sufficient.""" - - readme.gentoo_src_install -} |