gentoo resync : 11.07.2019

4 files changed, 123 insertions, 13 deletions

diff --git a/net-libs/libvncserver/Manifest b/net-libs/libvncserver/Manifest
index 76d284c09ab8..c2d9a719661f 100644
--- a/net-libs/libvncserver/Manifest
+++ b/net-libs/libvncserver/Manifest
@@ -1,6 +1,8 @@
 AUX libvncserver-0.9.12-cmake-libdir.patch 669 BLAKE2B 1906637be7180a884aa3daf8e6c670181a639a9646488830e3e84cf71ed927e656f51edd097145fac9c554d2f8af796300906ade5c3a5d910a49c4c486a8475f SHA512 e6833922d39ad13484a3ae96eb2ee5cda3ce52d41e0a0ea88281221f5378e7effa8f0a8eaac593e111e8e0b64de0f458d17df496fbdf124f2fbca2806f52012c
+AUX libvncserver-0.9.12-libgcrypt.patch 1526 BLAKE2B 83e042ff875844cced2cb1416477c9fa255f84e6cc40b9d1d5e7dfa3e2467effb3481155b5eeeb29835cf29c0a6aa0ed381862fc184e4070b149b3a1bfc84c9e SHA512 2b2aba010104b2206eab7bec1bc6a258edb28d43da2a376d03e063d9d5e7236d690388da8ccd501b22d3181b966d2b6ee1e6752153c1ff78ab498a59355fb385
 DIST LibVNCServer-0.9.11.tar.gz 1413739 BLAKE2B e295d3aef7181cd767676c4e55130fa65ecf8ea92a659b6de82d2cc465f1c9e1a587839942fd89882126dc8ec54f9de20a78e799ea194f9ae227a82ae705721b SHA512 e473c081b68dd3cdd96a1756b4f4945ece79d3c8e4cef62140be1699671555fc16d3080e81d764197a14ea83203ffcd0e18c3cc182e012d036e3faae943003fb
 DIST LibVNCServer-0.9.12.tar.gz 2237447 BLAKE2B 583500c0bcfb6e9e3a02a33fb2701113b164851f0906fcc4845de7c7d82d4f7f65f5edd6c9a672348ee1deeefc65c1b0a257da024254598ba86d121d424f027e SHA512 60ff1cc93a937d6f8f97449bc58b763095846207112f7b1b3c43eb2d74448b595d6da949903a764bd484ee54e38ff6277e882adbe965dd6d26ba15ef6ff6fcb8
 EBUILD libvncserver-0.9.11-r1.ebuild 1921 BLAKE2B e324d043474b5575867592f07106ef8c6054004aed2dd46a1ac433962538b0203da3315a1025490de760960d58102935fd925ef77287af597ac18b363590c5c2 SHA512 33159e0e940be618bc4267e62f34555cc48726fab8db08097568e911f3fa5efdb1391ad0ee054e92db785811368943a601ce6434456177a0258c044431c9eaab
+EBUILD libvncserver-0.9.12-r1.ebuild 2027 BLAKE2B 238b31dbf02fd2f1b9b6871ecbbab679cc9410746ffd9d129ba3bc7c482ebc88ef980c2062164447f588191cd19934e5fea7063c9e2cfedc21d98b36023e2282 SHA512 adbb73e67c4e47349a566d2b62754a024aab1dbf5772047f2643437835184ae9709405a9d985a3d84623b01a8b941ac2e45f278a4e1ccf9ce8e1b8ad827d9965
 EBUILD libvncserver-0.9.12.ebuild 2110 BLAKE2B 970c3a5794a09ed58a814c5455028a38e1ebc022412a86c8198d3a40fcc39ec9d6db5d634af6ceb524dd35f280d216262b3d5dc7e7123637987af13b621d57be SHA512 9bb50f1bbc8565547ece02c7fb2d5e62c967932045d39783e64eae5b221592af88b5c566e368e5e1346b5e7086f20b0b791a35a3e2cef9bb91ccf715c7cd03ad
-MISC metadata.xml 886 BLAKE2B eb2d3707e1c536735a10b97c885e8787d1039449cce85e93e4ad485bcc92ca786a538aa10cce2888657cb2764c5793c6d86516b5dfe16970ce54e23803c569f1 SHA512 40d57c413847589b5e3b4c4edd7743bcc3461624abe129c7cc558178e1af8ee7585c3a1edb776c884a2d8b33b99bf9d67e4e6fa44c774692e66b2bab074fe06e
+MISC metadata.xml 994 BLAKE2B 3c12097d08f89fadac86ad92efccccbb533c1ac018cf426aae4a45bbea33ae227dfaec320a7710eabff7da96d22229997dee72b2c84b1aedc575e21e0a5decff SHA512 0ca13849ab948490b862838bf3c2b87cb97ce1739369d23426e518197a786cf24fc79967c01072b710d37c298c792c45e61a55e558d692087800e834f93003e2
diff --git a/net-libs/libvncserver/files/libvncserver-0.9.12-libgcrypt.patch b/net-libs/libvncserver/files/libvncserver-0.9.12-libgcrypt.patch
new file mode 100644
index 000000000000..a0313562ff1b
--- /dev/null
+++ b/net-libs/libvncserver/files/libvncserver-0.9.12-libgcrypt.patch
@@ -0,0 +1,40 @@
+From 57be637006a95091119f7a49b4232e461116520f Mon Sep 17 00:00:00 2001
+From: Alexander Tsoy <alexander@tsoy.me>
+Date: Sat, 25 May 2019 02:02:47 +0300
+Subject: [PATCH] crypto: rfbcrypto_gnutls is actually libgcrypt-based
+
+Long time ago gnutls used libgcrypt as a cryptographic backend. Perhaps
+that was what caused the confusion.
+---
+ CMakeLists.txt                                       | 9 ++++-----
+ common/{rfbcrypto_gnutls.c => rfbcrypto_libgcrypt.c} | 0
+ 2 files changed, 4 insertions(+), 5 deletions(-)
+ rename common/{rfbcrypto_gnutls.c => rfbcrypto_libgcrypt.c} (100%)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b9ca4ba..0d3b4dc 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -226,11 +226,10 @@ if(SYSTEMD_FOUND)
+ endif(SYSTEMD_FOUND)
+ 
+ if(LIBVNCSERVER_HAVE_SYS_UIO_H)
+-  if(GNUTLS_FOUND)
+-    message(STATUS "Building crypto with GnuTLS")
+-    set(CRYPTO_LIBRARIES ${GNUTLS_LIBRARIES})
+-    set(CRYPTO_SOURCES ${COMMON_DIR}/rfbcrypto_gnutls)
+-    include_directories(${GNUTLS_INCLUDE_DIR})
++  if(WITH_GCRYPT AND LIBGCRYPT_LIBRARIES)
++    message(STATUS "Building crypto with Libgcrypt")
++    set(CRYPTO_LIBRARIES ${LIBGCRYPT_LIBRARIES})
++    set(CRYPTO_SOURCES ${COMMON_DIR}/rfbcrypto_libgcrypt)
+   elseif(OPENSSL_FOUND)
+     message(STATUS "Building crypto with OpenSSL")
+     set(CRYPTO_LIBRARIES ${OPENSSL_LIBRARIES})
+diff --git a/common/rfbcrypto_gnutls.c b/common/rfbcrypto_libgcrypt.c
+similarity index 100%
+rename from common/rfbcrypto_gnutls.c
+rename to common/rfbcrypto_libgcrypt.c
+-- 
+2.21.0
+
diff --git a/net-libs/libvncserver/libvncserver-0.9.12-r1.ebuild b/net-libs/libvncserver/libvncserver-0.9.12-r1.ebuild
new file mode 100644
index 000000000000..c2be55523f66
--- /dev/null
+++ b/net-libs/libvncserver/libvncserver-0.9.12-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+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"
+
+# libvncserver/tightvnc-filetransfer/*: GPL-2, but we don't build it
+# common/d3des.*: https://github.com/LibVNC/libvncserver/issues/88
+LICENSE="GPL-2+ LGPL-2.1+ BSD MIT"
+# no sub slot wanted (yet), see #578958
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="+24bpp gcrypt gnutls ipv6 +jpeg libressl lzo +png sasl ssl systemd +threads +zlib"
+# https://bugs.gentoo.org/435326
+# https://bugs.gentoo.org/550916
+REQUIRED_USE="ssl? ( !gnutls? ( threads ) ) png? ( zlib )"
+
+DEPEND="
+	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0= )
+	ssl? (
+		!gnutls? (
+			!libressl? ( >=dev-libs/openssl-1.0.2:0= )
+			libressl? ( >=dev-libs/libressl-2.7.0:0= )
+		)
+		gnutls? ( >=net-libs/gnutls-2.12.23-r6:0= )
+	)
+	jpeg? ( >=virtual/jpeg-0-r2:0 )
+	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}"
+
+S="${WORKDIR}/${PN}-${MY_P}"
+
+DOCS=( AUTHORS ChangeLog NEWS README.md TODO )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-cmake-libdir.patch
+	"${FILESDIR}"/${P}-libgcrypt.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_ZLIB=$(usex zlib ON OFF)
+		-DWITH_LZO=$(usex lzo ON OFF)
+		-DWITH_JPEG=$(usex jpeg ON OFF)
+		-DWITH_PNG=$(usex png ON OFF)
+		-DWITH_THREADS=$(usex threads ON OFF)
+		-DWITH_GNUTLS=$(usex gnutls $(usex ssl ON OFF) OFF)
+		-DWITH_OPENSSL=$(usex gnutls OFF $(usex ssl ON OFF))
+		-DWITH_GCRYPT=$(usex gcrypt ON OFF)
+		-DWITH_SYSTEMD=$(usex systemd ON OFF)
+		-DWITH_FFMPEG=OFF
+		-DWITH_24BPP=$(usex 24bpp ON OFF)
+		-DWITH_IPv6=$(usex ipv6 ON OFF)
+		-DWITH_SASL=$(usex sasl ON OFF)
+	)
+	cmake-utils_src_configure
+}
diff --git a/net-libs/libvncserver/metadata.xml b/net-libs/libvncserver/metadata.xml
index d495570cbb38..3d5cd2b505d6 100644
--- a/net-libs/libvncserver/metadata.xml
+++ b/net-libs/libvncserver/metadata.xml
@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>alexander@tsoy.me</email>
+		<name>Alexander Tsoy</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
-If you don't know VNC, have a look at the original VNC or at Tridia 
-VNC, who also have commercial support for it.
-
-Now that you know what it is, maybe you want to make your own server. If 
-this is not the case, you can ignore the rest of this page an go on 
-surfing the internet.
-
-Now that you want to make a VNC server, that is, a server which speaks 
-the RFB protocol, you can download this library from sourceforge.
+		LibVNCServer/LibVNCClient are cross-platform C libraries that allow you
+		to easily implement VNC server or client functionality in your program.
 	</longdescription>
 	<use>
-		<flag name="24bpp">enable 24bpp support</flag>
-		<flag name="gcrypt">enable support for gcrypt</flag>
+		<flag name="24bpp">Enable 24bpp support</flag>
+		<flag name="gcrypt">Enable support for additional authentication methods via <pkg>dev-libs/libgcrypt</pkg></flag>
+		<flag name="lzo">Enable LZO support via <pkg>dev-libs/lzo</pkg> instead of using internal miniLZO implementation</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">LibVNC/libvncserver</remote-id>