New release: 2.11.92

(Portage version: 2.0.51.22-r2)

15 files changed, 23 insertions, 283 deletions

diff --git a/gnome-extra/gconf-editor/ChangeLog b/gnome-extra/gconf-editor/ChangeLog
index 8df737288382..cb2e08ebeed3 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gconf-editor/ChangeLog,v 1.63 2005/07/12 03:53:25 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gconf-editor/ChangeLog,v 1.64 2005/08/24 21:59:16 leonardop Exp $
+
+*gconf-editor-2.11.92 (24 Aug 2005)
+
+  24 Aug 2005; Leonardo Boshell <leonardop@gentoo.org>
+  +gconf-editor-2.11.92.ebuild:
+  New version.
 
   12 Jul 2005; Stephen P. Becker <geoman@gentoo.org>
   gconf-editor-2.10.0.ebuild:
diff --git a/gnome-extra/gconf-editor/Manifest b/gnome-extra/gconf-editor/Manifest
index df6a9fdbf813..3092f47a89e6 100644
--- a/gnome-extra/gconf-editor/Manifest
+++ b/gnome-extra/gconf-editor/Manifest
@@ -1,18 +1,9 @@
-MD5 f2a895d2a52f28d78267a1cd6c84a564 gconf-editor-2.8.0.ebuild 695
-MD5 dc321fef8956eb35804439f3ec535bf7 gconf-editor-2.4.0.ebuild 692
-MD5 12f39d10e3d472a7f457ef13486b509a gconf-editor-2.6.1.ebuild 628
-MD5 e4aa9d6ef39937d97a1324819c0ccc1d gconf-editor-2.8.2.ebuild 687
-MD5 9309216b0addd1f74348cc5ad1989d7d gconf-editor-2.6.0.ebuild 859
-MD5 9ad48f878bc5f7176450b307c177ab28 gconf-editor-2.6.2.ebuild 626
 MD5 33d9576da4e9903cdc76c5b68ba1c34b ChangeLog 6875
-MD5 55d27e003d8ca8be5af6e30b369f1fef gconf-editor-2.10.0.ebuild 710
+MD5 c2c024b7b9c28f276849eefddafd3a7e gconf-editor-2.11.92.ebuild 718
+MD5 a03d7fa800a7c0e305626d8c6e09e65f .gconf-editor-2.11.92.ebuild.swp 12288
+MD5 e4aa9d6ef39937d97a1324819c0ccc1d gconf-editor-2.8.2.ebuild 687
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 99070c44d83be5df6ca3a275c4cc3b13 files/digest-gconf-editor-2.10.0 72
-MD5 37d0c602679587424d11f7b6363421a8 files/gconf-editor-2.4.0-gtk+-2.4.patch 1528
-MD5 a2b72e9cea80bfd300183397a4487a72 files/digest-gconf-editor-2.4.0 71
-MD5 e1005344b4be9e39de4829d91f0c2aba files/digest-gconf-editor-2.6.0 71
-MD5 8866f71c7c4162fc9ed59f0f60bdfe6c files/digest-gconf-editor-2.6.1 71
-MD5 6b1fcd04a46411dda1c62bd9df47e431 files/digest-gconf-editor-2.6.2 71
-MD5 dc5bba44c0b64bae5537992930ccd9d0 files/digest-gconf-editor-2.8.0 71
+MD5 55d27e003d8ca8be5af6e30b369f1fef gconf-editor-2.10.0.ebuild 710
+MD5 d0458e4c5f3de6f516a7f5cf080be4f8 files/digest-gconf-editor-2.11.92 73
 MD5 1a02c71e7fe8df4aeb8b35a48667c2b9 files/digest-gconf-editor-2.8.2 71
-MD5 d82811e98599090bb20b4e7173356556 files/gconf-editor-2.6.0-revert_escape_cjk.patch 3887
+MD5 99070c44d83be5df6ca3a275c4cc3b13 files/digest-gconf-editor-2.10.0 72
diff --git a/gnome-extra/gconf-editor/files/digest-gconf-editor-2.11.92 b/gnome-extra/gconf-editor/files/digest-gconf-editor-2.11.92
new file mode 100644
index 000000000000..964f3edbfad6
--- /dev/null
+++ b/gnome-extra/gconf-editor/files/digest-gconf-editor-2.11.92
@@ -0,0 +1 @@
+MD5 afbc07a3d861e1b43a5c2592419cc47d gconf-editor-2.11.92.tar.bz2 477844
diff --git a/gnome-extra/gconf-editor/files/digest-gconf-editor-2.4.0 b/gnome-extra/gconf-editor/files/digest-gconf-editor-2.4.0
deleted file mode 100644
index d995fd39474e..000000000000
--- a/gnome-extra/gconf-editor/files/digest-gconf-editor-2.4.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7ebc352062fc8b6d3c09a69ad6e963a7 gconf-editor-2.4.0.tar.bz2 352468
diff --git a/gnome-extra/gconf-editor/files/digest-gconf-editor-2.6.0 b/gnome-extra/gconf-editor/files/digest-gconf-editor-2.6.0
deleted file mode 100644
index aa4582c27697..000000000000
--- a/gnome-extra/gconf-editor/files/digest-gconf-editor-2.6.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 456d5dbddefffe7b49f18688aa9c1975 gconf-editor-2.6.0.tar.bz2 372032
diff --git a/gnome-extra/gconf-editor/files/digest-gconf-editor-2.6.1 b/gnome-extra/gconf-editor/files/digest-gconf-editor-2.6.1
deleted file mode 100644
index b992f411fced..000000000000
--- a/gnome-extra/gconf-editor/files/digest-gconf-editor-2.6.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 38803df797b8ab4b955ee8e473130b42 gconf-editor-2.6.1.tar.bz2 376272
diff --git a/gnome-extra/gconf-editor/files/digest-gconf-editor-2.6.2 b/gnome-extra/gconf-editor/files/digest-gconf-editor-2.6.2
deleted file mode 100644
index 8b02e4ea05ab..000000000000
--- a/gnome-extra/gconf-editor/files/digest-gconf-editor-2.6.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4b739532de350969c71f96c3b97f1093 gconf-editor-2.6.2.tar.bz2 387614
diff --git a/gnome-extra/gconf-editor/files/digest-gconf-editor-2.8.0 b/gnome-extra/gconf-editor/files/digest-gconf-editor-2.8.0
deleted file mode 100644
index 4ef39ae7c636..000000000000
--- a/gnome-extra/gconf-editor/files/digest-gconf-editor-2.8.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8222990dd271cadb259b55beb5c80cc9 gconf-editor-2.8.0.tar.bz2 504155
diff --git a/gnome-extra/gconf-editor/files/gconf-editor-2.4.0-gtk+-2.4.patch b/gnome-extra/gconf-editor/files/gconf-editor-2.4.0-gtk+-2.4.patch
deleted file mode 100644
index f4f60db39fb7..000000000000
--- a/gnome-extra/gconf-editor/files/gconf-editor-2.4.0-gtk+-2.4.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -uNr gconf-editor-2.4.0.orig/src/Makefile.am gconf-editor-2.4.0/src/Makefile.am
---- gconf-editor-2.4.0.orig/src/Makefile.am	2004-04-26 17:33:04.000000000 +0000
-+++ gconf-editor-2.4.0/src/Makefile.am	2004-04-26 17:33:52.000000000 +0000
-@@ -2,9 +2,6 @@
- 	-DLOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
- 	-DGCONF_EDITOR_IMAGEDIR=\""$(datadir)/pixmaps/gconf-editor"\" \
- 	-DIMAGEDIR=\""$(datadir)/pixmaps"\" \
--	-DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED \
--	-DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED \
--	-DGNOME_DISABLE_DEPRECATED -DGNOME_VFS_DISABLE_DEPRECATED \
- 	$(GCONF_EDITOR_CFLAGS)	
- 
- bin_PROGRAMS = gconf-editor
-diff -uNr gconf-editor-2.4.0.orig/src/Makefile.in gconf-editor-2.4.0/src/Makefile.in
---- gconf-editor-2.4.0.orig/src/Makefile.in	2004-04-26 17:33:04.000000000 +0000
-+++ gconf-editor-2.4.0/src/Makefile.in	2004-04-26 17:33:45.000000000 +0000
-@@ -123,7 +123,7 @@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
- 
--INCLUDES =  	-DLOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" 	-DGCONF_EDITOR_IMAGEDIR=\""$(datadir)/pixmaps/gconf-editor"\" 	-DIMAGEDIR=\""$(datadir)/pixmaps"\" 	-DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED 	-DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED 	-DGNOME_DISABLE_DEPRECATED -DGNOME_VFS_DISABLE_DEPRECATED 	$(GCONF_EDITOR_CFLAGS)	
-+INCLUDES =  	-DLOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" 	-DGCONF_EDITOR_IMAGEDIR=\""$(datadir)/pixmaps/gconf-editor"\" 	-DIMAGEDIR=\""$(datadir)/pixmaps"\"	$(GCONF_EDITOR_CFLAGS)	
- 
- 
- bin_PROGRAMS = gconf-editor
diff --git a/gnome-extra/gconf-editor/files/gconf-editor-2.6.0-revert_escape_cjk.patch b/gnome-extra/gconf-editor/files/gconf-editor-2.6.0-revert_escape_cjk.patch
deleted file mode 100644
index 00b43cb3150b..000000000000
--- a/gnome-extra/gconf-editor/files/gconf-editor-2.6.0-revert_escape_cjk.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-Index: gconf-editor-window.c
-===================================================================
-RCS file: /cvs/gnome/gconf-editor/src/gconf-editor-window.c,v
-retrieving revision 1.35
-diff -u -p -r1.35 gconf-editor-window.c
---- gconf-editor-window.c	22 Aug 2002 13:05:30 -0000	1.35
-+++ gconf-editor-window.c	7 Nov 2002 00:55:52 -0000
-@@ -455,7 +455,7 @@ gconf_editor_window_selection_changed (G
- 	if (selection == NULL)
- 		gtk_window_set_title (GTK_WINDOW (window), _("GConf editor"));
- 	else {
--		gchar *name, *title, *path;
-+	  	gchar *name, *title, *path, *escape_path;
- 		GtkTreeIter child_iter;
- 
- 		if (!gtk_tree_selection_get_selected (selection, NULL, &iter)) {
-@@ -478,8 +478,11 @@ gconf_editor_window_selection_changed (G
- 		gtk_statusbar_pop (GTK_STATUSBAR (window->statusbar), 0);
- 		gtk_statusbar_push (GTK_STATUSBAR (window->statusbar), 0, path);
- 
--		gconf_list_model_set_root_path (GCONF_LIST_MODEL (window->list_model), path);
-+		escape_path = gconf_tree_model_get_gconf_escape_path (path);
-+		
-+		gconf_list_model_set_root_path (GCONF_LIST_MODEL (window->list_model), escape_path);
- 
-+		g_free (escape_path);
- 		g_free (path);
- 
- 	}
-Index: gconf-tree-model.c
-===================================================================
-RCS file: /cvs/gnome/gconf-editor/src/gconf-tree-model.c,v
-retrieving revision 1.12
-diff -u -p -r1.12 gconf-tree-model.c
---- gconf-tree-model.c	9 Sep 2002 07:11:46 -0000	1.12
-+++ gconf-tree-model.c	7 Nov 2002 00:55:52 -0000
-@@ -104,17 +104,43 @@ gconf_tree_model_get_gconf_name (GConfTr
- 	return g_strdup (ptr);
- }
- 
-+gchar *
-+gconf_tree_model_get_gconf_escape_path (gchar *node_path)
-+{
-+	gchar *ptr;
-+	gchar *escape_key;
-+	gchar *escape_node_path;
-+	gchar *node_dir;
-+
-+	ptr = node_path + strlen (node_path);
-+
-+	while (ptr[-1] != '/')
-+		ptr--;
-+
-+	escape_key = gconf_escape_key (ptr, -1);
-+
-+	node_dir = g_strndup (node_path, ptr - node_path);
-+	escape_node_path = g_strconcat (node_dir, escape_key, NULL);
-+	g_free (node_dir);
-+	g_free (escape_key);
-+
-+	return escape_node_path;
-+
-+}
- static gboolean
- gconf_tree_model_build_level (GConfTreeModel *model, Node *parent_node, gboolean emit_signals)
- {
- 	GSList *list, *tmp;
- 	Node *tmp_node = NULL;
- 	gint i = 0;
-+	gchar *escape_key;
- 
- 	if (parent_node->children)
- 		return FALSE;
- 
--	list = gconf_client_all_dirs (model->client, parent_node->path, NULL);
-+	escape_key = gconf_tree_model_get_gconf_escape_path (parent_node->path);
-+	list = gconf_client_all_dirs (model->client, escape_key, NULL);
-+	g_free (escape_key);
- 
- 	if (!list)
- 		return FALSE;
-@@ -125,7 +151,8 @@ gconf_tree_model_build_level (GConfTreeM
- 		node = g_new0 (Node, 1);
- 		node->offset = i;
- 		node->parent = parent_node;
--		node->path = tmp->data;
-+		node->path = gconf_unescape_key (tmp->data, -1);
-+		g_free (tmp->data);
- 
- 		if (tmp_node) {
- 			tmp_node->next = node;
-@@ -402,8 +429,11 @@ gconf_tree_model_iter_has_child (GtkTree
- 	GConfTreeModel *model = (GConfTreeModel *)tree_model;
- 	Node *node = iter->user_data;
- 	GSList *list;
-+	gchar *escape_key;
- 
--	list = gconf_client_all_dirs (model->client, node->path, NULL);
-+	escape_key = gconf_tree_model_get_gconf_escape_path (node->path);
-+	list = gconf_client_all_dirs (model->client, escape_key, NULL);
-+	g_free (escape_key);
- 
- 	if (list == NULL)
- 		return FALSE;
-Index: gconf-tree-model.h
-===================================================================
-RCS file: /cvs/gnome/gconf-editor/src/gconf-tree-model.h,v
-retrieving revision 1.2
-diff -u -p -r1.2 gconf-tree-model.h
---- gconf-tree-model.h	14 Jan 2002 18:13:05 -0000	1.2
-+++ gconf-tree-model.h	7 Nov 2002 00:55:52 -0000
-@@ -62,4 +62,6 @@ gchar *gconf_tree_model_get_gconf_path (
- 
- GtkTreePath *gconf_tree_model_get_tree_path_from_gconf_path (GConfTreeModel *tree_model, const char *path);
- 
-+gchar *gconf_tree_model_get_gconf_escape_path (gchar *node_path);
-+
- #endif /* __GCONF_TREE_MODEL_H__ */
diff --git a/gnome-extra/gconf-editor/gconf-editor-2.8.0.ebuild b/gnome-extra/gconf-editor/gconf-editor-2.11.92.ebuild
index 877e7a3b6ec0..b57683501164 100644
--- a/gnome-extra/gconf-editor/gconf-editor-2.8.0.ebuild
+++ b/gnome-extra/gconf-editor/gconf-editor-2.11.92.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.8.0.ebuild,v 1.7 2005/01/22 06:52:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gconf-editor/gconf-editor-2.11.92.ebuild,v 1.1 2005/08/24 21:59:16 leonardop Exp $
 
 inherit gnome2
 
@@ -9,18 +9,19 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc sparc alpha hppa ~amd64 ia64 ~mips"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
-RDEPEND=">=gnome-base/gconf-1.2
-	>=x11-libs/gtk+-2.0.2
-	>=gnome-base/libgnome-2
-	>=gnome-base/libgnomeui-2.6"
+RDEPEND=">=gnome-base/gconf-2.9.2
+	>=x11-libs/gtk+-2.5.5
+	>=gnome-base/libgnome-1.96
+	>=gnome-base/libgnomeui-2.5.4"
 
 DEPEND="${RDEPEND}
 	app-text/scrollkeeper
 	sys-devel/gettext
-	>=dev-util/intltool-0.29
+	>=dev-util/intltool-0.28
 	>=dev-util/pkgconfig-0.9"
 
-DOCS="AUTHORS ChangeLog README INSTALL NEWS"
+DOCS="AUTHORS ChangeLog NEWS README"
+USE_DESTDIR="1"
diff --git a/gnome-extra/gconf-editor/gconf-editor-2.4.0.ebuild b/gnome-extra/gconf-editor/gconf-editor-2.4.0.ebuild
deleted file mode 100644
index 38172ebb0b59..000000000000
--- a/gnome-extra/gconf-editor/gconf-editor-2.4.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2005 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.4.0.ebuild,v 1.15 2005/01/08 23:27:34 slarti Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="An editor to the GNOME 2 config system"
-HOMEPAGE="http://www.gnome.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc alpha hppa amd64 ia64 mips"
-IUSE=""
-
-RDEPEND=">=gnome-base/gconf-1.2
-	>=x11-libs/gtk+-2.0.2"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9"
-
-DOCS="AUTHORS ChangeLog COPYING README INSTALL NEWS"
-
-src_unpack() {
-
-	unpack ${A}
-
-	cd ${S}
-	# fix gtk+-2.4 build
-	epatch ${FILESDIR}/${P}-gtk+-2.4.patch
-
-}
diff --git a/gnome-extra/gconf-editor/gconf-editor-2.6.0.ebuild b/gnome-extra/gconf-editor/gconf-editor-2.6.0.ebuild
deleted file mode 100644
index c0e86be54487..000000000000
--- a/gnome-extra/gconf-editor/gconf-editor-2.6.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2005 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.6.0.ebuild,v 1.9 2005/01/08 23:27:34 slarti Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="An editor to the GNOME 2 config system"
-HOMEPAGE="http://www.gnome.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha hppa amd64 ~ia64 mips"
-IUSE=""
-
-RDEPEND=">=gnome-base/gconf-1.2
-	>=x11-libs/gtk+-2.0.2"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.29
-	>=dev-util/pkgconfig-0.9"
-
-DOCS="AUTHORS ChangeLog COPYING README INSTALL NEWS"
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-
-	# Fix gconf-editor not showing some keys anymore
-	# http://bugzilla.gnome.org/show_bug.cgi?id=135807
-	EPATCH_OPTS="-d ${S}/src -R" epatch ${FILESDIR}/${P}-revert_escape_cjk.patch
-
-}
diff --git a/gnome-extra/gconf-editor/gconf-editor-2.6.1.ebuild b/gnome-extra/gconf-editor/gconf-editor-2.6.1.ebuild
deleted file mode 100644
index b49a8861d0ac..000000000000
--- a/gnome-extra/gconf-editor/gconf-editor-2.6.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2005 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.6.1.ebuild,v 1.10 2005/01/08 23:27:34 slarti Exp $
-
-inherit gnome2
-
-DESCRIPTION="An editor to the GNOME 2 config system"
-HOMEPAGE="http://www.gnome.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc ~sparc alpha hppa amd64 ~ia64 ~mips"
-IUSE=""
-
-RDEPEND=">=gnome-base/gconf-1.2
-	>=x11-libs/gtk+-2.0.2"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.29
-	>=dev-util/pkgconfig-0.9"
-
-DOCS="AUTHORS ChangeLog COPYING README INSTALL NEWS"
diff --git a/gnome-extra/gconf-editor/gconf-editor-2.6.2.ebuild b/gnome-extra/gconf-editor/gconf-editor-2.6.2.ebuild
deleted file mode 100644
index 6c7820b98c27..000000000000
--- a/gnome-extra/gconf-editor/gconf-editor-2.6.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2005 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.6.2.ebuild,v 1.9 2005/01/08 23:27:34 slarti Exp $
-
-inherit gnome2
-
-DESCRIPTION="An editor to the GNOME 2 config system"
-HOMEPAGE="http://www.gnome.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc sparc alpha hppa amd64 ~ia64 mips"
-IUSE=""
-
-RDEPEND=">=gnome-base/gconf-1.2
-	>=x11-libs/gtk+-2.0.2"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.29
-	>=dev-util/pkgconfig-0.9"
-
-DOCS="AUTHORS ChangeLog COPYING README INSTALL NEWS"