new version

9 files changed, 13 insertions, 112 deletions

diff --git a/gnome-extra/gnome-utils/ChangeLog b/gnome-extra/gnome-utils/ChangeLog
index cefc65afc810..6277910fa15c 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-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/ChangeLog,v 1.32 2003/09/07 22:07:15 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/ChangeLog,v 1.33 2003/09/08 15:53:20 foser Exp $
+
+*gnome-utils-2.4.0 (08 Sep 2003)
+
+  08 Sep 2003; foser <foser@gentoo.org> gnome-utils-2.4.0.ebuild :
+  New version
 
 *gnome-utils-2.3.90 (07 Sep 2003)
 
diff --git a/gnome-extra/gnome-utils/Manifest b/gnome-extra/gnome-utils/Manifest
index ad210102ee86..080b5d0db03c 100644
--- a/gnome-extra/gnome-utils/Manifest
+++ b/gnome-extra/gnome-utils/Manifest
@@ -1,17 +1,11 @@
-MD5 ba97e98b3ca0c6334dff63044f5be63b gnome-utils-2.0.6.ebuild 1283
 MD5 21823def31517a3466d2e92b0e13d09a gnome-utils-2.2.2.ebuild 870
 MD5 82b35cc36f6e4cdb7101f76fbd8530bc gnome-utils-2.2.0.3.ebuild 860
 MD5 ed18d5c4ade2231b7b2009926b5e4f1d gnome-utils-1.4.1.2.ebuild 1802
-MD5 0b1cab4b09bb5d9f6013e4c02057b5f5 gnome-utils-2.0.5.ebuild 1340
-MD5 61f28f99b7a70d3d9e98a76f59e90048 gnome-utils-2.4.0.ebuild 940
+MD5 dd0acc15b7fd81e093b173879fe07b54 gnome-utils-2.4.0.ebuild 884
 MD5 6cc193872addc7a56823a1435d847342 gnome-utils-2.2.3.ebuild 809
-MD5 cc4605d99eda72684d20b99ec7c822f9 ChangeLog 4671
+MD5 37ea5124553597633ab2e93750298c64 ChangeLog 4787
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 61f28f99b7a70d3d9e98a76f59e90048 gnome-utils-2.3.90.ebuild 940
 MD5 e41d82bfec32716a2cdf3b8cb1d7635c files/digest-gnome-utils-2.2.0.3 73
-MD5 a0f945351d7c15ac6a28d0029b4b3a93 files/digest-gnome-utils-2.3.90 72
-MD5 c653de52fba13a95223ca027cbee2603 files/digest-gnome-utils-2.0.5 71
-MD5 ae55b083bf0fd772eb0abeb3d35016fc files/digest-gnome-utils-2.0.6 71
 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.0.5 b/gnome-extra/gnome-utils/files/digest-gnome-utils-2.0.5
deleted file mode 100644
index 1ec823c39a71..000000000000
--- a/gnome-extra/gnome-utils/files/digest-gnome-utils-2.0.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3b51ec9b80da135ceca71acfb89ff5b2 gnome-utils-2.0.5.tar.bz2 1352538
diff --git a/gnome-extra/gnome-utils/files/digest-gnome-utils-2.0.6 b/gnome-extra/gnome-utils/files/digest-gnome-utils-2.0.6
deleted file mode 100644
index bc88fc6f2796..000000000000
--- a/gnome-extra/gnome-utils/files/digest-gnome-utils-2.0.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3514a1d34bbc58c07975bc0e1e883518 gnome-utils-2.0.6.tar.bz2 1365025
diff --git a/gnome-extra/gnome-utils/files/digest-gnome-utils-2.3.90 b/gnome-extra/gnome-utils/files/digest-gnome-utils-2.3.90
deleted file mode 100644
index 4998e4372b5f..000000000000
--- a/gnome-extra/gnome-utils/files/digest-gnome-utils-2.3.90
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9411f8e4e151e9dd3b111e2d98b61c18 gnome-utils-2.3.90.tar.bz2 1602241
diff --git a/gnome-extra/gnome-utils/files/digest-gnome-utils-2.4.0 b/gnome-extra/gnome-utils/files/digest-gnome-utils-2.4.0
new file mode 100644
index 000000000000..3b82155d925c
--- /dev/null
+++ b/gnome-extra/gnome-utils/files/digest-gnome-utils-2.4.0
@@ -0,0 +1 @@
+MD5 6986c0b7b5898f1f515add00b946ae48 gnome-utils-2.4.0.tar.bz2 1621364
diff --git a/gnome-extra/gnome-utils/gnome-utils-2.0.5.ebuild b/gnome-extra/gnome-utils/gnome-utils-2.0.5.ebuild
deleted file mode 100644
index e98122a01e6a..000000000000
--- a/gnome-extra/gnome-utils/gnome-utils-2.0.5.ebuild
+++ /dev/null
@@ -1,47 +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.0.5.ebuild,v 1.9 2003/09/06 23:52:56 msterret Exp $
-
-inherit gnome2
-
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Utilities for the Gnome2 desktop"
-SRC_URI="mirror://gnome/2.0.1/sources/${PN}/${P}.tar.bz2"
-HOMEPAGE="http://www.gnome.org/"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc  ppc alpha"
-
-RDEPEND=">=dev-libs/glib-2.0.6
-	>=x11-libs/pango-1.0.4
-	>=dev-libs/atk-1.0.3
-	>=x11-libs/gtk+-2.0.6
-	>=app-text/scrollkeeper-0.3.11
-	>=media-libs/freetype-2.0.9
-	>=x11-libs/libzvt-2.0.1
-	>=gnome-base/libglade-2.0.1
-	>=gnome-base/gconf-1.2.1
-	>=gnome-base/libgnomeui-2.0.5
-	>=gnome-base/gnome-panel-2.0.8
-	>=gnome-base/gnome-vfs-2.0.4
-	>=gnome-base/ORBit2-2.4.1
-	>=gnome-base/libbonoboui-2.0.3
-	>=gnome-base/libgnomecanvas-2.0.4
-	>=gnome-base/bonobo-activation-1.0.3
-	=gnome-extra/libgtkhtml-2*
-	>=dev-libs/libxml2-2.4.24
-	>=sys-libs/ncurses-5.2-r5
-	>=gnome-base/libgtop-2.0.0
-	>=net-libs/linc-0.5.3
-	app-text/scrollkeeper"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.22
-	>=dev-util/pkgconfig-0.12.0"
-
-G2CONF="${G2CONF} --disable-guname-capplet --enable-gcolorsel-applet --with-ncurses --enable-gdialog"
-
-DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS  README* THANKS"
-
-
diff --git a/gnome-extra/gnome-utils/gnome-utils-2.0.6.ebuild b/gnome-extra/gnome-utils/gnome-utils-2.0.6.ebuild
deleted file mode 100644
index 2f5232a0d609..000000000000
--- a/gnome-extra/gnome-utils/gnome-utils-2.0.6.ebuild
+++ /dev/null
@@ -1,46 +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.0.6.ebuild,v 1.8 2003/09/06 23:52:56 msterret Exp $
-
-inherit gnome2
-
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Utilities for the Gnome2 desktop"
-HOMEPAGE="http://www.gnome.org/"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~sparc ~ppc alpha"
-
-RDEPEND=">=dev-libs/glib-2.0.7
-	>=x11-libs/pango-1.0.4
-	>=dev-libs/atk-1.0.3
-	>=x11-libs/gtk+-2.0.8
-	>=app-text/scrollkeeper-0.3.11
-	>=media-libs/freetype-2.0.9
-	>=x11-libs/libzvt-2.0.1
-	>=gnome-base/libglade-2.0.1
-	>=gnome-base/gconf-1.2.1
-	>=gnome-base/libgnomeui-2.0.5
-	>=gnome-base/gnome-panel-2.0.8
-	>=gnome-base/gnome-vfs-2.0.4
-	>=gnome-base/ORBit2-2.4.1
-	>=gnome-base/libbonoboui-2.0.3
-	>=gnome-base/libgnomecanvas-2.0.4
-	>=gnome-base/bonobo-activation-1.0.4
-	=gnome-extra/libgtkhtml-2*
-	>=dev-libs/libxml2-2.4.24
-	>=sys-libs/ncurses-5.2-r5
-	>=gnome-base/libgtop-2.0.0
-	>=net-libs/linc-0.5.3
-	app-text/scrollkeeper"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.22
-	>=dev-util/pkgconfig-0.12.0"
-
-G2CONF="${G2CONF} --disable-guname-capplet --enable-gcolorsel-applet --with-ncurses --enable-gdialog"
-
-DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS  README* THANKS"
-
-
diff --git a/gnome-extra/gnome-utils/gnome-utils-2.3.90.ebuild b/gnome-extra/gnome-utils/gnome-utils-2.4.0.ebuild
index 7e3c61fb2894..4d73dad87b65 100644
--- a/gnome-extra/gnome-utils/gnome-utils-2.3.90.ebuild
+++ b/gnome-extra/gnome-utils/gnome-utils-2.4.0.ebuild
@@ -1,6 +1,6 @@
 # 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.3.90.ebuild,v 1.1 2003/09/07 22:07:15 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/gnome-utils-2.4.0.ebuild,v 1.1 2003/09/08 15:53:20 foser Exp $
 
 inherit gnome2
 
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64"
 
 RDEPEND=">=gnome-base/libgnome-2
-	>=gnome-base/libgnomeui-2.1
+	>=gnome-base/libgnomeui-2.2
 	>=gnome-base/gnome-desktop-2.2
 	>=gnome-base/libglade-2
 	>=gnome-base/libbonoboui-2
@@ -28,9 +28,6 @@ DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.21
 	>=dev-util/pkgconfig-0.12.0"
 
-DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS"
-
-use ipv6 \
-	&& G2CONF="${G2CONF} --enable-ipv6 " \
-	|| G2CONF="${G2CONF} --disable-ipv6 " \
+G2CONF="${G2CONF} $(use_enable ipv6)"
 
+DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS"