Required use, add gtk+:2 dep. Building against gtk+:3 or qt4 doesn't work.

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

4 files changed, 30 insertions, 20 deletions

diff --git a/x11-wm/xpra/ChangeLog b/x11-wm/xpra/ChangeLog
index 8d25c9633ced..5b292abb4d5e 100644
--- a/x11-wm/xpra/ChangeLog
+++ b/x11-wm/xpra/ChangeLog
@@ -1,6 +1,9 @@
 # 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.77 2013/08/15 11:50:37 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/ChangeLog,v 1.78 2013/08/16 19:26:43 xmw Exp $
+
+  16 Aug 2013; Michael Weber <xmw@gentoo.org> metadata.xml, xpra-0.10.0.ebuild:
+  Required use, add gtk+:2 dep. Building against gtk+:3 or qt4 doesn't work.
 
 *xpra-0.10.0 (15 Aug 2013)
 
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index b1f66ba410eb..6c8eedc91687 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -10,16 +10,16 @@ DIST xpra-0.10.0.tar.bz2 690365 SHA256 ba03da512a8aefdaef1614d4f0a55792bb96df9be
 DIST xpra-0.7.8.tar.bz2 471147 SHA256 27f5d0bc2a369a93076ef90fad46a6354e0327033b9139b659d602e9e32c17cb SHA512 d14fdd75c7fd494f4aaae8740ce1a5a7880ae70109ffa7989d346d1b5add56a8117a5851132140f2e8a3aad0f7f3f4a9fe6e2b2f3e9666e469f35fc179fd0af2 WHIRLPOOL c0ed83f90ade9b3a7b0ab728ab090d73277fecb56edc4943295fa19f211b3e41c12dcad6eec9b01932c0a2bb1a6402f8f88deaf25c7f88be01fcf986778c4fd0
 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.0.ebuild 2551 SHA256 d006292108fd0b80b8dee65876b55d2ff37870cadc1581bf5b8b5ecad153c05d SHA512 c8903406d65492ab3fdff43e37b61f8f5f390c74f9575763d1284d3cee0b1270003d9cbdd3ef2b1a51bd9bb1999c6d200bf9b6283b4e208a1dd5b60ac8c41994 WHIRLPOOL e9b70943ae9f4af460badd23a884cf894ee446fc535c3b5a7cc7900558d8ab3e71dff82e5c8d5fc1e4774bca02a848babfe6263456eed7bb96045a915abb1ecb
+EBUILD xpra-0.10.0.ebuild 2809 SHA256 b8c2d5cdf35f40167ff205ff26eed5fe4a83453e9f0efb922fcc7cb29a53b348 SHA512 185f7a090e9f1160990bbe06471e60308498b0c211aa87b138277f8862c9339de9fe8f03ee853f449b6edac2038fea4b9607dcf2fbbe24be18a3ceb2cf10f93e WHIRLPOOL 1b3ed2e29238fcc4fd7dcef2428f09befde02178c690aff3c68b737431fd5eb063c47e521b7064c0012e4b0d61aeda6c4bfa4d94b3b7a75ac96ed46a21225e44
 EBUILD xpra-0.7.8.ebuild 2520 SHA256 be7b5830ac406d6021ae56feee6549bf1e78f3623109c55d95b55b284bd2fbf3 SHA512 9a94a50c0e4f111e333b4545dbcbfd7b54e24e132e40bf57ab9aab881ea2e45127df71f84341fa5eed8e0aef1a6395861759881e537c97586ff9783c664f9838 WHIRLPOOL 1d00d061266bbd8935d37403a470a863af628127fe23b96ab258ab5595c0e9ad28bc7d7f3f011583b211c3758e320ce6c3c9f2f81e3a7424a753620f841769f5
 EBUILD xpra-0.8.8.ebuild 2263 SHA256 72bd40980609937092391960f5962683b3ec77304a76f902ba3a9b3dd6b8ffdd SHA512 c609633d6fbb8e3971b589646f3ad010698270287e68bb735df19294600ee893f00f6841495d703bf0dd642d26965a10a8a4f84158e1422c4228b6d16ebcc52c WHIRLPOOL 794fe466f3bd64e1739abaa54bd822b2b0d65c86b2eeb8c19e583a54bd41058159d1a771f8d0a36b602889057941a0cd2edbc7d8133118758a38560411a79030
 EBUILD xpra-0.9.8.ebuild 2646 SHA256 d56daad0cdd0ca7a07c98058e95e4a3f447e3866f9af6346782f7062285d6180 SHA512 b768650888ccbf9cbf2f6a2f5bb6e1bcab350d0111e33b178cca75fe80a0bd264ff1abbc1767d573ea0cc93edff6929a2db656360183a15d0618266c379dac49 WHIRLPOOL a57eb703e69b601e4e00506c9fb5cec605879dfa93c8b2b5d91c12f5c1f4dc6ae3b943e3551b44e92d178b264187748c38c09bd0cc8e3baa5010026011eac4e7
-MISC ChangeLog 11270 SHA256 359e817a05968cbc7ac2860c8cc691392ef54a66668f156e86217e7d421b8dc0 SHA512 610e7a69283fc9627b10f1c9bd26a595527f5b38fc052301feab9191cfd9255d64afbe022e72996f8a2234d6ab2e965e9044d0a8bd964e813996beb3dc06a165 WHIRLPOOL 2efafb83b643a50a9704d1e629d3230daa77424776c878cfbaacf1002a37a47782b0f95aac441c36433eb4195f5567162a6aa22986a48921ec8cbbc43cffdbfe
-MISC metadata.xml 640 SHA256 fb6464bfbb60b04399b21c29b7697b2d3485ace8ca818bea4a36c08fea0a09b9 SHA512 082c11f0ed3ae67ba9ecab314f4f8bac97f77ba3910dbc19702f1df025614dcc7bf17c8a7279bbbd303d669767abe5256a91475e10138c0827bb8485c7cf6526 WHIRLPOOL d07ac1943867f68389b32eb2856374a3cf09528256fa5b7f4b666889c0e77a7f290b0e4e13ba44bc1c702d1ea5f46bc5a3863bdb797475ae292689a5747b2c86
+MISC ChangeLog 11428 SHA256 6c4d5531f9e04dcafc978209ecb2e8623fc588c37655bd946fbf2168ae2f3fea SHA512 02703a26ea563a8b13039025ff5f56f9a3d287e0cb9c43533b1da8c5a1d9f946496aeac7923f1e49af8369637637953c0b66c01d9347928c061308894d592258 WHIRLPOOL 902a5e857f43349bf55e6dffdddc7c32ec98ff6fe47cb7f0dccc6303f984a5621f7a64b69ecd6677d108f0fb2972b4a38c676814e044163caa373f10fe529ca5
+MISC metadata.xml 750 SHA256 520a2fa41f7d77740b88be12b182f4eb4bbd38b2e8fcbc7e3b6fee104febe4d6 SHA512 3a8bcebe6a9c51100166601bdbdfab2cd67c455ef1f549ce3014dd2a17109273ba7849bdf70ae2077d48cb957b2f7a27e9d6213017fec6db6a5ef509985d8281 WHIRLPOOL cfd580b41e3eec89c58a7b6da0788b61906f91dd673eccd2b9b0219edbb328780cd6294958fb68f52e0dfffdf52c60d9454dd02dfd996644b9b2e2ca3014edd0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlIMwJcACgkQknrdDGLu8JBHWgD+P/WkWkLUte5pO4bzK/TluSwK
-YozGQVg0eh5Bwri9i6cA/isrWKurUi9hz/BNK788xstJveF5NXkwYc5XvYOYG8Ub
-=d0Ih
+iF4EAREIAAYFAlIOfPQACgkQknrdDGLu8JBRqQD+OlkysuYUV3UP/fVmdn7c35Mn
+Aijx3vfltiWT2rAVGW8A/R385WgQXfGOvu6U1zl3juqhfRB6YDwRuKxYKzjIOA4f
+=9ypy
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/xpra/metadata.xml b/x11-wm/xpra/metadata.xml
index 5581337a7bae..ea5be32cab12 100644
--- a/x11-wm/xpra/metadata.xml
+++ b/x11-wm/xpra/metadata.xml
@@ -15,5 +15,7 @@
 	<flag name='rencode'>Enable rencode support</flag>
 	<flag name='vpx'>Enable vpx image format support</flag>
 	<flag name='webp'>Enable webp image format support</flag>
+	<flag name='csc'>Enable csc softscaler support</flag>
+	<flag name='dec_av'>Enable dec_avcodec support</flag>
 </use>
 </pkgmetadata>
diff --git a/x11-wm/xpra/xpra-0.10.0.ebuild b/x11-wm/xpra/xpra-0.10.0.ebuild
index 006eeb80c082..c66b1f36fc32 100644
--- a/x11-wm/xpra/xpra-0.10.0.ebuild
+++ b/x11-wm/xpra/xpra-0.10.0.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.10.0.ebuild,v 1.1 2013/08/15 11:50:37 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/xpra-0.10.0.ebuild,v 1.2 2013/08/16 19:26:43 xmw Exp $
 
 EAPI=5
 
@@ -14,31 +14,35 @@ SRC_URI="http://xpra.org/src/${P}.tar.bz2"
 LICENSE="GPL-2 BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+client +clipboard gtk opengl pulseaudio qt4 +rencode server sound vpx webp x264"
+IUSE="+client +clipboard csc dec_av opengl pulseaudio +rencode server sound vpx webp x264"
 
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+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 )
+	vpx? ( media-libs/libvpx virtual/ffmpeg )
 	webp? ( media-libs/libwebp )
 	x264? ( media-libs/x264
-		|| ( >=media-video/ffmpeg-1.0.4:0 media-video/libav )
-		virtual/ffmpeg )"
+		|| ( >=media-video/ffmpeg-1.0.4:0 media-video/libav ) )"
 
 RDEPEND="${COMMON_DEPEND}
 	dev-python/dbus-python[${PYTHON_USEDEP}]
@@ -73,10 +77,12 @@ python_configure_all() {
 	mydistutilsargs=(
 		$(use_with client)
 		$(use_with clipboard)
-		$(use_with gtk gtk2)
+		$(use_with csc csc_swscale)
+		$(use_with dec_av dec_avcodec)
 		$(use_with opengl)
-		$(use_with qt4)
 		$(use_with rencode)
+		$(use_with server cymaths)
+		$(use_with server shadow)
 		$(use_with server)
 		$(use_with sound)
 		$(use_with vpx)
@@ -84,13 +90,12 @@ python_configure_all() {
 		$(use_with x264 enc_x264)
 		--with-Xdummy
 		--with-argb
-		--with-csc_swscale
 		--without-csc_nvcuda
-		--with-cymaths
 		--with-cyxor
-		--with-dec_avcodec
+		--with-gtk2
+		--without-gtk3
+		--without-qt4
 		--with-nvenc
-		--with-shadow
 		--with-strict
 		--with-warn
 		--with-x11