Add GCONF_DEBUG, bug #270905. Clean up old revision.

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

4 files changed, 19 insertions, 65 deletions

diff --git a/net-misc/vinagre/ChangeLog b/net-misc/vinagre/ChangeLog
index 69816a3b70b6..0647b0add9c1 100644
--- a/net-misc/vinagre/ChangeLog
+++ b/net-misc/vinagre/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/vinagre
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vinagre/ChangeLog,v 1.43 2009/10/24 16:57:48 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vinagre/ChangeLog,v 1.44 2009/10/28 20:43:30 eva Exp $
+
+  28 Oct 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -vinagre-2.26.1.ebuild, vinagre-2.26.2.ebuild:
+  Add GCONF_DEBUG, bug #270905. Clean up old revision.
 
   24 Oct 2009; nixnut <nixnut@gentoo.org> vinagre-2.26.2.ebuild:
   ppc stable #281427
diff --git a/net-misc/vinagre/Manifest b/net-misc/vinagre/Manifest
index bc968588c247..a9943c37bcb0 100644
--- a/net-misc/vinagre/Manifest
+++ b/net-misc/vinagre/Manifest
@@ -1,10 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX vinagre-2.24.2-optional-avahi.patch 11154 RMD160 3d54bc47fe815451cb464f65826f6fdb866a9589 SHA1 1d0f7479c83bd649cb2c75e173a0217df1352bda SHA256 31e4642955b3871bdd20b2cccc5e28536f5a402eaab4980c055de58eb799e857
 AUX vinagre-2.26.1-optional-applet.patch 1784 RMD160 7f1453843ae2084e26d18b267e896480692d7c72 SHA1 5834e139a159f79b9c7d13683278d5b9f0a4e209 SHA256 dcb0171c15fb9cb86a337e96adece439ea2b43e5d619dc72b859f6870a5eca3d
 DIST vinagre-2.24.2.tar.bz2 1450774 RMD160 880302151d827067d97486043aa07a23f2047e34 SHA1 3073f3a6b64594ea28252f79f01a0a52241e2ec6 SHA256 57b4be4c8bfeeb1493e96b728ec6a4ac29b3e01217b03ce9b194e1932f538959
-DIST vinagre-2.26.1.tar.bz2 1453150 RMD160 298ede9406ffde74fbcfb5491bcb5d481dd35d84 SHA1 7670dd1c9bc9b213539f10addfee4983a5ee9422 SHA256 d5a9fc5940d23f7a0209846576a81d4fc62f9fb038f945693b1be77c4e50f09c
 DIST vinagre-2.26.2.tar.bz2 1445532 RMD160 45a362eb516bf45f55c99ff05ba5d285a2a5624b SHA1 b5b27ae33882c6d9a57dd2fe1e4e43b2dfd202e0 SHA256 8a1e86dff5e1c14bb53f8f5ee579c7ddaaf532d5d7b1f66a2b5a239a65a15fb5
 EBUILD vinagre-2.24.2-r1.ebuild 1421 RMD160 88ed5e5f5329c60455fc71b360210ff7ad49b0b6 SHA1 6567c7f2922a097e046518a87cdcab0eedc22c9e SHA256 967450902714e94a6f39f8ac74aa0644eb67149202eeda331caadab9114ea986
-EBUILD vinagre-2.26.1.ebuild 1478 RMD160 fd8ad7cbee75eabcbb39ce4448c329ea5c9c7317 SHA1 f1db53ae8fc37f247aaecc86c0be0b5a07813689 SHA256 81ad750cc563c232d8f7bc4d6d73e7171db6c6eca50e95dbfff96efb1af95498
-EBUILD vinagre-2.26.2.ebuild 1480 RMD160 b0a4b11d7deb1648dcb9eed24b441f34f532cbd3 SHA1 fd1e946585f38b821a68168579550f9c34026346 SHA256 b156c67bc26f8a78bb3b00ecf197ba0bd20451ba09d5169b5bdc467ca2af3cf5
-MISC ChangeLog 5499 RMD160 6e2bdd0888579d3bd51aea50c883b79aaea0a367 SHA1 0b6b5baab244940d21f54ffbf3352ea7cbbb73dc SHA256 e703afa9293e42d24368d41bd007b0421df176494844f0760b049899c5002fc8
+EBUILD vinagre-2.26.2.ebuild 1494 RMD160 bce887b7c7de805e2c7ba9dcb163bfc858ae4803 SHA1 6c41b641b2e59cc7c14bea8ba3e9d0c6ed58a6f6 SHA256 0a474dcc0c4a9ad60a903078ee7a7d60619b326e1e176966ce4cd20c40a2309d
+MISC ChangeLog 5655 RMD160 b04b31ebc5b07efffb00be9255fde6cd99ac96bd SHA1 bc76a4543520ca0d912d4424757a98311c0ff915 SHA256 df5a3df107b1b18adf8ab4f7d1145da1127dd83b85c4a22f3b480e8ea12eb744
 MISC metadata.xml 308 RMD160 98671a6c211abb386123a7283c03de52fb83ce31 SHA1 e433a25760684d720c93a2a3906194de360133f9 SHA256 f90924ba76600e9f351f122fa48c581797b0b65fea241347205c02aeac722c7e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkrorPgACgkQ1fmVwcYIWAaLDQCfen5acCCzbXmxmY39EjThMAP0
+kuoAoL7IJF9feS9Dlypuz/y1g+XyXrLF
+=66vI
+-----END PGP SIGNATURE-----
diff --git a/net-misc/vinagre/vinagre-2.26.1.ebuild b/net-misc/vinagre/vinagre-2.26.1.ebuild
deleted file mode 100644
index 66467b92dd8b..000000000000
--- a/net-misc/vinagre/vinagre-2.26.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vinagre/vinagre-2.26.1.ebuild,v 1.2 2009/05/10 16:32:35 mr_bones_ Exp $
-
-EAPI="2"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="VNC Client for the GNOME Desktop"
-HOMEPAGE="http://www.gnome.org/projects/vinagre/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="applet avahi test"
-
-RDEPEND=">=dev-libs/glib-2.17.0
-	>=x11-libs/gtk+-2.13.1
-	>=gnome-base/libglade-2.6
-	>=gnome-base/gconf-2.16
-	>=net-libs/gtk-vnc-0.3.8
-	>=gnome-base/gnome-keyring-1
-	applet? ( >=gnome-base/gnome-panel-2 )
-	avahi? ( >=net-dns/avahi-0.6.22[dbus,gtk] )"
-
-DEPEND="${RDEPEND}
-	gnome-base/gnome-common
-	>=dev-lang/perl-5
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35
-	app-text/scrollkeeper
-	app-text/gnome-doc-utils
-	test? ( ~app-text/docbook-xml-dtd-4.3 )"
-
-DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-scrollkeeper
-		$(use_enable avahi)
-		$(use_enable applet)"
-}
-
-src_prepare()  {
-	gnome2_src_prepare
-
-	# Make applet optional, bug #267279
-	epatch "${FILESDIR}/${P}-optional-applet.patch"
-
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Remove it's own installation of DOCS that go to $PN instead of $P and aren't ecompressed
-	rm -rf "${D}"/usr/share/doc/vinagre
-}
diff --git a/net-misc/vinagre/vinagre-2.26.2.ebuild b/net-misc/vinagre/vinagre-2.26.2.ebuild
index 8a0b04fedd6b..ecf0745ad414 100644
--- a/net-misc/vinagre/vinagre-2.26.2.ebuild
+++ b/net-misc/vinagre/vinagre-2.26.2.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vinagre/vinagre-2.26.2.ebuild,v 1.4 2009/10/24 16:57:48 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vinagre/vinagre-2.26.2.ebuild,v 1.5 2009/10/28 20:43:30 eva Exp $
 
 EAPI="2"
+GCONF_DEBUG="no"
 
 inherit autotools eutils gnome2