Add a snapshot from git master.

(Portage version: 2.2.0_alpha179/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)

4 files changed, 126 insertions, 12 deletions

diff --git a/net-misc/freerdp/ChangeLog b/net-misc/freerdp/ChangeLog
index c5b2d56ac74c..c6354601f40a 100644
--- a/net-misc/freerdp/ChangeLog
+++ b/net-misc/freerdp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/freerdp
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/freerdp/ChangeLog,v 1.43 2013/06/09 20:42:52 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/freerdp/ChangeLog,v 1.44 2013/06/10 00:39:08 floppym Exp $
+
+*freerdp-1.1.0_beta1_p20130605 (10 Jun 2013)
+
+  10 Jun 2013; Mike Gilbert <floppym@gentoo.org>
+  +freerdp-1.1.0_beta1_p20130605.ebuild, freerdp-9999.1.ebuild, metadata.xml:
+  Add a snapshot from git master.
 
 *freerdp-1.1.0_beta1 (09 Jun 2013)
 
diff --git a/net-misc/freerdp/freerdp-1.1.0_beta1_p20130605.ebuild b/net-misc/freerdp/freerdp-1.1.0_beta1_p20130605.ebuild
new file mode 100644
index 000000000000..bb7f3c5e6fd1
--- /dev/null
+++ b/net-misc/freerdp/freerdp-1.1.0_beta1_p20130605.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/freerdp/freerdp-1.1.0_beta1_p20130605.ebuild,v 1.1 2013/06/10 00:39:08 floppym Exp $
+
+EAPI="5"
+
+inherit cmake-utils vcs-snapshot
+
+if [[ ${PV} != 9999* ]]; then
+	COMMIT="04752f0144f76189bd8527243a939e13acedc8cc"
+	SRC_URI="https://github.com/FreeRDP/FreeRDP/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+else
+	inherit git-2
+	SRC_URI=""
+	EGIT_REPO_URI="git://github.com/FreeRDP/FreeRDP.git
+		https://github.com/FreeRDP/FreeRDP.git"
+	KEYWORDS=""
+fi
+
+DESCRIPTION="Free implementation of the Remote Desktop Protocol"
+HOMEPAGE="http://www.freerdp.com/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="alsa +channels +client cups debug directfb doc ffmpeg gstreamer jpeg
+	pulseaudio server smartcard sse2 test X xinerama xv"
+
+RDEPEND="
+	dev-libs/openssl
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	client? (
+		directfb? ( dev-libs/DirectFB )
+		X? (
+			x11-libs/libXcursor
+			x11-libs/libXext
+			x11-libs/libXi
+			x11-libs/libXrender
+			xinerama? ( x11-libs/libXinerama )
+			xv? ( x11-libs/libXv )
+		)
+	)
+	ffmpeg? ( virtual/ffmpeg )
+	gstreamer? (
+		media-libs/gstreamer:0.10
+		media-libs/gst-plugins-base:0.10
+		x11-libs/libXrandr
+	)
+	jpeg? ( virtual/jpeg )
+	pulseaudio? ( media-sound/pulseaudio )
+	server? (
+		X? (
+			x11-libs/libXcursor
+			x11-libs/libXdamage
+			x11-libs/libXext
+			x11-libs/libXfixes
+			xinerama? ( x11-libs/libXinerama )
+		)
+	)
+	smartcard? ( sys-apps/pcsc-lite )
+	X? (
+		x11-libs/libX11
+		x11-libs/libxkbfile
+	)
+"
+DEPEND="${RDEPEND}
+	client? ( X? ( doc? (
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/xmlto
+	) ) )
+"
+
+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 server SERVER)
+		$(cmake-utils_use_with smartcard PCSC)
+		$(cmake-utils_use_with sse2 SSE2)
+		$(cmake-utils_use_with X X11)
+		$(cmake-utils_use_with xinerama XINERAMA)
+		$(cmake-utils_use_with xv XV)
+		$(cmake-utils_use_build test TESTING)
+	)
+	cmake-utils_src_configure
+}
diff --git a/net-misc/freerdp/freerdp-9999.1.ebuild b/net-misc/freerdp/freerdp-9999.1.ebuild
index f21226331971..b64d3af08e96 100644
--- a/net-misc/freerdp/freerdp-9999.1.ebuild
+++ b/net-misc/freerdp/freerdp-9999.1.ebuild
@@ -1,15 +1,14 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.14 2012/12/02 17:05:31 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/freerdp/freerdp-9999.1.ebuild,v 1.15 2013/06/10 00:39:08 floppym Exp $
 
-EAPI="4"
+EAPI="5"
 
-inherit cmake-utils
+inherit cmake-utils vcs-snapshot
 
 if [[ ${PV} != 9999* ]]; then
-	SRC_URI="mirror://github/FreeRDP/FreeRDP/${P}.tar.gz
-		mirror://gentoo/${P}.tar.gz
-		http://dev.gentoo.org/~floppym/distfiles/${P}.tar.gz"
+	COMMIT="04752f0144f76189bd8527243a939e13acedc8cc"
+	SRC_URI="https://github.com/FreeRDP/FreeRDP/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 else
 	inherit git-2
@@ -25,7 +24,7 @@ HOMEPAGE="http://www.freerdp.com/"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="alsa +channels +client cups debug directfb doc ffmpeg gstreamer jpeg
-	pulseaudio smartcard sse2 test X xinerama xv"
+	pulseaudio server smartcard sse2 test X xinerama xv"
 
 RDEPEND="
 	dev-libs/openssl
@@ -37,6 +36,8 @@ RDEPEND="
 		X? (
 			x11-libs/libXcursor
 			x11-libs/libXext
+			x11-libs/libXi
+			x11-libs/libXrender
 			xinerama? ( x11-libs/libXinerama )
 			xv? ( x11-libs/libXv )
 		)
@@ -49,6 +50,15 @@ RDEPEND="
 	)
 	jpeg? ( virtual/jpeg )
 	pulseaudio? ( media-sound/pulseaudio )
+	server? (
+		X? (
+			x11-libs/libXcursor
+			x11-libs/libXdamage
+			x11-libs/libXext
+			x11-libs/libXfixes
+			xinerama? ( x11-libs/libXinerama )
+		)
+	)
 	smartcard? ( sys-apps/pcsc-lite )
 	X? (
 		x11-libs/libX11
@@ -77,12 +87,10 @@ src_configure() {
 		$(cmake-utils_use_with gstreamer GSTREAMER)
 		$(cmake-utils_use_with jpeg JPEG)
 		$(cmake-utils_use_with pulseaudio PULSEAUDIO)
+		$(cmake-utils_use_with server SERVER)
 		$(cmake-utils_use_with smartcard PCSC)
 		$(cmake-utils_use_with sse2 SSE2)
 		$(cmake-utils_use_with X X11)
-		$(cmake-utils_use_with X XCURSOR)
-		$(cmake-utils_use_with X XEXT)
-		$(cmake-utils_use_with X XKBFILE)
 		$(cmake-utils_use_with xinerama XINERAMA)
 		$(cmake-utils_use_with xv XV)
 		$(cmake-utils_use_build test TESTING)
diff --git a/net-misc/freerdp/metadata.xml b/net-misc/freerdp/metadata.xml
index afd7dec54ae3..bcfaa33208d4 100644
--- a/net-misc/freerdp/metadata.xml
+++ b/net-misc/freerdp/metadata.xml
@@ -8,5 +8,6 @@
 	<use>
 		<flag name="channels">Build virtual channel plugins</flag>
 		<flag name="client">Build client binaries</flag>
+		<flag name="server">Build server binaries</flag>
 	</use>
 </pkgmetadata>