diff options
| author |   Michael Weber <xmw@gentoo.org> | 2012-06-04 17:09:46 +0000 |
|---|---|---|
| committer | Michael Weber <xmw@gentoo.org> | 2012-06-04 17:09:46 +0000 |
| commit | 8b2e4b0940c7aa23994d3b8a74ec6b0ccfa90b37 (patch) | |
| tree | db1dea2ae1772303b22aca7264acd107884a2016 /x11-wm | |
| parent | Version bumps, CVE-2012-1667. Remove old versions (diff) | |
| download | gentoo-2-8b2e4b0940c7aa23994d3b8a74ec6b0ccfa90b37.tar.gz gentoo-2-8b2e4b0940c7aa23994d3b8a74ec6b0ccfa90b37.tar.bz2 gentoo-2-8b2e4b0940c7aa23994d3b8a74ec6b0ccfa90b37.zip | |
Version bump, remove old.
(Portage version: 2.1.10.63/cvs/Linux x86_64)
Diffstat (limited to 'x11-wm')
| -rw-r--r-- | x11-wm/xpra/ChangeLog | 8 | ||||
| -rw-r--r-- | x11-wm/xpra/xpra-0.3.2.ebuild (renamed from x11-wm/xpra/xpra-0.1.0.1.ebuild) | 22 |
2 files changed, 21 insertions, 9 deletions
diff --git a/x11-wm/xpra/ChangeLog b/x11-wm/xpra/ChangeLog index e9fcad066a9c..c4b2260cf9bb 100644 --- a/x11-wm/xpra/ChangeLog +++ b/x11-wm/xpra/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-wm/xpra # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/ChangeLog,v 1.14 2012/05/30 05:39:21 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/ChangeLog,v 1.15 2012/06/04 17:09:46 xmw Exp $ + +*xpra-0.3.2 (04 Jun 2012) + + 04 Jun 2012; Michael Weber <xmw@gentoo.org> -xpra-0.1.0.1.ebuild, + +xpra-0.3.2.ebuild: + Version bump, remove old. 30 May 2012; Michael Weber <xmw@gentoo.org> xpra-0.3.1.ebuild: Disable python 3 diff --git a/x11-wm/xpra/xpra-0.1.0.1.ebuild b/x11-wm/xpra/xpra-0.3.2.ebuild index c9312869af93..f648d3de2641 100644 --- a/x11-wm/xpra/xpra-0.1.0.1.ebuild +++ b/x11-wm/xpra/xpra-0.3.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/xpra-0.1.0.1.ebuild,v 1.2 2012/05/04 08:58:57 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/xpra-0.3.2.ebuild,v 1.1 2012/06/04 17:09:46 xmw Exp $ EAPI=3 @@ -16,14 +16,17 @@ SRC_URI="http://xpra.org/src/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="jpeg libnotify parti png server ssh" +IUSE="ffmpeg jpeg libnotify parti png server ssh x264" COMMON_DEPEND="dev-python/pygtk:2 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage + ffmpeg? ( + virtual/ffmpeg + x264? ( media-libs/x264 ) + ) server? ( x11-libs/libXtst ) - server? ( x11-base/xorg-server[-minimal] ) !x11-wm/parti" RDEPEND="${COMMON_DEPEND} @@ -33,15 +36,18 @@ RDEPEND="${COMMON_DEPEND} libnotify? ( dev-python/dbus-python ) jpeg? ( dev-python/imaging ) png? ( dev-python/imaging ) - ssh? ( net-misc/openssh ) - server? ( x11-base/xorg-server[xvfb] )" + ssh? ( virtual/ssh ) + server? ( x11-base/xorg-server[xvfb,-minimal] )" DEPEND="${COMMON_DEPEND} virtual/pkgconfig - server? ( dev-python/cython )" + dev-python/cython" src_prepare() { - if ! use server; then - epatch disable-posix-server.patch + use server || epatch disable-posix-server.patch + if use ffmpeg ; then + use x264 || epatch disable-x264.patch + else + epatch disable-vpx.patch disable-x264.patch fi $(PYTHON -2) make_constants_pxi.py wimpiggy/lowlevel/constants.txt wimpiggy/lowlevel/constants.pxi || die |