gentoo resync : 04.01.2018

4 files changed, 6 insertions, 126 deletions

diff --git a/net-misc/ssvnc/Manifest b/net-misc/ssvnc/Manifest
index ad9b851df707..6479dd379a71 100644
--- a/net-misc/ssvnc/Manifest
+++ b/net-misc/ssvnc/Manifest
@@ -1,9 +1,6 @@
 AUX Makefile.libvncauth 140 BLAKE2B 84b119a944ffe6b126fd697d28f96f805a7c7b11311b4b93796694a98bf0f8e54d9e0b9822d675e2446be6082df9db7dc64c75c90dd87a452daf40daa5810ff4 SHA512 7d3a8833afc2169ab6440763680b24550fc16a0c60371e8b9ceb8eca48217638cc5e0beb9bff5d6c65fb81fe0bad77b6eb7b71c81195fa70b8879e45967852be
 AUX Makefile.vncviewer 295 BLAKE2B 6eee05699e3f14d54b8b7fcaecc6843d08d2fcdbd292be2bba2a76f838c398edad8f5a9b46a6621f8611913a712d945d94cdaaca3ee8dc21d2573ed957334fbd SHA512 1161a2612ab2d3a5e87efdf144baf84d0b90307f20c216cb7c49a6b13e0b8da4eb3aebc1db14192672d796cd92db6e7a6336611e07405b1fbbe2d2dcc5374625
-AUX ssvnc-1.0.27-build.patch 1393 BLAKE2B 0cc232fb07c039336c0b53f203e42b253f113d248d6abf7514d50c5ac2ff5c496e5ef27eb33e3e94c3c2d79eb20649e6521c6c0420d3ebd34f67520c0ce1ecf4 SHA512 2cc49d8c1e2c8db02f0bf680ac80f55595b606796e1501388649ca463b25d1a2a98bcc8646992f3f21c22ac775f7a8667951002ca03d40f3042ffb3c7c432f0e
 AUX ssvnc-1.0.29-build.patch 1087 BLAKE2B 9c568b53d1aee0875e65cbb919fcc0f7a986fe70d81028ed28bbb881ebbba91644cddae92bbc52d3c291d85cb07390b9f38bbb419b6b4e277e6a48850ea3421d SHA512 f0dbbf55f3c37aba66b8b26160e7447c413986bcf9676fcf744c1d53a63c3776a3c25f90a1ad5819f21ff3967151d5c7c44abb15b78898840bc45cb9c2ef5157
-DIST ssvnc-1.0.28.src.tar.gz 542796 BLAKE2B 121d78f18b0bb904b1aa15ccaa220beddabe500e77c9b483ba88b0d228f17a56174d83ca5746ecb4aeaef19e5efe87d47146d06e32f8abf196ae6c9a74a28b84 SHA512 8b86fc3ba971cae72878ba45a775b97b22c537c389d8ae3260e5d5657fe96c6ead51e3871bc8ff47bb5368d7e95c43250814be93508f0d403210b49c8393a712
 DIST ssvnc-1.0.29.src.tar.gz 552796 BLAKE2B 3bee980ef85c1a2769933ca0fec7ed7c76b4cbe107d3e0c81ee04fb6a5f4219cd625e948ed4a398b1db4b322498573c63e69f4d88612281b8cace239d1b65f5e SHA512 ea94f8114ee7e44d788ae698dd85ee8633f0dc8e9b86e17062c733e70b4f7c7c45bf68d0ea8d3e6156395777a41e3fbf63cc9425f45db6f6fda940ae2abcd092
-EBUILD ssvnc-1.0.28.ebuild 1376 BLAKE2B 623fb0d409c8a2a25c9a976bc08d1bcf7dfed6bb662c5687a8e9e47608c42c148b2e4bb9954a3cc2a94ad23c7ea89ddb670c2ede1e871010718cefdb3003f205 SHA512 e3eea930fbb50ad4131fe1a8f3458631553193580b4c91fddea5efce282197100b76ee49e73867d109b1c53eb68ee7da7d8b439d538f9ac5538751f64456e201
-EBUILD ssvnc-1.0.29-r1.ebuild 1417 BLAKE2B acde400a13e7e65f78c7c7b7351b626ffa85e0aecc6a342af776c29f8612fd3b5c96e8d07abe9d5287dd199c8013c8fc379239ba43568c0a530b877f47f1480a SHA512 d73fd40c2f1c7e6b20a0b7b963e8669c3dd29b1390fe5d770a75b2371d2a23b2cc0a0816f25d5820e19964862cc073b4002a3af2b8c53272a9cea32731cab891
+EBUILD ssvnc-1.0.29-r1.ebuild 1426 BLAKE2B b7a9e1a7230f85a7e29db82154309a68d2b819d964ba345ad51a4e40b8afe8bf6d66ac91b6ea4da962d458a52d6b6e7fe57e9ad9643f5849f3d4e82d36640811 SHA512 5b9240cebc7ea3b2ffd9fb42f54665de0d8aade0b855d95b8ef2b2faa798e0dbe470dbd37df760533abb6825d3fac69c39bd13a290aedd2d9c3b8f804b1b72b2
 MISC metadata.xml 242 BLAKE2B fccb5f5d9a500d3cb05aaee9df21a0ec0421e398c36915139fe871493632c7df070d222a5bc7d06b4451518baab1d0cbeb61ee2c8e909eb796d087ef7b627676 SHA512 ddf123246fb00abd46363ba180b90241b23577c60d7c001c2cbca9c3968dd240e98d8af00f63f3170fc7df9f824e7fd7957b3aafc780530a2c2fefbfd7e5faad
diff --git a/net-misc/ssvnc/files/ssvnc-1.0.27-build.patch b/net-misc/ssvnc/files/ssvnc-1.0.27-build.patch
deleted file mode 100644
index dc433ac2d145..000000000000
--- a/net-misc/ssvnc/files/ssvnc-1.0.27-build.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-https://sourceforge.net/tracker/?func=detail&aid=3031380&group_id=243486&atid=1122548
-
---- a/vnc_unixsrc/vncviewer/sockets.c
-+++ b/vnc_unixsrc/vncviewer/sockets.c
-@@ -32,6 +32,7 @@
- #include <netdb.h>
- #include <fcntl.h>
- #include <assert.h>
-+#include <ctype.h>
- #include <vncviewer.h>
- 
- #ifndef SOL_IPV6
---- a/Makefile
-+++ b/Makefile
-@@ -21,11 +21,11 @@
- 
- # N.B. ?= is gnu make specific.  Some of the subdir Makefiles are too. 
- #
--PREFIX  ?= /usr/local
--ROOT    ?=
-+PREFIX   = /usr
-+ROOT     = $(DESTDIR)
- BIN      = bin
- LIB      = lib/ssvnc
- MAN      = man
--MANDIR  ?= $(MAN)
-+MANDIR   = share/$(MAN)
- APPS    ?= share/applications
- BINNAME ?= ssvncviewer
-@@ -66,7 +66,6 @@
- 
- install: all
- 	mkdir -p $(ROOT)$(PREFIX)/$(BIN) $(ROOT)$(PREFIX)/$(LIB) $(ROOT)$(PREFIX)/$(MANDIR)/man1
--	strip $(VIEWER)
- 	cp -p $(VIEWER) $(ROOT)$(PREFIX)/$(LIB)
- 	cp -p $(VNCSPW) $(ROOT)$(PREFIX)/$(LIB)
- 	cp -p $(UNWRAP) $(ROOT)$(PREFIX)/$(LIB)
---- a/vncstorepw/Makefile
-+++ b/vncstorepw/Makefile
-@@ -14,7 +14,6 @@
- 
- $(CMD): vncauth.o vncstorepw.o d3des.o
- 	PATH=$$PATH:$(EPATH) $(CC) -o $(CMD) vncstorepw.o vncauth.o d3des.o
--	PATH=$$PATH:$(EPATH) strip $(CMD)
- 	@ls -l $(CMD)
- 
- $(UNWRAP): unwrap.c
-@@ -41,7 +40,6 @@
- 	else \
- 		PATH=$$PATH:$(EPATH) $(CC) -o $(ULTDSM) $(CPP_SSL) ultravnc_dsm_helper.c $(LD_SSL) -lcrypto; \
- 	fi
--	PATH=$$PATH:$(EPATH) strip $(ULTDSM)
- 	@ls -l $(ULTDSM)
- 
- test: $(CMD)
-
diff --git a/net-misc/ssvnc/ssvnc-1.0.28.ebuild b/net-misc/ssvnc/ssvnc-1.0.28.ebuild
deleted file mode 100644
index 3e9f88e5d8be..000000000000
--- a/net-misc/ssvnc/ssvnc-1.0.28.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="VNC viewer that adds encryption security to VNC connections"
-HOMEPAGE="http://www.karlrunge.com/x11vnc/ssvnc.html"
-SRC_URI="mirror://sourceforge/ssvnc/${P}.src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-linux"
-IUSE="java"
-
-RDEPEND="sys-libs/zlib
-	virtual/jpeg
-	dev-libs/openssl
-	dev-lang/tk
-	net-misc/stunnel
-	java? ( virtual/jre )
-	x11-terms/xterm
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXaw
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXmu
-	x11-libs/libXp
-	x11-libs/libXpm
-	x11-libs/libXt"
-DEPEND="${RDEPEND}
-	java? ( virtual/jdk )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.0.27-build.patch
-
-	sed -i \
-		-e "/^LIB/s:lib/:$(get_libdir)/:" \
-		-e "$(use java || echo '/^JSRC/s:=.*:=:')" \
-		Makefile
-	sed -i \
-		-e '/^CC/s:=.*:+= $(CFLAGS) $(CPPFLAGS) $(LDFLAGS):' \
-		vncstorepw/Makefile
-
-	cp "${FILESDIR}"/Makefile.libvncauth vnc_unixsrc/libvncauth/Makefile
-	cd "${S}"/vnc_unixsrc/vncviewer
-	sed -n '/^SRCS/,/^$/p' Imakefile > Makefile.in
-	cp "${FILESDIR}"/Makefile.vncviewer Makefile
-}
-
-src_compile() {
-	tc-export AR CC CXX RANLIB
-	emake all || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install || \
-		die "make install failed"
-	dodoc README
-}
diff --git a/net-misc/ssvnc/ssvnc-1.0.29-r1.ebuild b/net-misc/ssvnc/ssvnc-1.0.29-r1.ebuild
index d0524154cc1c..f31d0f32cd6f 100644
--- a/net-misc/ssvnc/ssvnc-1.0.29-r1.ebuild
+++ b/net-misc/ssvnc/ssvnc-1.0.29-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,11 +15,11 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="java"
 
 RDEPEND="sys-libs/zlib
-	virtual/jpeg
-	dev-libs/openssl
-	dev-lang/tk
+	virtual/jpeg:0
+	dev-libs/openssl:0=
+	dev-lang/tk:0
 	net-misc/stunnel
-	java? ( virtual/jre )
+	java? ( virtual/jre:* )
 	x11-terms/xterm
 	x11-libs/libICE
 	x11-libs/libSM