Remove networkmanager support from 2.26.2-r1 for stabilization since networkmanager-0.7 is not going stable (2.24* doesn't have NM support). Use 2.26.2-r2 for networkmanager support in ~arch

Package-Manager: portage-2.2_rc41/cvs/Linux i686

4 files changed, 81 insertions, 7 deletions

diff --git a/net-misc/vino/ChangeLog b/net-misc/vino/ChangeLog
index 27873e5f0ca9..af16a9f829c6 100644
--- a/net-misc/vino/ChangeLog
+++ b/net-misc/vino/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/vino
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/ChangeLog,v 1.126 2009/08/16 08:34:22 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/ChangeLog,v 1.127 2009/09/27 15:44:14 nirbheek Exp $
+
+*vino-2.26.2-r2 (27 Sep 2009)
+
+  27 Sep 2009; Nirbheek Chauhan <nirbheek@gentoo.org> vino-2.26.2-r1.ebuild,
+  +vino-2.26.2-r2.ebuild:
+  Remove networkmanager support from 2.26.2-r1 for stabilization since
+  networkmanager-0.7 is not going stable (2.24* doesn't have NM support).
+  Use 2.26.2-r2 for networkmanager support in ~arch
 
   16 Aug 2009; Mart Raudsepp <leio@gentoo.org>
   -files/vino-2.26.1-fbsd-fix.patch, -vino-2.26.2.ebuild:
diff --git a/net-misc/vino/Manifest b/net-misc/vino/Manifest
index 901befeea59a..430840120ba1 100644
--- a/net-misc/vino/Manifest
+++ b/net-misc/vino/Manifest
@@ -2,6 +2,7 @@ AUX vino-2.26.2-autorestart-loop.patch 588 RMD160 a0bba32d1416cfc36d67aea5db9b55
 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
 EBUILD vino-2.24.1.ebuild 1539 RMD160 018ce1964df25d6dff41301c3abf5d092023fc47 SHA1 e752e11e8a5ade840005d0bb495d1cb17223115f SHA256 0ff63958ebe8874001add62b73daa4d3c99c5e679595706c8c1b365d217784c9
-EBUILD vino-2.26.2-r1.ebuild 1808 RMD160 63c5e636db271b202ae9ec3d1642b9b7a8a91f17 SHA1 693f0b6ae06950cf58cbcd0f32394a988f572407 SHA256 327ff7e63dfb18a9f0c7683e75101e527d16192ee61c90133f979cedaf6ea85b
-MISC ChangeLog 15069 RMD160 6d737076c22fbf95949e44f31eafaa2bbd96ee24 SHA1 12c5dadbebf10eb84ecd1c5579abe28f4b2a1a55 SHA256 e8e7ad2965f5b652617b1a25fd7c043519a03204c9aceabc97e96d1965c47a13
+EBUILD vino-2.26.2-r1.ebuild 1728 RMD160 db8df62b481b184113d2771af0e6092c0e77220a SHA1 3c686310c4287982d839f6a08439ece25de89afd SHA256 6ae167d7d53c1b7e883272e8dc6af51edde98154b6e27902714b8ba7fe285926
+EBUILD vino-2.26.2-r2.ebuild 1813 RMD160 8c56d9539b1408755df12027fe69a3b0c3e1f719 SHA1 094b7af892cbbfd75232291aa8625ebfcc19a7d6 SHA256 0dae300c81a3f087421078d99f09965908bcb1e74a170670c97aa41b724376cf
+MISC ChangeLog 15405 RMD160 511974fe70ce2511b4d3180f3b893b187977810e SHA1 0f3afa557b3e6530eb86b834d4d5ce71b14993cd SHA256 1b7b60efab121f6dbbccbdce9c7ecd2b27eb14107bb056626f4d2b7b6452faee
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
diff --git a/net-misc/vino/vino-2.26.2-r1.ebuild b/net-misc/vino/vino-2.26.2-r1.ebuild
index f256f179b86c..e6e561a9347f 100644
--- a/net-misc/vino/vino-2.26.2-r1.ebuild
+++ b/net-misc/vino/vino-2.26.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/vino-2.26.2-r1.ebuild,v 1.1 2009/08/02 10:52:31 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/vino-2.26.2-r1.ebuild,v 1.2 2009/09/27 15:44:14 nirbheek Exp $
 
 EAPI="2"
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.gnome.org/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="avahi crypt gnutls ipv6 jpeg gnome-keyring libnotify networkmanager zlib"
+IUSE="avahi crypt gnutls ipv6 jpeg gnome-keyring libnotify zlib"
 
 RDEPEND=">=dev-libs/glib-2.17
 	>=x11-libs/gtk+-2.13.1
@@ -31,7 +31,6 @@ RDEPEND=">=dev-libs/glib-2.17
 	crypt? ( >=dev-libs/libgcrypt-1.1.90 )
 	gnutls? ( >=net-libs/gnutls-1 )
 	jpeg? ( media-libs/jpeg )
-	networkmanager? ( >=net-misc/networkmanager-0.7 )
 	zlib? ( sys-libs/zlib )"
 DEPEND="${RDEPEND}
 	>=dev-lang/perl-5
@@ -49,9 +48,9 @@ pkg_setup() {
 		$(use_with jpeg)
 		$(use_enable gnome-keyring)
 		$(use_enable libnotify)
-		$(use_enable networkmanager network-manager)
 		$(use_with zlib)
 		$(use_with zlib libz)
+		--disable-network-manager
 		--enable-libunique"
 }
 
diff --git a/net-misc/vino/vino-2.26.2-r2.ebuild b/net-misc/vino/vino-2.26.2-r2.ebuild
new file mode 100644
index 000000000000..08d7d3d5f6e3
--- /dev/null
+++ b/net-misc/vino/vino-2.26.2-r2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/vino-2.26.2-r2.ebuild,v 1.1 2009/09/27 15:44:14 nirbheek Exp $
+
+EAPI="2"
+
+inherit eutils gnome2
+
+DESCRIPTION="An integrated VNC server for GNOME"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="avahi crypt gnutls ipv6 jpeg gnome-keyring libnotify networkmanager zlib"
+
+RDEPEND=">=dev-libs/glib-2.17
+	>=x11-libs/gtk+-2.13.1
+	>=gnome-base/libgnomeui-2
+	>=gnome-base/gconf-2
+	>=gnome-base/libglade-2
+	>=sys-apps/dbus-1.2.3
+	>=net-libs/libsoup-2.24.0:2.4
+	>=dev-libs/libunique-1.0.0
+	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[dbus] )
+	crypt? ( >=dev-libs/libgcrypt-1.1.90 )
+	gnutls? ( >=net-libs/gnutls-1 )
+	jpeg? ( media-libs/jpeg )
+	networkmanager? ( >=net-misc/networkmanager-0.7 )
+	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() {
+	G2CONF="${G2CONF}
+		$(use_enable avahi)
+		$(use_enable crypt gcrypt)
+		$(use_enable gnutls)
+		$(use_enable ipv6)
+		$(use_with jpeg)
+		$(use_enable gnome-keyring)
+		$(use_enable libnotify)
+		$(use_enable networkmanager network-manager)
+		$(use_with zlib)
+		$(use_with zlib libz)
+		--enable-libunique"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Fix autorestart loop, bug #277989
+	epatch "${FILESDIR}/${P}-autorestart-loop.patch"
+
+	# Fix intltoolize broken file, see upstream #577133
+	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die "sed failed"
+}