gentoo auto-resync : 20:01:2024 - 20:08:51

4 files changed, 6 insertions, 93 deletions

diff --git a/net-libs/libvncserver/Manifest b/net-libs/libvncserver/Manifest
index afd409e5dd1f..42823acb4996 100644
--- a/net-libs/libvncserver/Manifest
+++ b/net-libs/libvncserver/Manifest
@@ -1,5 +1,4 @@
 AUX libvncserver-0.9.14-crypto-openssl-fix.patch 2043 BLAKE2B 7db58e983c1f7c633b883c385821272c2c0d32b786ec002df5a53bc18981de15b87d5be92ed246f219dc198fc9851b15823e2cb60e5c0b39f9572a4a6a3f0a38 SHA512 77838751bdb98c4de8351d6f10552dd646f929b8653ebee3b22b1ff86c80fb7b2f2434fbd4eba53c84be8af8eed220f2a7a115132a9823673d244da06a312eac
 DIST LibVNCServer-0.9.14.tar.gz 593516 BLAKE2B 6585e15e2ade08211ace0ae40deb07eca04b96dcfe38fb4d2e7d7a7192ca22dda546cb69fc4be6c6b7eb83c8afb0ea14d7cee3779a9e64c138ec861efeb540b8 SHA512 8a0a58e355154cbe1e5807864dc874b063c5e5f5e20d64ae541d49d51b654a35ca9c625adc5c303b6570fa79c19f82d87a37612f9801b453ccf862bd77c06fcc
-EBUILD libvncserver-0.9.14-r1.ebuild 2221 BLAKE2B 462f28e396e39954acbaf408d8e36edb87127fb55e171e6517b1b4a234a903c172db406b3e6e656ed7ed749ff0e640c1477baaafd6565e8ef59c4e6adf99fe70 SHA512 3a2a12d315b38f196637f7c8074d5cda15b3bfdc68e91844bc1c77c21f2f6234be119895a38986cc78b481cfbde1125043d3dde4b99b3729ecf7f61384c40493
-EBUILD libvncserver-0.9.14.ebuild 2163 BLAKE2B fcb5f1ab392c4e42c5f45e0cbba88757661dadb985e15b9530f18a4fb4ffe7b63e402f7f99c171d202ca374170ab6dbda0e556cd127a1dbf63a429b99800715b SHA512 ab361e3be84763c93bfdbe5b5b4c11d65f336bdee0a66e5ee1314a1cedd99b4b29d372bfdbd62bd08af71c0debf1957907a44cde74d98b6e86456d32136b230f
-MISC metadata.xml 1149 BLAKE2B 91ca3ad3a0f647ecbad62abd8dc85b9bc84552aa1c1b146755c3bcd80c1b8e4012417e51975c7fe67ff823369aba376b298a84ed77890bdef519c71f732210df SHA512 762998a11694a96086b1ab6e0c7a6896f595660ba5f07cfac9642938cf2d80d341577ba9f6a54f2b86dd54623551e38269fdc842354a9b586998a106361e9c06
+EBUILD libvncserver-0.9.14-r2.ebuild 2015 BLAKE2B 8a3581ec5883754e24cb4866eba4030a4824283fc3f88edd0f18ed0d86e8193c5d8d4bed5a0181ea483462a12e53e9be782f567f82e14d0d45a13c2c079f94b4 SHA512 8a07ae2f5bfead35dc9c27852866a13e2d5817663053047fd00211a6fdc715d53197286f9cbc90d9867cf777320e94ea13e90df1b22e19728ad5182b717d2c94
+MISC metadata.xml 1068 BLAKE2B 66b23e21aa1f000b4637818f6a3a9fadcba112f2162e8a57a61339253639147fc47f341e6992523f3ce4bb63025b02326849c6c75076f1b10f3b0ab3aae4b310 SHA512 92d8a97784c0feff36f1401b0856b3f2c53dc4d191ad93df042d68e2876479337c54d93c75dda0c8eedd203f20d11f18e9e8e42030a0f5b5a6a90ed2cdf00edb
diff --git a/net-libs/libvncserver/libvncserver-0.9.14-r1.ebuild b/net-libs/libvncserver/libvncserver-0.9.14-r2.ebuild
index 94af0ee8711e..02c596ac0d4b 100644
--- a/net-libs/libvncserver/libvncserver-0.9.14-r1.ebuild
+++ b/net-libs/libvncserver/libvncserver-0.9.14-r2.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-2 GPL-2+ LGPL-2.1+ BSD MIT"
 # no sub slot wanted (yet), see #578958
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="+24bpp +filetransfer +gcrypt gnutls ipv6 +jpeg lzo +png sasl ssl systemd +threads +zlib"
+IUSE="+24bpp +filetransfer gnutls ipv6 +jpeg lzo +png sasl ssl systemd +threads +zlib"
 # https://bugs.gentoo.org/690202
 # https://bugs.gentoo.org/435326
 # https://bugs.gentoo.org/550916
@@ -27,19 +27,11 @@ REQUIRED_USE="
 	png? ( zlib )
 	ssl? ( !gnutls? ( threads ) )
 "
-# Avoid using internal crypto backend as it doesn't support
-# all authentication methods #893608
-REQUIRED_USE+="
-	ssl? ( gnutls? ( gcrypt ) )
-	!ssl? ( gcrypt )
-"
 
 DEPEND="
-	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0= )
+	>=dev-libs/libgcrypt-1.5.3:0=
 	ssl? (
-		!gnutls? (
-			>=dev-libs/openssl-1.0.2:0=
-		)
+		!gnutls? ( >=dev-libs/openssl-1.0.2:0= )
 		gnutls? ( >=net-libs/gnutls-2.12.23-r6:0= )
 	)
 	jpeg? ( media-libs/libjpeg-turbo:= )
@@ -63,9 +55,9 @@ src_configure() {
 		-DWITH_FFMPEG=OFF
 		-DWITH_GTK=OFF
 		-DWITH_SDL=OFF
+		-DWITH_GCRYPT=ON
 		-DWITH_24BPP=$(usex 24bpp ON OFF)
 		-DWITH_TIGHTVNC_FILETRANSFER=$(usex filetransfer ON OFF)
-		-DWITH_GCRYPT=$(usex gcrypt ON OFF)
 		-DWITH_GNUTLS=$(usex gnutls $(usex ssl ON OFF) OFF)
 		-DWITH_IPv6=$(usex ipv6 ON OFF)
 		-DWITH_JPEG=$(usex jpeg ON OFF)
diff --git a/net-libs/libvncserver/libvncserver-0.9.14.ebuild b/net-libs/libvncserver/libvncserver-0.9.14.ebuild
deleted file mode 100644
index bc1c292d70e9..000000000000
--- a/net-libs/libvncserver/libvncserver-0.9.14.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-MY_P="LibVNCServer-${PV}"
-
-DESCRIPTION="library for creating vnc servers"
-HOMEPAGE="https://libvnc.github.io/"
-SRC_URI="https://github.com/LibVNC/${PN}/archive/${MY_P}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_P}"
-
-# common/d3des.*: https://github.com/LibVNC/libvncserver/issues/88
-LICENSE="GPL-2 GPL-2+ LGPL-2.1+ BSD MIT"
-# no sub slot wanted (yet), see #578958
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="+24bpp +filetransfer +gcrypt gnutls ipv6 +jpeg lzo +png sasl ssl systemd +threads +zlib"
-# https://bugs.gentoo.org/690202
-# https://bugs.gentoo.org/435326
-# https://bugs.gentoo.org/550916
-REQUIRED_USE="
-	filetransfer? ( threads )
-	jpeg? ( zlib )
-	png? ( zlib )
-	ssl? ( !gnutls? ( threads ) )
-"
-# Avoid using internal crypto backend as it doesn't support
-# all authentication methods #893608
-REQUIRED_USE+="
-	ssl? ( gnutls? ( gcrypt ) )
-	!ssl? ( gcrypt )
-"
-
-DEPEND="
-	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0= )
-	ssl? (
-		!gnutls? (
-			>=dev-libs/openssl-1.0.2:0=
-		)
-		gnutls? ( >=net-libs/gnutls-2.12.23-r6:0= )
-	)
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	lzo? ( dev-libs/lzo )
-	png? ( >=media-libs/libpng-1.6.10:0= )
-	sasl? ( dev-libs/cyrus-sasl )
-	systemd? ( sys-apps/systemd:= )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1:0= )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS ChangeLog NEWS.md README.md )
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_EXAMPLES=OFF
-		-DWITH_FFMPEG=OFF
-		-DWITH_GTK=OFF
-		-DWITH_SDL=OFF
-		-DWITH_24BPP=$(usex 24bpp ON OFF)
-		-DWITH_TIGHTVNC_FILETRANSFER=$(usex filetransfer ON OFF)
-		-DWITH_GCRYPT=$(usex gcrypt ON OFF)
-		-DWITH_GNUTLS=$(usex gnutls $(usex ssl ON OFF) OFF)
-		-DWITH_IPv6=$(usex ipv6 ON OFF)
-		-DWITH_JPEG=$(usex jpeg ON OFF)
-		-DWITH_LZO=$(usex lzo ON OFF)
-		-DWITH_OPENSSL=$(usex gnutls OFF $(usex ssl ON OFF))
-		-DWITH_PNG=$(usex png ON OFF)
-		-DWITH_SASL=$(usex sasl ON OFF)
-		-DWITH_SYSTEMD=$(usex systemd ON OFF)
-		-DWITH_THREADS=$(usex threads ON OFF)
-		-DWITH_ZLIB=$(usex zlib ON OFF)
-	)
-	cmake_src_configure
-}
diff --git a/net-libs/libvncserver/metadata.xml b/net-libs/libvncserver/metadata.xml
index b5e676acd4cb..74e3157eae46 100644
--- a/net-libs/libvncserver/metadata.xml
+++ b/net-libs/libvncserver/metadata.xml
@@ -16,7 +16,6 @@
 	<use>
 		<flag name="24bpp">Enable 24bpp support</flag>
 		<flag name="filetransfer">Enable support for TightVNC's file transfer protocol</flag>
-		<flag name="gcrypt">Use <pkg>dev-libs/libgcrypt</pkg> as crypto backend</flag>
 		<flag name="lzo">Enable LZO support via <pkg>dev-libs/lzo</pkg> instead of using internal miniLZO implementation</flag>
 	</use>
 	<upstream>