From ab9b710ee14d5e6fd24c51df93c9242faa967019 Mon Sep 17 00:00:00 2001
From: Nirbheek Chauhan <nirbheek@gentoo.org>
Date: Fri, 19 Aug 2011 14:29:25 +0000
Subject: [PATCH] Bump to 3.0.3, from gnome overlay for GNOME 3, remove old

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64
---
 net-misc/vinagre/Manifest        | 32 +++++++-------
 net-misc/vino/ChangeLog          |  8 +++-
 net-misc/vino/Manifest           | 24 +++++++---
 net-misc/vino/vino-2.32.1.ebuild | 76 --------------------------------
 net-misc/vino/vino-3.0.3.ebuild  | 75 +++++++++++++++++++++++++++++++
 5 files changed, 116 insertions(+), 99 deletions(-)
 delete mode 100644 net-misc/vino/vino-2.32.1.ebuild
 create mode 100644 net-misc/vino/vino-3.0.3.ebuild

diff --git a/net-misc/vinagre/Manifest b/net-misc/vinagre/Manifest
index 7e6022971064..8e3af6b6a302 100644
--- a/net-misc/vinagre/Manifest
+++ b/net-misc/vinagre/Manifest
@@ -2,23 +2,25 @@
 Hash: SHA1
 
 DIST vinagre-2.30.3.tar.bz2 2447388 RMD160 5602393b2dbd8f94e3bd6ea2be5b1843b4d5482c SHA1 17eaf74fa49eeda85fc6cd9e2db7a11720c45e34 SHA256 28bfc70a816bc3f1e71ada82e260c39ee2dac693cb7859323b06c8b1452a39f4
+DIST vinagre-3.0.2.tar.xz 2193892 RMD160 1504d89c07f2530c3c8c61d2ca2a4bd29db44f55 SHA1 d55baa3e2acc859684304f1ee87112c8ab5cad63 SHA256 cddc604ca6b2e45aaa5af55306eb29fc4910b29e1273c4915b7f60fd78da264e
 EBUILD vinagre-2.30.3.ebuild 1677 RMD160 8dd4e3926bef986e5e052dc536b50076cb57dcde SHA1 f696c0465b1c2dd2248b21d3dcf68a653d4bdd59 SHA256 a9d30bf6cb73ddbdda5340f378c38de81e5e7214f15ccbe0ec67deb258284ac7
-MISC ChangeLog 9592 RMD160 58b2db23894c11c6f72d6a7a9ecf14522832cd6c SHA1 8fdaad4bd0386133e8c9874f894a2254e80cf35c SHA256 c7d505c62f9ee0b4fb1d05da9e411e1ee7db1552f76585fb27b517637d439896
-MISC metadata.xml 392 RMD160 a8115d199a804c1b80c7dc76474d38109b579fa0 SHA1 0cec1b85c8b18e61c881bddcf0c0486a7f553178 SHA256 a7f04dbe75f242bb167c82d76ff23b3d01e3b5228d150de6b444c28b57ea6a9c
+EBUILD vinagre-3.0.2.ebuild 2068 RMD160 432aeb2d017acfb7bc26c5c8a17259af566cf60c SHA1 7ad3524d4cfcfce392d168649f2073500a4ee629 SHA256 d1bb678f5998b8cb38366d59866046eb1314038b46b605f8dc7264c9e6e67fe5
+MISC ChangeLog 9764 RMD160 39cf0eb2866c933b9cd2f24c9a2ad92b6f9db5c5 SHA1 aef796aa3d332d140a8ac40941e0285a3c818b7f SHA256 b3884334f2b2338aefbd974d35c848a4bceaf0ef1cadae77785e9603e05ec2cb
+MISC metadata.xml 558 RMD160 4127fd1a3c3137b3892e555977f279729b2ed2fd SHA1 3b3a14391dccf79ad492b9c376d40d1c22d4143a SHA256 4bf366158154a36b8f8a3812170afd1a2db89963c4baf4d259840511436e10b3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJNjzD3AAoJEO/kOhxWD91k2nAP/RGpa2ojGLMyIIVQt64K5qiB
-pxtSLu2BF6mWgbxI3ggFzvxguVaNJXl4Nm/HYKZ/p2hkXsM30P76K68y3JJy8Y4d
-YitqneperRSEYNKwWlbTO8aOTLfaV5yiaPAzk+kajUQMVfN9yXh6YqZ3T9UUPvz9
-drJFOH5qq4/NwyddonHhqE4bVggbXpCIMmVJXY1nKLEzlPM5rpDkAtPXK7C/rw56
-JrbncrXBsYARRacts85zv7zNnPPB0TtggB/lfAP6vcOls8ZIdIjAv0UIGaPMF8Gh
-xR//cpSbCJGoE7ZNCyKwgvAfozrjMetzeBFarS/bdSITJFNN+v8PuNwuQ0Gy2uNJ
-wRxRnmtvQ0Z1Wpo03G+aAeNWRCw/LDHEA7nX4S+Xl8frdBBKtB7oaJBzj5TLMSeV
-1EzmU9hyN98WeBe7Vvw3AOPIszYw0Dg3hYqN8TghptQ9bvq4ji6+2/khvyl3UYTt
-5I0CNpvZad5klJN6jxTIweztNVa3zU1qZPwyH3dJgKAsueW98uHHhn7QkUA2l3u9
-vQXMJQM9abudYsVZt94UATfb5lfQU6lLXHcA62+cqghiWU9gAm+maPQ4zjDpqTgm
-bQFHS28r6cRP6MGcEiiDfezz/l3rb5gDBTenKCDtgy6GkBm2nAYVGGx530+slFGb
-Hd/U69OQO/X99iX1LVEe
-=vLak
+iQIcBAEBAgAGBQJOTnRKAAoJEO/kOhxWD91ksCMP/i74Nn7a7Aze4mDQ90a4LatI
+8F5MIU371ruEp/0sqaSrzh36WURR+ZWUg70upw0+a24kFZCvSkdlJi5dTLiGBY7u
+Ib2JBIIIXtjAI6w7bOp6Fengn06+VLPQ9a2UhGFDt6Wg6jAofRFbom6Om67Zz9nR
+kJPjlEYplJJ1lqGyZFEblnY1hGZKmAMAOMEMphn4RXrLfUVG88GX0DfLyQy4PySN
+tHZvqcfPZMtv2ri8GGgadu5C93NPxMxOnyhGJSwL3MjYByUkfg31FyTlS6uxFAdT
+DlPiIIsqJT07XNq0qk8oLUOxeEZ/xutkaoP1zs94UF1z0xxAkNgTPByPm/LspPpU
+1Rs7yKzC6GHek2PgVdu0uXHtO3OQlD5PJ3LuAO8Tn4+vbHzxr9mwGs0G9CWrUR6d
+OgzUI/HWm7yAGQTdfOTuOreItRxu9gmzXIdK58z59REXi7bgcsupfLhrFO38uh07
+wK7fFdWYIE73PcoIytl+qzIhzw9zUEg+RnLnaFnubFvFBVWq97ShI686D0KYIxVV
+iHCZR31Hk0BShB5lf+Va0IcZRnU4vl4aT5uZR84fmn1aZ/4Ubsv3lFTU6fHqujdg
+DiB3K1wqfYQBLhbda0qHNXYASU/HxTNY2iasHmwFLqxXEzNIJy3UbshP+Nd0VN49
+JhFIAwKV5yHbYLjG3qSs
+=vlY7
 -----END PGP SIGNATURE-----
diff --git a/net-misc/vino/ChangeLog b/net-misc/vino/ChangeLog
index 6a1a984b9cd8..c5945de7f18c 100644
--- a/net-misc/vino/ChangeLog
+++ b/net-misc/vino/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/vino
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/ChangeLog,v 1.168 2011/05/21 15:59:40 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/ChangeLog,v 1.169 2011/08/19 14:29:25 nirbheek Exp $
+
+*vino-3.0.3 (19 Aug 2011)
+
+  19 Aug 2011; Nirbheek Chauhan <nirbheek@gentoo.org> -vino-2.32.1.ebuild,
+  +vino-3.0.3.ebuild:
+  Bump to 3.0.3, from gnome overlay for GNOME 3, remove old
 
   21 May 2011; Raúl Porcel <armin76@gentoo.org> vino-2.32.2.ebuild:
   alpha/arm/ia64/sparc stable wrt #366697
diff --git a/net-misc/vino/Manifest b/net-misc/vino/Manifest
index e7e9bc5fe9bc..cb2246bcaa67 100644
--- a/net-misc/vino/Manifest
+++ b/net-misc/vino/Manifest
@@ -2,16 +2,26 @@
 Hash: SHA1
 
 AUX vino-2.26.2-autorestart-loop.patch 588 RMD160 a0bba32d1416cfc36d67aea5db9b557063c4518a SHA1 e0c59939d7a36e295bbc1fbe03f9efa0c6e0d1b6 SHA256 e4c09b2a68a803eadb1b91f710ff6a9870a28cafef7856eb844806aec53c853e
-DIST vino-2.32.1.tar.bz2 845647 RMD160 d1e3588abe39e1e8cdb6edab30a9b49f2eca76e6 SHA1 0cec105e3c965935ab3a3222f0f10e5991b6d5dd SHA256 8ec3cb84216323660d6301e02f5853f928789c20be68ded538dd849eafac4087
 DIST vino-2.32.2.tar.bz2 856440 RMD160 1de0923ef33a73dd6a9c4e761291728c552708e8 SHA1 e457d1c5705607c3cd18b7e6fbb8776b7483c733 SHA256 1260b1f7b647caff69db441dc13c992f843d9d75b9386ec07b724a5e30c6d4fa
-EBUILD vino-2.32.1.ebuild 2222 RMD160 07bd414d3210d5763951cea2d424535b25625b59 SHA1 9e956dfa9a0d8d406f8e44ffa2f5a5a642282fc2 SHA256 77b70de34712b535d717c6daca7e2fbb780a4c916e8b9c053856e3560f656d02
+DIST vino-3.0.3.tar.xz 728292 RMD160 d760c4b6d4cf60fa4f168ab4095b388fb632c414 SHA1 59b17ac3c1f18cf10ce36e142b04a272ef249df2 SHA256 0e58027d3c10649da61445cdd5205e31c4d1aa0b63f4911de3db4e7052d7bbfb
 EBUILD vino-2.32.2.ebuild 2223 RMD160 9115fba24b0010afefa1b88e6cb74cb57691a5b6 SHA1 34615352b97f623af64d36c7315b4da687af4a6d SHA256 d1945ac18f80a60848b268040d21b25d2fb621ac3329eab7d0127890bc03c3ef
-MISC ChangeLog 20897 RMD160 5a2558c0d4a61e603c71f48a5878ab1df193430b SHA1 1e717ef2c9fb982962fd6c1b01d70c90b1a5c195 SHA256 9c7c66c76dc74278a2c286bee2a4be28e6288dab84a45c90ace5f99d6440c755
+EBUILD vino-3.0.3.ebuild 1968 RMD160 4d081df513ffb2c2716b9c3b5fbd865f011410b0 SHA1 935c040d7684d597edc2fdd44aff099686b899b8 SHA256 9fad7322a75b253ede6c9a1cc1e38023694561eee84996b7dbb603c9e5a24602
+MISC ChangeLog 21083 RMD160 b53684a1c179c53d044e94143f64e76a85e67fd6 SHA1 47999530713b53ce002fe684be0db08efe47b752 SHA256 1239c9f6ff6703237d45e78704ce8ec3b6dbd2d095977c419dbf926e850ac0e8
 MISC metadata.xml 252 RMD160 5b0b8374f7b039e12c213212494427ecd15387e2 SHA1 84868304c07b4f56d8acec522b1bc105bbaf350e SHA256 17ae8caf7ad8c64f98c45410f316d2dd6b3d12c822827fd34def79f7ee1f7602
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3X4XMACgkQuQc30/atMkBHKwCfTdisDYeY8VjbF44+mrEpAPi4
-fTYAn3SDcLD7G6DZhJxjIeCQun0cIE4i
-=7nl6
+iQIcBAEBAgAGBQJOTnNXAAoJEO/kOhxWD91kFmQQAKIsgSJ4z0BounL44ORMfEGq
+PScGz1tID2SOc6b1nUX6EctluHWGGw1bE7/cHvyX9sBH0dJfF7doUkuRQRkJ5i9+
+Y/lgwyCF3tSni52JVnoQtfAS2jmCssWnfU3/BkxBaHeb5zlUCHxcXFHK5vvbruSc
+1lC2a55XBLIU+v9fzUrxSDrtPjj63/k0WD//9Sf0OhljTH9OUIiJAvQwyHagAjQY
+kTkEhsR11nz0yOOAe5dsP1uDP1h5EI6FCy1BPr1nPM3AmeScoJ44/xXBshpkeDVB
+grWGCpDVeJU80D0SwBDoyGM7E7RI3bkIbWXet9iHomt0J05dWuwkFVpKGwUUP9Ry
+hiTkh/OfzM/5mPjs/3NV4XChoOrGim7y15E7zJMsEufR7qytWZI0/UQANF7l0N5l
+Vfl0DRcFO/HwUoBUrZ8Txi7rz39OQFiya+VjAsXCW39o4U43cYzk0dEcMiuAqOd3
+Coj4D/ARU+gLvtErhCuTcwWimUlgYGgptQyGBc0+TIUjK8LGOegNkvQWO4BYNi44
+Htm5NDTgd5shHUYZjR0Sl1S8TR8nkta+vFcm/M/To7oB45Ig2zESfDdTB679bWEA
+6I9QQgB+35sZkRb5enRZKTk9ViFPIGhgLq8Wp/YOyLhhfBJMNC0njXYqEuqptQxT
+uI+W/my49PkowHHNMum7
+=9ofD
 -----END PGP SIGNATURE-----
diff --git a/net-misc/vino/vino-2.32.1.ebuild b/net-misc/vino/vino-2.32.1.ebuild
deleted file mode 100644
index 6eb144b21eeb..000000000000
--- a/net-misc/vino/vino-2.32.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/vino-2.32.1.ebuild,v 1.8 2011/03/22 19:44:27 ranger Exp $
-
-EAPI="3"
-GCONF_DEBUG="yes"
-
-inherit eutils gnome2
-
-DESCRIPTION="An integrated VNC server for GNOME"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="avahi crypt ipv6 jpeg gnome-keyring libnotify networkmanager ssl +telepathy zlib"
-
-RDEPEND=">=dev-libs/glib-2.17:2
-	>=x11-libs/gtk+-2.20:2
-	>=gnome-base/gconf-2: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
-	avahi? ( >=net-dns/avahi-0.6[dbus] )
-	crypt? ( >=dev-libs/libgcrypt-1.1.90 )
-	gnome-keyring? ( || ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 ) )
-	jpeg? ( virtual/jpeg:0 )
-	libnotify? ( >=x11-libs/libnotify-0.4.4 )
-	networkmanager? ( >=net-misc/networkmanager-0.7 )
-	ssl? ( >=net-libs/gnutls-1 )
-	telepathy? ( >=net-libs/telepathy-glib-0.11.6 )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.40
-	|| (
-		gnome-base/libgnome-keyring
-		<gnome-base/gnome-keyring-2.29.4 )"
-# keyring is always required at build time per bug 322763
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		$(use_enable avahi)
-		$(use_enable crypt gcrypt)
-		$(use_enable ipv6)
-		$(use_with jpeg)
-		$(use_enable gnome-keyring)
-		$(use_enable libnotify)
-		$(use_enable networkmanager network-manager)
-		$(use_enable ssl gnutls)
-		$(use_enable telepathy)
-		$(use_with zlib)
-		$(use_with zlib libz)
-		--enable-libunique"
-	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Fix autorestart loop, bug #277989
-	epatch "${FILESDIR}/${PN}-2.26.2-autorestart-loop.patch"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	elog "If you are getting refresh problems when using special 3D effects,"
-	elog "try disabling XDamage extension. For that, you can run the following:"
-	elog " gconftool-2 --type boolean --set /desktop/gnome/remote_access/disable_xdamage true"
-	elog "This is due http://bugs.freedesktop.org/12255"
-}
diff --git a/net-misc/vino/vino-3.0.3.ebuild b/net-misc/vino/vino-3.0.3.ebuild
new file mode 100644
index 000000000000..cbfbd8b6158f
--- /dev/null
+++ b/net-misc/vino/vino-3.0.3.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/vino-3.0.3.ebuild,v 1.1 2011/08/19 14:29:25 nirbheek Exp $
+
+EAPI="4"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2
+if [[ ${PV} = 9999 ]]; then
+	inherit gnome2-live
+fi
+
+DESCRIPTION="An integrated VNC server for GNOME"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+if [[ ${PV} = 9999 ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+fi
+IUSE="avahi crypt ipv6 jpeg gnome-keyring libnotify networkmanager ssl +telepathy +zlib"
+
+RDEPEND=">=dev-libs/glib-2.26:2
+	>=x11-libs/gtk+-3.0.0:3
+	>=dev-libs/libgcrypt-1.1.90
+	>=net-libs/libsoup-2.24:2.4
+
+	dev-libs/dbus-glib
+	x11-libs/pango[X]
+	x11-libs/libX11
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXtst
+
+	avahi? ( >=net-dns/avahi-0.6[dbus] )
+	crypt? ( >=dev-libs/libgcrypt-1.1.90 )
+	gnome-keyring? ( || ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 ) )
+	jpeg? ( virtual/jpeg:0 )
+	libnotify? ( >=x11-libs/libnotify-0.7.0 )
+	networkmanager? ( >=net-misc/networkmanager-0.7 )
+	ssl? ( >=net-libs/gnutls-1.0.0 )
+	telepathy? ( >=net-libs/telepathy-glib-0.11.6 )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	>=dev-lang/perl-5
+	>=dev-util/pkgconfig-0.16
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	|| (
+		gnome-base/libgnome-keyring
+		<gnome-base/gnome-keyring-2.29.4 )"
+# keyring is always required at build time per bug 322763
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-schemas-compile
+		--disable-maintainer-mode
+		--enable-http-server
+		--with-gcrypt
+		$(use_with avahi)
+		$(use_with crypt gcrypt)
+		$(use_enable ipv6)
+		$(use_with jpeg)
+		$(use_with gnome-keyring)
+		$(use_with libnotify)
+		$(use_with networkmanager network-manager)
+		$(use_with ssl gnutls)
+		$(use_with telepathy)
+		$(use_with zlib)"
+	DOCS="AUTHORS ChangeLog* NEWS README"
+}
-- 
2.26.2