gentoo auto-resync : 30:12:2023 - 23:46:05

4 files changed, 12 insertions, 167 deletions

diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index 5618f4173512..6ec6120e6041 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -2,12 +2,10 @@ AUX freerdp-2.11-Revert-codec-encode-messages-considering-endianness.patch 10363
 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-3.0.0-beta3.tar.gz 8950651 BLAKE2B f5171d76da635bd05b4a267383ffb150b4c214820b79624b1988d297e44a4bfd3d7b34fbc4ac88f79d973e6eb4372700fe53910078eaf36ea7fc553cc6ed6e4f SHA512 a9e61c30254ba5e894c70b981fae4d6311d20546d4352e5a584361b3b7232f6cc075bf7d7c1e9e5a52c820c36a185120f095306ec36ff72489f7dce0cb7e0fbb
 DIST freerdp-3.0.0.tar.gz 9032924 BLAKE2B 45e3ee13a664b947e509100824709088091192e89405f48defd3dfe2f4bf16ca359b37d632db49b7d3ce5e764b2ba7de5b2296c7b703c6a25181db245e8b551f SHA512 7868f6d436e65d2b81e42a6b4073e9775d5336c908294d058023e86c4d5d2b86318bc7ba1ad6093d2d4defdbefa278b8202f6da6e450a4264d3f5cb39eaf02c2
 EBUILD freerdp-2.11.1.ebuild 3382 BLAKE2B d5dea2d7e87eecbaea1b0a40a306be2d5053b03874cc14499764750bf4a5139a2860a9804e2e96a8dfc2fc959100d97b3b210f3edcad5ea6d2f29cb9fc73d58a SHA512 3622e56997255a2f78ff349aeb88899d4e948d8b049cfd24bcb1ca4f7d6669068900aa35ae7e15659adffed01a7f08ca585d254d74353078b70ad56d8f4b44e2
 EBUILD freerdp-2.11.2.ebuild 3388 BLAKE2B 9c9a11d0ff7656b7222dabdff1f802e72880483d8175c1b804576d647512aa148f7294172e279e08664ff03c526bd0cfa754e512215f15f201a4ea4677467fea SHA512 95c104b10bbf6c79735fc87f1db6a1546cff8f419d4d1e0f7cb1720e90922bb516dda39ddbe3cb4d7a72e4f00aa7f1ea453a15165634e686a44b23d681a5b4b5
 EBUILD freerdp-2.9999.ebuild 3247 BLAKE2B ef1fc3d6aeccb4ac0fad19144f14034f784807b58892971cae742fb780115e6af807979c1de87b858eb5bfb0d47670f546c019867aa44912eacea9dc25c67b40 SHA512 abe9e156276fbf9877fb7b1859f7bb4e74cce6b9e0400fe498a0a02db4d407fe469c6119659e0a234c205e6f1b5491a2b34a0bbc81fca1df2b0ad52a2b644adb
-EBUILD freerdp-3.0.0.ebuild 3565 BLAKE2B 15c40d2bad48060145a0386e136fa875b117a4fd000d4dec6a1b5d838e06f443fb742ed07bbe4ff3383673c3f812b9790256b6a8c11a5083dadecdf7e522972e SHA512 26ccae1fcd13c4f75ff2ae32ca6a0ff0c89fe1155e910a5fb28787b66ead4b0fd7029271f333f1e133054731bc8128290ebb736d7da000f6314850c4a3909c16
-EBUILD freerdp-3.0.0_beta3.ebuild 3507 BLAKE2B 354fa785d0c3f5bb4aadbfee128d103d1842ec7c9a345712f125d4003ce3d88dba16e2f8bfdd24a1b423e0d189a0b41938183f4533805ef8af1dd1eb16314dd8 SHA512 9fc2f50123e40afcad6165e5d8432281e6fe4a3c580753932062a40517ffd0976b3a6debfbd7ba26ffc2022b47ff43ceeaf934dbce3ceaff2ceb62597f267f6a
-EBUILD freerdp-9999.ebuild 3571 BLAKE2B 48c5e1396857d5042963b3552f6e80f4c18614b7fdff609600586918119cec8a3c443710b27ef3ecedf437d2a033ddbe41f1b73c50456e22030722c97f44156e SHA512 277e119c37fea146a8126fa410645ad42fa6e2aaebd022e9b6f52e1d5efc9e4f47da8673240037d046404aa4b36aac2e51945fb0abf6ff5bc08df57174978941
+EBUILD freerdp-3.0.0.ebuild 3528 BLAKE2B b7793931786aa553ba0e8b334525d644dce93d1005952ef4313f21154bea38b732847fa47e3f3a8e7c27bca780750f9c571e92970ef69a2428876804201ca8c5 SHA512 068fccdfb96ca217fc44079e148587c2699c982924a95ecbb2af99686a6300c0b85e99f611809bb387c3274dc48cfce75ff9a9443188ddb41527979e527baf4d
+EBUILD freerdp-9999.ebuild 3528 BLAKE2B b7793931786aa553ba0e8b334525d644dce93d1005952ef4313f21154bea38b732847fa47e3f3a8e7c27bca780750f9c571e92970ef69a2428876804201ca8c5 SHA512 068fccdfb96ca217fc44079e148587c2699c982924a95ecbb2af99686a6300c0b85e99f611809bb387c3274dc48cfce75ff9a9443188ddb41527979e527baf4d
 MISC metadata.xml 599 BLAKE2B abc5045f654a1dee76a0c4352bb2374063a885c1bce2b0ccf43a62cf933119a6aa50bf835c3b35e546d6bbd772100d8523e4f388ebbb43883e5903957799d65e SHA512 7f06ed1615b32380a21e5fe772e0e36c475dc105a78f8766c13158b49526b288d4de81be2649861544acd8cd3ac51720c985ebfe19cb4439f3ea96c67b729c01
diff --git a/net-misc/freerdp/freerdp-3.0.0.ebuild b/net-misc/freerdp/freerdp-3.0.0.ebuild
index 873cbd5a6144..92c6e545dcd1 100644
--- a/net-misc/freerdp/freerdp-3.0.0.ebuild
+++ b/net-misc/freerdp/freerdp-3.0.0.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 ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 fi
 
 DESCRIPTION="Free implementation of the Remote Desktop Protocol"
@@ -23,7 +23,7 @@ HOMEPAGE="https://www.freerdp.com/"
 
 LICENSE="Apache-2.0"
 SLOT="0/3"
-IUSE="aad alsa cpu_flags_arm_neon cups debug doc +ffmpeg +fuse gstreamer +icu jpeg kerberos openh264 pulseaudio sdl server smartcard systemd test usb valgrind wayland X xinerama xv"
+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="
@@ -96,10 +96,8 @@ 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
 "
 
 src_configure() {
@@ -116,7 +114,7 @@ src_configure() {
 		-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_SWSCALE=$(usex ffmpeg ON OFF)
 		-DWITH_CAIRO=$(usex ffmpeg OFF ON)
diff --git a/net-misc/freerdp/freerdp-3.0.0_beta3.ebuild b/net-misc/freerdp/freerdp-3.0.0_beta3.ebuild
deleted file mode 100644
index f5fc7c8b622a..000000000000
--- a/net-misc/freerdp/freerdp-3.0.0_beta3.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# 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="https://www.freerdp.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0/2"
-IUSE="aad alsa cpu_flags_arm_neon cups debug doc +ffmpeg 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=
-	)
-	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 )
-	sdl? (
-		media-libs/libsdl2
-		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-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=(
-		-Wno-dev
-		-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_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_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 )
-	cmake_src_test
-}
diff --git a/net-misc/freerdp/freerdp-9999.ebuild b/net-misc/freerdp/freerdp-9999.ebuild
index 53737725451f..92c6e545dcd1 100644
--- a/net-misc/freerdp/freerdp-9999.ebuild
+++ b/net-misc/freerdp/freerdp-9999.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 ~ppc ~ppc64 ~riscv ~x86"
 fi
 
 DESCRIPTION="Free implementation of the Remote Desktop Protocol"
@@ -23,7 +23,7 @@ HOMEPAGE="https://www.freerdp.com/"
 
 LICENSE="Apache-2.0"
 SLOT="0/3"
-IUSE="aad alsa cpu_flags_arm_neon cups debug doc +ffmpeg +fuse gstreamer +icu jpeg kerberos openh264 pulseaudio sdl server smartcard systemd test usb valgrind wayland X xinerama xv"
+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="
@@ -96,10 +96,8 @@ 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
 "
 
 src_configure() {
@@ -116,7 +114,7 @@ src_configure() {
 		-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_SWSCALE=$(usex ffmpeg ON OFF)
 		-DWITH_CAIRO=$(usex ffmpeg OFF ON)