Version bump, drop old.

(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)

4 files changed, 92 insertions, 135 deletions

diff --git a/x11-wm/xpra/ChangeLog b/x11-wm/xpra/ChangeLog
index 39b2a10ac462..a0c205459837 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.35 2012/10/29 19:01:28 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/ChangeLog,v 1.36 2012/11/07 23:06:36 xmw Exp $
+
+*xpra-0.7.2 (07 Nov 2012)
+
+  07 Nov 2012; Michael Weber <xmw@gentoo.org> -xpra-0.4.2.ebuild,
+  -xpra-0.5.6.ebuild, +xpra-0.7.2.ebuild:
+  Version bump, drop old.
 
 *xpra-0.7.1-r1 (29 Oct 2012)
 
diff --git a/x11-wm/xpra/xpra-0.4.2.ebuild b/x11-wm/xpra/xpra-0.4.2.ebuild
deleted file mode 100644
index dc1af796350e..000000000000
--- a/x11-wm/xpra/xpra-0.4.2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# 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.4.2.ebuild,v 1.2 2012/08/17 22:19:06 xmw Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="*"
-RESTRICT_PYTHON_ABIS="2.4 2.5 3.*"
-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"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-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 )
-	!x11-wm/parti"
-
-RDEPEND="${COMMON_DEPEND}
-	x11-apps/xmodmap
-	parti? ( dev-python/ipython
-		 dev-python/dbus-python )
-	libnotify? ( dev-python/dbus-python )
-	jpeg? ( dev-python/imaging )
-	png? ( dev-python/imaging )
-	ssh? ( virtual/ssh )
-	server? ( x11-base/xorg-server[xvfb,-minimal] )"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	>=dev-python/cython-0.16"
-
-src_prepare() {
-	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
-
-	#python_copy_sources
-	#
-	#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 -vf "${ED}"usr/share/{parti,wimpiggy,xpra}/{README*,COPYING} || die
-}
diff --git a/x11-wm/xpra/xpra-0.5.6.ebuild b/x11-wm/xpra/xpra-0.5.6.ebuild
deleted file mode 100644
index 58ee68dcc7eb..000000000000
--- a/x11-wm/xpra/xpra-0.5.6.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# 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.5.6.ebuild,v 1.1 2012/10/06 09:24:29 xmw Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="*"
-RESTRICT_PYTHON_ABIS="2.4 2.5 3.*"
-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"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-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 )
-	!x11-wm/parti"
-
-RDEPEND="${COMMON_DEPEND}
-	x11-apps/xmodmap
-	parti? ( dev-python/ipython
-		 dev-python/dbus-python )
-	libnotify? ( dev-python/dbus-python )
-	jpeg? ( dev-python/imaging )
-	png? ( dev-python/imaging )
-	ssh? ( virtual/ssh )
-	server? ( x11-base/xorg-server[xvfb,-minimal] )"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	>=dev-python/cython-0.16"
-
-src_prepare() {
-	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
-
-	#python_copy_sources
-	#
-	#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 -vf "${ED}"usr/share/{parti,wimpiggy,xpra}/{README*,COPYING} || die
-}
diff --git a/x11-wm/xpra/xpra-0.7.2.ebuild b/x11-wm/xpra/xpra-0.7.2.ebuild
new file mode 100644
index 000000000000..372d68f7222b
--- /dev/null
+++ b/x11-wm/xpra/xpra-0.7.2.ebuild
@@ -0,0 +1,85 @@
+# 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.7.2.ebuild,v 1.1 2012/11/07 23:06:36 xmw 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
+
+	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 "${D}"usr/share/parti/{parti.,}README \
+		"${D}"usr/share/xpra/{webm/LICENSE,xpra.README} \
+		"${D}"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"
+	einfo
+}