gnome 2.6 commit

9 files changed, 15 insertions, 59 deletions

diff --git a/gnome-extra/gconf-editor/ChangeLog b/gnome-extra/gconf-editor/ChangeLog
index 16e2b451c807..edfbeebb2bc3 100644
--- a/gnome-extra/gconf-editor/ChangeLog
+++ b/gnome-extra/gconf-editor/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/gconf-editor
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gconf-editor/ChangeLog,v 1.23 2004/03/17 01:02:52 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gconf-editor/ChangeLog,v 1.24 2004/03/21 15:32:42 foser Exp $
+
+*gconf-editor-2.5.92 (21 Mar 2004)
+
+  21 Mar 2004; foser <foser@gentoo.org> gconf-editor-2.5.92.ebuild :
+  Gnome 2.6 commit
 
   16 Mar 2004; Stephen P. Becker <geoman@gentoo.org>
   gconf-editor-2.4.0.ebuild:
diff --git a/gnome-extra/gconf-editor/Manifest b/gnome-extra/gconf-editor/Manifest
index 9d2305093b0f..7291ce1ce627 100644
--- a/gnome-extra/gconf-editor/Manifest
+++ b/gnome-extra/gconf-editor/Manifest
@@ -1,10 +1,6 @@
 MD5 131cf7e01b6bab1c6d696040181a2174 gconf-editor-2.4.0.ebuild 582
-MD5 261e1199f82187f6b565c381696db545 gconf-editor-0.3.1.ebuild 718
-MD5 67401e622aaab68f6782ada5312fed08 gconf-editor-0.4.1.ebuild 577
-MD5 432972e466f6066ce87908c2d705f161 gconf-editor-0.4.0.ebuild 587
-MD5 f9ecca82b58c8f50eff1ee65b7e20357 ChangeLog 2642
+MD5 3e2a12cd70059877dfa2d31d28721fe9 gconf-editor-2.5.92.ebuild 634
+MD5 0a6203f057070d2d372933f5e9cb5bcb ChangeLog 2766
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 71c90b68219fe6a5eebb8315a4dc3f63 files/digest-gconf-editor-0.3.1 71
-MD5 748556d04c3ceba2a492444607a724ab files/digest-gconf-editor-0.4.0 71
-MD5 63319dfed515db1e2794d1ea164d7868 files/digest-gconf-editor-0.4.1 71
+MD5 82611faacd619c31934fba15905b1947 files/digest-gconf-editor-2.5.92 72
 MD5 a2b72e9cea80bfd300183397a4487a72 files/digest-gconf-editor-2.4.0 71
diff --git a/gnome-extra/gconf-editor/files/digest-gconf-editor-0.3.1 b/gnome-extra/gconf-editor/files/digest-gconf-editor-0.3.1
deleted file mode 100644
index a7e128ca2c9a..000000000000
--- a/gnome-extra/gconf-editor/files/digest-gconf-editor-0.3.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2ae3eb95dee36efdc96baf5baa000e96 gconf-editor-0.3.1.tar.bz2 227989
diff --git a/gnome-extra/gconf-editor/files/digest-gconf-editor-0.4.0 b/gnome-extra/gconf-editor/files/digest-gconf-editor-0.4.0
deleted file mode 100644
index 476b0cc0c76a..000000000000
--- a/gnome-extra/gconf-editor/files/digest-gconf-editor-0.4.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c8e90527fcc899cb3159de1d42ef1dd0 gconf-editor-0.4.0.tar.bz2 244566
diff --git a/gnome-extra/gconf-editor/files/digest-gconf-editor-0.4.1 b/gnome-extra/gconf-editor/files/digest-gconf-editor-0.4.1
deleted file mode 100644
index 5e3cfdf9bded..000000000000
--- a/gnome-extra/gconf-editor/files/digest-gconf-editor-0.4.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3ccff570fb185134452e04a35e6af6b4 gconf-editor-0.4.1.tar.bz2 330229
diff --git a/gnome-extra/gconf-editor/files/digest-gconf-editor-2.5.92 b/gnome-extra/gconf-editor/files/digest-gconf-editor-2.5.92
new file mode 100644
index 000000000000..1d8e52832422
--- /dev/null
+++ b/gnome-extra/gconf-editor/files/digest-gconf-editor-2.5.92
@@ -0,0 +1 @@
+MD5 2252bd7dddae094b287bbc911d6f8abf gconf-editor-2.5.92.tar.bz2 369646
diff --git a/gnome-extra/gconf-editor/gconf-editor-0.3.1.ebuild b/gnome-extra/gconf-editor/gconf-editor-0.3.1.ebuild
deleted file mode 100644
index 65d3f4cd68aa..000000000000
--- a/gnome-extra/gconf-editor/gconf-editor-0.3.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gconf-editor/gconf-editor-0.3.1.ebuild,v 1.7 2003/02/13 12:17:19 vapier Exp $ 
-
-
-inherit gnome2
-
-S=${WORKDIR}/${P}
-DESCRIPTION="an editor to the GConf2 system"
-SRC_URI="mirror://gnome/2.0.1/sources/${PN}/${P}.tar.bz2"
-HOMEPAGE="http://www.gnome.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc alpha"
-
-RDEPEND=">=gnome-base/gconf-1.2.1
-	>=x11-libs/gtk+-2.0.6-r1
-	>=dev-libs/glib-2.0.6-r1"
-
-DEPEND="${RDEPEND} >=dev-util/pkgconfig-0.12.0"
-
-G2CONF="${G2CONF} --enable-platform-gnome-2"
-DOCS="ABOUT-NLS AUTHORS ChangeLog COPYING README* INSTALL NEWS"
diff --git a/gnome-extra/gconf-editor/gconf-editor-0.4.0.ebuild b/gnome-extra/gconf-editor/gconf-editor-0.4.0.ebuild
deleted file mode 100644
index 8a4ffac179f1..000000000000
--- a/gnome-extra/gconf-editor/gconf-editor-0.4.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gconf-editor/gconf-editor-0.4.0.ebuild,v 1.7 2003/07/19 23:27:59 tester Exp $ 
-
-inherit gnome2
-
-S=${WORKDIR}/${P}
-DESCRIPTION="an editor to the GConf2 system"
-HOMEPAGE="http://www.gnome.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc ~sparc alpha hppa amd64"
-
-RDEPEND=">=gnome-base/gconf-1.2.1
-	>=x11-libs/gtk+-2.0.2"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0"
-
-DOCS="AUTHORS ChangeLog COPYING README INSTALL NEWS"
diff --git a/gnome-extra/gconf-editor/gconf-editor-0.4.1.ebuild b/gnome-extra/gconf-editor/gconf-editor-2.5.92.ebuild
index 133e582c5fc0..39406b871bb3 100644
--- a/gnome-extra/gconf-editor/gconf-editor-0.4.1.ebuild
+++ b/gnome-extra/gconf-editor/gconf-editor-2.5.92.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gconf-editor/gconf-editor-0.4.1.ebuild,v 1.7 2003/09/23 15:51:24 darkspecter Exp $ 
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gconf-editor/gconf-editor-2.5.92.ebuild,v 1.1 2004/03/21 15:32:42 foser Exp $ 
 
 inherit gnome2
 
@@ -9,12 +9,14 @@ HOMEPAGE="http://www.gnome.org/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc ~alpha hppa amd64"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~mips"
 
 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"