Version bump. Mostly translation updates.

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

3 files changed, 47 insertions, 19 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/Manifest b/net-misc/vino/Manifest
index 63861952f8b4..5ed7852f0868 100644
--- a/net-misc/vino/Manifest
+++ b/net-misc/vino/Manifest
@@ -1,10 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX vino-2.26.2-autorestart-loop.patch 588 RMD160 a0bba32d1416cfc36d67aea5db9b557063c4518a SHA1 e0c59939d7a36e295bbc1fbe03f9efa0c6e0d1b6 SHA256 e4c09b2a68a803eadb1b91f710ff6a9870a28cafef7856eb844806aec53c853e
-DIST vino-2.24.1.tar.bz2 674201 RMD160 f434d1f9259fa9fc1fd66d09e13329d1b47bab52 SHA1 54aa94364bafcf4d33295b6bdf50e4bcd40c6fe2 SHA256 4522c3969b64330b893de9a3257b4f7462975644b5e6cc57e9113d1f0c9c4a77
 DIST vino-2.26.2.tar.bz2 724845 RMD160 ab6c3a0f3e677f7b3fa4c0956e2246870a84077f SHA1 8e5c7bbe9900e954ed3096743ffba4e7640be508 SHA256 b42580887d91ed2ffc1f2e8e05f4dd0f7304abd98a04139bdb9a674022dd6913
 DIST vino-2.28.1.tar.bz2 794178 RMD160 a118ce4ea3d7271f65d231f8786f98b148b5d358 SHA1 2ef544100c74f3bc7f990fc6d2bc839dad231790 SHA256 bd86825546d2639ec3ea724efa013a84971f289c7903740418b2f2ca38f28ebe
-EBUILD vino-2.24.1.ebuild 1539 RMD160 018ce1964df25d6dff41301c3abf5d092023fc47 SHA1 e752e11e8a5ade840005d0bb495d1cb17223115f SHA256 0ff63958ebe8874001add62b73daa4d3c99c5e679595706c8c1b365d217784c9
+DIST vino-2.28.2.tar.bz2 795208 RMD160 541006f8fac7b951bfc236869e52a3b1c02e1ed1 SHA1 7d6863956356475b8784cdd2017bfbbd0e0ce15e SHA256 f2a0b7c77fe58f3918b202a9f0f4ae3295518ac43eeceade0875b096038a72e0
 EBUILD vino-2.26.2-r1.ebuild 1720 RMD160 8a2afd8380d2efe1a8da87290ff5d8230b2012fb SHA1 fb3ed4539a93cb8ed79ecff94ba3fc7facda59a4 SHA256 05fff6fd7aad910aecf5327836c19cf0eff336dfbe65a089993822c1a4cc520a
 EBUILD vino-2.26.2-r2.ebuild 1809 RMD160 fc5edd8cb6fe1b8710d0b098ee2c7c555d589c2b SHA1 ecd53d7cee04c6954c80bb9cf03f1bb240faecda SHA256 9d0495795b4b357384514f0980f90cfbf172482a742a878cad81d125d24ab1b7
 EBUILD vino-2.28.1.ebuild 1846 RMD160 bde5c709c3e9f749c5bfdea5eff98072c6a319d3 SHA1 7acaec5a61f7a0f455fb35d6ea0efd09f97254fe SHA256 18b8db3ea8e7a9c275a46cb300ef229c228269641d7ec9971c0e8531cae4ead6
-MISC ChangeLog 16922 RMD160 43e7da41dc43a718612fcf094a4516a03372d410 SHA1 7bf1833ee1008f5c23daf6997c918e00df122c63 SHA256 39f20ff67f715b32af6b5c011fb4df39a9fdefc494b8bbd6fae1ed92886952fd
+EBUILD vino-2.28.2.ebuild 1842 RMD160 0faaadc1df98571870f60e1991885105bf5bda09 SHA1 2d9664a10d1a8e798aefc3104af3a126571f3dbf SHA256 bd53f9c77816c08d69bfb3a743b11afe273d4bf99110a3e1c120917a52fe6823
+MISC ChangeLog 17089 RMD160 04fdecaea3a777bfba80c3b6cb74e3a85d75b6e1 SHA1 805b45a100f77b40fad6edd951efcba552f08713 SHA256 5c36e046fd8394c2901ae37240c6aa6186eba49cad024ddc521dd284f1de4cef
 MISC metadata.xml 252 RMD160 5b0b8374f7b039e12c213212494427ecd15387e2 SHA1 84868304c07b4f56d8acec522b1bc105bbaf350e SHA256 17ae8caf7ad8c64f98c45410f316d2dd6b3d12c822827fd34def79f7ee1f7602
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAku7QlsACgkQ1fmVwcYIWAYjtwCdFKqAqLq9qu/GRV4UMp0A4Wwf
+MBQAnjdqSUJGS1yzme6vXFjPxfeaOqC7
+=k6Eh
+-----END PGP SIGNATURE-----
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"
 }