Rewrite the live ebuild; point it at the old (working) git repo

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

4 files changed, 94 insertions, 95 deletions

diff --git a/net-misc/freerdp/ChangeLog b/net-misc/freerdp/ChangeLog
index 0e87f7d42759..f46014499694 100644
--- a/net-misc/freerdp/ChangeLog
+++ b/net-misc/freerdp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/freerdp
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/freerdp/ChangeLog,v 1.6 2011/09/03 09:23:15 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/freerdp/ChangeLog,v 1.7 2011/09/04 16:34:45 floppym Exp $
+
+  04 Sep 2011; Mike Gilbert <floppym@gentoo.org> freerdp-9999.ebuild,
+  metadata.xml:
+  Rewrite the live ebuild; point it at the old (working) git repo
 
   03 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org> metadata.xml:
   Drop unused local desc.
diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index 6407180c3979..8ee9aa0202d0 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -1,25 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 DIST freerdp-0.8.2.tar.gz 936410 RMD160 273e03d598e19900508ff23fde365f7140781917 SHA1 32ea0876357c9906784bd6d8ce6d0a8e7c10ebc4 SHA256 389a707b491bd1905c8395ede3df61ac73a55d866f8a56354c6442c23c8730e1
 EBUILD freerdp-0.8.2.ebuild 2516 RMD160 6a3a2ae32d33f5474064ec13add6174e1018f313 SHA1 f03fd68035c5a92028ebfc801139f26f88007684 SHA256 85c7a7907722ec58ae2ebea498b793a3bac824cff74bda9fd7da9916960ccd19
-EBUILD freerdp-9999.ebuild 2516 RMD160 be588df65984088a6e8464eb25b5cb7a6f1f0cee SHA1 926f33353a2e79e864261b97d11b1f4bde4ee908 SHA256 5c349e5d9d4461b6965783c7e5d19f707f7753bbf95defd7ea53736ff8e9b841
-MISC ChangeLog 1119 RMD160 e35efc139dbd869fa35a240a8554cc2a111964a4 SHA1 8f3018a5a8f411996e092f05b341f6019ad646a6 SHA256 ba9131f65d6ce445027fceb6673257c9954662d3f0f99f3d2ddf592d5cadfd55
-MISC metadata.xml 896 RMD160 8c7bfce75c1f871fd582f2d09b256da281789703 SHA1 ba0c2cbb8856a6a261abb8ab9ba7cc0cf6719366 SHA256 0a8748b91fb20ab43aa8d7d0f14b5dfc38231365a39530d1e27af4040f20d767
+EBUILD freerdp-9999.ebuild 2170 RMD160 32e259681d921fb55b1a1b346e9a4f59e8d9d993 SHA1 e8071faa181821459b183856c097a3bd81e4dd9e SHA256 5ae873b00c69b11238a3e3232ec1850f2da842bac14f234667bd9bbf890d347b
+MISC ChangeLog 1270 RMD160 7a717357ea4c2fac2f7e65ab6e578a1beb513be8 SHA1 6bbd5cba1743bbfbdd81b28a80f434af8da26e09 SHA256 4cebabc7e6c564dfb7feedc910f8552b8ba615c31568950c63c670c2b36f214c
+MISC metadata.xml 1365 RMD160 6b5a2223ee60e18a0e02b97c6c89451722cf1cac SHA1 e5b8c73d63e17150b9536189a9a5f56f2be7918b SHA256 ab1ef0b3a92a057f05fa0f35f609e2e4268654a53baea8bad69f84f7c31d054f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOYfIOAAoJEOSiRoyO7jvoe6gQALDsW4qw+zVMLADg5BqhbC6t
-Fv54SVk89aq4sokbk9H/PCqJzhQypysQw8z9bxGUfF5piE+NrLiZo6sHm/BLE3W8
-xSkXiz/Xox4qqc0FhUtLk6M2NrnBrbdFYzraFR6KpfI8+7dRpPyOqFTfJ8vq41Vw
-BRLTgJ9oV3WKaW7BKZA5JtFQz1CkkJmZCUzUVkI1bdSAok/ivmMV2jsKj81X8WKy
-rxwpXHZZYqM/WFm/ch7ykLb0Ky5RasuLq5ZJkjXjQds9kUBvHP6NzpBxJT0QKmUk
-sZ17G2Y5lsUxh0zJqFNT6Z2OUK5yrhCEXYHy5tGb1fh2GfK2u9ugH72mlp015c8J
-4yazSMUNXmQWeFupwJghvC61mgIzuGa2Qb/m/DNyr9vvAq6cQMIAo6hYUVahgBOr
-6lueMMy8JvxQXdw0WeGdC2ZOCiNmgDUliReAjew2XOLBZ4nj/M/SXz59PWHefydH
-YRKULL3zcTNkt7SbIwc+lbtn0wZVy23IRGIvmVdi4BvQD0+XIy6ZclARiMx+JMTl
-xNlhoV0PQ3rLT0Lcrx1/zHvXVHbFCc9okf9DuYToJCY76b5yTNlfkFeUbQolHqB6
-oTjIWvqVs/lVBNQumLQz8sUfxMJD90PH4P8rf+mtm+WVshePHuXj3NOF25QOBvSA
-CTrvAr2IJ/KfSO7SH8Np
-=9rta
+iF4EAREIAAYFAk5jqK8ACgkQC77qH+pIQ6TdpgEAwPJ3HZU+JfFxbeabhleASdGJ
+B1vh/HtfBTyj62rifxwA/i14TVm4lnxqnujJLrUt2+68IZC819Xjo1K3vf1AE0JN
+=zRbF
 -----END PGP SIGNATURE-----
diff --git a/net-misc/freerdp/freerdp-9999.ebuild b/net-misc/freerdp/freerdp-9999.ebuild
index cdba3b4d02a5..d48373877054 100644
--- a/net-misc/freerdp/freerdp-9999.ebuild
+++ b/net-misc/freerdp/freerdp-9999.ebuild
@@ -1,14 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/freerdp/freerdp-9999.ebuild,v 1.4 2011/03/15 11:16:19 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/freerdp/freerdp-9999.ebuild,v 1.5 2011/09/04 16:34:45 floppym Exp $
 
-EAPI=2
-WANT_AUTOMAKE="1.11"
-EGIT_BOOTSTRAP="eautoreconf"
+EAPI="4"
 
-inherit autotools base git
+inherit autotools-utils git-2
 
-EGIT_REPO_URI="git://github.com/FreeRDP/FreeRDP.git"
+EGIT_REPO_URI="git://github.com/FreeRDP/FreeRDP-old.git"
 
 DESCRIPTION="A Remote Desktop Protocol Client, forked from rdesktop"
 HOMEPAGE="http://www.freerdp.com/"
@@ -17,77 +15,75 @@ SRC_URI=""
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="alsa cups debug gnutls iconv ipv6 libsamplerate nss polarssl \
-ssl X"
+IUSE="alsa cups debug-assert debug-gdi debug-kbd debug-nla
+	debug-proto debug-serial debug-smartcard debug-sound
+	debug-stream-assert directfb ffmpeg gnutls iconv ipv6 nss polarssl
+	pulseaudio smartcard static-libs X xv"
 
-DEPEND="
-	x11-libs/libX11
-	ssl? ( >=dev-libs/openssl-0.9.8a )
-	nss? ( dev-libs/nss )
-	gnutls? ( >=net-libs/gnutls-2.10.1 )
-	polarssl? ( >=net-libs/polarssl-0.14.0 )
-	alsa? ( media-libs/alsa-lib )
-	libsamplerate? ( media-libs/libsamplerate )
+DEPEND="alsa? ( media-libs/alsa-lib )
 	cups? ( net-print/cups )
-	iconv? ( virtual/libiconv )"
-RDEPEND="${DEPEND}
-	x11-apps/setxkbmap"
+	directfb? ( dev-libs/DirectFB )
+	ffmpeg? ( virtual/ffmpeg )
+	iconv? ( virtual/libiconv )
+	pulseaudio? ( media-sound/pulseaudio )
+	smartcard? ( sys-apps/pcsc-lite )
+	gnutls? ( >=net-libs/gnutls-2.10.1 )
+	!gnutls? (
+		nss? ( dev-libs/nss )
+		!nss? (
+			polarssl? ( >=net-libs/polarssl-0.14.0 )
+			!polarssl? ( >=dev-libs/openssl-0.9.8a )
+		)
+	)
+	X? ( x11-libs/libX11
+		x11-libs/libXcursor
+		x11-libs/libxkbfile )
+	xv? ( x11-libs/libXext
+		x11-libs/libXv )"
+RDEPEND="${DEPEND}"
 
 DOCS=( AUTHORS ChangeLog NEWS README )
 
 pkg_setup() {
-	MY_CRYPTOBACKEND="simple"
-	if use polarssl; then
-		MY_CRYPTOBACKEND="polarssl"
-	fi
-	if use nss; then
-		if [[ "${MY_CRYPTOBACKEND}" != "simple" ]]; then
-			ewarn "You have enabled ${MY_CRYPTOBACKEND} and nss."
-			ewarn "Only one will be selected"
-		fi
-		MY_CRYPTOBACKEND="nss"
-	fi
-	if use gnutls; then
-		if [[ "${MY_CRYPTOBACKEND}" != "simple" ]]; then
-			ewarn "You have enabled ${MY_CRYPTOBACKEND} and gnutls."
-			ewarn "Only one will be selected"
-		fi
-		MY_CRYPTOBACKEND="gnutls"
-	fi
-	if use ssl; then
-		if [[ "${MY_CRYPTOBACKEND}" != "simple" ]]; then
-			ewarn "You have enabled ${MY_CRYPTOBACKEND} and openssl."
-			ewarn "Only one will be selected"
-		fi
-		MY_CRYPTOBACKEND="openssl"
-	fi
-
-	einfo "The selected crypto-backend is: ${MY_CRYPTOBACKEND}"
+	crypto=(
+		$(usev gnutls)
+		$(usev nss)
+		$(usev polarssl)
+		openssl
+	)
+	[[ ${#crypto[@]} > 1 ]] && \
+		ewarn "${crypto[0]} crypto backend selected; this will disable tls support"
+}
 
-	if ! use ssl; then
-		ewarn "You do not have OpenSSL as the crypto-backend,"
-		ewarn "TLS-connections will not be available."
-		ewarn "TLS-connectios currently need OpenSSL as crypto-backend."
-	fi
+src_prepare() {
+	autotools-utils_src_prepare
+	eautoreconf
 }
 
 src_configure() {
-	# chipcard and directfb are configurable according to ./configure
-	# but they are currently not usable...
-	econf \
-		--enable-largefile \
-		--with-crypto="${MY_CRYPTOBACKEND}" \
-		$(use_enable ssl tls) \
-		$(use_with debug) \
-		$(use_with debug debug-channel) \
-		$(use_with debug debug-kbd) \
-		$(use_with debug debug-rdp5) \
-		$(use_with debug debug-serial) \
-		$(use_with debug debug-sound) \
-		$(use_with alsa sound alsa) \
-		$(use_with cups printer cups) \
-		$(use_enable iconv) \
-		$(use_enable ipv6) \
-		$(use_with libsamplerate) \
+	local myeconfargs=(
+		$(use_enable iconv)
+		$(use_enable ipv6)
+		--enable-largefile
+		$(use_with alsa)
+		--with-crypto=${crypto[0]}
+		$(use_with cups printer cups)
+		$(use_with debug-assert)
+		$(use_with debug-gdi)
+		$(use_with debug-kbd)
+		$(use_with debug-nla)
+		$(use_with debug-proto debug)
+		$(use_with debug-serial)
+		$(use_with debug-smartcard)
+		$(use_with debug-sound)
+		$(use_with debug-stream-assert)
+		$(use_with directfb dfb)
+		$(use_with ffmpeg)
+		$(use_with pulseaudio pulse)
+		$(use_with smartcard)
 		$(use_with X x)
+		$(use_with X xkbfile)
+		$(use_with xv xvideo)
+	)
+	autotools-utils_src_configure
 }
diff --git a/net-misc/freerdp/metadata.xml b/net-misc/freerdp/metadata.xml
index 4e78f3d81c51..a9ef185aa13c 100644
--- a/net-misc/freerdp/metadata.xml
+++ b/net-misc/freerdp/metadata.xml
@@ -6,15 +6,24 @@
 	<email>hwoarang@gentoo.org</email>
 	<name>Markos Chandras</name>
 	</maintainer>
+	<maintainer>
+		<email>floppym@gentoo.org</email>
+		<name>Mike Gilbert</name>
+	</maintainer>
 	<longdescription>FreeRDP is a fork of the rdesktop project that intends to rapidly start moving forward and implement features that rdesktop lacks the most.</longdescription>
 <use>
-	<flag name='X'>Install also GUI client</flag>
-	<flag name='alsa'>Enable sound support (using alsa)</flag>
-	<flag name='cups'>Enable printing support (using cups)</flag>
-	<flag name='gnutls'>Use GnuTLS as crypto backend</flag>
-	<flag name='nss'>Use NSS as crypto backend</flag>
-	<flag name='ssl'>Use OpenSSL as crypto backend</flag>
-	<flag name='polarssl'>Use PolarSSL as crypto backend</flag>	
-	<flag name='debug'>Enable all debugging options</flag>
+	<flag name="debug-assert">Enable assert debugging</flag>
+	<flag name="debug-gdi">Enable debugging of GDI</flag>
+	<flag name="debug-kbd">Enable debugging of keyboard handling</flag>
+	<flag name="debug-nla">Enable debugging of network level authentication</flag>
+	<flag name="debug-proto">Enable protocol debugging output</flag>
+	<flag name="debug-serial">Enable debugging of serial code</flag>
+	<flag name="debug-smartcard">Enable debugging of smard-card code</flag>
+	<flag name="debug-sound">Enable debugging of sound code</flag>
+	<flag name="debug-stream-assert">Enable stream assert debugging</flag>
+	<flag name="gnutls">Use GnuTLS as crypto backend</flag>
+	<flag name="nss">Use NSS as crypto backend</flag>
+	<flag name="polarssl">Use PolarSSL as crypto backend</flag>
+	<flag name="ssl">Use OpenSSL as crypto backend</flag>
 </use>
 </pkgmetadata>