New release: 2.11.92

(Portage version: 2.0.51.22-r2)

7 files changed, 75 insertions, 46 deletions

diff --git a/net-misc/vino/ChangeLog b/net-misc/vino/ChangeLog
index 995de897a969..e76e9e52bf59 100644
--- a/net-misc/vino/ChangeLog
+++ b/net-misc/vino/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/vino
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/ChangeLog,v 1.34 2005/07/11 23:24:44 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/ChangeLog,v 1.35 2005/08/22 23:45:05 leonardop Exp $
+
+*vino-2.11.92 (22 Aug 2005)
+
+  22 Aug 2005; Leonardo Boshell <leonardop@gentoo.org>
+  +files/vino-2.11-zlib_fix.patch, +vino-2.11.92.ebuild:
+  New version. Re-added 'zlib' USE flag.
 
   11 Jul 2005; Stephen P. Becker <geoman@gentoo.org> vino-2.10.0.ebuild:
   stable on mips
diff --git a/net-misc/vino/Manifest b/net-misc/vino/Manifest
index f35fd27bad63..084139abeb1c 100644
--- a/net-misc/vino/Manifest
+++ b/net-misc/vino/Manifest
@@ -1,8 +1,9 @@
-MD5 bfce24ad38b627014ff2012be03591ab vino-2.8.0.1.ebuild 984
-MD5 b355d978b16a86813ab93eef55b5890f vino-2.8.1.ebuild 973
 MD5 856f436d89ab95adf79c81fac3444929 ChangeLog 3569
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 b355d978b16a86813ab93eef55b5890f vino-2.8.1.ebuild 973
 MD5 cda77acc8f6b37089f157edbf24c6fc0 vino-2.10.0.ebuild 977
-MD5 adec2ad7322fd787fd437d9e1e1550d6 files/digest-vino-2.8.0.1 65
+MD5 5a2a6bceb2644314f90374c1084256ea vino-2.11.92.ebuild 1206
+MD5 4bd66cdedeb8bff32c00a891417978e9 files/vino-2.11-zlib_fix.patch 633
 MD5 8998fdcfa6d5c111f54a22a2170ade9f files/digest-vino-2.8.1 63
 MD5 6a6e29695e536c76e6b01b930d65c430 files/digest-vino-2.10.0 64
+MD5 22b49a8af8c89540c961f8cbad576d4d files/digest-vino-2.11.92 65
diff --git a/net-misc/vino/files/digest-vino-2.11.92 b/net-misc/vino/files/digest-vino-2.11.92
new file mode 100644
index 000000000000..5380ed06f6ee
--- /dev/null
+++ b/net-misc/vino/files/digest-vino-2.11.92
@@ -0,0 +1 @@
+MD5 58047c590714e983e2a3daafb3661c81 vino-2.11.92.tar.bz2 566304
diff --git a/net-misc/vino/files/digest-vino-2.8.0.1 b/net-misc/vino/files/digest-vino-2.8.0.1
deleted file mode 100644
index c8e54dedd121..000000000000
--- a/net-misc/vino/files/digest-vino-2.8.0.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 eb0633f5be0c7baeee63bc78e166dd61 vino-2.8.0.1.tar.bz2 529369
diff --git a/net-misc/vino/files/vino-2.11-zlib_fix.patch b/net-misc/vino/files/vino-2.11-zlib_fix.patch
new file mode 100644
index 000000000000..4792632004b6
--- /dev/null
+++ b/net-misc/vino/files/vino-2.11-zlib_fix.patch
@@ -0,0 +1,17 @@
+diff -NurdB vino-2.11.90/server/libvncserver/zrle.c vino-2.11.90-patched/server/libvncserver/zrle.c
+--- vino-2.11.90/server/libvncserver/zrle.c	2004-02-05 03:55:25.000000000 -0500
++++ vino-2.11.90-patched/server/libvncserver/zrle.c	2005-08-22 17:30:06.000000000 -0500
+@@ -28,6 +28,8 @@
+ #include <zrleoutstream.h>
+ 
+ 
++#ifdef HAVE_LIBZ
++
+ #define GET_IMAGE_INTO_BUF(tx,ty,tw,th,buf)                                \
+ {  char *fbptr = (cl->screen->frameBuffer                                   \
+ 		 + (cl->screen->paddedWidthInBytes * ty)                   \
+@@ -181,3 +183,4 @@
+   cl->zrleData = NULL;
+ }
+ 
++#endif  /* HAVE_LIBZ */
diff --git a/net-misc/vino/vino-2.11.92.ebuild b/net-misc/vino/vino-2.11.92.ebuild
new file mode 100644
index 000000000000..e2c38db9ce71
--- /dev/null
+++ b/net-misc/vino/vino-2.11.92.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/vino-2.11.92.ebuild,v 1.1 2005/08/22 23:45:05 leonardop Exp $
+
+inherit eutils gnome2
+
+DESCRIPTION="An integrated VNC server for GNOME"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="crypt gnutls jpeg zlib"
+
+RDEPEND=">=x11-libs/gtk+-2
+	>=gnome-base/gconf-2
+	>=gnome-base/libglade-2
+	>=gnome-base/libgnomeui-2.5.2
+	>=gnome-base/orbit-2
+	>=gnome-base/libbonobo-2
+	virtual/x11
+	jpeg? ( media-libs/jpeg )
+	gnutls? ( >=net-libs/gnutls-1 )
+	crypt? ( >=dev-libs/libgcrypt-1.1.90 )
+	zlib? ( sys-libs/zlib )"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.28"
+
+DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
+USE_DESTDIR="1"
+
+
+pkg_setup() {
+	G2CONF="$(use_with jpeg) $(use_enable gnutls) $(use_enable crypt gcrypt) \
+		$(use_with zlib) $(use_with zlib libz) --enable-session-support"
+}
+
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+
+	# Fix compilation if --without-libz is passed
+	epatch ${FILESDIR}/${PN}-2.11-zlib_fix.patch
+}
diff --git a/net-misc/vino/vino-2.8.0.1.ebuild b/net-misc/vino/vino-2.8.0.1.ebuild
deleted file mode 100644
index cb5b71c3ff4f..000000000000
--- a/net-misc/vino/vino-2.8.0.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/vino-2.8.0.1.ebuild,v 1.12 2005/01/22 06:56:28 vapier Exp $
-
-inherit gnome2
-
-DESCRIPTION="VNC server"
-HOMEPAGE="http://www.gnome.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ~ppc64 sparc x86"
-#IUSE="jpeg zlib gnutls crypt"
-IUSE="jpeg gnutls crypt"
-
-RDEPEND=">=x11-libs/gtk+-2
-	>=gnome-base/gconf-2
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/orbit-2
-	>=gnome-base/libbonobo-2
-	sys-libs/zlib
-	jpeg? ( media-libs/jpeg )
-	gnutls? ( >=net-libs/gnutls-1 )
-	crypt? ( >=dev-libs/libgcrypt-1.1.90 )"
-#	zlib? ( sys-libs/zlib )
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=dev-util/intltool-0.29"
-
-USE_DESTDIR="1"
-
-G2CONF="${G2CONF} \
-	--with-zlib \
-	$(use_with jpeg) \
-	$(use_enable gnutls) \
-	$(use_enable crypt gcrypt)"
-#	$(use_with zlib) \
-
-DOCS="AUTHORS ChangeLog INSTALL NEWS README"