Update use flags and dependencies to match upstream.

Package-Manager: portage-2.2.0_alpha131/cvs/Linux x86_64

4 files changed, 42 insertions, 20 deletions

diff --git a/net-misc/freerdp/ChangeLog b/net-misc/freerdp/ChangeLog
index dd6fec96af21..a8008280a11b 100644
--- a/net-misc/freerdp/ChangeLog
+++ b/net-misc/freerdp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/freerdp
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/freerdp/ChangeLog,v 1.33 2012/07/28 19:39:32 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/freerdp/ChangeLog,v 1.34 2012/09/23 20:14:47 floppym Exp $
+
+  23 Sep 2012; Mike Gilbert <floppym@gentoo.org> freerdp-9999.1.ebuild,
+  metadata.xml:
+  Update use flags and dependencies to match upstream.
 
 *freerdp-1.0.1_p20120726 (28 Jul 2012)
 
diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index b13dd0bc504f..9861d3e7d397 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -5,13 +5,13 @@ DIST freerdp-1.0.1_p20120318.tar.gz 3666002 SHA256 f03d8f7138d66e0fac192e6ac52e7
 DIST freerdp-1.0.1_p20120726.tar.gz 3781458 SHA256 68eab735e00ac9cc53c65c243a366e8304d1234efa70d101266e93e550a90b55 SHA512 1edb20aec9ffcbebddf2504e2ab6cd3c7e8f6b3f9c2af24da682bb4f8d9699686aeaf1a425e4f899a4cb431ae9757e70f3e20cda342d275828a5b96fcbdb5f7b WHIRLPOOL 0ace4797a094b226a42593e427d92205a166b5ef75ad6a69f3f6c0fc00094f8709d84b47d7498da9de8ff8049ec48bd7a8734d79079a3c1db575a9f78d9bec8b
 EBUILD freerdp-1.0.1_p20120318.ebuild 2001 SHA256 1a416be3cedcbe52f5af32366d1a402d1742404c7297b4964a1df36943a1a1e7 SHA512 dd7178924ae1ec083a8179a3ce9e84d73d3530b3f26d0c65840df4efea4e4ccdac148c3cdbba916d9e5342ff2358e87c751b6d60b15a065c8f6e1748c84b2550 WHIRLPOOL 4cdb8f3d82573138e8d60b2f533266d1d9caf5d5518d15428b9c4c484a9772a1f326fda9d474a37327c39522fa3c295395ef9ed729685945d085fc39024447da
 EBUILD freerdp-1.0.1_p20120726.ebuild 2001 SHA256 c36da95597e62e4fc34982ee962bc7a02cdbea8faef55c9cf2a6429a32020def SHA512 021862f1ad73eb6d0a793268f70e096c1cc75a892003dd76da34dfe209ae4d8febea8a7a706ad5716e2bb74fc21646e086575e4e6291dc68dab547f17c69066b WHIRLPOOL e7bb8c53848c35425c37468575a05fd549ab8880b5c92df6e00079fea1ccb92c15f36968601aba1580eff47018d12d60f4752f4c146e4e141e59f1c242039842
-EBUILD freerdp-9999.1.ebuild 1993 SHA256 c154fc6271e75005f93edf738743b904a1b37f76b85f6685e33d6cd7dbeb0887 SHA512 e0b60d0daac8636d7fa73d5c7b45c028349ff737333a4a6db26e0f4654c2dcfffb5895fcc0124e2670b6f8f2983edf9d9c3f39d3947b8f2a72173dd590036eab WHIRLPOOL ee5897209f42510021604db26f54d0d93a72e0a40c8978f29d24fc21c1712172e1fcae70ef296d5820a9bccd81680fad54ccb0172751bf3c2488b0517b4211c7
-MISC ChangeLog 5214 SHA256 226de66c3061b3419fd898701bb4d45a3b428e6abdd3f3bcd21bbd2fedf334a6 SHA512 95ded79cf942e31ba7eddbcd95834897108e669fdc687a4256bc336653fa4263d08516543c2c3fd6912193b9f28937457c15b202a481f84213aa03cb009ff240 WHIRLPOOL 08753104a17601b350560038c839053fdc0e4884feeb400a295f840f4ef51ab74da1c9d89ce84874805d344585e44e94e28d7e24e060d0b9edce8ade8a156be9
-MISC metadata.xml 232 SHA256 8e0308eed9efea18755c3fc2161057faa2b438c4d31895e776d2d5cd5ff109df SHA512 0ec524315be6762228ff54bca53ec039e93672dcef379ef6ef0087656d5e11644aebabcc08663af4f18bdb1b254e71f2b2d3f91277e2867022b93f00d975ae88 WHIRLPOOL bd96dd794e9fdf37bea367be6ada6deb0cf7b98f1978c9e23746f98b1fc2fef931077dd59f6bff7d64856ed284d39f638fb8e0517c61b42f6a0605db09297047
+EBUILD freerdp-9999.1.ebuild 2392 SHA256 cd3a0320eceaa35a5f30438246cf120aefffec8b7ebebfb5aa478e5104a9b7b8 SHA512 4bd409b9f04990ea69bf09e829d18a01f14795cd0218bb265dfd5120fe17562eb72d89c7e6a302659ce5095fe9fc3e054d1a33e77a59fb30904f987b11558ea4 WHIRLPOOL d3808270df0c041b56c9fedcab53f2bf2f2114cf1d0015b31d834848c88f6c25fcf10ee88e7d8210b4b33dfc30884a7cb491691db30b36d444b68bfd18802525
+MISC ChangeLog 5358 SHA256 983d8480a276323604be2c5efd0f1a86e3747d8fb63f68ac7eed992946cd482d SHA512 72b49f64af84655ff55f0bc05eff87c920c1a2d5b77b85634a3d05a7bb1679121d6c0b10157c0f6d40d6fb28db60ce2717b707465aeb745acf406353a0cbcaad WHIRLPOOL d520fa25ed2d50abf34775d6e5e1374ce0c5978f3a83ff11eb363394e93e1aacc490a9236aed65b19928381bd8ec8c70f8ff3cc07db7b230f31d35afd360fc65
+MISC metadata.xml 359 SHA256 b52c548a3451269daf80f116cea37f2321a2c1f75bceef4d65c2a513dcebd09a SHA512 a649419b037d0ddd89c8021c055997c3d704fd9f3b8a13b22f69309ca3b168ee1ef19a02333888c3901fa1d363bede3e301670cc8d7c5ac88a22f2d9756de08e WHIRLPOOL f8bb8fb15c7a65811b622f6669b85742f0d57b45bd4b91ce1b576e9edb6f1d0c7809dfb6423e40826ac29fd0c36fd3b546860334145a4ba9da0026e2bbca59ae
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlAUP/0ACgkQC77qH+pIQ6QkjAEAjvqsDqVYfu8DSRUZXedRv1lG
-n1e3hqtHtQw8s/11HqUA/01DKh46GZi3eSZOvPJ7R560gjgqfhzxyWpz98ZJ7Vyk
-=CdNH
+iF4EAREIAAYFAlBfbcAACgkQC77qH+pIQ6S59QD/WuAY9ym9PuLsaa2RJf99dk3U
+dO7swJogWcczZNaRah4A/3rPaTXoTdlnk/9kt3kuDpnLnujkOHGGOKoAqO/u1Tfd
+=t37S
 -----END PGP SIGNATURE-----
diff --git a/net-misc/freerdp/freerdp-9999.1.ebuild b/net-misc/freerdp/freerdp-9999.1.ebuild
index 21f269a1532d..c3a48e3de5e6 100644
--- a/net-misc/freerdp/freerdp-9999.1.ebuild
+++ b/net-misc/freerdp/freerdp-9999.1.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/net-misc/freerdp/freerdp-9999.1.ebuild,v 1.11 2012/07/28 19:39:32 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/freerdp/freerdp-9999.1.ebuild,v 1.12 2012/09/23 20:14:47 floppym Exp $
 
 EAPI="4"
 
@@ -24,7 +24,8 @@ HOMEPAGE="http://www.freerdp.com/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="alsa cups directfb doc ffmpeg pulseaudio smartcard sse2 test X xinerama xv"
+IUSE="alsa +channels +client cups debug directfb doc ffmpeg gstreamer jpeg
+	pulseaudio smartcard sse2 test X xinerama xv"
 
 RESTRICT="test"
 
@@ -33,26 +34,34 @@ RDEPEND="
 	sys-libs/zlib
 	alsa? ( media-libs/alsa-lib )
 	cups? ( net-print/cups )
-	directfb? ( dev-libs/DirectFB )
+	client? (
+		directfb? ( dev-libs/DirectFB )
+		X? (
+			x11-libs/libXcursor
+			x11-libs/libXext
+			xinerama? ( x11-libs/libXinerama )
+			xv? ( x11-libs/libXv )
+		)
+	)
 	ffmpeg? ( virtual/ffmpeg )
+	gstreamer? (
+		media-libs/gstreamer
+		media-libs/gst-plugins-base
+		x11-libs/libXrandr
+	)
+	jpeg? ( virtual/jpeg )
 	pulseaudio? ( media-sound/pulseaudio )
 	smartcard? ( sys-apps/pcsc-lite )
 	X? (
 		x11-libs/libX11
-		x11-libs/libXcursor
-		x11-libs/libXext
 		x11-libs/libxkbfile
-		xinerama? ( x11-libs/libXinerama )
-		xv? ( x11-libs/libXv )
 	)
 "
 DEPEND="${RDEPEND}
-	doc? (
-		X? (
-			app-text/docbook-xml-dtd:4.1.2
-			app-text/xmlto
-		)
-	)
+	client? ( X? ( doc? (
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/xmlto
+	) ) )
 	test? ( dev-util/cunit )
 "
 
@@ -61,10 +70,15 @@ DOCS=( README )
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_with alsa ALSA)
+		$(cmake-utils_use_with channels CHANNELS)
+		$(cmake-utils_use_with client CLIENT)
 		$(cmake-utils_use_with cups CUPS)
+		$(cmake-utils_use_with debug DEBUG_ALL)
 		$(cmake-utils_use_with doc MANPAGES)
 		$(cmake-utils_use_with directfb DIRECTFB)
 		$(cmake-utils_use_with ffmpeg FFMPEG)
+		$(cmake-utils_use_with gstreamer GSTREAMER)
+		$(cmake-utils_use_with jpeg JPEG)
 		$(cmake-utils_use_with pulseaudio PULSEAUDIO)
 		$(cmake-utils_use_with smartcard PCSC)
 		$(cmake-utils_use_with sse2 SSE2)
diff --git a/net-misc/freerdp/metadata.xml b/net-misc/freerdp/metadata.xml
index 09ddbff14dbf..afd7dec54ae3 100644
--- a/net-misc/freerdp/metadata.xml
+++ b/net-misc/freerdp/metadata.xml
@@ -5,4 +5,8 @@
 		<email>floppym@gentoo.org</email>
 		<name>Mike Gilbert</name>
 	</maintainer>
+	<use>
+		<flag name="channels">Build virtual channel plugins</flag>
+		<flag name="client">Build client binaries</flag>
+	</use>
 </pkgmetadata>