gentoo auto-resync : 30:12:2022 - 14:17:35

5 files changed, 144 insertions, 227 deletions

diff --git a/net-misc/turbovnc/Manifest b/net-misc/turbovnc/Manifest
index 2f9c42b3d90a..95941916a8ea 100644
--- a/net-misc/turbovnc/Manifest
+++ b/net-misc/turbovnc/Manifest
@@ -1,7 +1,6 @@
 AUX turbovnc-2.2.7-fix-musl-compilation.patch 1535 BLAKE2B d0a95f7bffef46da41bb1faf3de3b3c3651890e3653ccb2d961e11921bb25c6910f9d4a049e9b6d867d214e1e0310de22ec3c423424acbebe7be2437d2ffb2ab SHA512 94ba2b53e02e9b2e32f70f2cfb4dd0cfb733726bb31383462113681c95afff4823dc82302641773947ab5e71fe6547a9f233b25146d9cd292f08da66faf8f786
 AUX turbovnc-3.0-fix-musl-compilation.patch 936 BLAKE2B d0785023ecf0ffa4f1c1d4f09ad8669d04780bf7c7159da06caf4ee8b58c2b46268d55c6148de95b9bfc8d4c695e2571338aa90c65ee848e1cf5886ffb909309 SHA512 dbf30af408a921a73e3100e5f05639beea2466c02cb8b3b2c8c498e904ba33bc84f92541f1e7d03ac6ae8301afcdfa537101ea9efe3c52245e2470903b13a517
-DIST turbovnc-2.2.7.tar.gz 8789325 BLAKE2B 257a9c9b3793b40668bf2f3bd9839b3003364f9130699caa52beaec24b75cb054830ee1b1aa67a22eb6173afc9af99c51e45fa3fa52e050c78e5226466ce99ce SHA512 932faa645a71b825e467bdcdb4b872e961ad688c959beb0adbdd35d77969d856bb5c82b893afe8f6b0aa8be18cac3fa9192ce05074295c92a83f1a2344468788
-DIST turbovnc-3.0.1.tar.gz 8685384 BLAKE2B 388657bac29ccd570b0a5e03ca49cb5b868907390743241599f84d900707ffc685d021702167e7f615004eafd545120de3dbd4c61e0e206ce2d4227ff54ea86a SHA512 1d205db7fa23730e32752b0bc449a4cd2920ce7d065184bc84e49041dcd8db0e057fd7923635b74b09ab7957568d34f70dc1dd96b77b0905e80b4a5f1d8f28db
-EBUILD turbovnc-2.2.7-r2.ebuild 2696 BLAKE2B a03f3d8f43871bdaedf3010b914e05580827a45579bca9c400a7bb533514956c920cde88fd67b9e0211a9df1b0c28f149791021e5854e0a913c5cdd7413cec59 SHA512 7b04acfbcb3e34c12c11baa36d11ed5de8a05a42bac8fc3068a1fde118999d0850fad349b7db92b6de3e44759f83bfc7e31e57c699b5460018979c8964ab86bb
-EBUILD turbovnc-3.0.1.ebuild 2093 BLAKE2B b4e7b67b6457e57827d57c42da4d5c71611f2adec7f570cb7cdb2ae83a2c59e3ea3eb22b8fd5a5a626e1ca3abf142e8bf77fcfee1293b29ac1c7903c3e53ea70 SHA512 ba1205bd0ff2406faa59e208d7750ed5d1cf96432e6993718b4f26ac58dd76b0596e34c1d33e60366e4f66c52c4f3e7375cf07acd64001d71c5b14a1125bd482
-MISC metadata.xml 683 BLAKE2B 15588b90c67a21d9fcae6ecd5cf1bd9c3e9654a973538d6a8ddb30cd175ac70ea1f83f90174f13243fe84752368e21aeabba390e137a9a23011e166c1dd63dfa SHA512 6908962decc70c5e3dd827d6fa30df7d03cc33b0f287fbadd2cebed02a8afb4bbec8bbdfcd95c795f74a6de179fe527ed2d3d116b0a7eab086bfc0f9e0894417
+DIST turbovnc-3.0.2.tar.gz 8691956 BLAKE2B 872dbdb0127d9935e8232757f0939cf95930bcd087d06dabe771bfe4ccf4703c05fd2d9c01f0baf073ba37f989c0f02b4e20d5ed08eb6f2a4a83c6f5bb0f9d36 SHA512 f04ab062dafe3210ab7722aa12a97d1f7956ddef7eed965e7df86810b7c9aa35d981d2397503d154bd0da0c71542e0e58be458fb5841f05fc9a0d80fdddf2d11
+DIST turbovnc-3.0.2.tar.gz.sig 543 BLAKE2B 3eeaa647ab3cab092112e3aa14cb4dba204e3c8a164082f32f942fd730d465e9b1973c9c7af047fcbba35fbfa02bb312fb8072963876b6add51d1105ac8eccbc SHA512 d17c6900db2bc47d8bbe3cc4bf8d0d1f17447fe4db5346baabf105c5d37a5a13048d6888d48fc5bd8e7a7a81b473b59b66c4c0108a10fcac211365d603093c4c
+EBUILD turbovnc-3.0.2.ebuild 2979 BLAKE2B 7cdab8545696eb6d324e27e5a34cebcf2dd2bbda6793f5f97d59d35d37d4e91d094c20adf60978d124a880ac0a4899da112cbd4f3a8ee63ee3580146b839ddae SHA512 cf3b7a1925f6276fece97bfca2a5b6d69e607cad67d12d5be163b82ff73192c1166b6fc259b3488b262d7e034c86fd60fe6621666ce9392446244f107b56e33d
+MISC metadata.xml 820 BLAKE2B 10f3075f4bbe8c9c39a7b1a2d40fb4986c089b48fd041e39880b310507130c091b53683870884b1f93a94e10ccf70a87504c6894637144d817ffa64b532c41e8 SHA512 13bd42b209f6a0f2b27240988edfa6b7e260ee70dbf42f380c1eec86a082106132de707d366325eb5eb04df5319420bc27b7f226fb994cb0ee700b0759b6b91c
diff --git a/net-misc/turbovnc/metadata.xml b/net-misc/turbovnc/metadata.xml
index 06bf263dec96..97cad453f15c 100644
--- a/net-misc/turbovnc/metadata.xml
+++ b/net-misc/turbovnc/metadata.xml
@@ -13,6 +13,10 @@
 		TurboVNC is a derivative of VNC (Virtual Network Computing) that is tuned to provide peak performance for 3D and video workloads.
 		By The VirtualGL Project.
 	</longdescription>
+	<use>
+		<flag name="client">Build the client (vncviewer)</flag>
+		<flag name="server">Build the server (vncserver, Xvnc)</flag>
+	</use>
 	<upstream>
 		<remote-id type="sourceforge">turbovnc</remote-id>
 		<remote-id type="github">TurboVNC/turbovnc</remote-id>
diff --git a/net-misc/turbovnc/turbovnc-2.2.7-r2.ebuild b/net-misc/turbovnc/turbovnc-2.2.7-r2.ebuild
deleted file mode 100644
index 1764dc4c265b..000000000000
--- a/net-misc/turbovnc/turbovnc-2.2.7-r2.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake desktop java-pkg-opt-2
-
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="gnutls +ssl"
-
-COMMON_DEPEND="
-	app-arch/bzip2
-	media-libs/freetype
-	>=media-libs/libjpeg-turbo-2.0.0:=[java?]
-	sys-libs/pam
-	sys-libs/zlib
-	virtual/opengl
-	x11-libs/libfontenc
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libXfont2
-	x11-libs/libxkbfile
-	x11-libs/pixman
-	java? (
-		>=virtual/jdk-1.8:*
-		x11-libs/libXi
-	)
-	ssl? (
-		!gnutls? ( dev-libs/openssl:= )
-		gnutls? ( net-libs/gnutls:= )
-	)
-	!net-misc/tigervnc
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	x11-apps/xkbcomp
-"
-DEPEND="
-	${COMMON_DEPEND}
-	x11-libs/xtrans
-"
-
-PATCHES=( "${FILESDIR}"/"${P}"-fix-musl-compilation.patch )
-
-src_prepare() {
-	use java && java-pkg-opt-2_src_prepare
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DTVNC_SYSTEMX11=ON
-		-DTVNC_SYSTEMLIBS=ON
-		-DTVNC_BUILDJAVA=$(usex java)
-		-DTVNC_BUILDNATIVE=$(usex java)
-		-DXKB_BIN_DIRECTORY=/usr/bin
-		-DXKB_DFLT_RULES=base
-		-DBUILDING_ON_MUSL=$(usex elibc_musl)	# bug #836723
-	)
-
-	if use ssl ; then
-		# We prefer OpenSSL, so default to that if SSL is enabled
-		if use gnutls ; then
-			mycmakeargs+=( -DTVNC_USETLS=GnuTLS )
-		else
-			# 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
-			)
-		fi
-	else
-		mycmakeargs+=( -DTVNC_USETLS=OFF )
-	fi
-
-	if use java ; then
-		export JAVACFLAGS="$(java-pkg_javac-args)"
-		export JNI_CFLAGS="$(java-pkg_get-jni-cflags)"
-
-		mycmakeargs+=(
-			-DTJPEG_JAR="${EPREFIX}/usr/share/java/turbojpeg.jar"
-			-DTJPEG_JNILIBRARY="${EPREFIX}/usr/$(get_libdir)/libturbojpeg.so"
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	if use java ; then
-		java-pkg_dojar "${BUILD_DIR}"/java/VncViewer.jar
-		make_desktop_entry vncviewer "TurboVNC Viewer" /usr/share/icons/hicolor/48x48/apps/${PN}.png
-
-		# turbovnc does not build this file, it merely copies it from media-libs/libjpeg-turbo
-		# so let's replace it by a symlink
-		rm "${ED}/"usr/share/turbovnc/classes/libturbojpeg.so || die
-		dosym -r "/usr/$(get_libdir)/libturbojpeg.so" /usr/share/turbovnc/classes/libturbojpeg.so
-	fi
-
-	# Don't install incompatible init script
-	rm -rf "${ED}"/etc/init.d/ || die
-	rm -rf "${ED}"/etc/sysconfig/ || die
-
-	find "${ED}"/usr/share/man/man1/ -name Xserver.1\* -delete || die
-
-	einstalldocs
-}
diff --git a/net-misc/turbovnc/turbovnc-3.0.1.ebuild b/net-misc/turbovnc/turbovnc-3.0.1.ebuild
deleted file mode 100644
index c8982a2ba230..000000000000
--- a/net-misc/turbovnc/turbovnc-3.0.1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake desktop java-pkg-opt-2
-
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+ssl"
-
-COMMON_DEPEND="
-	app-arch/bzip2
-	media-libs/freetype
-	>=media-libs/libjpeg-turbo-2.0.0:=[java?]
-	sys-libs/pam
-	sys-libs/zlib
-	virtual/opengl
-	x11-apps/xauth
-	x11-libs/libfontenc
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libXfont2
-	x11-libs/libxkbfile
-	x11-libs/pixman
-	x11-misc/xkeyboard-config
-	java? (
-		>=virtual/jdk-1.8:*
-		x11-libs/libXi
-		!net-misc/tigervnc
-	)
-	ssl? ( dev-libs/openssl:= )
-	!net-misc/tigervnc[server]
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	x11-apps/xkbcomp
-"
-DEPEND="
-	${COMMON_DEPEND}
-	x11-libs/xtrans
-"
-
-PATCHES=( "${FILESDIR}"/"${PN}"-3.0-fix-musl-compilation.patch )
-
-src_prepare() {
-	use java && java-pkg-opt-2_src_prepare
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DTVNC_SYSTEMX11=ON
-		-DTVNC_SYSTEMLIBS=ON
-		-DTVNC_BUILDVIEWER=$(usex java)
-		-DTVNC_BUILDHELPER=$(usex java)
-		-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
-
-	if use java ; 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 java ; 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
-
-	find "${ED}"/usr/share/man/man1/ -name Xserver.1\* -delete || die
-
-	einstalldocs
-}
diff --git a/net-misc/turbovnc/turbovnc-3.0.2.ebuild b/net-misc/turbovnc/turbovnc-3.0.2.ebuild
new file mode 100644
index 000000000000..3471a1f73bd5
--- /dev/null
+++ b/net-misc/turbovnc/turbovnc-3.0.2.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_OPT_USE=client
+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"
+IUSE="+server +ssl"
+REQUIRED_USE="|| ( client server )"
+
+COMMON_DEPEND="
+	x11-apps/xauth
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-misc/xkeyboard-config
+	client? (
+		media-libs/libjpeg-turbo:=[java]
+		x11-libs/libXi
+		!net-misc/tigervnc
+	)
+	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]
+	)
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	x11-apps/xkbcomp
+	client? ( >=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
+	client? ( >=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 )
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/vgl-turbovnc.asc
+
+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 client && java-pkg-opt-2_src_prepare
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DTVNC_BUILDVIEWER=$(usex client)
+		-DTVNC_BUILDHELPER=$(usex client)
+		-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 client ; 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 client ; 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
+}