New snapshot.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

4 files changed, 129 insertions, 7 deletions

diff --git a/net-misc/freerdp/ChangeLog b/net-misc/freerdp/ChangeLog
index edfe80cdef65..0b44762017b9 100644
--- a/net-misc/freerdp/ChangeLog
+++ b/net-misc/freerdp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/freerdp
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/freerdp/ChangeLog,v 1.77 2014/11/12 08:35:29 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/freerdp/ChangeLog,v 1.78 2014/11/17 05:12:52 floppym Exp $
+
+*freerdp-1.2.0_beta1_pre20141115 (17 Nov 2014)
+
+  17 Nov 2014; Mike Gilbert <floppym@gentoo.org>
+  +freerdp-1.2.0_beta1_pre20141115.ebuild, freerdp-9999.1.ebuild:
+  New snapshot.
 
   12 Nov 2014; Justin Lecher <jlec@gentoo.org>
   freerdp-1.1.0_beta1_p20130710-r2.ebuild,
diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index c65f6fe8ffa4..d2f268b6b46d 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -1,11 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX freerdp-1.1-CVE-2014-0250.patch 12976 SHA256 ea10fd71a81596b990c84771a5475de4abbda954af62d7a73d6cee38e9c05b0d SHA512 87f719670701100419483027982c045f39e2d0d0f39c58907ff508ca5a40cb01e18f9411854d3b947c9d07f5ecf32ddd6124484900801f1402396b2c847f2d71 WHIRLPOOL aef1e9233229db9437cd9817041f5a753177c25b4005b37519a66097f16b0addb64f2466d2e56595c934596f3f3fd6de6f5033109b9c234bfac9f517879f36e5
 AUX freerdp-1.1.0_beta1-avx.patch 1424 SHA256 6de8e333ae1b7defbfcd6af1189e33e6478ca52b80c06bb013555413470d31ef SHA512 dd3d0c07d23c112f4405e3cf249137cc14fff8d2ba63e7c45740ca4c1dcd17fe258e434f3c62dad772de55aa3b59d58ac1447cef81c19c4edf843e467d7ab147 WHIRLPOOL 1877a69a89f1c69b59c4bccb5d82dc0300941cfcc8f1816bd2f88fcf0dac5d3307292c46c22e5bfac031dc4a9bcc35cea6b198dd546353480730967ca5c4fb4a
 AUX freerdp-1.1.0_beta1_p20130710-cmake.patch 756 SHA256 1a3b20a0f4635be1d1805d2d8c33ab853cc108e3fb4d4896cece08d20c05d4a9 SHA512 c1fb1df37612adf7e60fabee055c07aea00d30665e4b3c771bc2511d5098b4e74179a58ede84935002bbe885ae03c5a6617fcbc909a75f27910808102f9c123d WHIRLPOOL f8f6a15e65023bf758287c504a1ac7b1e82c1630980f0fc07b1272d8f6eea1a93ba52a9598a0366428b5a364062ed737974d5e4254507d70e651b56e2e39c78d
 AUX freerdp-1.1.0_beta1_p20130710-ffmpeg.patch 4241 SHA256 8dbd70eb3c7fffb617cfd27b1dc58e71d70014b2720016d3f4f022638ad65ebd SHA512 f55c1ad33d947ba26b9222fa8ce600bbb13d91b136a04526d4118e2018be016ef4ce2fac35a5563c9b4100870ec784568e9f7509e2667d1c01d5a4ce72169819 WHIRLPOOL 2fe3ffa36c9491b55b7e0113f37bb1f6a2ba91e1b08ef2083b75d3e59dbf6ffc122b485408252945996bdf0353a656929a439aafbbb3b2509fd6bf629bc4ad5d
 AUX freerdp-1.1.0_beta1_p20130710-uclibc.patch 1921 SHA256 bd740b6c39200edd6979bd9c9d47ff2eb521ff55dedb25285a37fabf19c9ac85 SHA512 6324edec3be28e16291be88b24ce297111e8aa1744d4a1d8633f36f6633890e562e816c3b0cfe30d2792ca27bcedb6b87e9b7f68459d2c663d1b29e0cc5806fa WHIRLPOOL 53cb72c11a4f26d29b30dba3050f2aaae15309753fd827746ac155e52b90950b19662e97bdf92202a837d11c01496129b9ec9c01b490b17395778bfbf9d51098
 DIST freerdp-1.1.0_beta1_p20130710.tar.gz 6682149 SHA256 0d0d2eec7e78b61458415ee98ad54379b31e9fc269b8bacf3e939bd048ac5e61 SHA512 89ec08acff5c9bbafe107cd079005146b6c4447fbe3172d8f774a20ab6b5e1f24abdeab2d7cb0d7694251aaea2924b0a10f1c0b4b660994cdfa51e8428b90440 WHIRLPOOL 2f7c04bde54293fc8fc85ba03baf7dc64e5da4cecdc87aaaa2ff316127abc43f0b56d70e14652f97f2e97a8f43bee8880837a94230448397dfad5f4ddbd055b1
+DIST freerdp-1.2.0_beta1_pre20141115.tar.gz 6096004 SHA256 a9dcd76946878cecddafc79a14794e7f57cb32397b5bc45af9d866d8d76bb421 SHA512 8fdbfba86df2cbb6c980e940df66bf30cd8d06e66df18656e18a120eabdd2b17e78c7612f1349589fcd8d3b37066b3956e0ef977d069f2abde653b4824fee61b WHIRLPOOL 0c0bb6c2a9e0b0efd072d0c46ded4790b69df649fe1e18bd907458e238a8149314ca47e5166523044c14a520e8f1d0d5b910e294c4ee670c1562c7980036cbb0
 EBUILD freerdp-1.1.0_beta1_p20130710-r1.ebuild 2626 SHA256 3975fa6ba078b3e370d2113f660cdff871182df97ea2e963fdac25f3ad0c94a9 SHA512 1f494783cb7f7864aae27a7373fae32f17e140ced832aae0e4be63960a4897355bdd21e40074386b957e374710e825a7ccc1a7f7328087741d7a8fc1d0cb94f8 WHIRLPOOL 656aaa4f9932403db42fd4aad3d7ff56613b78f14c516dfccc1aaf185027b0ee81501791138580435cdf3bdef32b27cd6ce0ffba875a2dd63b0b47b34a810b77
 EBUILD freerdp-1.1.0_beta1_p20130710-r2.ebuild 2810 SHA256 e03e7655dc1ad45ee8e2cc8a9ec0da09a5a1ee28cf65c27a46b316f0ae621bd9 SHA512 b8a3bf63b81a1c28e15ecea4a07cf5542b9125d2fbc45e6fbff0db230315500e499f1b215b2b02433bd6e2658ad2d20a06dfa6a065ea4e5b6d7bce58541de2bc WHIRLPOOL ca0548877999b72e1842d90fded3af789866e257c770751e1c4cd185e6da97a1b722e9967fa1eb95ac88b7f6b70c9bc479f96c9bfb4aa0ef779e66a96b48e251
-EBUILD freerdp-9999.1.ebuild 2630 SHA256 7d31d9586af14f70bb02451f791b8c13ef1b085c37a437631634696eaf150ff0 SHA512 c6ea7917be49ecd6094e32d2fbffd99dcb69ae17e9777b4edf6f94bc536793bdf369c0cfe14e68b7441db3bcc3df0f06dcc6cfb1843521224a3c7c841d77cf61 WHIRLPOOL e765cbbabf1814db792dac3d9f88205798267d09df9a902a5d2c85e48005480f8580dad96057ff43b8da5b10a9759edf7463507d1cb27194849f90d7e788c8a7
-MISC ChangeLog 12248 SHA256 02e869eb581ce71ebe51e9c984a581e43e5bd4881d5fc0abd989d722a9d38a3d SHA512 d3526228a391cc5208f02c2f0fc72d3ae4cb5b37516a8468ee4c9e492dea4597b81745d72f2d5082415947f3d099febaa15c2e1a5bfa1a59e2bb93b30f9f5dd2 WHIRLPOOL 9fe38b62ab2f159fd7626e48f31ee59f51eac3d9866eead8ef5fb348db4bb7f51e3814735c1f2da4c1e6f59a7c46086040948283e8a44a21e2c4e7c7adec6b8d
+EBUILD freerdp-1.2.0_beta1_pre20141115.ebuild 2638 SHA256 25fc437456aa5e5c8a8dfbcdee85322dab703c859b9cefccd822780e5575dc4d SHA512 2a95d83a44c9e24b77426ad886a9d0f63c71a4d9dfdfcde158d1d4ffa5903c78937d566ff7a6ec86469fa09024466639c11d1cb8cff3307d96d8948fcea239d7 WHIRLPOOL 9f1bf454aadd3ad52e0e5ed5084fb628cdbd72074a24394312b0008a65dfcf5c4e3f821bb8849295d3f36b51227c3506b53fe7be0b24794bdd9bb7fa4d2e5cac
+EBUILD freerdp-9999.1.ebuild 2618 SHA256 e3b3055679c186f37bb2fcd62f45e62cbaaa31e2074e0442451cbb0052d6dd34 SHA512 39661fc2a3bd1cd6c4cfe001505bfec78d1b3677db52df87d74bcc8531385a0d4cb1663b1e980059cd71995e570cbb957b1e0c019049e91bf74d9d09b814582d WHIRLPOOL 058e28f2988aeac0dd5103c5a6295a165e772053faac5d9b7dfa6acbbfbedcec2acfa37a6a5e8aa6be47ec3869cbb65efab09c11eafffb4a0838ca7994929c16
+MISC ChangeLog 12431 SHA256 c0fc2a0b9fe178cc965f9800a001618a160ae936793c7bfea5d8f44c7e430c0e SHA512 02530a922174d59cd8fefd0dce2f8ffaef364fb1d2329525e9fb94534b0364a8e6691e7294f36e68f2536aa922f4404e8f636edd4d3ab80f0496b61cb3b4e88e WHIRLPOOL 716249e9f85daa239913e1d726eb7dbd0c839a55a360623cfc60c983e145fb53b239aed402af25ecdb0d4df65b50063558b37d6fcc4845445a43717b30e4546c
 MISC metadata.xml 424 SHA256 677d4fb3c378ea8ee9c4e340b7b32cf57a9f4fe9b92edddb42ddd39448f73f01 SHA512 4f1bb050f9b9889422c2e86b87dd43246b41cf45c1ce4e6c05e1c477c4a3031c20820edfd648cbc4ba2b61d2bae40883fcd5676246a0bc3fe767f5713701cf54 WHIRLPOOL d3ad68eadaf540d6200dc6a15ee3fe3597f80a64c1d2f8b7d22b23fb137422fda2edca1a8438800b31cd5d5dfd74dca23f611ad433b812f8bfe1ac0f1aa85b11
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iF4EAREIAAYFAlRpg9UACgkQC77qH+pIQ6R14wEAxPqWvEMs5fZ3gN5UuQlQdJ6M
+caq4t1dszQFASVE5d30A/04T5qCfGmIUIryOZDRxbBiPXigPliRSlcHnfHRLwXGQ
+=nOaL
+-----END PGP SIGNATURE-----
diff --git a/net-misc/freerdp/freerdp-1.2.0_beta1_pre20141115.ebuild b/net-misc/freerdp/freerdp-1.2.0_beta1_pre20141115.ebuild
new file mode 100644
index 000000000000..953d3733431b
--- /dev/null
+++ b/net-misc/freerdp/freerdp-1.2.0_beta1_pre20141115.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/freerdp/freerdp-1.2.0_beta1_pre20141115.ebuild,v 1.1 2014/11/17 05:12:52 floppym Exp $
+
+EAPI="5"
+
+inherit cmake-utils vcs-snapshot
+
+if [[ ${PV} != 9999* ]]; then
+	COMMIT="7a6c6b7436c2fcb02a38bf89e0b3efcdb43f2ef5"
+	SRC_URI="https://github.com/FreeRDP/FreeRDP/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+else
+	inherit git-r3
+	SRC_URI=""
+	EGIT_REPO_URI="git://github.com/FreeRDP/FreeRDP.git
+		https://github.com/FreeRDP/FreeRDP.git"
+fi
+
+DESCRIPTION="Free implementation of the Remote Desktop Protocol"
+HOMEPAGE="http://www.freerdp.com/"
+
+LICENSE="Apache-2.0"
+SLOT="0/1.2"
+IUSE="alsa +client cups debug directfb doc ffmpeg gstreamer jpeg
+	pulseaudio server smartcard sse2 test usb X xinerama xv"
+
+RDEPEND="
+	dev-libs/openssl
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	client? (
+		usb? (
+			virtual/libudev:0=
+			sys-apps/util-linux:0=
+			dev-libs/dbus-glib:0=
+			virtual/libusb:1=
+		)
+		X? (
+			x11-libs/libXcursor
+			x11-libs/libXext
+			x11-libs/libXi
+			x11-libs/libXrender
+			xinerama? ( x11-libs/libXinerama )
+			xv? ( x11-libs/libXv )
+		)
+	)
+	directfb? ( dev-libs/DirectFB )
+	ffmpeg? ( virtual/ffmpeg )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		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}
+	virtual/pkgconfig
+	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 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_1_0)
+		$(cmake-utils_use_with jpeg JPEG)
+		$(cmake-utils_use_with pulseaudio PULSE)
+		$(cmake-utils_use_with server SERVER)
+		$(cmake-utils_use_with smartcard PCSC)
+		$(cmake-utils_use_with sse2 SSE2)
+		$(cmake-utils_use usb CHANNEL_URBDRC)
+		$(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 c614e865cd55..8859318763ae 100644
--- a/net-misc/freerdp/freerdp-9999.1.ebuild
+++ b/net-misc/freerdp/freerdp-9999.1.ebuild
@@ -1,21 +1,20 @@
 # Copyright 1999-2014 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.19 2014/08/06 00:49:04 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/freerdp/freerdp-9999.1.ebuild,v 1.20 2014/11/17 05:12:52 floppym Exp $
 
 EAPI="5"
 
 inherit cmake-utils vcs-snapshot
 
 if [[ ${PV} != 9999* ]]; then
-	COMMIT="780d451afad21a22d2af6bd030ee71311856f038"
+	COMMIT="7a6c6b7436c2fcb02a38bf89e0b3efcdb43f2ef5"
 	SRC_URI="https://github.com/FreeRDP/FreeRDP/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 else
-	inherit git-2
+	inherit git-r3
 	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"