gentoo resync : 02.09.2020

3 files changed, 0 insertions, 149 deletions

diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index 86a0c73a5798..2a1b8a4d5f40 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -1,7 +1,4 @@
-AUX 2.1.2-mask-cached_brush.patch 691 BLAKE2B c7dd4dd9ec92958de6e2979446bc62e60ecd1fc729154deeff6c69614d9793bbc162d13cbb04e245faf2a237ffebcdaf3138ad5354573db903dc33a57fe7598e SHA512 33e75cf31f1922cc3e16c02e2a0f946c5c7c1268586952558a432119ffda4d18700967b223703c55ccb3bbfd01ee01e941d5ea70bd2e1d16be84cc93de91cb7d
-DIST freerdp-2.1.2.tar.gz 6877052 BLAKE2B f58e7efa03fb1184aa3ebfe42214668f8372613237571ec2cc21c3d15c30df4ab3b11ac6050eb4ab87af988341f12b0a78e451da967615bc88b3257c253146dc SHA512 6d72b9138b4a4ae6a0a092371624b5a9b73ff914a4c42c73ace63e3f794f6bbca9a84e03d5e92c89bdb945ba2cc8200b4790b685f59d115d67b78a87a6ecab96
 DIST freerdp-2.2.0.tar.gz 6878427 BLAKE2B 0a2a4e4724e9875ce5d975b2c9a0b89ce9467e5950ee4d2d007596269683fa834bfce83e2bf92558887e4fe9418186a5e69708e859649cd0ed095029167a7e12 SHA512 8917378f74b5fee1ddc607b152b29783855f7e1e838fde68bf4d55177295c15fdccece02356d83f998e3bef2abd75b8354d4bbd26a7631ed296a1daf46864aae
-EBUILD freerdp-2.1.2-r1.ebuild 2920 BLAKE2B 335e28b7a8877a6ca2acb59ba0794810bf2bd167e7b3ebad3f92755e0ed58fbf85ff1b690409b67139578e1b9e897eb6508db17ea3faaea61552e25cf7724942 SHA512 29a41334af123c568bd3e258dd7136351995ea73f929413304e8164680880b216a65da63ed31239797af2306cd9361b784257de43acfdeaca47c314c83e33d43
 EBUILD freerdp-2.2.0.ebuild 2865 BLAKE2B 6bb4ca8c1241827ae05fb47ab2b7d8f78075e6fff03773540d913397339532f5726c1c670e6b59cd7dbe427109cbfff7bc8b45af782cc59f832410e354216a0a SHA512 7b39663c760b4517ae82acce05d9934f2da0776e85b4fa9c7ce90a72bdd135a9cf004eda5d525b76b55d60f5eeda6af65ceb722661a51c8dc85efa4e463f62cd
 EBUILD freerdp-2.9999.ebuild 2871 BLAKE2B b265024d8b9f410f79fb5a4789f69b8f4e42e489c018e40d21b2a6bcb4442f821897f0a7575d712fc03e7e8c9a84850e9fd519c6134d46337ed5fa39b44b05f6 SHA512 749dca9f0824f5c9ec0196254ced9f1dce0cfc7a5acd08302b1559c52661f5d1c76a364e10eefec2ae0eb42acf5ffd0d836114b1a1ddd058ee7c8cf8bc2784dc
 EBUILD freerdp-9999.ebuild 2871 BLAKE2B b265024d8b9f410f79fb5a4789f69b8f4e42e489c018e40d21b2a6bcb4442f821897f0a7575d712fc03e7e8c9a84850e9fd519c6134d46337ed5fa39b44b05f6 SHA512 749dca9f0824f5c9ec0196254ced9f1dce0cfc7a5acd08302b1559c52661f5d1c76a364e10eefec2ae0eb42acf5ffd0d836114b1a1ddd058ee7c8cf8bc2784dc
diff --git a/net-misc/freerdp/files/2.1.2-mask-cached_brush.patch b/net-misc/freerdp/files/2.1.2-mask-cached_brush.patch
deleted file mode 100644
index bb8fedb19926..000000000000
--- a/net-misc/freerdp/files/2.1.2-mask-cached_brush.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From ce1a9d8d1969ecbb4d24b9f4812654638a44abc2 Mon Sep 17 00:00:00 2001
-From: Armin Novak <armin.novak@thincast.com>
-Date: Tue, 23 Jun 2020 09:24:35 +0200
-Subject: [PATCH] Fixed #6298: Mask CACHED_BRUSH when checking brush style
-
----
- libfreerdp/core/orders.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/libfreerdp/core/orders.c b/libfreerdp/core/orders.c
-index dc4e51a873..537e694264 100644
---- a/libfreerdp/core/orders.c
-+++ b/libfreerdp/core/orders.c
-@@ -139,7 +139,8 @@ static BYTE get_bmf_bpp(UINT32 bmf, BOOL* pValid)
- {
- 	if (pValid)
- 		*pValid = TRUE;
--	switch (bmf)
-+	/* Mask out highest bit */
-+	switch (bmf & (~CACHED_BRUSH))
- 	{
- 		case 1:
- 			return 1;
diff --git a/net-misc/freerdp/freerdp-2.1.2-r1.ebuild b/net-misc/freerdp/freerdp-2.1.2-r1.ebuild
deleted file mode 100644
index 41f40c416651..000000000000
--- a/net-misc/freerdp/freerdp-2.1.2-r1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 2011-2020 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 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 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 )
-	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 )
-	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}/2.1.2-mask-cached_brush.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
-}