Revision bump for both arch and ~arch version. No longer link against the system libvncserver. The included libvncserver is more recent and includes fixes not yet included in the system libvncserver.

(Portage version: 2.0.51.18)

7 files changed, 23 insertions, 92 deletions

diff --git a/x11-misc/x11vnc/ChangeLog b/x11-misc/x11vnc/ChangeLog
index 3ac3186e7cf4..7baca5a01703 100644
--- a/x11-misc/x11vnc/ChangeLog
+++ b/x11-misc/x11vnc/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-misc/x11vnc
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/ChangeLog,v 1.8 2005/02/24 20:05:06 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/ChangeLog,v 1.9 2005/03/02 21:23:29 swegener Exp $
+
+*x11vnc-0.7-r1 (02 Mar 2005)
+
+  02 Mar 2005; Sven Wegener <swegener@gentoo.org> files/0.7-autotools.patch,
+  -files/0.7.1-autotools.patch, +x11vnc-0.7-r1.ebuild,
+  +x11vnc-0.7.1-r1.ebuild, -x11vnc-0.7.1.ebuild, -x11vnc-0.7.ebuild:
+  Revision bump for both arch and ~arch version. No longer link against the
+  system libvncserver. The included libvncserver is more recent and includes
+  fixes not yet included in the system libvncserver.
 
 *x11vnc-0.7.1 (24 Feb 2005)
 
diff --git a/x11-misc/x11vnc/files/0.7-autotools.patch b/x11-misc/x11vnc/files/0.7-autotools.patch
index 97817553b534..97279172a348 100644
--- a/x11-misc/x11vnc/files/0.7-autotools.patch
+++ b/x11-misc/x11vnc/files/0.7-autotools.patch
@@ -20,28 +20,3 @@ diff -Nur x11vnc.orig/configure.ac x11vnc/configure.ac
 -AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h netinet/in.h stdlib.h string.h sys/socket.h sys/time.h sys/timeb.h syslog.h unistd.h])
  
  # Checks for typedefs, structures, and compiler characteristics.
-@@ -200,3 +200,2 @@
- AC_CONFIG_FILES([Makefile
--                 libvncserver/Makefile
-                  
---- x11vnc.orig/Makefile.am	2005-01-28 10:15:00.205392800 -0500
-+++ x11vnc/Makefile.am	2005-01-28 10:15:10.882769592 -0500
-@@ -1,7 +1,7 @@
- CFLAGS=-g -Wall
- 
--SUBDIRS=libvncserver x11vnc classes
--DIST_SUBDIRS=libvncserver x11vnc classes
-+SUBDIRS=x11vnc classes
-+DIST_SUBDIRS=x11vnc classes
- 
- 
- includedir=$(prefix)/include/rfb
---- x11vnc.orig/x11vnc/Makefile.am	2005-01-28 10:15:22.031074792 -0500
-+++ x11vnc/x11vnc/Makefile.am	2005-01-28 10:18:37.532354080 -0500
-@@ -1,5 +1,5 @@
- DEFINES = -I ..
--LDADD = ../libvncserver/libvncserver.a @WSOCKLIB@
-+LDADD = -lvncserver @WSOCKLIB@
- 
- man_MANS=x11vnc.1
- EXTRA_DIST=ChangeLog README tkx11vnc $(man_MANS)
diff --git a/x11-misc/x11vnc/files/0.7.1-autotools.patch b/x11-misc/x11vnc/files/0.7.1-autotools.patch
deleted file mode 100644
index 1f29e6e5b67c..000000000000
--- a/x11-misc/x11vnc/files/0.7.1-autotools.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -Nur x11vnc-0.7.1/Makefile.am x11vnc-0.7.1-gentoo/Makefile.am
---- x11vnc-0.7.1/Makefile.am	2005-02-24 20:59:50.533338639 +0100
-+++ x11vnc-0.7.1-gentoo/Makefile.am	2005-02-24 21:00:06.460146019 +0100
-@@ -1,8 +1,8 @@
- EXTRA_DIST=tightvnc-1.3dev5-vncviewer-alpha-cursor.patch README.LibVNCServer
- CFLAGS=-g -Wall
- 
--SUBDIRS=libvncserver x11vnc classes
--DIST_SUBDIRS=libvncserver x11vnc classes
-+SUBDIRS=x11vnc classes
-+DIST_SUBDIRS=x11vnc classes
- 
- 
- includedir=$(prefix)/include/rfb
-diff -Nur x11vnc-0.7.1/configure.ac x11vnc-0.7.1-gentoo/configure.ac
---- x11vnc-0.7.1/configure.ac	2005-02-24 20:59:50.544337124 +0100
-+++ x11vnc-0.7.1-gentoo/configure.ac	2005-02-24 21:00:56.679232972 +0100
-@@ -14,6 +14,10 @@
- AC_PROG_MAKE_SET
- AC_PROG_RANLIB
- 
-+# Checks for header files.
-+AC_HEADER_STDC
-+AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h netinet/in.h stdlib.h string.h sys/socket.h sys/time.h sys/timeb.h syslog.h unistd.h pwd.h sys/wait.h utmpx.h])
-+
- # Options
- AH_TEMPLATE(BACKCHANNEL, [Enable BackChannel communication])
- AC_ARG_WITH(backchannel,
-@@ -211,10 +215,6 @@
- fi
- AC_SUBST(WSOCKLIB)
- 
--# Checks for header files.
--AC_HEADER_STDC
--AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h netinet/in.h stdlib.h string.h sys/socket.h sys/time.h sys/timeb.h syslog.h unistd.h pwd.h sys/wait.h utmpx.h])
--
- # Checks for typedefs, structures, and compiler characteristics.
- AC_C_CONST
- AC_C_INLINE
-diff -Nur x11vnc-0.7.1/x11vnc/Makefile.am x11vnc-0.7.1-gentoo/x11vnc/Makefile.am
---- x11vnc-0.7.1/x11vnc/Makefile.am	2005-02-24 20:59:50.586331343 +0100
-+++ x11vnc-0.7.1-gentoo/x11vnc/Makefile.am	2005-02-24 21:00:16.754728825 +0100
-@@ -1,5 +1,5 @@
- DEFINES = -I ..
--LDADD = ../libvncserver/libvncserver.a @WSOCKLIB@
-+LDADD = -lvncserver @WSOCKLIB@
- 
- man_MANS=x11vnc.1
- EXTRA_DIST=ChangeLog README tkx11vnc $(man_MANS)
diff --git a/x11-misc/x11vnc/files/digest-x11vnc-0.7 b/x11-misc/x11vnc/files/digest-x11vnc-0.7-r1
index 472eed59a01c..472eed59a01c 100644
--- a/x11-misc/x11vnc/files/digest-x11vnc-0.7
+++ b/x11-misc/x11vnc/files/digest-x11vnc-0.7-r1
diff --git a/x11-misc/x11vnc/files/digest-x11vnc-0.7.1 b/x11-misc/x11vnc/files/digest-x11vnc-0.7.1-r1
index bab945ccceca..bab945ccceca 100644
--- a/x11-misc/x11vnc/files/digest-x11vnc-0.7.1
+++ b/x11-misc/x11vnc/files/digest-x11vnc-0.7.1-r1
diff --git a/x11-misc/x11vnc/x11vnc-0.7.ebuild b/x11-misc/x11vnc/x11vnc-0.7-r1.ebuild
index 94b024886811..1aebecff5871 100644
--- a/x11-misc/x11vnc/x11vnc-0.7.ebuild
+++ b/x11-misc/x11vnc/x11vnc-0.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/x11vnc-0.7.ebuild,v 1.5 2005/02/06 17:58:47 fserb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/x11vnc-0.7-r1.ebuild,v 1.1 2005/03/02 21:23:29 swegener Exp $
 
 inherit eutils
 
@@ -21,7 +21,8 @@ RDEPEND="virtual/x11
 	)"
 DEPEND="${RDEPEND}
 	net-libs/libvncserver
-	sys-devel/autoconf"
+	sys-devel/autoconf
+	sys-devel/automake"
 
 src_unpack() {
 	unpack ${A}
@@ -32,10 +33,13 @@ src_unpack() {
 }
 
 src_compile() {
+	local myconf=""
+	use jpeg && myconf="--enable-zlib"
+
 	econf \
 		$(use_with jpeg) \
-		$(use_with jpeg zlib) \
 		$(use_with zlib) \
+		${myconf} \
 		|| die "econf failed"
 	emake || die "emake failed"
 }
diff --git a/x11-misc/x11vnc/x11vnc-0.7.1.ebuild b/x11-misc/x11vnc/x11vnc-0.7.1-r1.ebuild
index b537c7e6ff98..5eaf1ea763ae 100644
--- a/x11-misc/x11vnc/x11vnc-0.7.1.ebuild
+++ b/x11-misc/x11vnc/x11vnc-0.7.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/x11vnc-0.7.1.ebuild,v 1.1 2005/02/24 20:05:06 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/x11vnc-0.7.1-r1.ebuild,v 1.1 2005/03/02 21:23:29 swegener Exp $
 
 inherit eutils
 
@@ -13,29 +13,21 @@ SLOT="0"
 KEYWORDS="~amd64 ~hppa ~x86 ~ppc"
 IUSE="jpeg zlib"
 
-RDEPEND="virtual/x11
+DEPEND="virtual/x11
 	zlib? ( sys-libs/zlib )
 	jpeg? (
 		media-libs/jpeg
 		sys-libs/zlib
 	)"
-DEPEND="${RDEPEND}
-	net-libs/libvncserver
-	sys-devel/autoconf"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/0.7.1-autotools.patch
-	aclocal && automake && autoconf || die "autoconf failed"
-}
 
 src_compile() {
+	local myconf=""
+	use jpeg && myconf="--enable-zlib"
+
 	econf \
 		$(use_with jpeg) \
-		$(use_with jpeg zlib) \
 		$(use_with zlib) \
+		${myconf} \
 		|| die "econf failed"
 	emake || die "emake failed"
 }