gentoo auto-resync : 16:03:2024 - 00:48:12

6 files changed, 43 insertions, 166 deletions

diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index 479887a1830d..870b6f09bcfd 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -1,13 +1,11 @@
 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.1.tar.gz 7325835 BLAKE2B 2b6e62cd46627c60c3e815216711d3c5c9839d232aa5cb8653d92870bb46d93c40f2f44e0abf7ef6e5f44d92239541ae44d37366f343a1992fdbc8f09452fba0 SHA512 efd9d44bdc15047322600046fdcd17e37f14c84d75badc77e8ea53da6e065f33725be2f3c03e02031867124b62b32ad9deeabf8cc8f79321e7a866f552e63f2d
-DIST freerdp-2.11.2.tar.gz 7326213 BLAKE2B 5d044d660df1e5115ffde13389be79e852711161ad1969017a9ba662e5f278fc98b86efbc59a24c3ea32a137c24ed308ef5c9eb89db1c24f37f1b8b41bfd3c45 SHA512 2e0e74cba22ed0b33fd6453dd76f6a1ffb3107d1868276faf3eea25bd58d3d869c2ce7c6c467896ecc94ca71c0582beb029a0d44f50df38cc26661f85d0822fb
 DIST freerdp-2.11.5.tar.gz 7330372 BLAKE2B 53adf40ca8f6c226f93cbc4599d857170bed2cbbe233860f52b30416b3a5d15c1ef2268c329790553dd1dbbcd93dedd834e5b62f67128029e551083d1053b357 SHA512 152dfef2783283ef703eb28ebe4d32fb02519ee6de9042b124af34395a2a6db36bd4cf1e96200ba3e93acf06c245109413e3e36e6143ed4409bd90ede6c383bd
 DIST freerdp-3.2.0.tar.gz 8407869 BLAKE2B cebb14965a71a441d1e53b778db1464751830e96660b6f0d68f32c741544a173b57c4fc92ec24ea6aa3599b62db666987e66b46bd4e6fd2de7ce72869a5d1a07 SHA512 ace6004d11f7fea0e1f927a84367afd9e51b2b566135d7055f548146922a949b9324a2e172bfc1c055bcd27f0eea3e077dc6cfd825c172bffdecb8c28edb076e
-EBUILD freerdp-2.11.1.ebuild 3383 BLAKE2B f845c84d88923801d371a075033dff512c457cb85c411961b754c8ef14521343718bb8ee2988d3e2280ec8c5291375014d0b1b1d83af9935094212248126c961 SHA512 3dbc6db657855fef9c770a20d864f7e21c2b7815b53311cad95bd12119eae738e94a373fe3c21d67c46e2422dcd7037a8b8ace46df73888523fa3cefb324e3d3
-EBUILD freerdp-2.11.2.ebuild 3389 BLAKE2B a6705e74f7edc98fbb9fab25ec9fb40d27190e4de4198fa2c3859e40020e59afeec4e43779af815093112fe43db7097dbf068edb77f9c8ede68b3710c018cc23 SHA512 6cdc0ed1eb0c7b867458e1d6c0852bb7000c4f4cf90c827417753a56ece9f5f7270318340bb3bed541fe8fe54f4fd3d196f63a2e482da7bbc5d87b2ec8e11536
-EBUILD freerdp-2.11.5.ebuild 3389 BLAKE2B a6705e74f7edc98fbb9fab25ec9fb40d27190e4de4198fa2c3859e40020e59afeec4e43779af815093112fe43db7097dbf068edb77f9c8ede68b3710c018cc23 SHA512 6cdc0ed1eb0c7b867458e1d6c0852bb7000c4f4cf90c827417753a56ece9f5f7270318340bb3bed541fe8fe54f4fd3d196f63a2e482da7bbc5d87b2ec8e11536
+DIST freerdp-3.4.0.tar.gz 9331562 BLAKE2B 888d6c5786c7b3c5eea89e41bca23ef2b323377b8115c5f5bfd0dd38e5ed2d3701ffc7603e4aa4253e9116804a12268f4b59dadeb2f60f5c39e8170e78ba6bd1 SHA512 b69f2a2a5f6c70b4a21f0768ce2050020af47b83a3cf06d3b3b46a0e6aa7c062ed2b9de04782a8d6651002ded4c267f8653dfdc2517323926aaab3675924b6c5
+EBUILD freerdp-2.11.5.ebuild 3383 BLAKE2B f845c84d88923801d371a075033dff512c457cb85c411961b754c8ef14521343718bb8ee2988d3e2280ec8c5291375014d0b1b1d83af9935094212248126c961 SHA512 3dbc6db657855fef9c770a20d864f7e21c2b7815b53311cad95bd12119eae738e94a373fe3c21d67c46e2422dcd7037a8b8ace46df73888523fa3cefb324e3d3
 EBUILD freerdp-2.9999.ebuild 3248 BLAKE2B 977546bf36497225536b8796a6e050be5e343b4e28e573f0813ef8f87e54717e211c20acc02b36b1a8dd5457fb7aaff82b7df50196d77bd5012db26da4ce4b76 SHA512 449c04a5761cc92f9b8ccc8825d38feada98352903af08db706b60ede48dfaefde464a9343ba1273a1c32bac8c3607e16c7d6a3cc5926a7a7d49f2c189fbf791
-EBUILD freerdp-3.2.0.ebuild 3688 BLAKE2B 6e8f38bffd51d9fd70a2d361351b46f88282d37cbf4c6f64e485670db4c85675bef46339ada8571fd26cb1dac38aaff1d710b6a848861e42a738489379e63de9 SHA512 cbb93ce79e1fcdcd2c300d612e1aacab9bd94dafb67a0e603e4fb783650f47cd1189c7c8857c53b51126132ddd890c415da3b4c03fb04bbfb108bba4b3fe2045
-EBUILD freerdp-9999.ebuild 3688 BLAKE2B 6e8f38bffd51d9fd70a2d361351b46f88282d37cbf4c6f64e485670db4c85675bef46339ada8571fd26cb1dac38aaff1d710b6a848861e42a738489379e63de9 SHA512 cbb93ce79e1fcdcd2c300d612e1aacab9bd94dafb67a0e603e4fb783650f47cd1189c7c8857c53b51126132ddd890c415da3b4c03fb04bbfb108bba4b3fe2045
+EBUILD freerdp-3.2.0.ebuild 3768 BLAKE2B 32346ef2365430c9a0103c602bd6f9ac88908f8b2ded5d3a9d9309469075c7345f87895d56c1d79010e7da6d01a542520b228123ed3373cb4f7fd3563b2d0b45 SHA512 c31f48fa09a31292d3feb8e10f0f99b23326dfb730ba9d9608a0fcb540d623edc6c1091fb9a4bec60713ab62cc2ce156ebe53325bd725144a00ccc10dc4605de
+EBUILD freerdp-3.4.0.ebuild 3768 BLAKE2B 32346ef2365430c9a0103c602bd6f9ac88908f8b2ded5d3a9d9309469075c7345f87895d56c1d79010e7da6d01a542520b228123ed3373cb4f7fd3563b2d0b45 SHA512 c31f48fa09a31292d3feb8e10f0f99b23326dfb730ba9d9608a0fcb540d623edc6c1091fb9a4bec60713ab62cc2ce156ebe53325bd725144a00ccc10dc4605de
+EBUILD freerdp-9999.ebuild 3768 BLAKE2B 32346ef2365430c9a0103c602bd6f9ac88908f8b2ded5d3a9d9309469075c7345f87895d56c1d79010e7da6d01a542520b228123ed3373cb4f7fd3563b2d0b45 SHA512 c31f48fa09a31292d3feb8e10f0f99b23326dfb730ba9d9608a0fcb540d623edc6c1091fb9a4bec60713ab62cc2ce156ebe53325bd725144a00ccc10dc4605de
 MISC metadata.xml 599 BLAKE2B abc5045f654a1dee76a0c4352bb2374063a885c1bce2b0ccf43a62cf933119a6aa50bf835c3b35e546d6bbd772100d8523e4f388ebbb43883e5903957799d65e SHA512 7f06ed1615b32380a21e5fe772e0e36c475dc105a78f8766c13158b49526b288d4de81be2649861544acd8cd3ac51720c985ebfe19cb4439f3ea96c67b729c01
diff --git a/net-misc/freerdp/freerdp-2.11.1.ebuild b/net-misc/freerdp/freerdp-2.11.1.ebuild
deleted file mode 100644
index d4068b5b9c9e..000000000000
--- a/net-misc/freerdp/freerdp-2.11.1.ebuild
+++ /dev/null
@@ -1,142 +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/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="
-	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
-	)
-	icu? ( dev-libs/icu:0= )
-	jpeg? ( media-libs/libjpeg-turbo:0= )
-	kerberos? ( virtual/krb5 )
-	openh264? ( media-libs/openh264:0= )
-	pulseaudio? ( media-libs/libpulse )
-	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}
-	valgrind? ( dev-debug/valgrind )
-"
-BDEPEND="
-	virtual/pkgconfig
-	X? ( doc? (
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/xmlto
-	) )
-"
-
-PATCHES=(
-	"${FILESDIR}/freerdp-2.11.2-clang.patch"
-	"${FILESDIR}/freerdp-2.11-Revert-codec-encode-messages-considering-endianness.patch"
-)
-
-src_configure() {
-	# bug #881695
-	filter-lto
-
-	local mycmakeargs=(
-		-Wno-dev
-		-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_ICU=$(usex icu ON OFF)
-		-DWITH_JPEG=$(usex jpeg ON OFF)
-		-DWITH_GSSAPI=$(usex kerberos ON OFF)
-		-DWITH_NEON=$(usex cpu_flags_arm_neon ON OFF)
-		-DWITH_OPENH264=$(usex openh264 ON OFF)
-		-DWITH_OSS=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_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)
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	local myctestargs=()
-	use elibc_musl && myctestargs+=( -E TestBacktrace )
-	cmake_src_test
-}
diff --git a/net-misc/freerdp/freerdp-2.11.5.ebuild b/net-misc/freerdp/freerdp-2.11.5.ebuild
index c94a19725bf3..d4068b5b9c9e 100644
--- a/net-misc/freerdp/freerdp-2.11.5.ebuild
+++ b/net-misc/freerdp/freerdp-2.11.5.ebuild
@@ -15,7 +15,7 @@ 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"
+	KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="Free implementation of the Remote Desktop Protocol"
diff --git a/net-misc/freerdp/freerdp-3.2.0.ebuild b/net-misc/freerdp/freerdp-3.2.0.ebuild
index ed9a088b6946..30a72c73cdb5 100644
--- a/net-misc/freerdp/freerdp-3.2.0.ebuild
+++ b/net-misc/freerdp/freerdp-3.2.0.ebuild
@@ -106,6 +106,10 @@ src_configure() {
 
 	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)
diff --git a/net-misc/freerdp/freerdp-2.11.2.ebuild b/net-misc/freerdp/freerdp-3.4.0.ebuild
index c94a19725bf3..30a72c73cdb5 100644
--- a/net-misc/freerdp/freerdp-2.11.2.ebuild
+++ b/net-misc/freerdp/freerdp-3.4.0.ebuild
@@ -22,13 +22,14 @@ DESCRIPTION="Free implementation of the Remote Desktop Protocol"
 HOMEPAGE="https://www.freerdp.com/"
 
 LICENSE="Apache-2.0"
-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"
+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? (
@@ -49,6 +50,7 @@ RDEPEND="
 	!ffmpeg? (
 		x11-libs/cairo:0=
 	)
+	fuse? ( sys-fs/fuse:3 )
 	gstreamer? (
 		media-libs/gstreamer:1.0
 		media-libs/gst-plugins-base:1.0
@@ -59,6 +61,10 @@ RDEPEND="
 	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
@@ -70,7 +76,10 @@ RDEPEND="
 			xinerama? ( x11-libs/libXinerama )
 		)
 	)
-	smartcard? ( sys-apps/pcsc-lite )
+	smartcard? (
+		dev-libs/pkcs11-helper
+		sys-apps/pcsc-lite
+	)
 	systemd? ( sys-apps/systemd:0= )
 	wayland? (
 		dev-libs/wayland
@@ -87,50 +96,53 @@ DEPEND="
 "
 BDEPEND="
 	virtual/pkgconfig
-	X? ( doc? (
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/xmlto
-	) )
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
 "
 
-PATCHES=(
-	"${FILESDIR}/freerdp-2.11.2-clang.patch"
-	"${FILESDIR}/freerdp-2.11-Revert-codec-encode-messages-considering-endianness.patch"
-)
-
 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_CUPS=$(usex cups ON OFF)
 		-DWITH_DEBUG_ALL=$(usex debug ON OFF)
-		-DWITH_MANPAGES=$(usex doc 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_ICU=$(usex icu ON OFF)
 		-DWITH_JPEG=$(usex jpeg ON OFF)
-		-DWITH_GSSAPI=$(usex kerberos 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_PCSC=$(usex smartcard 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
 }
@@ -138,5 +150,6 @@ src_configure() {
 src_test() {
 	local myctestargs=()
 	use elibc_musl && myctestargs+=( -E TestBacktrace )
+	has network-sandbox ${FEATURES} && myctestargs+=( -E TestConnect )
 	cmake_src_test
 }
diff --git a/net-misc/freerdp/freerdp-9999.ebuild b/net-misc/freerdp/freerdp-9999.ebuild
index ed9a088b6946..30a72c73cdb5 100644
--- a/net-misc/freerdp/freerdp-9999.ebuild
+++ b/net-misc/freerdp/freerdp-9999.ebuild
@@ -106,6 +106,10 @@ src_configure() {
 
 	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)