gentoo resync : 15.01.2020

3 files changed, 128 insertions, 4 deletions

diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index 16774ba4a927..e6b6b4570f3a 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -2,6 +2,8 @@ AUX 2.0.0-rc4-bitmap-endian.patch 1184 BLAKE2B 60afebd809d06fb5fc6948b06b1928baa
 AUX 2.0.0-rc4-libressl.patch 2914 BLAKE2B fa343a8068f59f63e8ede86fd9987aa3490c3fe969ccc000742c9d1fd77a16c46d3a3d31666023d49d419032768c5119f02380cbbd930b30998151da6070de90 SHA512 eef629707eb0e25c66dd492767b7c714545102e5c20139c028f252b0c301cd5792c67306e74fe1d5908e7500022387efba43b0e532667e32ce18b5cee1aafa84
 DIST freerdp-2.0.0-rc4-fix-NTLM-AvPair-lists.patch 20553 BLAKE2B 17ba83ba2dc05f2179df3aa8805877e15b353d4c6bbe88fa0553f7412baf85849a834032143ebd22ff3d27dd12ffdfddfc802868e10ca2718145a58378940ec4 SHA512 b3b548e98422362f63aedfefca399e4008a4b571e6cd786603418c5a3d1c4d832d5148ddee2f62d6bc1259c66020ee01ced6357d72333f49fc34a1059f4f804e
 DIST freerdp-2.0.0-rc4.tar.gz 6662044 BLAKE2B 50bc72336841e421b8fd89ce4f2be6a0b1a9f052933c4cd5bad33261689e6a6b54bc5563fb1ace8cc7a2271990c0ff4c7fe239243f5d75140af497ee6ff9bcd6 SHA512 63cf89aecc6d7ac55db8c7aca60f4ba29cfa54ad70d0fa87fdab011cd16500a3d184659119cd08b7596b7236346db3b61b46282c5325d7f0ca6da09b42d0df20
+DIST freerdp-2.0.0_rc4_p1129.tar.gz 6774330 BLAKE2B 728a4d0f0d7ee4a6cf8a7d0d4ed6f2e0f13a76ceb1c16e7cb48ad0f3d6b6f36194839129bd57e73e02d2a6ae89a83d9d571f515ab2f46cb26f611424dd5b23b5 SHA512 407b06ca7607e01d52b7b89337dbcd5dc15633de197ea91443825672963cbb6d966a187dee022afb5f9979e8d08577ee62b681f37419e5b986f9c2f5e8a3e285
 EBUILD freerdp-2.0.0_rc4.ebuild 3000 BLAKE2B 1b80dee002f09b3a77eebecae80535944d1f37d427e27b04d9556a6d8803b9cebbea728a46e681a0db1cbdf6bff1af86f8bdc9ecc40cf0673e6a540673b1dfb3 SHA512 16659cbbfb54506ea7e94cb76400e7c2e4592f39b785e66d40e7930441de28477317ae293b9908d844094634ed58b88a3d5982fd6ed07b8c473498d130169bc0
-EBUILD freerdp-9999.ebuild 2958 BLAKE2B d6bdbc6c4f93ca0cf0a5552cb8df38da2ed6072e73956acabb9ea2f09e09fcdc372d4c374cf52bd6f1a27015ab1e94db8976dbbbf720b4469c4ab3aa03e9f2b9 SHA512 504105d55395458877e5d0ad5a0160a83bc9569cc3dfc04ae5b280a5acdc3c440ff8047cc25e79f04e11583862398fae7fc0927ba67a90eca4cd1f10ffb4639c
+EBUILD freerdp-2.0.0_rc4_p1129.ebuild 3026 BLAKE2B 52ef38105384c0ac40f4a83db2d01ee4bc5d06f34fbd26336a93ea5f96bc4c9b522d31f3c60efe2d3146c1aaa51919f905e3a29ebdddee3191cb53edc0f68fce SHA512 cd483f12fb1b591c2648f09b056c0b380d63e0fa31b59d309ab2bb2abf57de654fe31313719bfb35380e3146faf63553a7adf01c296bd07f2c1451f1eaed54ac
+EBUILD freerdp-9999.ebuild 2953 BLAKE2B 3dbd7d6b1d1f1b7ce4af442a0f4e5a276e4c5b56c511fefd648a100586749ad9a55a64e29af83929b189b02a0533bfe4df2c03002d91735d2c59f15d81f8ae39 SHA512 a25f0e46d7fa99969dbb8c8c6a9931759582b015ca711b2710fffd70e30e34565c78cfc6f35b21829a124eb6e6ce72ff7e8f028ef981a7503f26134badd1a2f4
 MISC metadata.xml 532 BLAKE2B fc894629c3fa7e1e83f4b3a2e7697e820e705a4616de55d00c6c79a6d23438e5b7e4e192019dff50f17b102280802dc8d2742284b530fcb9e63935c13d95ae72 SHA512 7e80224d494d65b4215f157266512649803df82de87a73a68e08f8cc1a62b7e87b966641b75779179ed26fc124d4235e4efe9b239c13701c96f92de09bcab3b0
diff --git a/net-misc/freerdp/freerdp-2.0.0_rc4_p1129.ebuild b/net-misc/freerdp/freerdp-2.0.0_rc4_p1129.ebuild
new file mode 100644
index 000000000000..4ef50289d0b5
--- /dev/null
+++ b/net-misc/freerdp/freerdp-2.0.0_rc4_p1129.ebuild
@@ -0,0 +1,122 @@
+# Copyright 2011-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+if [[ ${PV} != 9999 ]]; then
+	COMMIT="483d09b760bea529972afad9b6f6c7a89dcffd40"
+	SRC_URI="https://github.com/FreeRDP/FreeRDP/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/FreeRDP-${COMMIT}"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+else
+	inherit git-r3
+	EGIT_REPO_URI="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/2"
+IUSE="alsa +client cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg libav libressl openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	sys-libs/zlib:0
+	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 )
+		)
+	)
+	ffmpeg? (
+		libav? ( media-video/libav:0= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+	!ffmpeg? (
+		x11-libs/cairo:0=
+	)
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		x11-libs/libXrandr
+	)
+	jpeg? ( virtual/jpeg:0 )
+	openh264? ( media-libs/openh264 )
+	pulseaudio? ( media-sound/pulseaudio )
+	server? (
+		X? (
+			x11-libs/libXcursor
+			x11-libs/libXdamage
+			x11-libs/libXext
+			x11-libs/libXfixes
+			x11-libs/libXrandr
+			x11-libs/libXtst
+			xinerama? ( x11-libs/libXinerama )
+		)
+	)
+	smartcard? ( sys-apps/pcsc-lite )
+	systemd? ( sys-apps/systemd:0= )
+	wayland? (
+		dev-libs/wayland
+		x11-libs/libxkbcommon
+	)
+	X? (
+		x11-libs/libX11
+		x11-libs/libxkbfile
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	client? ( X? ( doc? (
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/xmlto
+	) ) )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test ON OFF)
+		-DCHANNEL_URBDRC=$(usex usb ON OFF)
+		-DWITH_ALSA=$(usex alsa ON OFF)
+		-DWITH_CCACHE=OFF
+		-DWITH_CLIENT=$(usex client ON OFF)
+		-DWITH_CUPS=$(usex cups ON OFF)
+		-DWITH_DEBUG_ALL=$(usex debug ON OFF)
+		-DWITH_MANPAGES=$(usex doc ON OFF)
+		-DWITH_FFMPEG=$(usex ffmpeg ON OFF)
+		-DWITH_SWSCALE=$(usex ffmpeg ON OFF)
+		-DWITH_CAIRO=$(usex ffmpeg OFF ON)
+		-DWITH_DSP_FFMPEG=$(usex ffmpeg ON OFF)
+		-DWITH_GSTREAMER_1_0=$(usex gstreamer ON OFF)
+		-DWITH_JPEG=$(usex jpeg ON OFF)
+		-DWITH_NEON=$(usex cpu_flags_arm_neon ON OFF)
+		-DWITH_OPENH264=$(usex openh264 ON OFF)
+		-DWITH_PULSE=$(usex pulseaudio ON OFF)
+		-DWITH_SERVER=$(usex server ON OFF)
+		-DWITH_PCSC=$(usex smartcard ON OFF)
+		-DWITH_LIBSYSTEMD=$(usex systemd ON OFF)
+		-DWITH_X11=$(usex X ON OFF)
+		-DWITH_XINERAMA=$(usex xinerama ON OFF)
+		-DWITH_XV=$(usex xv ON OFF)
+		-DWITH_WAYLAND=$(usex wayland ON OFF)
+	)
+	cmake_src_configure
+}
diff --git a/net-misc/freerdp/freerdp-9999.ebuild b/net-misc/freerdp/freerdp-9999.ebuild
index 0bc7c2735df1..1ca075a5d92c 100644
--- a/net-misc/freerdp/freerdp-9999.ebuild
+++ b/net-misc/freerdp/freerdp-9999.ebuild
@@ -3,13 +3,13 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 if [[ ${PV} != 9999 ]]; then
 	MY_P=${P/_/-}
 	S="${WORKDIR}/${MY_P}"
 	SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git"
@@ -118,5 +118,5 @@ src_configure() {
 		-DWITH_XV=$(usex xv ON OFF)
 		-DWITH_WAYLAND=$(usex wayland ON OFF)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }