Version bump, drop old.

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090

5 files changed, 98 insertions, 143 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/Manifest b/x11-wm/xpra/Manifest
index c4e7683be0e8..2d35dfd12c20 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -2,20 +2,18 @@
 Hash: SHA256
 
 AUX xpra-0.7.1-ignore-gentoo-no-compile.patch 482 SHA256 32c4a3819b0035ecdeeab72a15b183a894226c300bc5159a419251440f070195 SHA512 e22bfbcf6402e179d86fa4128b96d47e2ad4373ea2aa22a877ca3a3573ed56fbbf20ce66c2e94713a1d2d7b53dfa3339fd2f481f57e14770e09e1c0435bbc693 WHIRLPOOL 152c1c9ff623afd1d29dd7678f5ba44524e60b1cdbafd7f5779f1f8e53ea33015afa2476926aa91ef587131e0b1a6504cf9ffa149c3b72fd2fa62e7838152201
-DIST xpra-0.4.2.tar.bz2 1129229 SHA256 c0f537855d22897832edbe771fe91eb5327d35db07d4389e906658c677d7aa02 SHA512 58ed09b87a571aba48d1068a4ab3e727eaf5511af5160f490207a1fd5af851a2844be42c15d92e084e56be676668e49eeb243d44bd7d6bccc63e101383813f3a WHIRLPOOL c150052896c97fef5515af429a9c960d4c31522bae094b8fd82257ccf181adecf8d5d395de6a1ad2364d7d8510e3da4441b7ee52de0a2e3f2da79abfb2a9b6e0
-DIST xpra-0.5.6.tar.bz2 453318 SHA256 a456fec93d4fc1e3746432a42d62e177cf27595b17f8cb1c5f6e6d139014f0c9 SHA512 5360a4205b5fcaeac1c47d4794e0faa33fb0c7002d1ecd40db0b848d208516580c1f02fcfc8e3d7c86c24266072d7891b1f416260bce9d7031a641d9776177e3 WHIRLPOOL 6055cd14771cc9e7637a61d314e1a3491b347ccbcd3ffc2ae00ac09c62c6acc53908b06ab1a925ac80a2521d6b63a1de8e584e0ab9672fddc1bfefbba5bb0f50
 DIST xpra-0.6.4.tar.bz2 456613 SHA256 3c47e16555325417e8be19dfcfd0c9c9f07d7a6e2e203d0bad46f68ac059f5d6 SHA512 841b7857c58af8943dbe970ce237cb479221acac529397cb32d4ee114551e8437eef3864ea7bed85f5a3b8c53434ace8e86e02cae8a159df59f0e7ba15dd3298 WHIRLPOOL 6abec3fdb6448652b049a88f991785dad764bee821f21e36fd7e24d5be6effc0d4ec31346ea36c499b9a9905ed5c3c2650956ad7fd0d11f02b3ea43ea3fb4f4c
 DIST xpra-0.7.1.tar.bz2 470217 SHA256 89a7645b7098acd08abc084c478b2e317e3719df471e57e4bd0acbaa5599afc7 SHA512 11623ee85bf0473244eb5e483ca5b67f8b403319cd5417b2dee207a22b628bad0113a968a5ffd68ba371535d2e30a5dfc4e603931f6b3035f651cbbedec1cf2a WHIRLPOOL e43524b5f712ac7721ccbaa0f5cce9001a3936079545e995a9affa33538910403d7b61591219fbebdf6d9b03ef02c4b10bb92d24cfc2909ee537c8e6e5a41b5d
-EBUILD xpra-0.4.2.ebuild 1828 SHA256 c0c09c7a6d1a743483967d4192abb170bbba401c54690a60083a2d093d2a9ac1 SHA512 c27f8a04ee4691965f25550de4a7259d0989b0a1acc0932ae657c14058b950131ccf399ba2d70cf189634c63f3214f41f92b0a672573ace4d54eba2370be1ba0 WHIRLPOOL 2a564e02cade0bf9c927609f8891ee6f4b510f6e56083273d45aa138eb5452ca2e73186373728be6647673ec5197177bb408a08a6c2756391d9a3d9db6326893
-EBUILD xpra-0.5.6.ebuild 1828 SHA256 292708e70121ed60d33cc7a701556cc8faae1c7d12b460cc71fd090580f3ad9a SHA512 b159ba30224ff658e9b49e2e72d8b788f008d5876a525c5795225e9e88fc64d0efb86d4478735588704fb87c980989b443b767a0eaebe24166a3c6b6e55bb898 WHIRLPOOL 796ddbcbbaca1a80f18e781e048db43512d351c6bd4560baf02691ab46ea5e2ddde66eefa6ca6e2e3578f436e5dbd875782cb43438e9b0a39a0b7dece65205b3
+DIST xpra-0.7.2.tar.bz2 469959 SHA256 f9e5bcf94f65becdeeec13eeb1cbea6accf8925c095cfe42ab46fe96625c9015 SHA512 b82d1c751436464ac5000c9f6d5ae29d8e0eb37f82c2009942b092da2f04842760e82079dffc3935389eac06d49253fa3a9f14b08ec29c91cd32965f10cdb32a WHIRLPOOL 1d9a596aabe3fbf3ec9430dba7457ca4c6669dfc811ec67fce0f938c2f984e82be5fd80596dc76b7cc60383612438217d8afa76eecdf29883ab7cfa0cc3d9d6a
 EBUILD xpra-0.6.4.ebuild 1917 SHA256 0777a55f1447e2d88466b7d0e5d86f32aa20eae9c9764dbdabcb7f8b9ac95941 SHA512 b2b5e55b1b596fd3b7d5105bea338a251b5fbf9315d5fb92a6f00fd71f87279e40fd60a4970387a6cc81662fa92ac2242a54d2914fb2ae10e59c8febb46963ca WHIRLPOOL c68af67d59821e4c1f00d92d119f391f2289c27ed8d135766eb82b7f4bba04e528a0898431e3f8b6836f2474365c16a935b93118c96b015d1a416bfad7f38603
 EBUILD xpra-0.7.1-r1.ebuild 2393 SHA256 d9927c240a3e840b2045f589769beffe7c3550f4f0dc5e2de41061ac0f4b33be SHA512 9efbfc77a078bdec0f99886a2d037bc7b11384d99a660c9a3756b70d314aaebf040d5d04708b561d70e657a74483c5db6840fe39fdf4a8aac5608456a46246bb WHIRLPOOL 4f77d181ad82f0d26b89e3c8313f5caf41a8591b84c0453f5362ca4a0a4599ab4677d70f59b180a0afe53a53d0befc6782039b7936ab4c8984feff904ab70aa4
-MISC ChangeLog 5132 SHA256 6e66ffb4abbb4c0932685611993813f17e292517ea0820a836db2c81773a7fb4 SHA512 2abffa41f47f2ae081dc1f6632222791ee68d67b0306fe93cbc2beb1474e136f9f0c69ef5debedc7c5f634dbfd842d956ba9369273c8d574cc468c72a6f073dc WHIRLPOOL 4721a26d08f3e504b0bdb9095755b255d8d80c45c494edf9c4412bcd1a5d146ecfbdae291414ab75de9679199e1fa0ca85a4c4ce2fe2cbb6f6c0433f7f9c7af7
+EBUILD xpra-0.7.2.ebuild 2397 SHA256 126c7fcf47e2f6321c13a2fa6f4d072023b8e0b914eec6751d88d334293ea056 SHA512 d62e947d929124ebbbe8b230be097074dea089d7cf5ed0f095b0a90d69aa900221d1002276200b89397f13781428638e862b940f8730c43315b7892a3ec300d9 WHIRLPOOL cb3d7801cd9fb240319448bf9463db5636943efc80bfd91258b1d367beb7bb99489630956916b15686ac6540724f010785ce61e489303c38332cb52eae71f69b
+MISC ChangeLog 5294 SHA256 1be1f6b8105f7b2068281348efd099d4d4843f4f174269b8cba539c50e0a0622 SHA512 8df89090519ce7df23d7b4b4e395cac0f74c94f6dcc499f2dca48419823015d07199382e2fad7cf868c2937a5428f90a4f1e2ee14fd5e9ff9683b00121c46068 WHIRLPOOL 87dd4c5787ddcbee16e7564593e60abd0156727095828d6a8bf870edec199e97303afc369634d8f193aa447b6cd8d576b7feb9ae1486ae57c94cf186f2427054
 MISC metadata.xml 658 SHA256 6aef86c970695b5c01220804072b2eccf90d1b9338d8a44e22ca2a72b067bc0a SHA512 71abc8d4880b0ff4e793c7f402090bc3e77e785c596ca6ebba76f4054628fb679aecb015971718f164ad095a081ed4d279d87e5a4660d3978c17ac232a532365 WHIRLPOOL b0ccd330fef2d9ca77bd617f3e11dc6d08481181481abf6941969a62e837331d3b06e82cf89504cc928b5df3abaee05f9f3b2d0c7aadd6ca67cebdd4275b28a8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlCO0ooACgkQknrdDGLu8JBJ+QD/S/Bk/pOczTv39/RDmEOZv0uO
-WjJYX7eCM9Ze7Y7xXawA/3CQwb9fqmxa+Ij87ZobLC10/nf4AGBJ6tMZbgk2qaIB
-=cQKb
+iF4EAREIAAYFAlCa6XkACgkQknrdDGLu8JDrIAD9H4JgVmS0KBuiYaAG2kyxzqhI
+D6JlcHoC4jQ8mW5DcZwA/RMlPRdE2o+PVup0jgFz3fdAw9AO9Q5haYFnhkeYpBHr
+=w7Lu
 -----END PGP SIGNATURE-----
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
+}