gentoo auto-resync : 09:08:2024 - 11:04:52

5 files changed, 11 insertions, 189 deletions

diff --git a/net-misc/turbovnc/Manifest b/net-misc/turbovnc/Manifest
index 863d3f7b0292..e19ca62e4373 100644
--- a/net-misc/turbovnc/Manifest
+++ b/net-misc/turbovnc/Manifest
@@ -1,13 +1,8 @@
-AUX turbovnc-3.0-fix-musl-compilation.patch 863 BLAKE2B 6ef29d43b0849bf746c83eb2fc1477ba1eef9262cac75335b697bfb1867cca3113f755a9cd04f6f2638a212ae8cfb67b354dd28b96258ab1c84212863fc5d4cb SHA512 bea6cf58dbd27a4fe5d7ba08eabe3c8e2440e9bb28737e427a174ff0c2c77b5f0ab94be17fc31040c119226a3b939c440c4d48a3a152ff1d2e15b2a318eae37e
-AUX turbovnc-3.0.3-java-launcher-32-bit.patch 601 BLAKE2B 9142ac45a5113921872a102ff71e5266a5d1960a4ffa673ea811dd02fbae6dba44ed44e3cca7ded8b6a0cbd902d7c5780242d2c43567bc21c94dda5562da6a43 SHA512 52cfdd1a9d65292ad1192a5515f659321fe54de855ae9fff8fe5207ea2c79635f6ad3f01955ea79f50762ba7efdba0303e26c07a78e8c5b061f6411699c6531b
 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
+DIST turbovnc-3.1.2.tar.gz 9037445 BLAKE2B 0a645c510ce9caf7b0a8cbbf74debf1d1c6a159a46798176d7c6103f18b81b1191c5f82e365fa6eadb8e128a6a4f5060b6d456cda858f4d87361a5ca4bf7d842 SHA512 ab66ac516c1d8cbadeb205c3a46233d25893bf415eeb1004825c613997f9b17c858e823d7264a92459a82e24e9c9b372298b7bcec7c413a4b9206dadcc99e29c
+DIST turbovnc-3.1.2.tar.gz.sig 543 BLAKE2B 2cb7ea20a246cbf4fc6209c2e23ebf05a47638a9c926009c97b61a2d8d696b069429069f8822b18212b6efea69bfd10da0a53df1efa545b44b689cecf03ec7b9 SHA512 c1619b2f9e4babb3b0bcde1bb6294d8fdb15d35e0c04f69a8cf73c8a93966dd2bc39e2223f2bd2e57086deb11e04fc8034e5ca3ba0cdeb5a3270cddb82497d2a
 EBUILD turbovnc-3.1.1.ebuild 3124 BLAKE2B 53faebd33901aa3f7d1368c746e7913033f69893e234955df8c92b0e67b1081798a292b52c7203c063abef565292249d85cdccfbd8501baed6a71acc9ac20565 SHA512 9d51a495349d4ce2a8e3da1f4247494dad83b45909f4fe52b0d9ea20996ddbb28f7798c3c0151bd9e3117081b63232fb0480e444107f83569971800ee88cb62a
-EBUILD turbovnc-3.1.ebuild 3056 BLAKE2B ba3eaf92578f84d6ed64156cb95c9d6bbd89126a96bd312ad6e09cf54b6b1aac17ec0c55bb643a336160e436f581f1e0cb4847944b8c499bc5b8a4fde9dffb4b SHA512 1044db205ec3750c434bbfdf2e620ece0e347f427f803c0b65787d84b812315332135147adf3e4898a3158db217f29dbbb3a11aaa0f8cc0e79114c4ada8615c5
+EBUILD turbovnc-3.1.2.ebuild 3124 BLAKE2B 53faebd33901aa3f7d1368c746e7913033f69893e234955df8c92b0e67b1081798a292b52c7203c063abef565292249d85cdccfbd8501baed6a71acc9ac20565 SHA512 9d51a495349d4ce2a8e3da1f4247494dad83b45909f4fe52b0d9ea20996ddbb28f7798c3c0151bd9e3117081b63232fb0480e444107f83569971800ee88cb62a
 MISC metadata.xml 820 BLAKE2B 331426a28ac5efa9f27d1e9b21e4b75e6965b5c1cf41ce7b8d98b03187fc56d81ffb58f555fc522188d1003e64713220b6f5591131fb8a26a8fe43e277f54526 SHA512 0aa50eef5eb122e0de38bf5e2f8d0627841419dd5e88ee58444493f4a9804626111d5edc5b36aa996635f38c7fd87c71706dd543305f9b495031971b1c52be3d
diff --git a/net-misc/turbovnc/files/turbovnc-3.0-fix-musl-compilation.patch b/net-misc/turbovnc/files/turbovnc-3.0-fix-musl-compilation.patch
deleted file mode 100644
index 0769f00ffa56..000000000000
--- a/net-misc/turbovnc/files/turbovnc-3.0-fix-musl-compilation.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-See bug https://bugs.gentoo.org/836723
-
-The error is this:
-
-/var/tmp/portage/net-misc/turbovnc-2.2.7-r2/work/turbovnc-2.2.7/unix/Xvnc/programs/Xserver/os/access.c: In function 'GetLocalClientCreds':
-/var/tmp/portage/net-misc/turbovnc-2.2.7-r2/work/turbovnc-2.2.7/unix/Xvnc/programs/Xserver/os/access.c:1178:18: error: storage size of 'peercred' isn't known
- 1178 |     struct ucred peercred;
-      |                  ^~~~~~~~
-
---- a/unix/Xvnc/programs/Xserver/os/CMakeLists.txt
-+++ b/unix/Xvnc/programs/Xserver/os/CMakeLists.txt
-@@ -1,7 +1,7 @@
- include_directories(../render ../../../lib/libsha1)
- 
- add_definitions(-DUNIXCONN -DTCPCONN -DHASXDMAUTH ${ServerOSDefines} -DXDMCP
--	-DHAVE_SHA1_IN_LIBSHA1)
-+	-DHAVE_SHA1_IN_LIBSHA1 -D_GNU_SOURCE)
- if(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
- 	add_definitions(-DLOCALCONN)
- elseif(NOT CMAKE_SYSTEM_NAME STREQUAL "Linux")
diff --git a/net-misc/turbovnc/files/turbovnc-3.0.3-java-launcher-32-bit.patch b/net-misc/turbovnc/files/turbovnc-3.0.3-java-launcher-32-bit.patch
deleted file mode 100644
index a94c76ddfd24..000000000000
--- a/net-misc/turbovnc/files/turbovnc-3.0.3-java-launcher-32-bit.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Jdk 8 does not need -d32
-Jdk 11+ doesn't recognize it at all, so the viewer doesn't start on x86
-
---- a/unix/vncviewer/vncviewer.in
-+++ b/unix/vncviewer/vncviewer.in
-@@ -53,8 +53,4 @@
- 	LD_LIBRARY_PATH=$JAWT_PATH:$LD_LIBRARY_PATH
- 	export LD_LIBRARY_PATH
- fi
--if [ "@BITS@" = "32" ]; then
--	exec $JAVA -server -d@BITS@ -Djava.library.path=$TVNC_JAVADIR -jar $TVNC_JAVADIR/VncViewer.jar ${1+"$@"}
--else
--	exec $JAVA -server -Djava.library.path=$TVNC_JAVADIR -jar $TVNC_JAVADIR/VncViewer.jar ${1+"$@"}
--fi
-+exec $JAVA -server -Djava.library.path=$TVNC_JAVADIR -jar $TVNC_JAVADIR/VncViewer.jar ${1+"$@"}
diff --git a/net-misc/turbovnc/turbovnc-3.0.3.ebuild b/net-misc/turbovnc/turbovnc-3.0.3.ebuild
deleted file mode 100644
index 8bc1560582eb..000000000000
--- a/net-misc/turbovnc/turbovnc-3.0.3.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2023 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 verify-sig
-
-DESCRIPTION="A fast replacement for TigerVNC"
-HOMEPAGE="https://www.turbovnc.org/"
-SRC_URI="
-	https://sourceforge.net/projects/turbovnc/files/${PV}/${P}.tar.gz/download -> ${P}.tar.gz
-	verify-sig? ( https://sourceforge.net/projects/turbovnc/files/${PV}/${P}.tar.gz.sig/download -> ${P}.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-fix-musl-compilation.patch
-	"${FILESDIR}"/"${PN}"-3.0.3-java-launcher-32-bit.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_BUILDHELPER=$(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
-	rm -rf "${ED}"/etc/init.d/ || die
-	rm -rf "${ED}"/etc/sysconfig/ || die
-
-	# Conflicts with x11-base/xorg-server
-	find "${ED}"/usr/share/man/man1/ -name Xserver.1\* -delete || die
-
-	einstalldocs
-}
diff --git a/net-misc/turbovnc/turbovnc-3.1.ebuild b/net-misc/turbovnc/turbovnc-3.1.2.ebuild
index 8046e0e11fb8..a60e961b75ed 100644
--- a/net-misc/turbovnc/turbovnc-3.1.ebuild
+++ b/net-misc/turbovnc/turbovnc-3.1.2.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2023 Gentoo Authors
+# 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 verify-sig
+inherit cmake desktop java-pkg-opt-2 optfeature verify-sig
 
 DESCRIPTION="A fast replacement for TigerVNC"
 HOMEPAGE="https://www.turbovnc.org/"
 SRC_URI="
-	https://sourceforge.net/projects/turbovnc/files/${PV}/${P}.tar.gz/download -> ${P}.tar.gz
-	verify-sig? ( https://sourceforge.net/projects/turbovnc/files/${PV}/${P}.tar.gz.sig/download -> ${P}.tar.gz.sig )
+	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"
@@ -140,3 +140,7 @@ src_install() {
 
 	einstalldocs
 }
+
+pkg_postinst() {
+	use server && optfeature "dbus support" sys-apps/dbus
+}