gentoo resync : 12.05.2022

8 files changed, 7 insertions, 405 deletions

diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index c3b5bb562beb..eb49dff001f9 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -1,12 +1,5 @@
-AUX freerdp-2.4.1-rdpei-free.patch 859 BLAKE2B 2bf990acf4b4294bedb11acd824637b168fc9e03c4e41b9437388e0e09c2dbfa90e955c254fef2d8c6cae7e796b09cc1875953688c58c13462bc7b05d2a85b11 SHA512 5877a95569d0f3e099d1de35bb8ee5fc8c6889f76aa3f410bd095932440ab6c50c0fc88322ff8982a0ee34a93da97becfa07b52a76804fc262b9a06d9e789f20
-DIST freerdp-2.4.1.tar.gz 7300797 BLAKE2B cd14cadfbad9f30ab6ee6ba80c3a3bfb191b68dc0cf576082044a20489f558e222e618ed314a7fefdefcb480f201f384df5d77db8699d2e4530559fd3d5b4398 SHA512 9bacd6a7219690ed62d6a646616a54770293ff45b59211aff73dc8d67300a79ba22e72cbe56803d301b60964e4acccea9b7c6d7e2d698b91eafcf6ba561cd66a
-DIST freerdp-2.5.0.tar.gz 7303832 BLAKE2B 93f7428f04e0f5faaf93c08acd75cb4af655b52fc89653d470f28175e8d3fad9b61c9c19bfd7fb7e6edf947c9cca12a1d6a98b410409cd9f96007de1bc52b034 SHA512 d9f70bc12175d4ab1c874a2106d37c7d8c0f5e1f81ef30329518eecc5c58c0131429243a3faa6c7d68b187c8f43f93000a1de0e39e81ab71ad626e33f373f33d
-DIST freerdp-2.5.0_p39.tar.gz 37767 BLAKE2B ae520958e2b1418c46d20c4fb50ecf952d0b0cf2c455dca2d6cf08daf85dabcf2dacb5934240a7c3411ff490903bf15a21f621267a47e81e57edaf520b93c274 SHA512 e7455953f11b82290f6689f4ebaa030e73bf5ea3dac768527027bbb09e4d925208d9b324ae175d28642c161eb0e3227f6c98f4c8717e1f83c81d4399586495db
-DIST freerdp-2.6.1.tar.gz 7270692 BLAKE2B c4da1868be5f1fc40fb14ba54b33c7c79c66cf44b464e4f2e62cfd9cad2da3a6980dc5d33fdd93a11bf8138a75e4427c46977a7110f4cb8669827c0940e3b196 SHA512 4de8718924b63b32fb5068c6538ba31f966e3cc14d17ae42dc90a01787dfff388c486263dcc085777baf4ce25b89f12191e1a5d6afb42f17cbcb38282f4868b7
-EBUILD freerdp-2.4.1-r1.ebuild 2871 BLAKE2B de9740ea0c2a87abab293645ec75da55f51fb63edd01b7335b8783b06294000ddb56681004ea2c190cd4fceb9da70016370cb8cd1be09852f63401d86a19ef07 SHA512 237d458cdeb28bde23fe764705fad0bf5916faaf8ce775963210c24b8c377d6ede9b8c4f7e114593babd79c31716cb4d689ddb28085b70ed1d67251dfe7e4332
-EBUILD freerdp-2.5.0.ebuild 2818 BLAKE2B 1e4378eda5aa5126b96edc10699ec57e760fb2c0145df2cf2c5013e4a311286f90243965b98ce1b50a2e611b118a9a032578c1d909590988d3e1c1aee973bf13 SHA512 491028d8efd3a5c1bf1d35ef7447514004643689bcea6c8c4506bd7af309b7241b48bfbec3617be81287f2b1c29e8e0080c72812c222dc3ae3cb97c51fffb124
-EBUILD freerdp-2.5.0_p39.ebuild 2919 BLAKE2B f9f712ac341b9d43db123a21313fb7baa84f58fca229d2453d84b56b7e93de954c158596f54e358bb9c0c446359b039503f9704a3be1dbfd2fb4e7530e169ae7 SHA512 778f79acdc9eeb81dfeb0d1fe3c19823e77ac3b7af925d93d0533dbe0b1f39737b71554bc0ce8404c9e1cddb983b43a749d9a1ad92f1de425f41bf02dbc2bdbd
-EBUILD freerdp-2.6.1.ebuild 2919 BLAKE2B 2f09e74283529e4c2a99dd258e2fc80fbb759b3c8cd38dd7a9515ec4b2faf3855f0aa3b6781fe158f86729866f55c1cf658880f463f5c11c384247ad3b6ee210 SHA512 fbe08f13bcb4af401d1f93f4fdd06c4de26e4f010d3409663822f03f6d885aac50c7d14d1f0bb2f210beaf6c0b9cd2f951e8630274afbc7fc631d975635c0d10
-EBUILD freerdp-2.9999.ebuild 2925 BLAKE2B 01ca37a036ca50aaafb3e44ea1843360309c1a2e52f31a3a01b76b4ff3205b6bde8d689ca48bef43e8e0fb8b9cc993fffc72a13e0554e2d1a205ce03755bd593 SHA512 1fcb2ca5519fcddfb643647eb5ca17a0eee0a2fcbe11c6917581a7422ab8c6b2633f2713e197df4de4961c1eb3613b78024dc92abb76f9294a0709e0658c68d0
-EBUILD freerdp-9999.ebuild 2925 BLAKE2B 01ca37a036ca50aaafb3e44ea1843360309c1a2e52f31a3a01b76b4ff3205b6bde8d689ca48bef43e8e0fb8b9cc993fffc72a13e0554e2d1a205ce03755bd593 SHA512 1fcb2ca5519fcddfb643647eb5ca17a0eee0a2fcbe11c6917581a7422ab8c6b2633f2713e197df4de4961c1eb3613b78024dc92abb76f9294a0709e0658c68d0
+DIST freerdp-2.7.0.tar.gz 7274512 BLAKE2B 82dc1403c8c2cada81585e869315ee2601d1fe87c3cb293f3cfe90278110644a5dab42ec0b516a204a651dc3127e458cd47994269644c41183501b848e399348 SHA512 9e9df14a39412f3ee3cd8a97123377d3da39492f66a0caee37d122f487639483d172cb89824523d57516aa83d22b9da569f2169a0598b475fbe70eab65fa2dc4
+EBUILD freerdp-2.7.0-r1.ebuild 2932 BLAKE2B 3aaeead1b1de541514b2f138d07943e1f5598d92e3ce29d3d0bc9d0758a1aad7f417d7c9da119a6baaf15f73c9577b4039f22869670d3bf044a3309b320eca8b SHA512 d37e89b2584fedae4963059986f8fd905f1bad35cc49455de1807d278e202c82747ee5f624bc9718d722267fec38bdb494413efed86d63f24a616dfe993d1329
+EBUILD freerdp-2.9999.ebuild 2938 BLAKE2B 8d5554dc8720f339a3188c137be858bb9f542f5cbe11a8f447d74bdf50a5a5a6225a484a3ca45be4eae35b5573cb57dc91ec693d0f299dedd2f2fb004b5042cc SHA512 adcb7ead414092aeb0ef5655049a56a8c409174ebe469ce8aa67e59cd244f0542e4894350ce8cbc936494d79388394e792ed4855fa4c5e143519544915f4777c
+EBUILD freerdp-9999.ebuild 2938 BLAKE2B 8d5554dc8720f339a3188c137be858bb9f542f5cbe11a8f447d74bdf50a5a5a6225a484a3ca45be4eae35b5573cb57dc91ec693d0f299dedd2f2fb004b5042cc SHA512 adcb7ead414092aeb0ef5655049a56a8c409174ebe469ce8aa67e59cd244f0542e4894350ce8cbc936494d79388394e792ed4855fa4c5e143519544915f4777c
 MISC metadata.xml 482 BLAKE2B 9961a7b8e99468833978be3722ffcfa1fe38ed2b9c0de0ec7237fbbdd1484b674df65995e4802abe961e70df37e8a7d11c8d1e26f25779e5419b4439cd336ed3 SHA512 3dd28b1ac648b19794970f306d811ebcb860146da9dd4e0dc1ca72c493f78ddf63e95c8232c583a71bee7e6ad90bbad24ece5fca4e6f561a9c019767a4755b72
diff --git a/net-misc/freerdp/files/freerdp-2.4.1-rdpei-free.patch b/net-misc/freerdp/files/freerdp-2.4.1-rdpei-free.patch
deleted file mode 100644
index d6e73631c6e2..000000000000
--- a/net-misc/freerdp/files/freerdp-2.4.1-rdpei-free.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From a0ce57541f4f22c4a7201de317e603103d6ffdc6 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Sun, 24 Oct 2021 10:04:38 -0400
-Subject: [PATCH] channels/rdpei: avoid calling free() on contactPoints array
-
-This was fixed on master as part of
-268bc2e8ef7b76887d14d50702bb8446ce15a4c1. Backporting that change seems
-like too much for the stable branch.
----
- channels/rdpei/client/rdpei_main.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/channels/rdpei/client/rdpei_main.c b/channels/rdpei/client/rdpei_main.c
-index f20d58a13..1d95054a0 100644
---- a/channels/rdpei/client/rdpei_main.c
-+++ b/channels/rdpei/client/rdpei_main.c
-@@ -1386,7 +1386,6 @@ UINT DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints)
- 	return CHANNEL_RC_OK;
- error_out:
- 	free(context);
--	free(rdpei->contactPoints);
- 	free(rdpei);
- 	return error;
- }
--- 
-2.33.1
-
diff --git a/net-misc/freerdp/freerdp-2.4.1-r1.ebuild b/net-misc/freerdp/freerdp-2.4.1-r1.ebuild
deleted file mode 100644
index 6494b88b6bfb..000000000000
--- a/net-misc/freerdp/freerdp-2.4.1-r1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 2011-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git"
-	case ${PV} in
-		2.*) EGIT_BRANCH="stable-2.0";;
-	esac
-else
-	MY_P=${P/_/-}
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 ~riscv x86"
-fi
-
-DESCRIPTION="Free implementation of the Remote Desktop Protocol"
-HOMEPAGE="http://www.freerdp.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0/2"
-IUSE="alsa cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/openssl:0=
-	sys-libs/zlib:0
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	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? ( 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:0= )
-	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
-	X? ( doc? (
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/xmlto
-	) )
-"
-
-PATCHES=(
-	"${FILESDIR}/freerdp-2.4.1-rdpei-free.patch"
-)
-
-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_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-2.5.0.ebuild b/net-misc/freerdp/freerdp-2.5.0.ebuild
deleted file mode 100644
index 670754db442c..000000000000
--- a/net-misc/freerdp/freerdp-2.5.0.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 2011-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git"
-	case ${PV} in
-		2.*) EGIT_BRANCH="stable-2.0";;
-	esac
-else
-	MY_P=${P/_/-}
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-fi
-
-DESCRIPTION="Free implementation of the Remote Desktop Protocol"
-HOMEPAGE="http://www.freerdp.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0/2"
-IUSE="alsa cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/openssl:0=
-	sys-libs/zlib:0
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	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? ( 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:0= )
-	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
-	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_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-2.5.0_p39.ebuild b/net-misc/freerdp/freerdp-2.5.0_p39.ebuild
deleted file mode 100644
index 5755601b61ed..000000000000
--- a/net-misc/freerdp/freerdp-2.5.0_p39.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 2011-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git"
-	case ${PV} in
-		2.*) EGIT_BRANCH="stable-2.0";;
-	esac
-else
-	MY_P=${P%_p*}
-	MY_P=${MY_P/_/-}
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz
-		https://dev.gentoo.org/~floppym/dist/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-fi
-
-DESCRIPTION="Free implementation of the Remote Desktop Protocol"
-HOMEPAGE="http://www.freerdp.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0/2"
-IUSE="alsa cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/openssl:0=
-	sys-libs/zlib:0
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	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? ( 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:0= )
-	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
-	X? ( doc? (
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/xmlto
-	) )
-"
-
-PATCHES=(
-	"${WORKDIR}/${P}"
-)
-
-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_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-2.6.1.ebuild b/net-misc/freerdp/freerdp-2.7.0-r1.ebuild
index 191ea6dabde4..ea738875d837 100644
--- a/net-misc/freerdp/freerdp-2.6.1.ebuild
+++ b/net-misc/freerdp/freerdp-2.7.0-r1.ebuild
@@ -54,7 +54,7 @@ RDEPEND="
 		media-libs/gst-plugins-base:1.0
 		x11-libs/libXrandr
 	)
-	jpeg? ( virtual/jpeg:0 )
+	jpeg? ( media-libs/libjpeg-turbo:0= )
 	openh264? ( media-libs/openh264:0= )
 	pulseaudio? ( media-sound/pulseaudio )
 	server? (
diff --git a/net-misc/freerdp/freerdp-2.9999.ebuild b/net-misc/freerdp/freerdp-2.9999.ebuild
index 99ddb2dd9804..d46c57ffe2df 100644
--- a/net-misc/freerdp/freerdp-2.9999.ebuild
+++ b/net-misc/freerdp/freerdp-2.9999.ebuild
@@ -54,7 +54,7 @@ RDEPEND="
 		media-libs/gst-plugins-base:1.0
 		x11-libs/libXrandr
 	)
-	jpeg? ( virtual/jpeg:0 )
+	jpeg? ( media-libs/libjpeg-turbo:0= )
 	openh264? ( media-libs/openh264:0= )
 	pulseaudio? ( media-sound/pulseaudio )
 	server? (
diff --git a/net-misc/freerdp/freerdp-9999.ebuild b/net-misc/freerdp/freerdp-9999.ebuild
index 99ddb2dd9804..d46c57ffe2df 100644
--- a/net-misc/freerdp/freerdp-9999.ebuild
+++ b/net-misc/freerdp/freerdp-9999.ebuild
@@ -54,7 +54,7 @@ RDEPEND="
 		media-libs/gst-plugins-base:1.0
 		x11-libs/libXrandr
 	)
-	jpeg? ( virtual/jpeg:0 )
+	jpeg? ( media-libs/libjpeg-turbo:0= )
 	openh264? ( media-libs/openh264:0= )
 	pulseaudio? ( media-sound/pulseaudio )
 	server? (