gentoo resync : 15.12.2019

5 files changed, 34 insertions, 190 deletions

diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index c964fcfe5d4c..16774ba4a927 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -1,10 +1,7 @@
-AUX 2.0.0-rc2-primitives.patch 1493 BLAKE2B 6799a594c5e88ef92893d490137be0d5414b4f5856b64899b14c97a76d685c8a663211aca51018e77cd3c8ba30e24203dcc895dcdb830f324353a2b8edc43aae SHA512 01a4d68493709352faf62d222b62e0368fca368f2b6e9ffff648af999d419675ab02fad2c8a9a9fb6149abca9bedbe35a35018dbeb82784d993fd09e3df62ab2
 AUX 2.0.0-rc4-bitmap-endian.patch 1184 BLAKE2B 60afebd809d06fb5fc6948b06b1928baa1fb0dcc01189964e252fc2fa190f4dc05b13a20302bc5921c4c0344e732539a560c11fd5800d661a518d99fdec68698 SHA512 cdd2a6c3524e717d68d3f386d666cbf81e53e956b8f2a5ae1b37e89c32e334e847255f3a4b77cb4b4b9bbe7f831ec4fe2ce87d5a49b11d7a452affd7083de21a
 AUX 2.0.0-rc4-libressl.patch 2914 BLAKE2B fa343a8068f59f63e8ede86fd9987aa3490c3fe969ccc000742c9d1fd77a16c46d3a3d31666023d49d419032768c5119f02380cbbd930b30998151da6070de90 SHA512 eef629707eb0e25c66dd492767b7c714545102e5c20139c028f252b0c301cd5792c67306e74fe1d5908e7500022387efba43b0e532667e32ce18b5cee1aafa84
-DIST freerdp-2.0.0-rc2.tar.gz 6611081 BLAKE2B 564abd6289f0c9d3947b9074111ade8c2e7b6e6dce9af8a06ef1772d0e76822c5df80932a5cbac2f23c4d2a76d4796c12bd4fa067c6ef21ea84a1b8423be1ce3 SHA512 cb765b3b9559c4877be4c10e5df9e95d11a0184ce34e89564097c3234f859de8e82b6de6217396628e5f70c85c40c65ccd75f9b0f7f89daaed7e0e971a833589
 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
-EBUILD freerdp-2.0.0_rc2-r1.ebuild 2689 BLAKE2B 7f94bd2bcf14b1a0b73e5180bb11bd85dc86e0dab5af329944ecf3772b52c73c49731f8e6166afc1f69090d4adee586575e11caed0462f0b40a89d58761a31cd SHA512 b33ff3f59ac78245b34cedff771fb211c9bdeb99964391e9f722c3cecbc153b30e6e4d63e9c36fd993c945ef52e9b21ee5616a7c1eb06814727f805e7555d16e
-EBUILD freerdp-2.0.0_rc4.ebuild 2973 BLAKE2B e0f4c84a47743017f000e33f244ad0f161f07e225e012531aa23822afc8543894b531d9cfb2df52e967ebd563c4a5ac814043222cc10c158194929f471c65996 SHA512 ebd3c520e895ac6c7cce0c1610794ae604e5b11e9a11f01d4e6a8ce345a6529fd07341bc84e304b8ae005d1500a8f89984438c37d547a0fbd3b94d7131dda861
-EBUILD freerdp-9999.ebuild 2675 BLAKE2B 062df07d0bd6c7274aa1433c8c2067e653cbd5e563956e226bcdd97012bc9b938667970e2d74e5f3ef06a6a056b855745cfb77e38fd2de9c5b21d98f4c301659 SHA512 f8f5458aedbf4fb7693c8b2630078c43473d1b088c6aecd9ce8ed553b95783d67575893d1acf8eddc4fcdc42a607e26a722b1f213bbe01479f913850fa086d73
+EBUILD freerdp-2.0.0_rc4.ebuild 3000 BLAKE2B 1b80dee002f09b3a77eebecae80535944d1f37d427e27b04d9556a6d8803b9cebbea728a46e681a0db1cbdf6bff1af86f8bdc9ecc40cf0673e6a540673b1dfb3 SHA512 16659cbbfb54506ea7e94cb76400e7c2e4592f39b785e66d40e7930441de28477317ae293b9908d844094634ed58b88a3d5982fd6ed07b8c473498d130169bc0
+EBUILD freerdp-9999.ebuild 2958 BLAKE2B d6bdbc6c4f93ca0cf0a5552cb8df38da2ed6072e73956acabb9ea2f09e09fcdc372d4c374cf52bd6f1a27015ab1e94db8976dbbbf720b4469c4ab3aa03e9f2b9 SHA512 504105d55395458877e5d0ad5a0160a83bc9569cc3dfc04ae5b280a5acdc3c440ff8047cc25e79f04e11583862398fae7fc0927ba67a90eca4cd1f10ffb4639c
 MISC metadata.xml 532 BLAKE2B fc894629c3fa7e1e83f4b3a2e7697e820e705a4616de55d00c6c79a6d23438e5b7e4e192019dff50f17b102280802dc8d2742284b530fcb9e63935c13d95ae72 SHA512 7e80224d494d65b4215f157266512649803df82de87a73a68e08f8cc1a62b7e87b966641b75779179ed26fc124d4235e4efe9b239c13701c96f92de09bcab3b0
diff --git a/net-misc/freerdp/files/2.0.0-rc2-primitives.patch b/net-misc/freerdp/files/2.0.0-rc2-primitives.patch
deleted file mode 100644
index a82dec1ad0fc..000000000000
--- a/net-misc/freerdp/files/2.0.0-rc2-primitives.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 9460f4292b130fcca58519a1c52b9aaef3265042 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Wed, 16 May 2018 16:15:50 -0400
-Subject: [PATCH] primitives: ensure primitives_get() returns a populated
- struct
-
-Fixes: https://github.com/FreeRDP/FreeRDP/issues/4658
----
- libfreerdp/primitives/primitives.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/libfreerdp/primitives/primitives.c b/libfreerdp/primitives/primitives.c
-index fd236df6e7..d25c5b41dc 100644
---- a/libfreerdp/primitives/primitives.c
-+++ b/libfreerdp/primitives/primitives.c
-@@ -28,10 +28,12 @@
- #include "prim_internal.h"
- 
- /* Singleton pointer used throughout the program when requested. */
--static primitives_t pPrimitives = { 0 };
- static primitives_t pPrimitivesGeneric = { 0 };
- static INIT_ONCE generic_primitives_InitOnce = INIT_ONCE_STATIC_INIT;
-+#if defined(HAVE_OPTIMIZED_PRIMITIVES)
-+static primitives_t pPrimitives = { 0 };
- static INIT_ONCE primitives_InitOnce = INIT_ONCE_STATIC_INIT;
-+#endif
- 
- 
- /* ------------------------------------------------------------------------- */
-@@ -74,8 +76,10 @@ primitives_t* primitives_get(void)
- 	InitOnceExecuteOnce(&generic_primitives_InitOnce, primitives_init_generic, NULL, NULL);
- #if defined(HAVE_OPTIMIZED_PRIMITIVES)
- 	InitOnceExecuteOnce(&primitives_InitOnce, primitives_init, NULL, NULL);
--#endif
- 	return &pPrimitives;
-+#else
-+	return &pPrimitivesGeneric;
-+#endif
- }
- 
- primitives_t* primitives_get_generic(void)
diff --git a/net-misc/freerdp/freerdp-2.0.0_rc2-r1.ebuild b/net-misc/freerdp/freerdp-2.0.0_rc2-r1.ebuild
deleted file mode 100644
index 7e5cfb6e5906..000000000000
--- a/net-misc/freerdp/freerdp-2.0.0_rc2-r1.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 2011-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-utils
-
-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"
-else
-	inherit git-r3
-	SRC_URI=""
-	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"
-
-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= )
-	)
-	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}
-	virtual/pkgconfig
-	client? ( X? ( doc? (
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/xmlto
-	) ) )
-"
-
-PATCHES=(
-	"${FILESDIR}"/2.0.0-rc2-primitives.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test)
-		-DCHANNEL_URBDRC=$(usex usb)
-		-DWITH_ALSA=$(usex alsa)
-		-DWITH_CCACHE=OFF
-		-DWITH_CLIENT=$(usex client)
-		-DWITH_CUPS=$(usex cups)
-		-DWITH_DEBUG_ALL=$(usex debug)
-		-DWITH_MANPAGES=$(usex doc)
-		-DWITH_FFMPEG=$(usex ffmpeg)
-		-DWITH_GSTREAMER_1_0=$(usex gstreamer)
-		-DWITH_JPEG=$(usex jpeg)
-		-DWITH_NEON=$(usex cpu_flags_arm_neon)
-		-DWITH_OPENH264=$(usex openh264)
-		-DWITH_PULSE=$(usex pulseaudio)
-		-DWITH_SERVER=$(usex server)
-		-DWITH_PCSC=$(usex smartcard)
-		-DWITH_LIBSYSTEMD=$(usex systemd)
-		-DWITH_X11=$(usex X)
-		-DWITH_XINERAMA=$(usex xinerama)
-		-DWITH_XV=$(usex xv)
-		-DWITH_WAYLAND=$(usex wayland)
-	)
-	cmake-utils_src_configure
-}
diff --git a/net-misc/freerdp/freerdp-2.0.0_rc4.ebuild b/net-misc/freerdp/freerdp-2.0.0_rc4.ebuild
index 2e2b4e41b520..741e74e65869 100644
--- a/net-misc/freerdp/freerdp-2.0.0_rc4.ebuild
+++ b/net-misc/freerdp/freerdp-2.0.0_rc4.ebuild
@@ -23,6 +23,7 @@ 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= )
diff --git a/net-misc/freerdp/freerdp-9999.ebuild b/net-misc/freerdp/freerdp-9999.ebuild
index 78014fa99063..0bc7c2735df1 100644
--- a/net-misc/freerdp/freerdp-9999.ebuild
+++ b/net-misc/freerdp/freerdp-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 2011-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
 inherit cmake-utils
 
@@ -12,7 +12,6 @@ if [[ ${PV} != 9999 ]]; then
 	KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
 else
 	inherit git-r3
-	SRC_URI=""
 	EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git"
 fi
 
@@ -21,7 +20,8 @@ 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"
+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= )
@@ -49,6 +49,9 @@ RDEPEND="
 		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
@@ -79,7 +82,8 @@ RDEPEND="
 		x11-libs/libxkbfile
 	)
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
 	client? ( X? ( doc? (
 		app-text/docbook-xml-dtd:4.1.2
@@ -89,28 +93,30 @@ DEPEND="${RDEPEND}
 
 src_configure() {
 	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test)
-		-DCHANNEL_URBDRC=$(usex usb)
-		-DWITH_ALSA=$(usex alsa)
+		-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)
-		-DWITH_CUPS=$(usex cups)
-		-DWITH_DEBUG_ALL=$(usex debug)
-		-DWITH_MANPAGES=$(usex doc)
-		-DWITH_FFMPEG=$(usex ffmpeg)
-		-DWITH_DSP_FFMPEG=$(usex ffmpeg)
-		-DWITH_GSTREAMER_1_0=$(usex gstreamer)
-		-DWITH_JPEG=$(usex jpeg)
-		-DWITH_NEON=$(usex cpu_flags_arm_neon)
-		-DWITH_OPENH264=$(usex openh264)
-		-DWITH_PULSE=$(usex pulseaudio)
-		-DWITH_SERVER=$(usex server)
-		-DWITH_PCSC=$(usex smartcard)
-		-DWITH_LIBSYSTEMD=$(usex systemd)
-		-DWITH_X11=$(usex X)
-		-DWITH_XINERAMA=$(usex xinerama)
-		-DWITH_XV=$(usex xv)
-		-DWITH_WAYLAND=$(usex wayland)
+		-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-utils_src_configure
 }