5 files changed, 152 insertions, 3 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index da9f25c69bad..1940e729cb04 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/gallery-dl/Manifest b/net-misc/gallery-dl/Manifest
index 944406fc12e5..322c2bd7e020 100644
--- a/net-misc/gallery-dl/Manifest
+++ b/net-misc/gallery-dl/Manifest
@@ -3,7 +3,7 @@ DIST gallery-dl-1.26.5.gh.tar.gz 631129 BLAKE2B a9870436eb41269bcb5ff7f339473d1b
 DIST gallery-dl-1.26.6.gh.tar.gz 637424 BLAKE2B feb7cf54bc15112c9c7e26be58ab69a6219416f2c8533922fc32e4c9790d71c829718875e0e93cec5eb0542fd68cf65f60716af06b8ea1a09b88574816315312 SHA512 b788353cd18f5cb9b505aa788cd16700846d6f430649a04317e0f688bbd95200fb45dbcba8ec28c3f37c4de7c353d144f940decb369baf171e70da57042f0933
 DIST gallery-dl-1.26.7.gh.tar.gz 649312 BLAKE2B b9b493c03c459d9ff0fafce8d48b9fef075d17cc5b1d7133f2f24841ddf0af96297c284d114088825afa3b4be6499ac98b2be44aabe11d31d27ea0718d5cd453 SHA512 fdd00e43d91c5ab577f21f874ddbaa18031af308c8ca7ee8996a0b816ab9f9d422cb870467f83b3c2ce5f943727fd26af4e5597cd808fbef2df88a874bcbd9bc
 EBUILD gallery-dl-1.26.4.ebuild 1030 BLAKE2B 85bc61adbbe16f66b6e4bfb40f2337c526fb606801222f6a08156427514ca3654e50ef29cafe849209138f99fbbe6e5ee0a80a0da9cf553b3747cd9b0a0c5714 SHA512 a2dd971785a8882e66e4325d5e8d35adc3cc218f24e3bdb0e9156c11058e37fe1e2d688a212a37c6d38f8f7534f819d140ea99e7db790a224bcebf4bc7509746
-EBUILD gallery-dl-1.26.5.ebuild 1037 BLAKE2B d0a577a5e71be88d28c735580b24617e1d87bac48ed8ce1044991fc8eddf1044d1cb69d2bccbf40843fe0b99877cce069ae048d43f1016bd687f5a7ab8589298 SHA512 8b209c0d297af4f95c9dea25e22df7a4f3323ac1396c644b07e99a782d42f343065c846dbbc9b0c05a98d20e4b456ab5509ff7ff91b0904668509efb26425f26
+EBUILD gallery-dl-1.26.5.ebuild 1030 BLAKE2B 85bc61adbbe16f66b6e4bfb40f2337c526fb606801222f6a08156427514ca3654e50ef29cafe849209138f99fbbe6e5ee0a80a0da9cf553b3747cd9b0a0c5714 SHA512 a2dd971785a8882e66e4325d5e8d35adc3cc218f24e3bdb0e9156c11058e37fe1e2d688a212a37c6d38f8f7534f819d140ea99e7db790a224bcebf4bc7509746
 EBUILD gallery-dl-1.26.6.ebuild 1074 BLAKE2B addeb849b14e68eb58b9aaee69182bcdac9e972f4ffae1dac19e8aefbb55e09f90f487a5ac1c720869a664caa6a2742e768b42f973afb8b56a03e639d84c87fe SHA512 f9008774638e612166806dd0ac6aab9a5e2f18ea5bacbaad7f5f6cc8ad6d640417f34768af90a7a9612192538e489b7a6a54ce02105c1fc5dbdbafe54ad69e4b
 EBUILD gallery-dl-1.26.7.ebuild 1074 BLAKE2B addeb849b14e68eb58b9aaee69182bcdac9e972f4ffae1dac19e8aefbb55e09f90f487a5ac1c720869a664caa6a2742e768b42f973afb8b56a03e639d84c87fe SHA512 f9008774638e612166806dd0ac6aab9a5e2f18ea5bacbaad7f5f6cc8ad6d640417f34768af90a7a9612192538e489b7a6a54ce02105c1fc5dbdbafe54ad69e4b
 EBUILD gallery-dl-9999.ebuild 1074 BLAKE2B 1b6c6fb5ef3964f88245b18be917156351251f80d6b3aa7f7c8132e9aaf7af67ae1eefd2bcc6d193e80bf9247e7ff4a6553f44cede2cb6dc17114aa6d09ecd82 SHA512 1027e4244c20acc30f9df8ddfcc9fa8efbbd94fd6375f7855e8d9dc2121eb207025820c9e4fdddab8acc176dc2e5a4d12106a5f3461123b80ecf8eb41e79f9fa
diff --git a/net-misc/gallery-dl/gallery-dl-1.26.5.ebuild b/net-misc/gallery-dl/gallery-dl-1.26.5.ebuild
index b3da2a9c870f..ab1aa54283f4 100644
--- a/net-misc/gallery-dl/gallery-dl-1.26.5.ebuild
+++ b/net-misc/gallery-dl/gallery-dl-1.26.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/mikf/${PN}.git"
 else
 	SRC_URI="https://github.com/mikf/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-misc/turbovnc/Manifest b/net-misc/turbovnc/Manifest
index 433ab2dd5baf..863d3f7b0292 100644
--- a/net-misc/turbovnc/Manifest
+++ b/net-misc/turbovnc/Manifest
@@ -3,8 +3,11 @@ AUX turbovnc-3.0.3-java-launcher-32-bit.patch 601 BLAKE2B 9142ac45a5113921872a10
 AUX turbovnc-3.0.90-fix-musl-compilation.patch 869 BLAKE2B e44b15693e9df497ff646162cca2d96a47e753e899e2a9a40074b567600bf44e6c4ef9d7770d114f164399ec30d6dccf687647508bc14831b5c5c2117b400d6b SHA512 2ce59ee4cf98376fd1c08c01918356b3cfa9e5cde3ff1a3179507086bc97749543423a9459e7b7518e95e0a0ebc3be4ab9f93cdb4a4460a9d8d5b36513c3c30a
 DIST turbovnc-3.0.3.tar.gz 8693682 BLAKE2B cdb10b3f16be542a214e16329914eaf97a5646f96b47da5a738f7c16355284b100af3755f046a6975233c31ce662a939db01aa5825ebcf944e64eacca2f57a2f SHA512 e9cece436f70f2b75683eb8f21ffc985797a36c76efb6829ba5fac75849d1c9f35d636431a0fb28066ed17717800d6d6029f2fda863e650f39d6d64eef1e30de
 DIST turbovnc-3.0.3.tar.gz.sig 543 BLAKE2B 14df4d080b587125f82151c457b69324b993b169550e95beec74344705ad77a2c9886deaed59d0c487c8995c34fca1e4004fb4f50b836c3aff373cecd911a6a9 SHA512 0ecc236823c78cb16876f2cc6ac07ec14a099974b0f1ac4d2f45fdc1c53c6adbede924553cc42431cc95a5c4185f1cc9991053d72bb41ddbe1fc8c3f85120489
+DIST turbovnc-3.1.1.tar.gz 9032635 BLAKE2B 84b6d656bcadf310368f4c59e03c25d2997e8264141bf54dc670e76c1f52e4ea63a71670f134643018f9cae76aa20d51d15a4a9f919a25d21abac80fbc0b43db SHA512 d855b5f6aca9db73474d6a63868212a847c472ae01e4d26ea877bccb911d910730409e13183928426ce07a401da38a55fbcb39e411530f993d758e8dbf244cd1
+DIST turbovnc-3.1.1.tar.gz.sig 543 BLAKE2B 2563db72dbca74781b0c2d76867298c400db61bff120e8bd4167c90347c94a26824f7aa252a2ac9fc1b0c101d56caeaceec74155ae5593428ad23a36373e998a SHA512 0dd0bde26bba3fe7ebbbe3c1a0af5f7e223026f140f031ae29405a47dd5d62183f22ea9fd6e1902b23016887503d80b65f77c48759e540ae8969a17046e41c60
 DIST turbovnc-3.1.tar.gz 9031021 BLAKE2B 08a349bec517b36a505145a572905da64055e39c8cdc40a0609aa5976604aa4cb43196584c4bf078ea68094c87818fd611589b3b12d2f81085ed40ea4db0d4bd SHA512 ebcfd2c542542fd266eedf23bd7ce246acc2257b195dd204d474ca658e9ef2dab8bb8731a7ae4d30bf3845b9015c318e19c3b68a1ad6b658287fddbcb4db509b
 DIST turbovnc-3.1.tar.gz.sig 543 BLAKE2B 6e6d13e611913abacaedb9251554263713f04f26aaff6a1526b796091f84260b10c156ee302156aac12ad519d9d9a55f059460b13df4fe02a237be37307acf7e SHA512 753a9f77ed851b999a49d22787ee992cae74340afb78a30db25d5cc36d95facce437df0474bf4ef92317ebcfa41e2cb145f3841df39fbb6b3b191ec57fcc0100
 EBUILD turbovnc-3.0.3.ebuild 3120 BLAKE2B 664da13e6ed134d0a31d02b838a6943aec2a289968ee25cd606d68e12cc7b4323f0d249a4de7ba56a9c53b4840b1b8a4b6096d0ba521df3fbdae7da37605c3dc SHA512 e56946766cb7a15e6ccdd02730929ae0d36c2e1c7a11e05ebcb4513a45ff90445a02b2d54a2cddb57b1337c45472686c8289bceaced9ca103c8aee69682f7d6c
+EBUILD turbovnc-3.1.1.ebuild 3124 BLAKE2B 53faebd33901aa3f7d1368c746e7913033f69893e234955df8c92b0e67b1081798a292b52c7203c063abef565292249d85cdccfbd8501baed6a71acc9ac20565 SHA512 9d51a495349d4ce2a8e3da1f4247494dad83b45909f4fe52b0d9ea20996ddbb28f7798c3c0151bd9e3117081b63232fb0480e444107f83569971800ee88cb62a
 EBUILD turbovnc-3.1.ebuild 3056 BLAKE2B ba3eaf92578f84d6ed64156cb95c9d6bbd89126a96bd312ad6e09cf54b6b1aac17ec0c55bb643a336160e436f581f1e0cb4847944b8c499bc5b8a4fde9dffb4b SHA512 1044db205ec3750c434bbfdf2e620ece0e347f427f803c0b65787d84b812315332135147adf3e4898a3158db217f29dbbb3a11aaa0f8cc0e79114c4ada8615c5
 MISC metadata.xml 820 BLAKE2B 331426a28ac5efa9f27d1e9b21e4b75e6965b5c1cf41ce7b8d98b03187fc56d81ffb58f555fc522188d1003e64713220b6f5591131fb8a26a8fe43e277f54526 SHA512 0aa50eef5eb122e0de38bf5e2f8d0627841419dd5e88ee58444493f4a9804626111d5edc5b36aa996635f38c7fd87c71706dd543305f9b495031971b1c52be3d
diff --git a/net-misc/turbovnc/turbovnc-3.1.1.ebuild b/net-misc/turbovnc/turbovnc-3.1.1.ebuild
new file mode 100644
index 000000000000..a60e961b75ed
--- /dev/null
+++ b/net-misc/turbovnc/turbovnc-3.1.1.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_OPT_USE=viewer
+inherit cmake desktop java-pkg-opt-2 optfeature verify-sig
+
+DESCRIPTION="A fast replacement for TigerVNC"
+HOMEPAGE="https://www.turbovnc.org/"
+SRC_URI="
+	https://github.com/TurboVNC/turbovnc/releases/download/${PV}/turbovnc-${PV}.tar.gz
+	verify-sig? ( https://github.com/TurboVNC/turbovnc/releases/download/${PV}/turbovnc-${PV}.tar.gz.sig )
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+server +ssl +viewer"
+REQUIRED_USE="|| ( server viewer )"
+
+COMMON_DEPEND="
+	x11-apps/xauth
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-misc/xkeyboard-config
+	server? (
+		media-libs/libjpeg-turbo:=
+		sys-libs/pam
+		sys-libs/zlib
+		virtual/opengl
+		x11-libs/libXau
+		x11-libs/libXdmcp
+		x11-libs/libXfont2
+		x11-libs/pixman
+		ssl? ( dev-libs/openssl:= )
+		!net-misc/tigervnc[server]
+	)
+	viewer? (
+		media-libs/libjpeg-turbo:=[java]
+		x11-libs/libXi
+		!net-misc/tigervnc[viewer(+)]
+	)
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	x11-apps/xkbcomp
+	viewer? ( >=virtual/jre-1.8:* )
+"
+
+# libbz2.so.1, libfontenc.so.1 and libfreetype.so.6 are used by libXfont2.so.2
+# but cmake will look for them, so add them here
+DEPEND="
+	${COMMON_DEPEND}
+	x11-libs/xtrans
+	viewer? ( >=virtual/jdk-1.8:* )
+	server? (
+		app-arch/bzip2
+		media-libs/freetype
+		x11-libs/libfontenc
+	)
+"
+
+BDEPEND="
+	verify-sig? ( sec-keys/openpgp-keys-vgl-turbovnc )
+"
+
+PATCHES=(
+	"${FILESDIR}"/"${PN}"-3.0.90-fix-musl-compilation.patch
+)
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/vgl-turbovnc.asc
+
+#879797 - BSD functions
+QA_CONFIG_IMPL_DECL_SKIP=( strlcat strlcpy )
+
+pkg_pretend() {
+	if use ssl && ! use server; then
+		einfo "USE=\"ssl\" selected but USE=\"server\" is not.  The SSL support is unused"
+	fi
+}
+
+src_prepare() {
+	use viewer && java-pkg-opt-2_src_prepare
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DTVNC_BUILDVIEWER=$(usex viewer)
+		-DTVNC_BUILDSERVER=$(usex server)
+		-DTVNC_BUILDWEBSERVER=$(usex server)
+	)
+
+	if use server ; then
+		mycmakeargs+=(
+			-DTVNC_SYSTEMLIBS=ON
+			-DTVNC_SYSTEMX11=ON
+			-DXKB_BIN_DIRECTORY=/usr/bin
+			-DXKB_DFLT_RULES=base
+		)
+		if use ssl ; then
+			# Link properly against OpenSSL to ensure
+			# we catch e.g. ABI change
+			# (i.e. don't dlopen it)
+			mycmakeargs+=(
+				-DTVNC_USETLS=OpenSSL
+				-DTVNC_DLOPENSSL=OFF
+			)
+		else
+			mycmakeargs+=( -DTVNC_USETLS=OFF )
+		fi
+	fi
+
+	if use viewer ; then
+		export JAVACFLAGS="$(java-pkg_javac-args)"
+		export JNI_CFLAGS="$(java-pkg_get-jni-cflags)"
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if use viewer ; then
+		java-pkg_dojar "${BUILD_DIR}"/java/VncViewer.jar
+		make_desktop_entry vncviewer "TurboVNC Viewer" /usr/share/icons/hicolor/48x48/apps/${PN}.png
+	fi
+
+	# Don't install incompatible init script
+	if use server; then
+		rm -r "${ED}"/etc/init.d/ || die
+		rm -r "${ED}"/etc/sysconfig/ || die
+	fi
+
+	# Conflicts with x11-base/xorg-server
+	find "${ED}"/usr/share/man/man1/ -name Xserver.1\* -delete || die
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	use server && optfeature "dbus support" sys-apps/dbus
+}