gentoo auto-resync : 19:03:2024 - 18:50:00

4 files changed, 13 insertions, 168 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 6d5f2086ec2d..41348934eaf8 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index 0b350b70956a..64847919c9a1 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -1,12 +1,10 @@
 AUX freerdp-2.11-Revert-codec-encode-messages-considering-endianness.patch 10363 BLAKE2B 03dd4e9795feaf6d4ac8a9f0412b5e9baf3b33e732ff13964c7acdb1bfeb884b524f4483e99de808d4130e70f3310366427f3f1b011735ff22442afd92c6888e SHA512 c66b4d2d18d2189f8df9d68ad556ecae2c5fde8d632c5207960bd1adc33d23c3a4a0ac055657388861b96ce8e391d414b4b98c160f89dad890e911535bdde3d6
 AUX freerdp-2.11.2-clang.patch 1132 BLAKE2B ba35de705f66e571e177f1291ccaf3c72f23f4dafe90c6b145b2bfe13d1cc6ec3c0729b6b6d3394da3a090fb73903b775b9d51711416ba0a56786e141d7a2bad SHA512 f45a38b36b5caee74be8b590b80e56adb91b42f41ad8149a97ef2ed0f5c10a32e4024149d75e4eb0b0242f086e71d9367ffd4c9dd307f113f1d25f1cc2c0793e
 DIST freerdp-2.11.5.tar.gz 7330372 BLAKE2B 53adf40ca8f6c226f93cbc4599d857170bed2cbbe233860f52b30416b3a5d15c1ef2268c329790553dd1dbbcd93dedd834e5b62f67128029e551083d1053b357 SHA512 152dfef2783283ef703eb28ebe4d32fb02519ee6de9042b124af34395a2a6db36bd4cf1e96200ba3e93acf06c245109413e3e36e6143ed4409bd90ede6c383bd
-DIST freerdp-3.2.0.tar.gz 8407869 BLAKE2B cebb14965a71a441d1e53b778db1464751830e96660b6f0d68f32c741544a173b57c4fc92ec24ea6aa3599b62db666987e66b46bd4e6fd2de7ce72869a5d1a07 SHA512 ace6004d11f7fea0e1f927a84367afd9e51b2b566135d7055f548146922a949b9324a2e172bfc1c055bcd27f0eea3e077dc6cfd825c172bffdecb8c28edb076e
 DIST freerdp-3.4.0.tar.gz 9331562 BLAKE2B 888d6c5786c7b3c5eea89e41bca23ef2b323377b8115c5f5bfd0dd38e5ed2d3701ffc7603e4aa4253e9116804a12268f4b59dadeb2f60f5c39e8170e78ba6bd1 SHA512 b69f2a2a5f6c70b4a21f0768ce2050020af47b83a3cf06d3b3b46a0e6aa7c062ed2b9de04782a8d6651002ded4c267f8653dfdc2517323926aaab3675924b6c5
-EBUILD freerdp-2.11.5-r1.ebuild 3390 BLAKE2B 0d737f70a9631c8fbc984578d351d501763aed71acd3543153088ad464dd6fa704bc346e5b51d7197b165adc6d6538446f5ddfa0b54a5cf68e1d40c6fe849744 SHA512 b7a34473f106d3bc438b4315e66e5e2e572ac4e7b3114facb657f103d114eb49cd0bd8661440b06e21bed58ae693c1dfcd84525af342fb9af25570a37156bd07
 EBUILD freerdp-2.11.5-r10.ebuild 3669 BLAKE2B 77e04414dba8a816cc751244e16a8266274fbc3f4ba2d79a12bac8c3aaa94b72c507b7090aaa1f92bed2596213d6ef799e19c60d08399b93250ef69755f748a3 SHA512 f940b8f6b59eadcf68d6fa146832feb30e1a7a24e58d03218231917a577cb86ae4694c349ac6e0e6f397c399df75bcceb130684bda08f089ad6e21e9dac75e39
+EBUILD freerdp-2.11.5-r2.ebuild 3470 BLAKE2B 738dfd8ac8d02cf814ee17ca07a593b0c4394862aa8c5ac5a4a59f5aaf4f58f8d28c4069a7d2726a8a5a2bceace3497c18a6f93f894e02f8af997fa257799194 SHA512 cf303673f413fe5d404d98ba0dc8d08fbe1a67175f20b00fd5f857a0674baaa62c439e1a88158aa204e0498fab5a7a326521b630d73c8b72de74a6417a434812
 EBUILD freerdp-2.9999.ebuild 3535 BLAKE2B beec173d3aab0eaa21c85235b2c859853796dab2e285ca91f961514044bd0bb23f444118953ae114c451113de8bfb4d316d576890d7c49b543b64d8166ea0868 SHA512 7e6baae43145d324583f77275449626f40c2f63a1f12d862edc260bbf4dcfa644d384ece41cb6e6cd9399a3d79b12445207a92f2f95b0db7a117549a8b316edd
-EBUILD freerdp-3.2.0-r2.ebuild 3795 BLAKE2B 8653776ac56bc09b9e19ca8c70cad31ffa554ff3cae6f48d1d2d3afa14f76ba7bd2b21508caa68a2d1aac8605fab80e89ad95d25d89ebc12ba42b7997e9bd6bf SHA512 3738ec8393ea0cd2ce324040691ffe7c9e4a2d75833c4181eeab5ce965cdb8e5f7ea2ace4474caec1d695a1ad48fc5e9d6f6145a0499844753fdb1b07bb56b7d
 EBUILD freerdp-3.4.0-r10.ebuild 4095 BLAKE2B e0f810af5cc837d8c8880bd08141ec001bed660ab16c8031f6951cf531c0bc87c2e316c9eef65834925c685d90c40cc809c3cf7f6ca30c97c1c030f19adc8395 SHA512 e716e445d6355b31c12f32b7b89cdcf4891e4f4d4effab50d920939ad2e7740130e10331babcc3e4b4e7baa1c400ca544c1b7ceaa65609753804fb8ee05c983d
 EBUILD freerdp-9999.ebuild 4095 BLAKE2B e0f810af5cc837d8c8880bd08141ec001bed660ab16c8031f6951cf531c0bc87c2e316c9eef65834925c685d90c40cc809c3cf7f6ca30c97c1c030f19adc8395 SHA512 e716e445d6355b31c12f32b7b89cdcf4891e4f4d4effab50d920939ad2e7740130e10331babcc3e4b4e7baa1c400ca544c1b7ceaa65609753804fb8ee05c983d
 MISC metadata.xml 650 BLAKE2B 619e236cb4c4b249beafc2e4772c5321e5c912242a0e69d7e181867a83078ebfadd639aa5b7cf2a0da58572ade2ae374bfd61f41d83e333065bbfde2c06533ed SHA512 f9ec3e33c342c2a364be4d780c0fc69800617896bda40e473175f0b98f39925ea7bcc1896993782470fd9aad1b04edc2848baf5db2a8dd4e2c4099c062e657ae
diff --git a/net-misc/freerdp/freerdp-2.11.5-r1.ebuild b/net-misc/freerdp/freerdp-2.11.5-r2.ebuild
index 1d009bf8f0f4..dfd5ba988b49 100644
--- a/net-misc/freerdp/freerdp-2.11.5-r1.ebuild
+++ b/net-misc/freerdp/freerdp-2.11.5-r2.ebuild
@@ -26,7 +26,14 @@ SLOT="0/2"
 IUSE="alsa cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer icu jpeg kerberos openh264 pulseaudio server smartcard systemd test usb valgrind wayland X xinerama xv"
 RESTRICT="!test? ( test )"
 
-RDEPEND="
+BDEPEND="
+	virtual/pkgconfig
+	X? ( doc? (
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/xmlto
+	) )
+"
+COMMON_DEPEND="
 	dev-libs/openssl:0=
 	sys-libs/zlib:0
 	alsa? ( media-libs/alsa-lib )
@@ -81,16 +88,12 @@ RDEPEND="
 		x11-libs/libxkbfile
 	)
 "
-DEPEND="
-	${RDEPEND}
+DEPEND="${COMMON_DEPEND}
 	valgrind? ( dev-debug/valgrind )
 "
-BDEPEND="
-	virtual/pkgconfig
-	X? ( doc? (
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/xmlto
-	) )
+RDEPEND="${COMMON_DEPEND}
+	!net-misc/freerdp:2
+	!net-misc/freerdp:3
 "
 
 PATCHES=(
diff --git a/net-misc/freerdp/freerdp-3.2.0-r2.ebuild b/net-misc/freerdp/freerdp-3.2.0-r2.ebuild
deleted file mode 100644
index 82b1a427b285..000000000000
--- a/net-misc/freerdp/freerdp-3.2.0-r2.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 2011-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic
-
-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 ~loong ~ppc ~ppc64 ~riscv ~x86"
-fi
-
-DESCRIPTION="Free implementation of the Remote Desktop Protocol"
-HOMEPAGE="https://www.freerdp.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0/3"
-IUSE="aad alsa cpu_flags_arm_neon cups debug +ffmpeg +fuse gstreamer +icu jpeg kerberos openh264 pulseaudio sdl server smartcard systemd test usb valgrind wayland X xinerama xv"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/openssl:0=
-	sys-libs/zlib:0
-	aad? ( dev-libs/cJSON )
-	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=
-	)
-	fuse? ( sys-fs/fuse:3 )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		X? ( x11-libs/libXrandr )
-	)
-	icu? ( dev-libs/icu:0= )
-	jpeg? ( media-libs/libjpeg-turbo:0= )
-	kerberos? ( virtual/krb5 )
-	openh264? ( media-libs/openh264:0= )
-	pulseaudio? ( media-libs/libpulse )
-	sdl? (
-		media-libs/libsdl2[haptic(+),joystick(+),sound(+),video(+)]
-		media-libs/sdl2-ttf
-	)
-	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? (
-		dev-libs/pkcs11-helper
-		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}
-	valgrind? ( dev-debug/valgrind )
-"
-BDEPEND="
-	virtual/pkgconfig
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-"
-
-src_configure() {
-	# bug #881695
-	filter-lto
-
-	local mycmakeargs=(
-		-Wno-dev
-
-		# https://bugs.gentoo.org/927037
-		-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=OFF
-
-		-DBUILD_TESTING=$(usex test ON OFF)
-		-DCHANNEL_URBDRC=$(usex usb ON OFF)
-		-DWITH_AAD=$(usex aad ON OFF)
-		-DWITH_ALSA=$(usex alsa ON OFF)
-		-DWITH_CCACHE=OFF
-		-DWITH_CLIENT_SDL=$(usex sdl ON OFF)
-		-DWITH_SAMPLE=OFF
-		-DWITH_CUPS=$(usex cups ON OFF)
-		-DWITH_DEBUG_ALL=$(usex debug ON OFF)
-		-DWITH_MANPAGES=ON
-		-DWITH_FFMPEG=$(usex ffmpeg ON OFF)
-		-DWITH_FREERDP_DEPRECATED_COMMANDLINE=ON
-		-DWITH_SWSCALE=$(usex ffmpeg ON OFF)
-		-DWITH_CAIRO=$(usex ffmpeg OFF ON)
-		-DWITH_DSP_FFMPEG=$(usex ffmpeg ON OFF)
-		-DWITH_FUSE=$(usex fuse ON OFF)
-		-DWITH_GSTREAMER_1_0=$(usex gstreamer ON OFF)
-		-DWITH_JPEG=$(usex jpeg ON OFF)
-		-DWITH_KRB5=$(usex kerberos ON OFF)
-		-DWITH_NEON=$(usex cpu_flags_arm_neon ON OFF)
-		-DWITH_OPENH264=$(usex openh264 ON OFF)
-		-DWITH_OSS=OFF
-		-DWITH_PCSC=$(usex smartcard ON OFF)
-		-DWITH_PKCS11=$(usex smartcard ON OFF)
-		-DWITH_PULSE=$(usex pulseaudio ON OFF)
-		-DWITH_SERVER=$(usex server ON OFF)
-		-DWITH_LIBSYSTEMD=$(usex systemd ON OFF)
-		-DWITH_UNICODE_BUILTIN=$(usex icu OFF ON)
-		-DWITH_VALGRIND_MEMCHECK=$(usex valgrind 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)
-		-DWITH_WEBVIEW=OFF
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	local myctestargs=()
-	use elibc_musl && myctestargs+=( -E TestBacktrace )
-	has network-sandbox ${FEATURES} && myctestargs+=( -E TestConnect )
-	cmake_src_test
-}