gentoo auto-resync : 31:08:2023 - 22:12:06

5 files changed, 149 insertions, 3 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 3bc3189c1c02..8ed7b1fe73a7 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index 3793f3a78b76..bd092e3dcdbd 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -1,6 +1,8 @@
 AUX freerdp-2.10.0-ffmpeg-6.patch 1195 BLAKE2B 49868f42ab24d0754bd11550c5ffffbdf90ff88561f48079d225980de7229a8f3ff8fbe9238d05eff7595405b303c6ef8728b6c29aea863950087e2f9b6aedbc SHA512 de6c8a7c1b31e0da4db5838bcc9607e55ff2c3e780f8924a67c610f85366385d0a91332972750c692136f1cfb6dd9ba009e1615346f2f4834afafc40a85f6dc7
 DIST freerdp-2.10.0.tar.gz 7321489 BLAKE2B 92b4b45670a5ed3b41713d1e036d41a9ef5714ddf9273a4b88fadf5c8435a467a53144f42bd969a44e641995a7f94b6c7b43b85f0ede738b1a1213e3bada9788 SHA512 a5749e3140d74c66d51869b405852bdaa776ca7d82e50a1e3ed19ccf56ed91a4ad9c3ce2c8ee6ff0abbb29d915c2e7278a1fcea04d73fd5ba4014f6590484477
+DIST freerdp-2.11.0.tar.gz 7325731 BLAKE2B 7cf2805065b870d959461a41b2b5cc7a5d00121078c0a5f51db0f2d83c4a5eb64aba75d0c1e184edf3546b4df87150b30f81ad88b301366ccaeaec59120085ca SHA512 97ce19f392e2b197830e22f12870e787fce85a7d9342cd7b7043c1efc45f5773410901b27de11bf1b70ca36dd6d7d102b3dd34eace813892a72d44dc290a8703
 EBUILD freerdp-2.10.0-r3.ebuild 3198 BLAKE2B 1e5b2b274b6efcfaff80b5d352d9103106accb47bcdb244583b02497e017dd4f85db6064bf9886238202a8fd42bffe353043b2393bd1704fc8cf4ea47bf2d769 SHA512 8bf81d0b6ced110078597aa599a42a2443503ec92163cd1d6c362983d4349cff13cbc45d6d19ac209c365768d31d751d78a51b2b2be71c3c839019583b12bd45
+EBUILD freerdp-2.11.0.ebuild 3156 BLAKE2B 6506d72ab8f4f6fbf5e593e725c125eb3ecb517937cebd8d71d48c288c0559cc373b972d64ca044b89090f35aa403283411018a77e9c551d72aeaff40a8f0243 SHA512 5c264d667c50707e1eadd4687f4ddf691b613103377415b0722b0f67fbe2aab8a0bb46666009938a0dfcdf85b322dc5e044fd8078afab7d556268b4b8b8f7f57
 EBUILD freerdp-2.9999.ebuild 3156 BLAKE2B 6506d72ab8f4f6fbf5e593e725c125eb3ecb517937cebd8d71d48c288c0559cc373b972d64ca044b89090f35aa403283411018a77e9c551d72aeaff40a8f0243 SHA512 5c264d667c50707e1eadd4687f4ddf691b613103377415b0722b0f67fbe2aab8a0bb46666009938a0dfcdf85b322dc5e044fd8078afab7d556268b4b8b8f7f57
-EBUILD freerdp-9999.ebuild 3154 BLAKE2B 0969565f458a7a676c1cbaf95cc0001545a5daf506f6bd1bb0364c1cbe8218f35a2249a9ed6d7e8333a586b8713ecef77f9c498ce17526d048a81036c46e1408 SHA512 1410eef326a45efed067381e9545886f6c15e4e5e0119b3495c58fb6ab91b2a84d0fb8cd91833cecacc2c1f66ae0847ea68850cd21ec70831af4a6be7897c7f4
-MISC metadata.xml 482 BLAKE2B 9961a7b8e99468833978be3722ffcfa1fe38ed2b9c0de0ec7237fbbdd1484b674df65995e4802abe961e70df37e8a7d11c8d1e26f25779e5419b4439cd336ed3 SHA512 3dd28b1ac648b19794970f306d811ebcb860146da9dd4e0dc1ca72c493f78ddf63e95c8232c583a71bee7e6ad90bbad24ece5fca4e6f561a9c019767a4755b72
+EBUILD freerdp-9999.ebuild 3393 BLAKE2B 9b6921a70e09e201d219da4cb31af9c1725e4696385dd938527bd6d43e59185402bef790aeddc259652fa9f1292fe82bae99c0c5dc57e8bc59d0d357a5cc18fa SHA512 fbb204ef58f3abf2b987201be169cab0d67282f121ec38df11471095fe45d51218f7d6ea5e6eaa83684a95d4c9ab22b2a78bd65a31190ba14a48ce1930101944
+MISC metadata.xml 609 BLAKE2B cc60eba6be155f836c7aa0a136bb6a37a24fb9bdb7ef87cfc56b11d90525ec6def5725dd3d0957c8f3fc20ba33bdb34740f1e17a9af2c6d7b85002c43e7b4863 SHA512 d5446ef39f4337a815577ea5507f658c5c4d7f6a8c22a83a0b601bc5a7b0a77de0a037df4d51f9ce20c60b17746b84688b44e914b6874d5db7cfb957823cbed6
diff --git a/net-misc/freerdp/freerdp-2.11.0.ebuild b/net-misc/freerdp/freerdp-2.11.0.ebuild
new file mode 100644
index 000000000000..04d9059dea56
--- /dev/null
+++ b/net-misc/freerdp/freerdp-2.11.0.ebuild
@@ -0,0 +1,133 @@
+# Copyright 2011-2023 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="http://www.freerdp.com/"
+
+LICENSE="Apache-2.0"
+SLOT="0/2"
+IUSE="alsa cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer 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
+	)
+	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-util/valgrind )
+"
+BDEPEND="
+	virtual/pkgconfig
+	X? ( doc? (
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/xmlto
+	) )
+"
+
+src_configure() {
+	# bug #881695
+	filter-lto
+
+	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_GSSAPI=$(usex kerberos 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_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-9999.ebuild b/net-misc/freerdp/freerdp-9999.ebuild
index c580e3f72696..ecb074f9973c 100644
--- a/net-misc/freerdp/freerdp-9999.ebuild
+++ b/net-misc/freerdp/freerdp-9999.ebuild
@@ -23,12 +23,13 @@ HOMEPAGE="http://www.freerdp.com/"
 
 LICENSE="Apache-2.0"
 SLOT="0/2"
-IUSE="alsa cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg kerberos openh264 pulseaudio server smartcard systemd test usb valgrind wayland X xinerama xv"
+IUSE="aad alsa cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg kerberos openh264 pkcs11 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? (
@@ -57,7 +58,12 @@ RDEPEND="
 	jpeg? ( media-libs/libjpeg-turbo:0= )
 	kerberos? ( virtual/krb5 )
 	openh264? ( media-libs/openh264:0= )
+	pkcs11? ( dev-libs/pkcs11-helper )
 	pulseaudio? ( media-libs/libpulse )
+	sdl? (
+		media-libs/libsdl2
+		media-libs/sdl2-ttf
+	)
 	server? (
 		X? (
 			x11-libs/libXcursor
@@ -99,8 +105,10 @@ src_configure() {
 	local mycmakeargs=(
 		-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)
@@ -113,6 +121,7 @@ src_configure() {
 		-DWITH_KRB5=$(usex kerberos ON OFF)
 		-DWITH_NEON=$(usex cpu_flags_arm_neon ON OFF)
 		-DWITH_OPENH264=$(usex openh264 ON OFF)
+		-DWITH_PKCS11=$(usex pkcs11 ON OFF)
 		-DWITH_PULSE=$(usex pulseaudio ON OFF)
 		-DWITH_SERVER=$(usex server ON OFF)
 		-DWITH_PCSC=$(usex smartcard ON OFF)
diff --git a/net-misc/freerdp/metadata.xml b/net-misc/freerdp/metadata.xml
index cdc60d1ae1df..9714bf4a3c1f 100644
--- a/net-misc/freerdp/metadata.xml
+++ b/net-misc/freerdp/metadata.xml
@@ -6,7 +6,9 @@
 		<name>Mike Gilbert</name>
 	</maintainer>
 	<use>
+		<flag name="aad">Enable login via Azure AD</flag>
 		<flag name="openh264">Enable H.264 support using <pkg>media-libs/openh264</pkg></flag>
+		<flag name="pkcs11">Enable pkcs11 for NLA smartcard logon support</flag>
 		<flag name="server">Build server binaries</flag>
 	</use>
 	<upstream>