gnome 2.6 commit

13 files changed, 67 insertions, 75 deletions

diff --git a/gnome-extra/gcalctool/ChangeLog b/gnome-extra/gcalctool/ChangeLog
index 489e31ae5cc9..e76e8eb76f1a 100644
--- a/gnome-extra/gcalctool/ChangeLog
+++ b/gnome-extra/gcalctool/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/gcalctool
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/ChangeLog,v 1.22 2004/03/16 23:31:14 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/ChangeLog,v 1.23 2004/03/21 17:04:35 foser Exp $
+
+*gcalctool-4.3.50 (21 Mar 2004)
+
+  21 Mar 2004; foser <foser@gentoo.org> gcalctool-4.3.50.ebuild :
+  Gnome 2.6 commit
 
   16 Mar 2004; Stephen P. Becker <geoman@gentoo.org> gcalctool-4.3.44.ebuild:
   Added ~mips keyword.
diff --git a/gnome-extra/gcalctool/Manifest b/gnome-extra/gcalctool/Manifest
index dd8699b7e27a..f20f34c21752 100644
--- a/gnome-extra/gcalctool/Manifest
+++ b/gnome-extra/gcalctool/Manifest
@@ -1,8 +1,10 @@
 MD5 840ffc2b7f1a710f9442ce3017644290 gcalctool-4.3.44.ebuild 803
+MD5 89ea36f0b35c9ed881753d9c21c9e6d7 gcalctool-4.3.50.ebuild 806
 MD5 10dcb51fdf91d0a01e722cc982be2fc9 gcalctool-4.3.16.ebuild 795
 MD5 e211c415c7ba4b2b3e0a33c92af9c3a4 gcalctool-4.3.3.ebuild 779
 MD5 1fa0d19ef215457bd934ab6fc9a2d7ca ChangeLog 2553
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 27a9f969711324aeb731aad61f22da11 files/digest-gcalctool-4.3.16 69
 MD5 63e6e1baa5b96896d1fa6906613229e0 files/digest-gcalctool-4.3.44 69
+MD5 38a6559332b1247d6c1562bfa8483c28 files/digest-gcalctool-4.3.50 69
 MD5 637f792d6f6cd63a0b97de6dbf997dec files/digest-gcalctool-4.3.3 68
diff --git a/gnome-extra/gcalctool/files/digest-gcalctool-4.3.50 b/gnome-extra/gcalctool/files/digest-gcalctool-4.3.50
new file mode 100644
index 000000000000..9cdef0b347df
--- /dev/null
+++ b/gnome-extra/gcalctool/files/digest-gcalctool-4.3.50
@@ -0,0 +1 @@
+MD5 eb9e81364d18dc7cc107954537125c37 gcalctool-4.3.50.tar.bz2 610488
diff --git a/gnome-extra/gcalctool/gcalctool-4.3.50.ebuild b/gnome-extra/gcalctool/gcalctool-4.3.50.ebuild
new file mode 100644
index 000000000000..16894335fbca
--- /dev/null
+++ b/gnome-extra/gcalctool/gcalctool-4.3.50.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/gcalctool-4.3.50.ebuild,v 1.1 2004/03/21 17:04:35 foser Exp $
+
+inherit gnome2
+
+DESCRIPTION="A scientific calculator for Gnome2"
+HOMEPAGE="http://calctool.sourceforge.net/"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~hppa ~alpha ~ia64 ~amd64 ~mips"
+IUSE=""
+
+RDEPEND=">=x11-libs/gtk+-2
+	>=gnome-base/libgnome-2
+	>=gnome-base/libgnomeui-2
+	>=gnome-base/gconf-1.2"
+
+DEPEND="${RDEPEND}
+	app-text/scrollkeeper
+	dev-util/pkgconfig"
+
+DOCS="AUTHORS COPYING ChangeLog NEWS README TODO MAINTAINERS"
+
+src_install() {
+
+	gnome2_src_install
+
+	# remove symlink that conflicts with <2.3 gnome-utils
+	rm -f ${D}/usr/bin/gnome-calculator
+
+}
diff --git a/gnome-extra/gnome-utils/ChangeLog b/gnome-extra/gnome-utils/ChangeLog
index e4b53a467dfb..01cf2cc6d894 100644
--- a/gnome-extra/gnome-utils/ChangeLog
+++ b/gnome-extra/gnome-utils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/gnome-utils
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/ChangeLog,v 1.47 2004/03/16 03:00:33 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/ChangeLog,v 1.48 2004/03/21 17:01:09 foser Exp $
+
+*gnome-utils-2.5.90 (21 Mar 2004)
+
+  21 Mar 2004; foser <foser@gentoo.org> gnome-utils-2.5.90.ebuild :
+  Gnome 2.6 commit
 
   15 Mar 2004; Stephen P. Becker <geoman@gentoo.org> gnome-utils-2.4.1.ebuild:
   Added ~mips keyword.
diff --git a/gnome-extra/gnome-utils/Manifest b/gnome-extra/gnome-utils/Manifest
index d4128469afa9..5dedf78d4c1c 100644
--- a/gnome-extra/gnome-utils/Manifest
+++ b/gnome-extra/gnome-utils/Manifest
@@ -2,11 +2,13 @@ MD5 1e278f93694d10475ad6a56006e3cdfb gnome-utils-2.4.1.ebuild 1246
 MD5 21823def31517a3466d2e92b0e13d09a gnome-utils-2.2.2.ebuild 870
 MD5 82b35cc36f6e4cdb7101f76fbd8530bc gnome-utils-2.2.0.3.ebuild 860
 MD5 01aba95cdbd0415a448c31a43644148e gnome-utils-1.4.1.2.ebuild 1799
+MD5 549c8526964bc3c5f88bb184ed9aadf1 gnome-utils-2.5.90.ebuild 919
 MD5 9beda8fbc7122da7af48c078917d38f4 gnome-utils-2.4.0.ebuild 885
 MD5 d1a066cdf6216ca132c135e8c8c42dd5 gnome-utils-2.2.3.ebuild 811
 MD5 2e6e2911a6d40d9a202798c8bd9c83b1 ChangeLog 6218
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 e41d82bfec32716a2cdf3b8cb1d7635c files/digest-gnome-utils-2.2.0.3 73
+MD5 18554b52b0cd1356698ecfc192429805 files/digest-gnome-utils-2.5.90 72
 MD5 c58ab55bf3e0510ad6029e214e758382 files/digest-gnome-utils-2.2.2 71
 MD5 e66307be4fac29383091faf342f76e04 files/digest-gnome-utils-2.2.3 71
 MD5 940bd47ebdfab5d32d62d2af41759a99 files/digest-gnome-utils-2.4.0 71
diff --git a/gnome-extra/gnome-utils/files/digest-gnome-utils-2.2.0.3 b/gnome-extra/gnome-utils/files/digest-gnome-utils-2.2.0.3
deleted file mode 100644
index 7e8365778ca7..000000000000
--- a/gnome-extra/gnome-utils/files/digest-gnome-utils-2.2.0.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cef6a3be39d160cf5e2a371293044f7f gnome-utils-2.2.0.3.tar.bz2 1270949
diff --git a/gnome-extra/gnome-utils/files/digest-gnome-utils-2.2.2 b/gnome-extra/gnome-utils/files/digest-gnome-utils-2.2.2
deleted file mode 100644
index e4f5f873277c..000000000000
--- a/gnome-extra/gnome-utils/files/digest-gnome-utils-2.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 49de8adb42a70fc0ab35bb80bc751158 gnome-utils-2.2.2.tar.bz2 2225386
diff --git a/gnome-extra/gnome-utils/files/digest-gnome-utils-2.2.3 b/gnome-extra/gnome-utils/files/digest-gnome-utils-2.2.3
deleted file mode 100644
index b31e3338f048..000000000000
--- a/gnome-extra/gnome-utils/files/digest-gnome-utils-2.2.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2bde68d39e135a99dfd308a7ec7b6c4a gnome-utils-2.2.3.tar.bz2 2224920
diff --git a/gnome-extra/gnome-utils/files/digest-gnome-utils-2.5.90 b/gnome-extra/gnome-utils/files/digest-gnome-utils-2.5.90
new file mode 100644
index 000000000000..e5e765d9a886
--- /dev/null
+++ b/gnome-extra/gnome-utils/files/digest-gnome-utils-2.5.90
@@ -0,0 +1 @@
+MD5 bd7e193525cf2053b3588328cbe855ed gnome-utils-2.5.90.tar.bz2 1668645
diff --git a/gnome-extra/gnome-utils/gnome-utils-2.2.0.3.ebuild b/gnome-extra/gnome-utils/gnome-utils-2.2.0.3.ebuild
deleted file mode 100644
index 13ed9aedf023..000000000000
--- a/gnome-extra/gnome-utils/gnome-utils-2.2.0.3.ebuild
+++ /dev/null
@@ -1,29 +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/gnome-utils/gnome-utils-2.2.0.3.ebuild,v 1.7 2003/07/09 16:33:01 liquidx Exp $
-
-inherit gnome2
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Utilities for the Gnome2 desktop"
-HOMEPAGE="http://www.gnome.org/"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc alpha ~sparc"
-
-RDEPEND=">=gnome-base/libgnome-2
-	>=gnome-base/libgnomeui-2.1
-	>=gnome-base/libglade-2
-	>=gnome-base/libbonoboui-2
-	>=gnome-base/gnome-vfs-2
-	>=gnome-base/gnome-panel-2
-	app-text/scrollkeeper"
-
-DEPEND="${RDEPEND}
-	>=gnome-base/gconf-1.2.1
-	>=dev-util/intltool-0.21
-	>=dev-util/pkgconfig-0.12.0"
-
-G2CONF="${G2CONF} --disable-guname-capplet --enable-gcolorsel-applet --enable-gdialog"
-
-DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS"
diff --git a/gnome-extra/gnome-utils/gnome-utils-2.2.2.ebuild b/gnome-extra/gnome-utils/gnome-utils-2.2.2.ebuild
deleted file mode 100644
index 196a8c7d678d..000000000000
--- a/gnome-extra/gnome-utils/gnome-utils-2.2.2.ebuild
+++ /dev/null
@@ -1,30 +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/gnome-utils/gnome-utils-2.2.2.ebuild,v 1.6 2003/07/19 23:27:59 tester Exp $
-
-inherit gnome2
-
-IUSE=""
-S=${WORKDIR}/${P}
-DESCRIPTION="Utilities for the Gnome2 desktop"
-HOMEPAGE="http://www.gnome.org/"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc ~alpha sparc amd64"
-
-RDEPEND=">=gnome-base/libgnome-2
-	>=gnome-base/libgnomeui-2.1
-	>=gnome-base/libglade-2
-	>=gnome-base/libbonoboui-2
-	>=gnome-base/gnome-vfs-2
-	>=gnome-base/gnome-panel-2
-	>=gnome-base/gconf-1.2.1
-	app-text/scrollkeeper"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.21
-	>=dev-util/pkgconfig-0.12.0"
-
-G2CONF="${G2CONF} --disable-guname-capplet --enable-gcolorsel-applet --enable-gdialog"
-
-DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS"
diff --git a/gnome-extra/gnome-utils/gnome-utils-2.2.3.ebuild b/gnome-extra/gnome-utils/gnome-utils-2.5.90.ebuild
index ee6098c2bf35..c868dc15377e 100644
--- a/gnome-extra/gnome-utils/gnome-utils-2.2.3.ebuild
+++ b/gnome-extra/gnome-utils/gnome-utils-2.5.90.ebuild
@@ -1,29 +1,34 @@
-# 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/gnome-utils/gnome-utils-2.2.3.ebuild,v 1.7 2003/09/23 15:51:24 darkspecter Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/gnome-utils-2.5.90.ebuild,v 1.1 2004/03/21 17:01:09 foser Exp $
 
 inherit gnome2
 
-IUSE=""
-S=${WORKDIR}/${P}
 DESCRIPTION="Utilities for the Gnome2 desktop"
 HOMEPAGE="http://www.gnome.org/"
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc ~alpha ~sparc hppa amd64"
 
-RDEPEND=">=gnome-base/libgnome-2
-	>=gnome-base/libgnomeui-2.1
+IUSE="ipv6"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64 ~ia64 ~mips"
+
+RDEPEND=">=x11-libs/gtk+-2.3
+	>=gnome-base/libgnome-2
+	>=gnome-base/libgnomeui-2.2
+	>=gnome-base/gnome-desktop-2.2
 	>=gnome-base/libglade-2
 	>=gnome-base/libbonoboui-2
-	>=gnome-base/gnome-vfs-2
+	>=gnome-base/gnome-vfs-2.4
 	>=gnome-base/gnome-panel-2
 	>=gnome-base/gconf-1.2.1
 	sys-fs/e2fsprogs
-	app-text/scrollkeeper"
+	app-text/scrollkeeper
+	dev-libs/popt"
 
 DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.21
+	>=dev-util/intltool-0.29
 	>=dev-util/pkgconfig-0.12.0"
 
+G2CONF="${G2CONF} $(use_enable ipv6)"
+
 DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS"