New release: 2.12.1. Removing old ebuilds/patches.

(Portage version: 2.0.53_rc4)

8 files changed, 34 insertions, 114 deletions

diff --git a/gnome-extra/gnome-utils/ChangeLog b/gnome-extra/gnome-utils/ChangeLog
index f8e88768bb98..29c73989c510 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.102 2005/09/17 16:12:41 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/ChangeLog,v 1.103 2005/10/10 04:58:19 leonardop Exp $
+
+*gnome-utils-2.12.1 (10 Oct 2005)
+
+  10 Oct 2005; Leonardo Boshell <leonardop@gentoo.org>
+  -gnome-utils-2.12.0.ebuild, +gnome-utils-2.12.1.ebuild:
+  New version.
 
   17 Sep 2005; Aron Griffis <agriffis@gentoo.org>
   gnome-utils-2.10.1-r1.ebuild, gnome-utils-2.12.0.ebuild:
diff --git a/gnome-extra/gnome-utils/Manifest b/gnome-extra/gnome-utils/Manifest
index 873445303bed..b1b0b574b322 100644
--- a/gnome-extra/gnome-utils/Manifest
+++ b/gnome-extra/gnome-utils/Manifest
@@ -1,24 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 4667f33dc876413b4dd989f0d9381bb7 gnome-utils-2.8.1.ebuild 1141
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 e16a399c5a5f9f0112e62cdb86da13ab gnome-utils-2.10.1-r1.ebuild 1244
 MD5 be8ec9f791474d3a2d9814ceecfb20b7 ChangeLog 12662
-MD5 22b4e2b0e138aab39cb04137d1c9f55e gnome-utils-2.12.0.ebuild 1059
-MD5 8c33499309a1ece4481fb6d161058609 gnome-utils-2.10.0.ebuild 1193
-MD5 62292c35e7929905ad1e54d64faf457f gnome-utils-1.4.1.2.ebuild 1770
-MD5 7f6c4dde21c087f0af77c8374ca6da31 files/gnome-utils-2.6.2-gfloppymajor.patch 933
-MD5 5d6009bce57d48f0dea3ded00d2c1d12 files/digest-gnome-utils-2.12.0 72
+MD5 5ed644c587beafb4c4a1461bbe322a1d files/digest-gnome-utils-1.4.1.2 72
 MD5 536b1103c2a53ca7485697352a308809 files/digest-gnome-utils-2.10.0 72
-MD5 f72b26ca184501563846835353e2750e files/gnome-utils-2.10.1-gdict_pref.patch 6856
 MD5 caf01bac7da4888355b1c173652d2525 files/digest-gnome-utils-2.10.1-r1 72
+MD5 5d6009bce57d48f0dea3ded00d2c1d12 files/digest-gnome-utils-2.12.0 72
+MD5 9b3eac0bc78d177675af9a85728b1dc5 files/digest-gnome-utils-2.12.1 72
 MD5 41af2c6a875d5a02609b98998a2cf614 files/digest-gnome-utils-2.8.1 71
-MD5 5ed644c587beafb4c4a1461bbe322a1d files/digest-gnome-utils-1.4.1.2 72
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDLECQJrHF4yAQTrARAouuAKCVGei+FRu2UdPQzxZsEGYnVtzpCQCeKHb/
-yUiISH41+Umya1WqMO6QDhw=
-=ypeZ
------END PGP SIGNATURE-----
+MD5 f72b26ca184501563846835353e2750e files/gnome-utils-2.10.1-gdict_pref.patch 6856
+MD5 7f6c4dde21c087f0af77c8374ca6da31 files/gnome-utils-2.6.2-gfloppymajor.patch 933
+MD5 62292c35e7929905ad1e54d64faf457f gnome-utils-1.4.1.2.ebuild 1770
+MD5 8c33499309a1ece4481fb6d161058609 gnome-utils-2.10.0.ebuild 1193
+MD5 e16a399c5a5f9f0112e62cdb86da13ab gnome-utils-2.10.1-r1.ebuild 1244
+MD5 22b4e2b0e138aab39cb04137d1c9f55e gnome-utils-2.12.0.ebuild 1059
+MD5 6524228db9b3edd3c6ec3a72f5a9a114 gnome-utils-2.12.1.ebuild 1071
+MD5 4667f33dc876413b4dd989f0d9381bb7 gnome-utils-2.8.1.ebuild 1141
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
diff --git a/gnome-extra/gnome-utils/files/digest-gnome-utils-2.12.0 b/gnome-extra/gnome-utils/files/digest-gnome-utils-2.12.0
deleted file mode 100644
index 81f79a4002e6..000000000000
--- a/gnome-extra/gnome-utils/files/digest-gnome-utils-2.12.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 950148f8d30f23185fc3910b2b45d978 gnome-utils-2.12.0.tar.bz2 1711083
diff --git a/gnome-extra/gnome-utils/files/digest-gnome-utils-2.12.1 b/gnome-extra/gnome-utils/files/digest-gnome-utils-2.12.1
new file mode 100644
index 000000000000..009b03d970b8
--- /dev/null
+++ b/gnome-extra/gnome-utils/files/digest-gnome-utils-2.12.1
@@ -0,0 +1 @@
+MD5 345a330b7a80e09c0d5a6562438b346b gnome-utils-2.12.1.tar.bz2 1714248
diff --git a/gnome-extra/gnome-utils/files/digest-gnome-utils-2.8.1 b/gnome-extra/gnome-utils/files/digest-gnome-utils-2.8.1
deleted file mode 100644
index de066415c781..000000000000
--- a/gnome-extra/gnome-utils/files/digest-gnome-utils-2.8.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 048224275454781c7eebc5afd4004069 gnome-utils-2.8.1.tar.bz2 1738576
diff --git a/gnome-extra/gnome-utils/files/gnome-utils-2.6.2-gfloppymajor.patch b/gnome-extra/gnome-utils/files/gnome-utils-2.6.2-gfloppymajor.patch
deleted file mode 100644
index 526b4c17ae2a..000000000000
--- a/gnome-extra/gnome-utils/files/gnome-utils-2.6.2-gfloppymajor.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- gnome-utils-2.6.2/gfloppy/src/gfloppy.c	2004-04-28 18:22:36.000000000 -0500
-+++ gnome-utils-2.6.2-fixed/gfloppy/src/gfloppy.c	2004-05-02 21:09:06.000000000 -0500
-@@ -35,8 +35,8 @@
- #include <string.h>
- 
- #ifdef HAVE_LINUX_FD_H
--#include <linux/fd.h>
--#include <linux/fs.h>
-+ #include <linux/fd.h>
-+ #include <sys/sysmacros.h>
- #endif
- 
- #include "gfloppy.h"
-@@ -579,7 +579,7 @@
- 
- 	if (stat (device, &s) < 0)
- 		return GFLOPPY_NO_DEVICE;
--	if (!S_ISBLK(s.st_mode) || MAJOR(s.st_rdev) != FLOPPY_MAJOR)
-+	if (!S_ISBLK(s.st_mode) || major(s.st_rdev) != FLOPPY_MAJOR)
- 		return GFLOPPY_NO_DEVICE;
- 
- 	if (access (device, R_OK|W_OK) != 0)
---- gnome-utils-2.6.2/gfloppy/src/badblocks.c	2004-01-04 17:21:32.000000000 -0600
-+++ gnome-utils-2.6.2-fixed/gfloppy/src/badblocks.c	2004-05-02 20:59:55.000000000 -0500
-@@ -42,7 +42,6 @@
- 
- #ifdef HAVE_LINUX_FD_H
- #include <linux/fd.h>
--#include <linux/fs.h>
- #endif
- 
- #include <et/com_err.h>
diff --git a/gnome-extra/gnome-utils/gnome-utils-2.12.0.ebuild b/gnome-extra/gnome-utils/gnome-utils-2.12.1.ebuild
index 5d0c21f31e3f..6c175c5a1256 100644
--- a/gnome-extra/gnome-utils/gnome-utils-2.12.0.ebuild
+++ b/gnome-extra/gnome-utils/gnome-utils-2.12.1.ebuild
@@ -1,8 +1,8 @@
 # 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.12.0.ebuild,v 1.2 2005/09/17 16:12:41 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/gnome-utils-2.12.1.ebuild,v 1.1 2005/10/10 04:58:19 leonardop Exp $
 
-inherit eutils gnome2
+inherit gnome2
 
 DESCRIPTION="Utilities for the Gnome2 desktop"
 HOMEPAGE="http://www.gnome.org/"
@@ -10,30 +10,34 @@ HOMEPAGE="http://www.gnome.org/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="ipv6 hal"
+IUSE="hal ipv6"
 
 RDEPEND=">=x11-libs/gtk+-2.6
+	>=gnome-base/gnome-desktop-2.9.91
 	>=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/libbonoboui-2.1
 	>=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
+	>=gnome-base/gconf-2
+	sys-fs/e2fsprogs
 	hal? ( >=sys-apps/hal-0.5 )"
 
 DEPEND="${RDEPEND}
 	app-text/scrollkeeper
 	>=dev-util/intltool-0.29
-	>=dev-util/pkgconfig-0.12.0"
+	>=dev-util/pkgconfig-0.9"
 
-G2CONF="${G2CONF} $(use_enable ipv6) $(use_enable hal)"
 
 DOCS="AUTHORS ChangeLog NEWS README THANKS"
-
 USE_DESTDIR="1"
+
+
+pkg_setup() {
+	G2CONF="$(use_enable ipv6) \
+		$(use_enable hal)"
+}
diff --git a/gnome-extra/gnome-utils/gnome-utils-2.8.1.ebuild b/gnome-extra/gnome-utils/gnome-utils-2.8.1.ebuild
deleted file mode 100644
index 4caef1911e0b..000000000000
--- a/gnome-extra/gnome-utils/gnome-utils-2.8.1.ebuild
+++ /dev/null
@@ -1,49 +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.8.1.ebuild,v 1.10 2005/06/12 13:49:53 allanonjl Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="Utilities for the Gnome2 desktop"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc alpha sparc hppa amd64 ia64 mips"
-IUSE="ipv6"
-
-RDEPEND=">=x11-libs/gtk+-2.3.2
-	>=gnome-base/libgnome-2.5
-	>=gnome-base/libgnomeui-2.5
-	>=gnome-base/gnome-desktop-2.2
-	>=gnome-base/libglade-2.3
-	>=gnome-base/libbonoboui-2.2
-	>=gnome-base/gnome-vfs-2.4
-	>=gnome-base/gnome-panel-2.4
-	>=gnome-base/gconf-1.2.1
-	sys-fs/e2fsprogs
-	dev-libs/popt"
-
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	>=dev-util/intltool-0.29
-	>=dev-util/pkgconfig-0.12.0"
-
-G2CONF="${G2CONF} $(use_enable ipv6)"
-
-DOCS="AUTHORS ChangeLog NEWS README THANKS"
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-	# fix gfloppy compile problem
-	epatch ${FILESDIR}/${PN}-2.6.2-gfloppymajor.patch
-
-}
-
-src_install() {
-	gnome2_src_install scrollkeeper_localstate_dir=${D}/var/lib/scrollkeeper/
-}
-
-USE_DESTDIR="1"