bump to 2.20

(Portage version: 2.1.3.12)

7 files changed, 22 insertions, 87 deletions

diff --git a/net-misc/vino/ChangeLog b/net-misc/vino/ChangeLog
index 0fa093064e2e..d8b6fd92586a 100644
--- a/net-misc/vino/ChangeLog
+++ b/net-misc/vino/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/vino
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/ChangeLog,v 1.91 2007/09/23 05:47:54 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/ChangeLog,v 1.92 2007/10/11 23:08:51 eva Exp $
+
+*vino-2.20.0 (11 Oct 2007)
+
+  11 Oct 2007; Gilles Dartiguelongue <eva@gentoo.org>
+  -files/vino-2.10.0-fbsd.patch, -files/vino-2.11-zlib_fix.patch,
+  -files/vino-2.13.5-as-needed.patch, -vino-2.13.5.ebuild,
+  +vino-2.20.0.ebuild:
+  prune 2.13.5 related files and bump to 2.20.0
 
   23 Sep 2007; Tom Gall <tgall@gentoo.org> vino-2.18.1.ebuild:
   stable on ppc64
diff --git a/net-misc/vino/files/digest-vino-2.13.5 b/net-misc/vino/files/digest-vino-2.13.5
deleted file mode 100644
index eabeefe9d3e1..000000000000
--- a/net-misc/vino/files/digest-vino-2.13.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9bc8c3f0e639fdc7b9ed023501308359 vino-2.13.5.tar.bz2 566620
-RMD160 9daeb18df6d5cbbe3d993325c1ed0800327a7b68 vino-2.13.5.tar.bz2 566620
-SHA256 58ee9c77070a8865cce6d25dd6b68fae02b307b64b203d78bd492e33c8e0c89f vino-2.13.5.tar.bz2 566620
diff --git a/net-misc/vino/files/digest-vino-2.20.0 b/net-misc/vino/files/digest-vino-2.20.0
new file mode 100644
index 000000000000..001c80087f92
--- /dev/null
+++ b/net-misc/vino/files/digest-vino-2.20.0
@@ -0,0 +1,3 @@
+MD5 e9560ff2e135a5eec645593fc6c22150 vino-2.20.0.tar.bz2 625180
+RMD160 75cffdedc31ce81719936ccb2524d22abe5cc251 vino-2.20.0.tar.bz2 625180
+SHA256 5ab403a3ef5c8fc7fc66a27c206b34faaf0fd0fafcf6800ee10280a9dd88faeb vino-2.20.0.tar.bz2 625180
diff --git a/net-misc/vino/files/vino-2.10.0-fbsd.patch b/net-misc/vino/files/vino-2.10.0-fbsd.patch
deleted file mode 100644
index d1a2acd7aed9..000000000000
--- a/net-misc/vino/files/vino-2.10.0-fbsd.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: vino-2.10.0/server/libvncserver/rfb/rfbproto.h
-===================================================================
---- vino-2.10.0.orig/server/libvncserver/rfb/rfbproto.h
-+++ vino-2.10.0/server/libvncserver/rfb/rfbproto.h
-@@ -60,9 +60,11 @@
- #include <rfb/rfbint.h>
- #else
- #include <config.h>
-+#ifdef HAVE_STDINT_H
- #include <stdint.h>
- #endif
- #endif
-+#endif
- #include <rfb/keysym.h>
- 
- #ifdef HAVE_LIBZ
-Index: vino-2.10.0/server/vino-fb.c
-===================================================================
---- vino-2.10.0.orig/server/vino-fb.c
-+++ vino-2.10.0/server/vino-fb.c
-@@ -36,6 +36,7 @@
- 
- #include <stdlib.h>
- #include <string.h>
-+#include <sys/types.h>
- #include <sys/ipc.h>
- #include <sys/shm.h>
- #include <gdk/gdkx.h>
diff --git a/net-misc/vino/files/vino-2.11-zlib_fix.patch b/net-misc/vino/files/vino-2.11-zlib_fix.patch
deleted file mode 100644
index 4792632004b6..000000000000
--- a/net-misc/vino/files/vino-2.11-zlib_fix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-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/files/vino-2.13.5-as-needed.patch b/net-misc/vino/files/vino-2.13.5-as-needed.patch
deleted file mode 100644
index 9e6c01fe742b..000000000000
--- a/net-misc/vino/files/vino-2.13.5-as-needed.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- vino-2.13.5/server/libvncserver/Makefile.am.orig	2006-05-07 14:53:51.000000000 +0200
-+++ vino-2.13.5/server/libvncserver/Makefile.am	2006-05-07 14:58:02.000000000 +0200
-@@ -32,6 +32,10 @@
- 	zrletypes.h 		\
- 	$(NULL)
- 
-+libvncserver_la_LIBADD =	\
-+	$(LIBGNUTLS_LIBS)		\
-+	$(LIBGCRYPT_LIBS)
-+
- EXTRA_DIST =			\
- 	tableinit24.c		\
- 	tableinittctemplate.c	\
diff --git a/net-misc/vino/vino-2.13.5.ebuild b/net-misc/vino/vino-2.20.0.ebuild
index aac8abb6ca3c..2881c6a10805 100644
--- a/net-misc/vino/vino-2.13.5.ebuild
+++ b/net-misc/vino/vino-2.20.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/vino-2.13.5.ebuild,v 1.19 2007/07/22 08:08:57 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/vino-2.20.0.ebuild,v 1.1 2007/10/11 23:08:51 eva Exp $
 
 WANT_AUTOCONF=latest
 WANT_AUTOMAKE=1.9
@@ -11,16 +11,20 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
-IUSE="avahi crypt gnutls jpeg zlib"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="avahi crypt gnutls jpeg keyring libnotify zlib"
 
-RDEPEND=">=x11-libs/gtk+-2
+RDEPEND=">=dev-libs/glib-2.12
+	>=x11-libs/gtk+-2.10
 	>=gnome-base/gconf-2
 	>=gnome-base/libglade-2
 	>=gnome-base/libgnomeui-2.5.2
+	dev-libs/dbus-glib
 	>=gnome-base/orbit-2
 	>=gnome-base/libbonobo-2
 	x11-libs/libXtst
+	libnotify? ( >=x11-libs/libnotify-0.4.4 )
+	keyring? ( gnome-base/gnome-keyring )
 	avahi? ( >=net-dns/avahi-0.6 )
 	crypt? ( >=dev-libs/libgcrypt-1.1.90 )
 	gnutls? ( >=net-libs/gnutls-1 )
@@ -28,7 +32,7 @@ RDEPEND=">=x11-libs/gtk+-2
 	zlib? ( sys-libs/zlib )"
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.28"
+	>=dev-util/intltool-0.35"
 
 DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
 
@@ -39,25 +43,6 @@ pkg_setup() {
 	fi
 	G2CONF="$(use_with jpeg) $(use_enable gnutls) $(use_enable crypt gcrypt) \
 			$(use_with zlib) $(use_with zlib libz) $(use_enable avahi) \
+			$(use_enable libnotify) $(use_enable keyring gnome-keyring) \
 			--enable-session-support"
 }
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Fix compilation if --without-libz is passed
-	epatch "${FILESDIR}"/${PN}-2.11-zlib_fix.patch
-
-	# Fix compilation for Gentoo/FreeBSD
-	epatch "${FILESDIR}"/${PN}-2.10.0-fbsd.patch
-
-	# fix as-needed #132558
-	epatch "${FILESDIR}"/${P}-as-needed.patch
-
-	cp aclocal.m4 old_macros.m4
-	# rename some things so they get regenerated and we don't get a mismatch
-	sed -i -e 's:AM_AUTOMAKE_VERSION:AM_AUTOMAKE_VERSION2:' old_macros.m4
-	sed -i -e 's:AM_INIT_AUTOMAKE:AM_INIT_AUTOMAKE2:' old_macros.m4
-	sed -i -e 's:AM_SET_CURRENT_AUTOMAKE_VERSION:AM_SET_CURRENT_AUTOMAKE_VERSION2:' old_macros.m4
-	AT_M4DIR="." eautoreconf
-}