gentoo auto-resync : 02:11:2024 - 03:04:23

2 files changed, 60 insertions, 28 deletions

diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index a0edb5562fda..8b79da70a6f4 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -3,7 +3,6 @@ AUX freerdp-2.11.2-clang.patch 1132 BLAKE2B ba35de705f66e571e177f1291ccaf3c72f23
 AUX freerdp-2.11.7-type-mismatch.patch 758 BLAKE2B 3841272554c8b5e3bbd6a94fe00c8a9d429a3ef82f1723ff27a15c23d1be91bc3ec5bc1a9cc7a87911e3d690f2e53a6b46f65a77a5c3f738a585544b512e5743 SHA512 49e5b67904cb84b658c28cf98845b152c4421d506440e8efe04a388aa72d22dee5e41350f2acfeebd0bfc859ff8bc6a2aa654fabecadede3d8fc9166420de2e7
 AUX freerdp-3.4.0-incompatible-pointer.patch 10251 BLAKE2B 70a23022ff8db7dcf0ada3bf2165d6b271f259f4a49b40d4ca2c2de75e5321156cbedcca77240663e143986073d5a49e74b2b6caf456a6136d83673becf6c35e SHA512 c44165fc843742d1cb5859f24c6eaa78cda13837315ca3fde48092835992998701a670a66cf351c406153a65166050b5523e432789b5b6e2151227ea43ef034d
 AUX freerdp-3.6.3-backports.patch 9269 BLAKE2B 24f9c976c5406b967a207179a2fb86f1f1ffec73ff46d7f049f628817aac7ccf1a71e6f76c5fbd5e569a599e01880ee5d27ad3f328a27c836972984ce6d53e4a SHA512 febce83fe7006b4e3112dcd385d3c2911290f7aa9cdc702bbd2d2163ef153a86dd2ba57afac75c491505bbc947e02db74c185d86abad832a38c6f091c2602c80
-DIST freerdp-2.11.5.tar.gz 7330372 BLAKE2B 53adf40ca8f6c226f93cbc4599d857170bed2cbbe233860f52b30416b3a5d15c1ef2268c329790553dd1dbbcd93dedd834e5b62f67128029e551083d1053b357 SHA512 152dfef2783283ef703eb28ebe4d32fb02519ee6de9042b124af34395a2a6db36bd4cf1e96200ba3e93acf06c245109413e3e36e6143ed4409bd90ede6c383bd
 DIST freerdp-2.11.7.tar.gz 7337520 BLAKE2B ad579b4c36d96a17ccceb26c4c34124a050c05c49c05e2d8b4fd46789929dd4581d26aad88de7a3b3e6ecdd330b9b2ac2d45616537c1c635d10706f14a36f5ca SHA512 e1b4ac112090f2364ef2c360453f91b4643680cad75785cb214b48ebbc78c5eeca9fa8fe9f84f241a70825eefb5273e4e380483a5cdc86c92aa6ac1eb22c188e
 DIST freerdp-2.11.7.tar.gz.asc 228 BLAKE2B a374c22ada6da59fb66fcb8021d5bb27545df0c0875b929766dc9b468e9fbfb4a79b1c38b2dbf5c44f925fd44305b1798e5ede0e6726a85c98cac96ceb8020f2 SHA512 18a1b8f18bba14e0156e5eca8fad28efdadd2f87fa29221629ffd9cf53f74606392de0df0e11ae41809fad0509c87462ee29d1e01e9df0dfe08b29832378be76
 DIST freerdp-3.4.0.tar.gz 9331562 BLAKE2B 888d6c5786c7b3c5eea89e41bca23ef2b323377b8115c5f5bfd0dd38e5ed2d3701ffc7603e4aa4253e9116804a12268f4b59dadeb2f60f5c39e8170e78ba6bd1 SHA512 b69f2a2a5f6c70b4a21f0768ce2050020af47b83a3cf06d3b3b46a0e6aa7c062ed2b9de04782a8d6651002ded4c267f8653dfdc2517323926aaab3675924b6c5
@@ -13,12 +12,14 @@ DIST freerdp-3.7.0.tar.gz 10223833 BLAKE2B 6d1fab8a88dd9113c6daf0d609cac006d1303
 DIST freerdp-3.7.0.tar.gz.asc 228 BLAKE2B 87cd5f8cb8286eaf108098ee8baa7ed7c6e05b0d3e78050d16f96f6327c40f03bbe96b6aac719a8203240b4eb02e175daad57189dc7e0a0e022b02372aa69d6f SHA512 b62cf129db113ae727669f26de8dc971e33b78cf0b83e5f84a518c30366ff74c14675701870e9e09aedaad23000b3316a04a76cb7df475f3e4d5465f206b0e30
 DIST freerdp-3.8.0.tar.gz 10235403 BLAKE2B 96a788e6f394d21cc57c8dc729d1fe5f80b7dbd0119342358a59b63dda7e9e687f17aa0b6c812c33f4a3f3dd34c067e1206418083d2b61b3e5d20b75e6846093 SHA512 ebe724930ea56890a83514496bd11fcc6f77f170a3bb3de4b62506fa2e8bc919cf8593d7e93a9a421fdea22976ddc3f3dbd921fd9e0fb3c7dbd288e387a1c238
 DIST freerdp-3.8.0.tar.gz.asc 228 BLAKE2B 442b48027cbb7fe8cee9a2599772d317f003635939c3f8201097fefd0e2d2f5ec8776a18db23cac47f153c02864b976893f2fccb9050c638f0b94d7b98b5bd40 SHA512 d6be8aa062544b6cb05b39b4036da5403786d02db1ccf11363bfb9ef71c64703051305dfd3de46ac8ec986a664c849521f22d3061112c851a7e40038b827a3e6
-EBUILD freerdp-2.11.5-r10.ebuild 3675 BLAKE2B 81ed6fb24d6bdd2ca894b2368e47adc29996441fa251ab5e4fa5d45128027a446c83f733dc9c010c6701e4b42bec15d987381bc3d72a234563c021552fd18a7e SHA512 910dad20fca8dbd8a287b31769f71fb2f660f4001df1b013e1340e19898fe2fd950765517faea66ecb9b8488b7bd1e87595813dccde3749a76f91b92b6a5b4e8
+DIST freerdp-3.9.0.tar.gz 10308500 BLAKE2B f86ffd6e77cc19985b30b93d76cbb02a0884c445bf7b6f18112b0a39f66563e843ed2d981c6c76b8c4d8af4528d8e3c4d58aec37fb73e251ee5f076b8f041848 SHA512 2b2e181e3b49f9769091c5188060b6a2f0e3a68620795673ce1d577149705c637312b5747846481027e8a2ee4f56cbdec71becc2cb9db6d36906284d8029d125
+DIST freerdp-3.9.0.tar.gz.asc 228 BLAKE2B 6749a3c9cd7fff6b46ebe36d253f64be8abcd46ba153d73fb64fb0128fee4be3beca4b61983e29ac842ee04c262d3c353ed890e279c07609439d3fcd740b9b29 SHA512 ef3eda5d31db6622d2fc12b3c1b242059d9570a10135113eba908584495b64ead33d6406c69f85c3e2c7583134a2cdf409abf93c6c502e454056c17729cc9d05
 EBUILD freerdp-2.11.7.ebuild 4059 BLAKE2B f104ca6d06a417cc3e5930fe85eadbf9fa10c61bb52e544daeaaf3316c216ba6363b0b1d3d1a0b79455fe9613831748901f0edce28f5d2df9cca8abffdd349a3 SHA512 fe9ebbcacf18cb59d16458c5cfe47cf15fe89150ebfeca176b6d288b96112ef0965e517171f87c16e62590eee8b3a6a106fe2ba87062061e98dd36f33671b18a
 EBUILD freerdp-2.9999.ebuild 4014 BLAKE2B 8e16a4c7dc35301402fbae5da1ba9da5673f0b5c4d8da811e5671f91816265a7dad92b5ae69533f44c084cec371962eac4499a0bb7ce98665336abf3ddaa730e SHA512 7ca53326d24353a2e1bc2d5c006c6a0866c98363d11ab231ff1c086119545979019ad9e13d9e40d4903bb020f4b891a041c0c93edfd566def19296b870e968fc
 EBUILD freerdp-3.4.0-r12.ebuild 4202 BLAKE2B 5f55807ba41422d61497b7ee08a0b150ad41a92ea50a83c9d1aaac06700b1b7b99927c651a9e861860935bb0643174be983e09e2b9f07e5cf99bb3c75016d2b1 SHA512 6a3029a833773ae2e30da1510d4a7d0b185cc300d1c53c164ae8da5f63b3fd63d2a0bc90616546b0ce45f162eda34b907230392267facb948123ea3ef60d21a2
 EBUILD freerdp-3.6.3.ebuild 4340 BLAKE2B 8472e441c21a0a9495242e314e52be5013b17b54a8694d6fe8560cb8e31fbbd23996fdabb98de6d87c0f4c1b5eb4596d416d41d3039904d747fa3ff12f7ca425 SHA512 4bf09d96f4931f12d1511a75599bdcb8cb28b80b4d43ebd8d16e33e8210ffbdf1690fac6d66c06657d165d22db1ac5db1eff4cae0eacc466ffb4f8d7ba764d23
 EBUILD freerdp-3.7.0.ebuild 4288 BLAKE2B 46b1483dc049b9a791bc35d29a8c411a5d9a3c9efb0768ccfa51b9f95fb050815611fc25339f55797ca605a0bf0f9cdea27bac61ee532c6e88932068b8a8c237 SHA512 284f977053213df5d2ca5f7e1e778a513a38e0c37e853133ec3f7a1520940f742ab9112d8383190cb2fd17d5f3cc7a08b88cd9efb199746db069a8a54c7eb517
 EBUILD freerdp-3.8.0.ebuild 4566 BLAKE2B 361aa3061b8f579ded57069aa9589f01645a3a2f288e24f605abb594d5026608ab55c132cd2b1a55fc4b619e3810cc2f6f6ff5cc4cf4258faca716195d559448 SHA512 80b846fb437a526adb5fe15e24296585ff1bf8c6efb659b7ea580a1ba38ff829d6f3c221171fd1f482a3a8a5726b3c85be679bec17a92c9daf613df285dedd3c
+EBUILD freerdp-3.9.0.ebuild 4566 BLAKE2B 361aa3061b8f579ded57069aa9589f01645a3a2f288e24f605abb594d5026608ab55c132cd2b1a55fc4b619e3810cc2f6f6ff5cc4cf4258faca716195d559448 SHA512 80b846fb437a526adb5fe15e24296585ff1bf8c6efb659b7ea580a1ba38ff829d6f3c221171fd1f482a3a8a5726b3c85be679bec17a92c9daf613df285dedd3c
 EBUILD freerdp-9999.ebuild 4566 BLAKE2B 361aa3061b8f579ded57069aa9589f01645a3a2f288e24f605abb594d5026608ab55c132cd2b1a55fc4b619e3810cc2f6f6ff5cc4cf4258faca716195d559448 SHA512 80b846fb437a526adb5fe15e24296585ff1bf8c6efb659b7ea580a1ba38ff829d6f3c221171fd1f482a3a8a5726b3c85be679bec17a92c9daf613df285dedd3c
 MISC metadata.xml 650 BLAKE2B 619e236cb4c4b249beafc2e4772c5321e5c912242a0e69d7e181867a83078ebfadd639aa5b7cf2a0da58572ade2ae374bfd61f41d83e333065bbfde2c06533ed SHA512 f9ec3e33c342c2a364be4d780c0fc69800617896bda40e473175f0b98f39925ea7bcc1896993782470fd9aad1b04edc2848baf5db2a8dd4e2c4099c062e657ae
diff --git a/net-misc/freerdp/freerdp-2.11.5-r10.ebuild b/net-misc/freerdp/freerdp-3.9.0.ebuild
index 6c9b29344718..5907f28cdfca 100644
--- a/net-misc/freerdp/freerdp-2.11.5-r10.ebuild
+++ b/net-misc/freerdp/freerdp-3.9.0.ebuild
@@ -12,29 +12,33 @@ if [[ ${PV} == *9999 ]]; then
 		2.*) EGIT_BRANCH="stable-2.0";;
 	esac
 else
+	inherit verify-sig
 	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"
+	SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz
+		verify-sig? ( https://pub.freerdp.com/releases/${MY_P}.tar.gz.asc )"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-akallabeth )"
+	VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/akallabeth.asc"
 fi
 
 DESCRIPTION="Free implementation of the Remote Desktop Protocol"
 HOMEPAGE="https://www.freerdp.com/"
 
 LICENSE="Apache-2.0"
-SLOT="2"
-IUSE="alsa cpu_flags_arm_neon client cups debug +ffmpeg gstreamer icu jpeg kerberos openh264 pulseaudio server smartcard systemd test usb valgrind wayland X xinerama xv"
+SLOT="3"
+IUSE="aad alsa cpu_flags_arm_neon +client cups debug +ffmpeg +fuse gstreamer +icu jpeg kerberos openh264 pulseaudio sdl server smartcard systemd test usb valgrind wayland X xinerama xv"
 RESTRICT="!test? ( test )"
 
-BDEPEND="
+BDEPEND+="
 	virtual/pkgconfig
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/xmlto
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
 "
-
 COMMON_DEPEND="
 	dev-libs/openssl:0=
 	sys-libs/zlib:0
+	aad? ( dev-libs/cJSON )
 	alsa? ( media-libs/alsa-lib )
 	cups? ( net-print/cups )
 	usb? (
@@ -55,16 +59,21 @@ COMMON_DEPEND="
 	!ffmpeg? (
 		x11-libs/cairo:0=
 	)
+	fuse? ( sys-fs/fuse:3 )
 	gstreamer? (
 		media-libs/gstreamer:1.0
 		media-libs/gst-plugins-base:1.0
-		x11-libs/libXrandr
+		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
@@ -94,18 +103,11 @@ DEPEND="${COMMON_DEPEND}
 "
 RDEPEND="${COMMON_DEPEND}
 	!net-misc/freerdp:0
-	client? ( !net-misc/freerdp:3[client] )
-	server? ( !net-misc/freerdp:3[server] )
+	client? ( !net-misc/freerdp:2[client] )
+	server? ( !net-misc/freerdp:2[server] )
+	smartcard? ( app-crypt/p11-kit )
 "
 
-src_prepare() {
-	local PATCHES=(
-		"${FILESDIR}/freerdp-2.11.2-clang.patch"
-		"${FILESDIR}/freerdp-2.11-Revert-codec-encode-messages-considering-endianness.patch"
-	)
-	cmake_src_prepare
-}
-
 option() {
 	usex "$1" ON OFF
 }
@@ -118,51 +120,80 @@ option_client() {
 	fi
 }
 
+run_for_testing() {
+	if use test; then
+		local BUILD_DIR="${WORKDIR}/${P}_testing"
+		"$@"
+	fi
+}
+
 src_configure() {
 	# bug #881695
 	filter-lto
+	freerdp_configure -DBUILD_TESTING=OFF
+	run_for_testing freerdp_configure -DBUILD_TESTING=ON
+}
 
+freerdp_configure() {
 	local mycmakeargs=(
 		-Wno-dev
-		-DBUILD_TESTING=$(option test)
+
+		# https://bugs.gentoo.org/927037
+		-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=OFF
+
 		-DCHANNEL_URBDRC=$(option usb)
+		-DWITH_AAD=$(option aad)
 		-DWITH_ALSA=$(option alsa)
 		-DWITH_CCACHE=OFF
-		-DWITH_CUPS=$(option cups)
 		-DWITH_CLIENT=$(option client)
+		-DWITH_CLIENT_SDL=$(option sdl)
+		-DWITH_SAMPLE=OFF
+		-DWITH_CUPS=$(option cups)
 		-DWITH_DEBUG_ALL=$(option debug)
 		-DWITH_MANPAGES=ON
 		-DWITH_FFMPEG=$(option ffmpeg)
+		-DWITH_FREERDP_DEPRECATED_COMMANDLINE=ON
 		-DWITH_SWSCALE=$(option ffmpeg)
 		-DWITH_CAIRO=$(option !ffmpeg)
 		-DWITH_DSP_FFMPEG=$(option ffmpeg)
+		-DWITH_FUSE=$(option fuse)
 		-DWITH_GSTREAMER_1_0=$(option gstreamer)
-		-DWITH_ICU=$(option icu)
 		-DWITH_JPEG=$(option jpeg)
-		-DWITH_GSSAPI=$(option kerberos)
+		-DWITH_KRB5=$(option kerberos)
 		-DWITH_NEON=$(option cpu_flags_arm_neon)
 		-DWITH_OPENH264=$(option openh264)
 		-DWITH_OSS=OFF
+		-DWITH_PCSC=$(option smartcard)
+		-DWITH_PKCS11=$(option smartcard)
 		-DWITH_PULSE=$(option pulseaudio)
 		-DWITH_SERVER=$(option server)
-		-DWITH_PCSC=$(option smartcard)
 		-DWITH_LIBSYSTEMD=$(option systemd)
+		-DWITH_UNICODE_BUILTIN=$(option !icu)
 		-DWITH_VALGRIND_MEMCHECK=$(option valgrind)
 		-DWITH_X11=$(option X)
 		-DWITH_XINERAMA=$(option xinerama)
 		-DWITH_XV=$(option xv)
 		-DWITH_WAYLAND=$(option_client wayland)
+		-DWITH_WEBVIEW=OFF
 		-DWITH_WINPR_TOOLS=$(option server)
+
+		"$@"
 	)
 	cmake_src_configure
 }
 
+src_compile() {
+	cmake_src_compile
+	run_for_testing cmake_src_compile
+}
+
 src_test() {
 	local myctestargs=( -E TestBacktrace )
-	cmake_src_test
+	has network-sandbox ${FEATURES} && myctestargs+=( -E TestConnect )
+	run_for_testing cmake_src_test
 }
 
 src_install() {
 	cmake_src_install
-	mv "${ED}"/usr/share/man/man7/wlog{,2}.7 || die
+	mv "${ED}"/usr/share/man/man7/wlog{,3}.7 || die
 }