Version bump including patches mentioned on bug 499530, thanks all.

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

4 files changed, 14 insertions, 115 deletions

diff --git a/x11-wm/xpra/ChangeLog b/x11-wm/xpra/ChangeLog
index 9f1a2b1823a0..d46eef9d6adf 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.91 2014/01/27 07:39:31 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/ChangeLog,v 1.92 2014/02/06 10:19:57 xmw Exp $
+
+*xpra-0.11.2 (06 Feb 2014)
+
+  06 Feb 2014; Michael Weber <xmw@gentoo.org> +xpra-0.11.2.ebuild,
+  -xpra-0.11.0.ebuild, -xpra-0.11.1.ebuild:
+  Version bump including patches mentioned on bug 499530, thanks all.
 
 *xpra-0.11.1 (27 Jan 2014)
 
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index c312ca5b066c..42caf39da44c 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -9,21 +9,19 @@ AUX xpra-0.8.0-prefix.patch 463 SHA256 5c05c47154751e68ea91a3988d17baa06a027370b
 AUX xpra-0.9.5-PIL.patch 4196 SHA256 8e3e9a52a3f2b4721b8980768fbac47c13493631fa6245bba873837f2e23969c SHA512 a247b14526d59e9b10c2ce27545e71f149dec9bc45c50b50840e7ddc524aaca0e25b6e322e55a90992626c2fc1eaf161d70f69a491f62afbee3372212ce70b34 WHIRLPOOL ab14c618adb6b1de786f9cc8d794d8074466bbc77065b65a75281dfb4058a22e948851dfd3587847511bebf412e05780183f68b154545974d9c4bde0606901c3
 AUX xpra-0.9.5-opengl-auto.patch 2168 SHA256 69c20c7557af0b4ab532ae505307ef2c28965e66df03a5f9ce91b9015b707a05 SHA512 72f3d5919802d90bec63f9ab927c19a896b5e17d322832bf130b1b8202452e796b93c653cc0c7293a8e1c535e28738cc0d1b21891d5c788f222e4e79265bf910 WHIRLPOOL ef90c6ca9188e8a647987a685d8aecce895bc36addc90240536929fc9bbf22332fbccb14a4a5309e389eab5b2924009c397973d9d09101d8854e19ebec435e8f
 DIST xpra-0.10.12.tar.bz2 673416 SHA256 3ccd3a400b48492f0548ba36e909ec5ce025ef88a3ca440aeafd1a73cfbe76b6 SHA512 2cd7c1eab7a0756c1700f71265859908365c463fa3dc2107de12a65674c515d7fdbdb62045c65ff27695939daad4c3da192829ac80d56f997d93d2c9a68ae2c9 WHIRLPOOL 30060b2eb62306262bcb23e3984e7e8bdd81a433306f042b09164255b3e0759339499c29a76ed01ec56f4af9533708372f4653cc4b497b1212b7a04b51e4dad6
-DIST xpra-0.11.0.tar.xz 940348 SHA256 e8d8102a1801eef8e7e83b943439c507414feee123777dd068ad37579fc77a00 SHA512 c9cd724e760920a92fbc62282d2763a5bd8105d3654cce71876d2cd2c495cd3a560f4da668446c6223135b48fb3b73f7fb8b697ba09954b480de97b452e9acaa WHIRLPOOL 99bae036aa3ee1acc1a217ac83c7be66d88a15825436c25e59e15566faae7036112fcb542c7ea3a94546cf87e99d5a101a4c8bf4c1bb0cfd71e97ca1434f9e70
-DIST xpra-0.11.1.tar.xz 927716 SHA256 9b723dbc3b641f1645032aab92996383db9c5b2cd4f1de3f5e6a036ec216e00f SHA512 594df0fba36ed611e4998521b146c9e87847fa21f42e545840b3674f83b0cb15941243d497273a63de941d08dec5f976f5bcc75dc09ec01ebc94099ce50150a2 WHIRLPOOL e2b7f734ec6aca98d6db64e1e7265c19d1ca6eff846c77511b707c7c3f26c4860cbfe15f4b93610165f00456a6d3c2bb11666e28f8905d6a37985d43cff1bb3d
+DIST xpra-0.11.2.tar.xz 927580 SHA256 6fd83a57c139f8f0e6ac7f936ed668a82d4265a9c94d7e62215b81eb591fc03f SHA512 3c007fa6cb33380a3363ffc798739046ad0d7a0ddc3306701316d9efef68c910d63f957ee575c150ef85c0c26520a94b012e13f142ba7813b14bcb18f4068da6 WHIRLPOOL 5628d98a1b4b4e3399ce59b8895243312e47e5a016161caa8e269fbbf0f7ebc19a4570f539bbca46dad536a2d4f123cf6ec3d5a41b824343c97a5b513315e03b
 DIST xpra-0.8.8.tar.bz2 581029 SHA256 248bac50c78eccfbc7f728667f9d0ef26b101b288193fa286881cda452e63683 SHA512 b3d2121c13e293cca466997af1b49069ced0012c6692cfac375e9990d62efc916b44f2641a4e9c5e04e425d19c14e85e1521ae1832aa3ea02fcc46ac29672a63 WHIRLPOOL b1f654542e8e89ce89ffb6fac9ee3a42f0c88e6d9ce0fdc1573b28c0b117e970f7e96484eadf7552c35e6dd3064f37495a4eb2cdb1c51c2dc0a8ded8877ba321
 DIST xpra-0.9.8.tar.bz2 607316 SHA256 6c33f2da404209158a4684d26365bac56c77d3f158b95710a482e3a813178884 SHA512 324eeb09a2f948ded76a6cb53180ee68dedbce1c9f11736475e43551f9f27cb09949f1f8c1cdc1f5eb5000070a73e58593fac74d7ca3e24d2ddbc69bdf57d70e WHIRLPOOL 77dc3f3e27e1914d4691eb08247d1025a42d438167db178e59a3befdab44c8c02618f46968f5805af886aafb0129c1461a4843cd753f79d10e4bd9c4a07eeb9a
 EBUILD xpra-0.10.12-r1.ebuild 2921 SHA256 01bb1ce9f0a70ef66e51c38f47f86d6afd5b2efd80cb2e9285b6d644a3794008 SHA512 32bd629be054795550707d7b5bb348f27a94af2e4c86c4265da3f98749657bf3e662b76f576aeb98fcd52d79ccced745f628c07993b4a69816ab4d53d09d963c WHIRLPOOL e13d39cef4b634de56d6adcaf5ba813ac1649d62ccc56e9716c010aea53ed0fd987bbde0c386ae1478ae71c6850152d18075c43639285a1efae9f724eb16d48c
-EBUILD xpra-0.11.0.ebuild 2869 SHA256 8ff9ce9e9c1c0eaec2edf76e44a38935984da758788d0d5ae34f6354a5befa60 SHA512 48c05063b348218cbd4dcde1f23aa986ea9d7d7c5e230be00457e32c2c79d5f5ccc2c56a78f7dc678975b144dd8be98d53eda7e8e0a1e572057de893ba43ec71 WHIRLPOOL 5109024c57e26842e5c218bd75f2bcdd31ea050c6c5082f465602530cff0d055579400027a64c66ac2f6072155668a12b0323613b447cc081bcf8082391f32c8
-EBUILD xpra-0.11.1.ebuild 2869 SHA256 ecfe8f2b5ab506c2e2d43665c17173b32bdc970f90e1c36a7dfb47006f00f8bd SHA512 ad1a4dd3c9f4a0d961f8d1ee7070764d32f2cd530abf3354b0213235d313052c22c21a550e3159558b3609e8387fa480ce915e85515fb0b2f9f8e1db39b85f72 WHIRLPOOL 0949e6884756f181e88f5bfc587d220f61872581f03006be9755eb58166afee617ba9c8454595893d9cc9b7de8bec810de5ec000c2cb379d505e3e300cc52fdb
+EBUILD xpra-0.11.2.ebuild 2869 SHA256 0c40d71850838dbfd80a8df7f453071d0cdcc5aeb2f324a3242cc8dd72e73e6f SHA512 00de64c24d5c4893a1080319760b26d7990bbdbd0f860528a9dc72b6cded8288f01ae1127a62dccedfcce23bc1e05435195cd94b7ac6676648230281549db6c3 WHIRLPOOL ffad726c6383f101dfb7deeae80d4a9297aeae67ac4f6c059a99c1d2a0de8b770dfaabcd434ba5c778fb6369c52551c167ab88abe6ba1aef408948e7945f47fc
 EBUILD xpra-0.8.8.ebuild 2257 SHA256 c7104143884d38acf3570af333ed58434846c889b4cc0f4810638ef54c24ac29 SHA512 983b7c148c2adf455482243efc9b771fe0154682f842ad0d793e9c0dfc36e2238df08e12581e5ad27140b58c06cd37e8d581dfef41b37ff42a5ecb343f8cfabf WHIRLPOOL 8ab3dcefad02cbb0014d72c49660769431b93d36c30215bc38e0ea4d6b544f9e2538da4b108948ffddc0cfa08660061da58e61a6c0cecb9ed86884ae79019361
 EBUILD xpra-0.9.8.ebuild 2646 SHA256 d56daad0cdd0ca7a07c98058e95e4a3f447e3866f9af6346782f7062285d6180 SHA512 b768650888ccbf9cbf2f6a2f5bb6e1bcab350d0111e33b178cca75fe80a0bd264ff1abbc1767d573ea0cc93edff6929a2db656360183a15d0618266c379dac49 WHIRLPOOL a57eb703e69b601e4e00506c9fb5cec605879dfa93c8b2b5d91c12f5c1f4dc6ae3b943e3551b44e92d178b264187748c38c09bd0cc8e3baa5010026011eac4e7
-MISC ChangeLog 13103 SHA256 6e959cd060e6fda800f20f9ab2a047f818fe292517aceb8bcf8fa14cd8bed69a SHA512 3c7e553e5f89d88322bc915a9dde14652eaebe22a48d6552528aec33e5459148264299b751075bbdd115d72b982bd368dfc668b9acd73fda6b356bef35a38906 WHIRLPOOL 626a360df09e6fa34c125138ad108a93b94fbf039399251ca555fda03034d9662141081edba1f23ead4c72f41a4c4464fde61efe4c04249c51b40fc18cdaa962
+MISC ChangeLog 13313 SHA256 6b8a85200dbc5ad642129b042cdb2a6cd403ee6d5f2312b93c4732b525f04b01 SHA512 52431195edb15f2402504674f9082c82c9faa1150b51b6b51f9ed7160a7ae6a278315dab63cf86c964673fb4fb90be4eaaa248d1112058fb536983039981721c WHIRLPOOL 8cc58fbcecbe65c8e8ef1cdb5cb98c64807fc4157de45ede8fd5cd0f68106be2a47aabb298c49b815c516c06cc36704997371c6edb2d446f98094c6e48e2979c
 MISC metadata.xml 807 SHA256 f6d1439d6efe3f82dd2d49440d0d44b8d7e01933ea607f46ffb48e43b6a8384c SHA512 38f024193f3101248653f0ecc21f2aff1fc1041a147067ae48e101a4c467da522026dba22e6e4716d1271eef9b064455a007f123d75efad3e0f58604f51ab4c6 WHIRLPOOL 56ea9db2c71b6ff8da6b0dc288ce4e7599cc9b0a38b89fd344e3f0a3f3c27c44e53d993054c99fede4f1541690aae5b2369f67eaa72ac324e9b6624ba5df4685
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlLmDToACgkQknrdDGLu8JCuSwD/ad+GMAm/Tpa9k+9/NwC7fDkK
-4Igp72kUHftB9HG440gA/02fTpI1hF+raJfWAGjVhYhAhjeylIeEi/67UWITOFXm
-=+5Vi
+iF4EAREIAAYFAlLzYc4ACgkQknrdDGLu8JBRwAEAlrJTzdLh3i5eDu5NiJQsp6DC
+MIyedrHbZNz3YaaOd5AA/i7u+wS3X9QqDsq5+RGAt4tm8OdTa9k47sRWWGvvWokE
+=kupB
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/xpra/xpra-0.11.1.ebuild b/x11-wm/xpra/xpra-0.11.1.ebuild
deleted file mode 100644
index 6bc8a6787446..000000000000
--- a/x11-wm/xpra/xpra-0.11.1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# 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.11.1.ebuild,v 1.1 2014/01/27 07:39:31 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.xz"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+client +clipboard csc dec_av dec_av2 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
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	mydistutilsargs=(
-		$(use_with client)
-		$(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)
-		$(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
-		--with-cyxor
-		--with-gtk2
-		--without-gtk3
-		--without-qt4
-		--with-strict
-		--with-warn
-		--with-x11
-		--without-PIC
-		--without-debug )
-}
diff --git a/x11-wm/xpra/xpra-0.11.0.ebuild b/x11-wm/xpra/xpra-0.11.2.ebuild
index ca6ff7510db2..cbaa0bb95e9c 100644
--- a/x11-wm/xpra/xpra-0.11.0.ebuild
+++ b/x11-wm/xpra/xpra-0.11.2.ebuild
@@ -1,6 +1,6 @@
 # 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.11.0.ebuild,v 1.1 2014/01/23 00:49:06 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/xpra-0.11.2.ebuild,v 1.1 2014/02/06 10:19:57 xmw Exp $
 
 EAPI=5