bugfix release, remove old ebuilds

Package-Manager: portage-2.0.51.19

6 files changed, 76 insertions, 58 deletions

diff --git a/gnome-extra/gnome-utils/ChangeLog b/gnome-extra/gnome-utils/ChangeLog
index 93de73af047c..2a95e1f909d5 100644
--- a/gnome-extra/gnome-utils/ChangeLog
+++ b/gnome-extra/gnome-utils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/gnome-utils
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/ChangeLog,v 1.79 2005/04/02 05:02:07 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/ChangeLog,v 1.80 2005/04/12 16:44:28 joem Exp $
+
+*gnome-utils-2.10.1 (12 Apr 2005)
+
+  12 Apr 2005; Joe McCann <joem@gentoo.org> +gnome-utils-2.10.1.ebuild,
+  -gnome-utils-2.4.1.ebuild:
+  bugfix release, remove old ebuilds
 
   02 Apr 2005; Stephen P. Becker <geoman@gentoo.org>
   gnome-utils-2.8.1.ebuild:
diff --git a/gnome-extra/gnome-utils/Manifest b/gnome-extra/gnome-utils/Manifest
index 155ecef13dd1..360fd810cf89 100644
--- a/gnome-extra/gnome-utils/Manifest
+++ b/gnome-extra/gnome-utils/Manifest
@@ -1,15 +1,25 @@
-MD5 680df545350e6f47ebb90b9b87b4ae12 gnome-utils-2.6.2-r1.ebuild 1038
-MD5 ec3c2978b395559f9004937abed4523f gnome-utils-2.8.1.ebuild 1043
-MD5 794b8b1d8306de88459b460642e86af4 gnome-utils-2.4.1.ebuild 1236
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 64f584655222d6d74566f0e3bdd6a561 ChangeLog 9870
 MD5 62292c35e7929905ad1e54d64faf457f gnome-utils-1.4.1.2.ebuild 1770
+MD5 680df545350e6f47ebb90b9b87b4ae12 gnome-utils-2.6.2-r1.ebuild 1038
 MD5 7ee7b90f752d9f748a2e3a914d899c33 gnome-utils-2.8.0.ebuild 1046
-MD5 0915c6aeec80f9c56d107d51a1286977 gnome-utils-2.10.0.ebuild 1169
-MD5 0350d2ee52473e378486c24a88af4f85 ChangeLog 9698
+MD5 ec3c2978b395559f9004937abed4523f gnome-utils-2.8.1.ebuild 1043
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 7f6c4dde21c087f0af77c8374ca6da31 files/gnome-utils-2.6.2-gfloppymajor.patch 933
+MD5 0915c6aeec80f9c56d107d51a1286977 gnome-utils-2.10.0.ebuild 1169
+MD5 5bbd3dd3d722da151261c14577092bca gnome-utils-2.10.1.ebuild 1168
+MD5 5ed644c587beafb4c4a1461bbe322a1d files/digest-gnome-utils-1.4.1.2 72
 MD5 905deb658d4e4b2ab55f3101851e7da4 files/digest-gnome-utils-2.6.2-r1 71
-MD5 536b1103c2a53ca7485697352a308809 files/digest-gnome-utils-2.10.0 72
-MD5 5bd26bcde1ddcf7e2246aabdcdaac8af files/digest-gnome-utils-2.4.1 71
 MD5 d9a86bd0e29d148f71627cfc879089b6 files/digest-gnome-utils-2.8.0 71
 MD5 41af2c6a875d5a02609b98998a2cf614 files/digest-gnome-utils-2.8.1 71
-MD5 5ed644c587beafb4c4a1461bbe322a1d files/digest-gnome-utils-1.4.1.2 72
+MD5 7f6c4dde21c087f0af77c8374ca6da31 files/gnome-utils-2.6.2-gfloppymajor.patch 933
+MD5 536b1103c2a53ca7485697352a308809 files/digest-gnome-utils-2.10.0 72
+MD5 caf01bac7da4888355b1c173652d2525 files/digest-gnome-utils-2.10.1 72
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCW/qpXjcVihsel0ERAnkBAJ45BvlXnCJG26Nkot+8q1pn0//OkgCg9bV0
+2zlvA7Samf7bGz48hY+x++U=
+=mBfd
+-----END PGP SIGNATURE-----
diff --git a/gnome-extra/gnome-utils/files/digest-gnome-utils-2.10.1 b/gnome-extra/gnome-utils/files/digest-gnome-utils-2.10.1
new file mode 100644
index 000000000000..43cb6d0c8a90
--- /dev/null
+++ b/gnome-extra/gnome-utils/files/digest-gnome-utils-2.10.1
@@ -0,0 +1 @@
+MD5 78c0afdc112757b13d203fe1ad9c04ad gnome-utils-2.10.1.tar.bz2 2049143
diff --git a/gnome-extra/gnome-utils/files/digest-gnome-utils-2.4.1 b/gnome-extra/gnome-utils/files/digest-gnome-utils-2.4.1
deleted file mode 100644
index 66ecceefc7cd..000000000000
--- a/gnome-extra/gnome-utils/files/digest-gnome-utils-2.4.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8512eed7ce0d291d4d8a9ddabceaa23b gnome-utils-2.4.1.tar.bz2 1628878
diff --git a/gnome-extra/gnome-utils/gnome-utils-2.10.1.ebuild b/gnome-extra/gnome-utils/gnome-utils-2.10.1.ebuild
new file mode 100644
index 000000000000..ff494ce03377
--- /dev/null
+++ b/gnome-extra/gnome-utils/gnome-utils-2.10.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/gnome-utils-2.10.1.ebuild,v 1.1 2005/04/12 16:44:28 joem Exp $
+
+inherit gnome2 eutils
+
+DESCRIPTION="Utilities for the Gnome2 desktop"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
+IUSE="ipv6 hal"
+
+RDEPEND=">=x11-libs/gtk+-2.6
+	>=gnome-base/libgnome-2.5
+	>=gnome-base/libgnomeui-2.5
+	>=gnome-base/gnome-desktop-2.9.91
+	>=gnome-base/libglade-2.3
+	>=gnome-base/libbonoboui-2.2
+	>=gnome-base/gnome-vfs-2.8.4
+	>=gnome-base/gnome-panel-2.9.4
+	>=gnome-base/libgnomeprint-2.8
+	>=gnome-base/libgnomeprintui-2.8
+	>=gnome-base/gconf-1.2.1
+	sys-fs/e2fsprogs
+	dev-libs/popt
+	hal? ( >=sys-apps/hal-0.4 )"
+
+DEPEND="${RDEPEND}
+	app-text/scrollkeeper
+	>=dev-util/intltool-0.29
+	>=dev-util/pkgconfig-0.12.0"
+
+G2CONF="${G2CONF} $(use_enable ipv6) $(use_enable hal)"
+
+DOCS="AUTHORS ChangeLog NEWS README THANKS"
+
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+	# fix gfloppy compile problem
+	#epatch ${FILESDIR}/${PN}-2.9-gfloppymajor.patch
+	# may need more work
+
+}
+
+USE_DESTDIR="1"
diff --git a/gnome-extra/gnome-utils/gnome-utils-2.4.1.ebuild b/gnome-extra/gnome-utils/gnome-utils-2.4.1.ebuild
deleted file mode 100644
index 83b3198749b3..000000000000
--- a/gnome-extra/gnome-utils/gnome-utils-2.4.1.ebuild
+++ /dev/null
@@ -1,47 +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/gnome-utils/gnome-utils-2.4.1.ebuild,v 1.12 2005/01/09 11:15:10 slarti Exp $
-
-inherit gnome2
-
-DESCRIPTION="Utilities for the Gnome2 desktop"
-HOMEPAGE="http://www.gnome.org/"
-
-IUSE="ipv6"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc alpha sparc hppa amd64 ia64 mips"
-
-RDEPEND=">=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.4
-	>=gnome-base/gnome-panel-2
-	>=gnome-base/gconf-1.2.1
-	sys-fs/e2fsprogs
-	app-text/scrollkeeper
-	dev-libs/popt"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.21
-	>=dev-util/pkgconfig-0.12.0"
-
-G2CONF="${G2CONF} $(use_enable ipv6)"
-
-DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS"
-
-src_compile() {
-	gnome2_src_configure
-
-	# This fixes compilation on ia64.  I wish I knew the "right"
-	# solution but this will have to do for now.
-	# (01 Mar 2004 agriffis)
-	if use ia64; then
-		sed -i -e 's/^DEFS.*/& -Ds64=__s64 -Du64=__u64 -Ds32=__s32 -Du32=__u32/' \
-			gfloppy/src/Makefile || die "ia64 sed failed"
-	fi
-
-	emake || die "emake failed"
-}