bump to 2.20.0

Package-Manager: portage-2.1.3.12

6 files changed, 62 insertions, 49 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/Manifest b/gnome-extra/gconf-editor/Manifest
index 18ddb2d3fffe..eacc0bd57789 100644
--- a/gnome-extra/gconf-editor/Manifest
+++ b/gnome-extra/gconf-editor/Manifest
@@ -1,15 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gconf-editor-2.14.0-mem_corrupt.patch 1341 RMD160 05248eb3f87947ba26f8793878f04202c270e285 SHA1 d9e8b8877b28e3de23564c866b21f1b56e3a3e7c SHA256 dfdf0480fd5e210d78f16788e5aa5d1d8065ca8f7183a0cc20ea5af8d1ff6d0e
 MD5 c3cc99a920f7d8f60cda6f591d19035f files/gconf-editor-2.14.0-mem_corrupt.patch 1341
 RMD160 05248eb3f87947ba26f8793878f04202c270e285 files/gconf-editor-2.14.0-mem_corrupt.patch 1341
 SHA256 dfdf0480fd5e210d78f16788e5aa5d1d8065ca8f7183a0cc20ea5af8d1ff6d0e files/gconf-editor-2.14.0-mem_corrupt.patch 1341
-DIST gconf-editor-2.14.0.tar.bz2 541099 RMD160 570c863597155d075b710c153880488662406a1b SHA1 3cda659ebbfbe8c10ca75406aed0f778374983b5 SHA256 974e1ba2c6bb650ee638a80e81174582123d7bfbe14cccf613542dd103e2b554
 DIST gconf-editor-2.16.0.tar.bz2 528644 RMD160 fd368fd7f1de34e1f1c407e0e152eee3bbba0c71 SHA1 a3e807aff373c3ecd7cd49d5ef7f5a8e53c058d0 SHA256 efee1e2e65e280abe30b94b20b59d24d2c71e55e5ad26cb3041966a32b436786
 DIST gconf-editor-2.18.0.tar.bz2 694449 RMD160 cc16f83d771b7797a6b310a6d504e36ffe116541 SHA1 18b969b5aba2e42f0d68e2538a5529b544a8811e SHA256 ffd3d8ef4637ead6ebd7469c1e4283e3c1044351a243e81e6f242194e07fa057
 DIST gconf-editor-2.18.2.tar.bz2 922748 RMD160 acb269cdc8a3a27a8196de1583e01cbb48a0cede SHA1 7118d71242042c78896218e6c461b07e72e7aa26 SHA256 e6c07528a1f770c9848550d8f101940f52d40bdf616754e4eba93af1079ef6d6
-EBUILD gconf-editor-2.14.0.ebuild 807 RMD160 10010d1576ca70c1bd104e42579449df3abb2712 SHA1 db1e39e862135e6ec280fcb49310f44780878a50 SHA256 e284ea814da418961dc0f5b802cb408780a60c5296dc9d9c415bad7c5bb99ba4
-MD5 0a0cbe7e555d4056c50623b1e5a6b92e gconf-editor-2.14.0.ebuild 807
-RMD160 10010d1576ca70c1bd104e42579449df3abb2712 gconf-editor-2.14.0.ebuild 807
-SHA256 e284ea814da418961dc0f5b802cb408780a60c5296dc9d9c415bad7c5bb99ba4 gconf-editor-2.14.0.ebuild 807
+DIST gconf-editor-2.20.0.tar.bz2 892603 RMD160 b951b2a7db1fd315e0068ec00612297cb7ffd14f SHA1 628404983b89e005cbd688d841291ddc46c361a2 SHA256 10b5043c4152cf5d33b138c516c10708005212ee150ea8dc6c7dc396ac27a79a
 EBUILD gconf-editor-2.16.0.ebuild 711 RMD160 706ea4e888dbf2d9f271a0960001302966c9d6eb SHA1 1dd374ec54f066bb926041401c12bff9b3b52775 SHA256 02f84d91318d5cec6d67243320d076fe1413fab53cc620c80d4eae101e2ab0e0
 MD5 6940882d3b22fa1e2e21082567791109 gconf-editor-2.16.0.ebuild 711
 RMD160 706ea4e888dbf2d9f271a0960001302966c9d6eb gconf-editor-2.16.0.ebuild 711
@@ -22,17 +21,18 @@ EBUILD gconf-editor-2.18.2.ebuild 796 RMD160 052ca614cdd6f6c5e023cc659cf16d19f62
 MD5 7bba277516f4392bd42c16e2e8b7c5ac gconf-editor-2.18.2.ebuild 796
 RMD160 052ca614cdd6f6c5e023cc659cf16d19f6269001 gconf-editor-2.18.2.ebuild 796
 SHA256 0409ed0f52fa6bb914a878d02fc5f879bad9a6a4c32cb48deaa5f46156931221 gconf-editor-2.18.2.ebuild 796
-MISC ChangeLog 13292 RMD160 aed736e9d786dff2c2152812cfb8574e8435b9b1 SHA1 a36bc42cfde230bea45d8919ba9bda6d11ec7284 SHA256 1a73f68eb9153ce2863897e376572c55df46c33a88ae0fe461c032e09d1cee47
-MD5 f40f134f51f6b22feac55493b5be4161 ChangeLog 13292
-RMD160 aed736e9d786dff2c2152812cfb8574e8435b9b1 ChangeLog 13292
-SHA256 1a73f68eb9153ce2863897e376572c55df46c33a88ae0fe461c032e09d1cee47 ChangeLog 13292
+EBUILD gconf-editor-2.20.0.ebuild 799 RMD160 8bbbbfb2ef9b7724ac45238a5972b675793e414c SHA1 a4da5c9189d068365fd47f417a78bc0543057da9 SHA256 ac2504f5bf45afd1587a6152fddd526a1a36f598b3ca0123dde535defec94416
+MD5 b2b560faaf3521d9aba0a02f3e80deaa gconf-editor-2.20.0.ebuild 799
+RMD160 8bbbbfb2ef9b7724ac45238a5972b675793e414c gconf-editor-2.20.0.ebuild 799
+SHA256 ac2504f5bf45afd1587a6152fddd526a1a36f598b3ca0123dde535defec94416 gconf-editor-2.20.0.ebuild 799
+MISC ChangeLog 13473 RMD160 fee64880b29f552a8ffe9ed970a3caffb075c954 SHA1 5d36b5d96e1e2026f90a7978fa5106d65674b71e SHA256 8cca7ec75b9585457af2d0de1797b0a599cd34d5146b14eeb0a85a926817eb4d
+MD5 b04efd81f6fb513242fbf439cc8add29 ChangeLog 13473
+RMD160 fee64880b29f552a8ffe9ed970a3caffb075c954 ChangeLog 13473
+SHA256 8cca7ec75b9585457af2d0de1797b0a599cd34d5146b14eeb0a85a926817eb4d ChangeLog 13473
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 metadata.xml 158
-MD5 a31eea040d0abcda01eb7a70e8a0dfdf files/digest-gconf-editor-2.14.0 262
-RMD160 94effd81661eb4214a9c4f388cd4af55f112853b files/digest-gconf-editor-2.14.0 262
-SHA256 40de7fa8aae6e95e03ebc79ea3f4c0b911accb5aad26d643df4d1909e93bb383 files/digest-gconf-editor-2.14.0 262
 MD5 6774cdde9b7cc504cf3a17a4109376e8 files/digest-gconf-editor-2.16.0 262
 RMD160 4a6f8ab99ac125598b6cfeb6b2adf726d9807594 files/digest-gconf-editor-2.16.0 262
 SHA256 cde0efbea29560106e25ad635cae94d4a056e1028dbf8080cf4acf8ac4ab3979 files/digest-gconf-editor-2.16.0 262
@@ -42,3 +42,13 @@ SHA256 f0148fc2eda30b83c2af699adefc7ab85083d81a9ed153a4e0e8eb6b01b5036e files/di
 MD5 ccaf7a9156cb90e66bc19643267b606b files/digest-gconf-editor-2.18.2 262
 RMD160 409ac3959a26950d332fb4ec17f2f2648c9fc300 files/digest-gconf-editor-2.18.2 262
 SHA256 c8e802e80904b2c83c92af1d794ac11f6701b85d7129d1b9c5542df44adc900b files/digest-gconf-editor-2.18.2 262
+MD5 3d398c1c2da0c1a769824dce1438ce0a files/digest-gconf-editor-2.20.0 262
+RMD160 e02a125b3aa1981fce5990a5ff5e8743d6366265 files/digest-gconf-editor-2.20.0 262
+SHA256 070cae7a3c88384aadbdfb654fdfc9724d728872deb5e93750d71d046d26e604 files/digest-gconf-editor-2.20.0 262
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHDqs61fmVwcYIWAYRAiIoAKDFMWq/8oHwdpPV191kfE3fQLlkNQCfeEtT
+cRlyd0GvB91usFHJwzupwM8=
+=mqnV
+-----END PGP SIGNATURE-----
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"
+}