bump to 2.20.0

(Portage version: 2.1.3.12)

5 files changed, 40 insertions, 37 deletions

diff --git a/gnome-extra/gconf-editor/ChangeLog b/gnome-extra/gconf-editor/ChangeLog
index 70d935ce587e..68556ee2d3f5 100644
--- a/gnome-extra/gconf-editor/ChangeLog
+++ b/gnome-extra/gconf-editor/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/gconf-editor
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gconf-editor/ChangeLog,v 1.114 2007/09/27 11:41:47 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gconf-editor/ChangeLog,v 1.115 2007/10/11 23:00:56 eva Exp $
+
+*gconf-editor-2.20.0 (11 Oct 2007)
+
+  11 Oct 2007; Gilles Dartiguelongue <eva@gentoo.org>
+  -gconf-editor-2.14.0.ebuild, +gconf-editor-2.20.0.ebuild:
+  bump to 2.20.0 and prune 2.14.0
 
   27 Sep 2007; Raúl Porcel <armin76@gentoo.org> gconf-editor-2.18.2.ebuild:
   alpha/ia64 stable wrt #193339
diff --git a/gnome-extra/gconf-editor/files/digest-gconf-editor-2.14.0 b/gnome-extra/gconf-editor/files/digest-gconf-editor-2.14.0
deleted file mode 100644
index 46bdd5808003..000000000000
--- a/gnome-extra/gconf-editor/files/digest-gconf-editor-2.14.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 eb8b979464f6e383e5a27b57ee4e8382 gconf-editor-2.14.0.tar.bz2 541099
-RMD160 570c863597155d075b710c153880488662406a1b gconf-editor-2.14.0.tar.bz2 541099
-SHA256 974e1ba2c6bb650ee638a80e81174582123d7bfbe14cccf613542dd103e2b554 gconf-editor-2.14.0.tar.bz2 541099
diff --git a/gnome-extra/gconf-editor/files/digest-gconf-editor-2.20.0 b/gnome-extra/gconf-editor/files/digest-gconf-editor-2.20.0
new file mode 100644
index 000000000000..4902af4c7aaf
--- /dev/null
+++ b/gnome-extra/gconf-editor/files/digest-gconf-editor-2.20.0
@@ -0,0 +1,3 @@
+MD5 b686677878b5754ffa8d0a2cc1129988 gconf-editor-2.20.0.tar.bz2 892603
+RMD160 b951b2a7db1fd315e0068ec00612297cb7ffd14f gconf-editor-2.20.0.tar.bz2 892603
+SHA256 10b5043c4152cf5d33b138c516c10708005212ee150ea8dc6c7dc396ac27a79a gconf-editor-2.20.0.tar.bz2 892603
diff --git a/gnome-extra/gconf-editor/gconf-editor-2.14.0.ebuild b/gnome-extra/gconf-editor/gconf-editor-2.14.0.ebuild
deleted file mode 100644
index fda3a7f21a43..000000000000
--- a/gnome-extra/gconf-editor/gconf-editor-2.14.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gconf-editor/gconf-editor-2.14.0.ebuild,v 1.12 2006/10/20 22:50:27 agriffis Exp $
-
-inherit gnome2
-
-DESCRIPTION="An editor to the GNOME 2 config system"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=">=gnome-base/gconf-2.9.2
-		 >=x11-libs/gtk+-2.5.5
-		 >=gnome-base/libgnome-1.96
-		 >=gnome-base/libgnomeui-2.5.4
-		 sys-devel/gettext"
-
-DEPEND="${RDEPEND}
-		app-text/scrollkeeper
-		>=dev-util/intltool-0.28
-		>=dev-util/pkgconfig-0.9"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-mem_corrupt.patch
-	gnome2_omf_fix
-}
diff --git a/gnome-extra/gconf-editor/gconf-editor-2.20.0.ebuild b/gnome-extra/gconf-editor/gconf-editor-2.20.0.ebuild
new file mode 100644
index 000000000000..16e0539290c8
--- /dev/null
+++ b/gnome-extra/gconf-editor/gconf-editor-2.20.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gconf-editor/gconf-editor-2.20.0.ebuild,v 1.1 2007/10/11 23:00:56 eva Exp $
+
+inherit gnome2
+
+DESCRIPTION="An editor to the GNOME 2 config system"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=x11-libs/gtk+-2.6
+	>=gnome-base/gconf-2.10
+	>=gnome-base/libgnome-2.14
+	>=gnome-base/libgnomeui-2.6"
+DEPEND="${RDEPEND}
+	app-text/scrollkeeper
+	sys-devel/gettext
+	app-text/gnome-doc-utils
+	>=dev-util/intltool-0.35
+	>=dev-util/pkgconfig-0.19"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+pkg_setup() {
+	G2CONF="${G2CONF} --disable-scrollkeeper"
+}