Version bump and avoid imake #289407 by Dmitri Pogosian.

Package-Manager: portage-2.2_rc54/cvs/Linux x86_64

7 files changed, 191 insertions, 6 deletions

diff --git a/net-misc/ssvnc/ChangeLog b/net-misc/ssvnc/ChangeLog
index 6c1ce24ccd06..841abbbee928 100644
--- a/net-misc/ssvnc/ChangeLog
+++ b/net-misc/ssvnc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/ssvnc
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ssvnc/ChangeLog,v 1.5 2009/06/29 20:55:26 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ssvnc/ChangeLog,v 1.6 2009/12/04 08:19:54 vapier Exp $
+
+*ssvnc-1.0.24 (04 Dec 2009)
+
+  04 Dec 2009; Mike Frysinger <vapier@gentoo.org> +ssvnc-1.0.24.ebuild,
+  +files/ssvnc-1.0.24-build.patch, +files/ssvnc-1.0.24-optional-java.patch,
+  +files/Makefile.libvncauth, +files/Makefile.vncviewer:
+  Version bump and avoid imake #289407 by Dmitri Pogosian.
 
   29 Jun 2009; Markus Meier <maekke@gentoo.org> ssvnc-1.0.22.ebuild:
   amd64/x86 stable, bug #274986
diff --git a/net-misc/ssvnc/Manifest b/net-misc/ssvnc/Manifest
index 3d4174b41b22..e81b467f701b 100644
--- a/net-misc/ssvnc/Manifest
+++ b/net-misc/ssvnc/Manifest
@@ -1,18 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX Makefile.libvncauth 119 RMD160 2322c42b23d5f94e77e2beead9f08b5c36ad8254 SHA1 ed4995b68a15a2aff0311241d432cd2b0a35c7c4 SHA256 9529203c1c941410d15610596c7b97ecc1b20d56ed9098ce849fec595497040f
+AUX Makefile.vncviewer 168 RMD160 58be50b5db9fc2edfdb2b339d8a576834dafa050 SHA1 14562f61d6881a774fcf1040fe71440b4deba783 SHA256 f81f695b80cd4dca53c8e7d89b2de7e65471bc7b7d2a3b2bba9d3f2ea53dc9a5
 AUX ssvnc-1.0.22-build.patch 1443 RMD160 9f48706464c98ea132fe726ada854d5b743fb0d4 SHA1 0e56db69cd3d6c177117642cd5806ead33b4b356 SHA256 a6b9838db90c5175c666467c68f73bdb74b36b5ae2b0b7f04bcc43d1beb37765
 AUX ssvnc-1.0.22-optional-java.patch 797 RMD160 197377cac2ccc3fa38b2dcf608429e3be553ed36 SHA1 76a2d9de65686d0b9f1f7460d623d0de0c502f41 SHA256 410f3dfaffe34066167a3b48a1ae06f131a7d3a82fc6d7924df76c1443a1f708
+AUX ssvnc-1.0.24-build.patch 1443 RMD160 c4ae80f7cde0977804604c036d77b30f6ee48589 SHA1 912003cdb846c3fc602d769cde8abea67d5fcdf4 SHA256 dea4b09bc6331e6fb7d00171cb85e2aa67626d27e7d89805e90886162d2d2c60
+AUX ssvnc-1.0.24-optional-java.patch 1003 RMD160 851e6f343991466d2d00174022b9436fbdb9908a SHA1 c2c8ca674be87951afa80c6ddb3ee4c359e22b39 SHA256 842f5b1cb89adcebaaeb22dca839a054dc497575663e55c9a31512fdfc369827
 DIST ssvnc-1.0.22.src.tar.gz 453665 RMD160 4e367d9662add8630029772edd392dd34de23e6a SHA1 4cf77c3110ac730abd59f2c2b8461c8f9eb1c1fa SHA256 a758ad5f4584f2b7aa170fbae5a99849bbc97ef0500b1ecb7445dcbd01d736d9
 DIST ssvnc-1.0.23.src.tar.gz 483158 RMD160 4979254a45748fb4c8f7f47ec906566599fab1f3 SHA1 70e2a99502bc4f8c7e9bafb8a685e2d36a746a58 SHA256 d28638ca02bfbcb5b31788d292fa7640ae11e673ed024baea7f7d80f13adc7df
+DIST ssvnc-1.0.24.src.tar.gz 498389 RMD160 792edead091391244a744cbb27f72a4d9c6952d1 SHA1 97a807eedef4556e51df9b9a4a116d98deb414c5 SHA256 25b66f7e9a7738628f014e3f0a136a561306d019470bf8cee094a62382239eba
 EBUILD ssvnc-1.0.22.ebuild 1292 RMD160 e3f1b4d4036d16db68988f3318fb03374adfcbb2 SHA1 605eef51df2267d597a283d800ab9f5c7f81fa0f SHA256 54f5bf9cb18eb99583856807ccfafeb5e826eeba025c9af9bcd73e88d309e40a
 EBUILD ssvnc-1.0.23.ebuild 1310 RMD160 d179e29cacf09395f5154d6d89317225af32f905 SHA1 618fd3442d872ab197ee0f078c9606c2bd7ccc07 SHA256 c4e2539f49679142c7ac89da8bf289b8843c96ff8e089ecb532707107b92f0e1
-MISC ChangeLog 756 RMD160 5f0f24be4a10f41bc0708460d3daddb5f41c1bc8 SHA1 1786670f84ba5f5bca4064d3eba852dff0ff0268 SHA256 555dc4ce58216e8dd6d83e45618fd2cab983c231bb435dc0c54896ac2e075476
+EBUILD ssvnc-1.0.24.ebuild 1469 RMD160 d5eedf873e037f280baffa942e0b5c608b2acc91 SHA1 e8094c030e1e8a73a4ca0e85aaeba3e6d37b4224 SHA256 b0c9bffea9078db8e9160301d845cf5ff134e84d50d808b8d45d870ec6506408
+MISC ChangeLog 1050 RMD160 918713d3346f62d5c1a7d07d299b2f76807a9188 SHA1 8579150ac318b9cc472d8efba27e462e37732dd9 SHA256 23eec5d3469766aaee915f0cb7234dd8608c53b46b9031f0171de2a018557694
 MISC metadata.xml 221 RMD160 2699c0059639536eb7befa077a27e437569a26ba SHA1 4bef3741184af2e2d984fec094cd0ab39ae2e624 SHA256 1d72b91d3ef79fdff0049c23a645d8595a5fb72ea7e5d5b6fa43cfc18e9a4627
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAkpJKl4ACgkQkKaRLQcq0GLVwQCeII5ylKiSDI6a749qQLFLeYc0
-QxMAoIeJT5VXXGID8/5LdhdBnBmv/JA6
-=gG7K
+iEYEARECAAYFAksYx2YACgkQlPl3HsVfCDouRACfYeiWI8hMpE19Xejhd496kvfF
+cj0An37GFW7OeDb39yO6F2RDuH+kmSWv
+=ad/x
 -----END PGP SIGNATURE-----
diff --git a/net-misc/ssvnc/files/Makefile.libvncauth b/net-misc/ssvnc/files/Makefile.libvncauth
new file mode 100644
index 000000000000..09406d6fe386
--- /dev/null
+++ b/net-misc/ssvnc/files/Makefile.libvncauth
@@ -0,0 +1,5 @@
+AR ?= ar
+CPPFLAGS += -I. -I../include -D_GNU_SOURCE
+srcs = $(wildcard *.c)
+libvncauth.a: $(srcs:.c=.o)
+	$(AR) rc $@ $^
diff --git a/net-misc/ssvnc/files/Makefile.vncviewer b/net-misc/ssvnc/files/Makefile.vncviewer
new file mode 100644
index 000000000000..46b4a8b6e269
--- /dev/null
+++ b/net-misc/ssvnc/files/Makefile.vncviewer
@@ -0,0 +1,5 @@
+CPPFLAGS += -I. -I../include -D_GNU_SOURCE
+LDLIBS += ../libvncauth/libvncauth.a -lz -ljpeg -lX11 -lXt -lXaw
+include Makefile.in
+all: vncviewer
+vncviewer: $(SRCS:.c=.o)
diff --git a/net-misc/ssvnc/files/ssvnc-1.0.24-build.patch b/net-misc/ssvnc/files/ssvnc-1.0.24-build.patch
new file mode 100644
index 000000000000..8988c2f5b12a
--- /dev/null
+++ b/net-misc/ssvnc/files/ssvnc-1.0.24-build.patch
@@ -0,0 +1,61 @@
+--- a/vncstorepw/vncauth.c
++++ b/vncstorepw/vncauth.c
+@@ -1,5 +1,6 @@
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include <sys/stat.h>
+ #include "d3des.h"
+ #if 0
+--- a/vncstorepw/vncstorepw.c
++++ b/vncstorepw/vncstorepw.c
+@@ -1,4 +1,5 @@
+ #include <stdio.h>
++#include <stdlib.h>
+ 
+ extern int rfbEncryptAndStorePasswd(char *, char*);
+ 
+--- 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/files/ssvnc-1.0.24-optional-java.patch b/net-misc/ssvnc/files/ssvnc-1.0.24-optional-java.patch
new file mode 100644
index 000000000000..44fddcfe6cdd
--- /dev/null
+++ b/net-misc/ssvnc/files/ssvnc-1.0.24-optional-java.patch
@@ -0,0 +1,41 @@
+--- a/Makefile
++++ b/Makefile
+@@ -44,8 +44,10 @@
+ 
+ config:
+ 	sh -c 'type xmkmf'
++ifneq ($(JSRC),)
+ 	sh -c 'type javac'
+ 	sh -c 'type jar'
++endif
+ 	@echo
+ 	cd $(VSRC)/libvncauth; pwd; xmkmf
+ 	cd $(VSRC)/vncviewer;  pwd; xmkmf
+@@ -55,13 +55,17 @@ config:
+ all:
+ 	cd $(VSRC)/libvncauth; $(MAKE)
+ 	cd $(VSRC)/vncviewer;  $(MAKE)
++ifneq ($(JSRC),)
+ 	cd $(JSRC); $(MAKE)
++endif
+ 	cd $(PSRC); $(MAKE)
+ 
+ clean:
+ 	cd $(VSRC)/libvncauth; $(MAKE) clean
+ 	cd $(VSRC)/vncviewer;  $(MAKE) clean
++ifneq ($(JSRC),)
+ 	cd $(JSRC); $(MAKE) clean
++endif
+ 	cd $(PSRC); $(MAKE) clean
+ 
+ install: all
+@@ -72,7 +76,9 @@ install: all
+ 	cp -p $(LIMACC) $(ROOT)$(PREFIX)/$(LIB)
+ 	cp -p $(ULTDSM) $(ROOT)$(PREFIX)/$(LIB)
+ 	cp -pR scripts/* $(ROOT)$(PREFIX)/$(LIB)
++ifneq ($(JSRC),)
+ 	cp -p $(ARCHIVE) $(ROOT)$(PREFIX)/$(LIB)/util
++endif
+ 	cp -p $(MAN)/man1/ssvnc.1 $(ROOT)$(PREFIX)/$(MANDIR)/man1
+ 	./wr_tool $(ROOT)$(PREFIX)/$(BIN)/ssvnc  $(PREFIX)/$(LIB)/ssvnc
+ 	./wr_tool $(ROOT)$(PREFIX)/$(BIN)/tsvnc  $(PREFIX)/$(LIB)/tsvnc
diff --git a/net-misc/ssvnc/ssvnc-1.0.24.ebuild b/net-misc/ssvnc/ssvnc-1.0.24.ebuild
new file mode 100644
index 000000000000..2903208e326c
--- /dev/null
+++ b/net-misc/ssvnc/ssvnc-1.0.24.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ssvnc/ssvnc-1.0.24.ebuild,v 1.1 2009/12/04 08:19:54 vapier Exp $
+
+EAPI="2"
+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"
+IUSE="java"
+
+RDEPEND="sys-libs/zlib
+	media-libs/jpeg
+	dev-libs/openssl
+	dev-lang/tk
+	java? ( virtual/jre )
+	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.24-build.patch
+	epatch "${FILESDIR}"/${PN}-1.0.24-optional-java.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}" install || die "make install failed"
+	dodoc README
+}