[gentoo-commits] repo/gentoo:master commit in: net-misc/ssvnc/, net-misc/ssvnc/files/

[gentoo-commits] repo/gentoo:master commit in: net-misc/ssvnc/, net-misc/ssvnc/files/

[David Seifert]

commit:     67ec2e50c913b1c2b4fb80ed9b9854e7a45dcfc9
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  3 18:37:51 2018 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Jan  3 18:37:51 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67ec2e50

net-misc/ssvnc: Remove old

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 net-misc/ssvnc/Manifest                       |  1 -
 net-misc/ssvnc/files/ssvnc-1.0.27-build.patch | 56 ------------------------
 net-misc/ssvnc/ssvnc-1.0.28.ebuild            | 61 ---------------------------
 3 files changed, 118 deletions(-)

diff --git a/net-misc/ssvnc/Manifest b/net-misc/ssvnc/Manifest
index 7b99e95d1d3..1d3c1401a0c 100644
--- a/net-misc/ssvnc/Manifest
+++ b/net-misc/ssvnc/Manifest
@@ -1,2 +1 @@
-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

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 dc433ac2d14..00000000000
--- 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 3e9f88e5d8b..00000000000
--- 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
-}

[gentoo-commits] repo/gentoo:master commit in: net-misc/ssvnc/, net-misc/ssvnc/files/

[Ulrich Müller]

commit:     a01f661ac006818d8ee6dd4283df6a850ee1f3a4
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  1 11:55:01 2018 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Apr  1 11:59:16 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a01f661a

net-misc/ssvnc: Drop unnecessary X libraries.

Straight to stable, because only dependencies are affected,
but installed files do not change.

Closes: https://bugs.gentoo.org/649130
Package-Manager: Portage-2.3.27, Repoman-2.3.9

 net-misc/ssvnc/files/Makefile.vncviewer                           | 2 +-
 net-misc/ssvnc/{ssvnc-1.0.29-r1.ebuild => ssvnc-1.0.29-r2.ebuild} | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/net-misc/ssvnc/files/Makefile.vncviewer b/net-misc/ssvnc/files/Makefile.vncviewer
index 60879b9461a..4b6e745c697 100644
--- a/net-misc/ssvnc/files/Makefile.vncviewer
+++ b/net-misc/ssvnc/files/Makefile.vncviewer
@@ -1,6 +1,6 @@
 CFLAGS += -fno-strength-reduce -fno-strict-aliasing
 CPPFLAGS += -I. -I../include -D_GNU_SOURCE -DMITSHM
-LDLIBS += ../libvncauth/libvncauth.a -lz -ljpeg -lXaw -lXmu -lXt -lSM -lICE -lXpm -lXp -lXext -lX11
+LDLIBS += ../libvncauth/libvncauth.a -lz -ljpeg -lXaw -lXmu -lXt -lXext -lX11
 include Makefile.in
 all: vncviewer
 vncviewer: $(SRCS:.c=.o)

diff --git a/net-misc/ssvnc/ssvnc-1.0.29-r1.ebuild b/net-misc/ssvnc/ssvnc-1.0.29-r2.ebuild
similarity index 95%
rename from net-misc/ssvnc/ssvnc-1.0.29-r1.ebuild
rename to net-misc/ssvnc/ssvnc-1.0.29-r2.ebuild
index 7cd986affb1..91bb7ba5799 100644
--- a/net-misc/ssvnc/ssvnc-1.0.29-r1.ebuild
+++ b/net-misc/ssvnc/ssvnc-1.0.29-r2.ebuild
@@ -21,14 +21,10 @@ RDEPEND="sys-libs/zlib
 	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 )"