Version bump. Mostly translation updates.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

2 files changed, 34 insertions, 16 deletions

diff --git a/net-misc/vino/ChangeLog b/net-misc/vino/ChangeLog
index e45aef0a6940..0717f555ea18 100644
--- a/net-misc/vino/ChangeLog
+++ b/net-misc/vino/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/vino
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/ChangeLog,v 1.141 2010/04/05 15:09:30 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/ChangeLog,v 1.142 2010/04/06 14:16:54 eva Exp $
+
+*vino-2.28.2 (06 Apr 2010)
+
+  06 Apr 2010; Gilles Dartiguelongue <eva@gentoo.org> -vino-2.24.1.ebuild,
+  +vino-2.28.2.ebuild:
+  Version bump. Mostly translation updates.
 
   05 Apr 2010; Raúl Porcel <armin76@gentoo.org> vino-2.26.2-r2.ebuild:
   alpha/arm/ia64/sparc stable wrt #308549
diff --git a/net-misc/vino/vino-2.24.1.ebuild b/net-misc/vino/vino-2.28.2.ebuild
index bf6d5de7608c..bb041fef7732 100644
--- a/net-misc/vino/vino-2.24.1.ebuild
+++ b/net-misc/vino/vino-2.28.2.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/vino-2.24.1.ebuild,v 1.9 2009/04/27 14:31:37 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/vino-2.28.2.ebuild,v 1.1 2010/04/06 14:16:54 eva Exp $
+
+EAPI="2"
 
 inherit eutils gnome2
 
@@ -9,38 +11,35 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="avahi crypt gnutls ipv6 jpeg gnome-keyring libnotify zlib"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="avahi crypt gnutls ipv6 jpeg gnome-keyring libnotify networkmanager +telepathy zlib"
 
-# FIXME: add support for libunique
 RDEPEND=">=dev-libs/glib-2.17
-	>=x11-libs/gtk+-2.13.1
-	>=gnome-base/libgnomeui-2
+	>=x11-libs/gtk+-2.16
 	>=gnome-base/gconf-2
-	>=gnome-base/libglade-2
 	>=sys-apps/dbus-1.2.3
+	>=net-libs/libsoup-2.24:2.4
+	>=dev-libs/libunique-1
 	dev-libs/dbus-glib
 	x11-libs/libXext
 	x11-libs/libXtst
 	libnotify? ( >=x11-libs/libnotify-0.4.4 )
 	gnome-keyring? ( >=gnome-base/gnome-keyring-2.20 )
-	avahi? ( >=net-dns/avahi-0.6 )
+	avahi? ( >=net-dns/avahi-0.6[dbus] )
 	crypt? ( >=dev-libs/libgcrypt-1.1.90 )
 	gnutls? ( >=net-libs/gnutls-1 )
 	jpeg? ( media-libs/jpeg )
+	networkmanager? ( >=net-misc/networkmanager-0.7 )
+	telepathy? ( >=net-libs/telepathy-glib-0.7.31 )
 	zlib? ( sys-libs/zlib )"
 DEPEND="${RDEPEND}
+	>=dev-lang/perl-5
 	>=dev-util/pkgconfig-0.9
 	>=dev-util/intltool-0.35"
 
 DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
 
 pkg_setup() {
-	if use avahi && ! built_with_use net-dns/avahi dbus; then
-		einfo "avahi support in vino requires USE=dbus in avahi"
-		die "Please rebuild net-dns/avahi with USE=dbus"
-	fi
-
 	G2CONF="${G2CONF}
 		$(use_enable avahi)
 		$(use_enable crypt gcrypt)
@@ -49,7 +48,20 @@ pkg_setup() {
 		$(use_with jpeg)
 		$(use_enable gnome-keyring)
 		$(use_enable libnotify)
+		$(use_enable networkmanager network-manager)
+		$(use_enable telepathy)
 		$(use_with zlib)
 		$(use_with zlib libz)
-		--disable-libunique"
+		--enable-libunique"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Fix autorestart loop, bug #277989
+	epatch "${FILESDIR}/${PN}-2.26.2-autorestart-loop.patch"
+
+	# Fix intltoolize broken file, see upstream #577133
+	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
+		|| die "sed failed"
 }