Fixed bug 151206 and removed old versions of -core

Package-Manager: portage-2.1.2_pre2-r9

7 files changed, 27 insertions, 14 deletions

diff --git a/gnome-extra/gdesklets-core/ChangeLog b/gnome-extra/gdesklets-core/ChangeLog
index f46f6fb16ea8..fc48e30dd53f 100644
--- a/gnome-extra/gdesklets-core/ChangeLog
+++ b/gnome-extra/gdesklets-core/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/gdesklets-core
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/ChangeLog,v 1.66 2006/10/15 16:29:42 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/ChangeLog,v 1.67 2006/10/16 01:41:39 nixphoeni Exp $
+
+  16 Oct 2006; Joe Sapp <nixphoeni@gentoo.org>
+  -gdesklets-core-0.33.1.ebuild, gdesklets-core-0.34.3-r1.ebuild,
+  -gdesklets-core-0.35-r1.ebuild, gdesklets-core-0.35.2-r1.ebuild,
+  gdesklets-core-0.35.3.ebuild, gdesklets-core-0.35.3-r1.ebuild:
+  Fixed bug 151206 by removing /usr/share/mime/mime.cache along with all the
+  other shared mime files. Also removed old versions of -core.
 
   15 Oct 2006; Bryan Østergaard <kloeri@gentoo.org>
   gdesklets-core-0.35.3.ebuild:
diff --git a/gnome-extra/gdesklets-core/files/digest-gdesklets-core-0.34.3-r1 b/gnome-extra/gdesklets-core/files/digest-gdesklets-core-0.34.3-r1
index 36a1c0b701ae..6e330e22c796 100644
--- a/gnome-extra/gdesklets-core/files/digest-gdesklets-core-0.34.3-r1
+++ b/gnome-extra/gdesklets-core/files/digest-gdesklets-core-0.34.3-r1
@@ -1,2 +1,6 @@
-MD5 83f8a3f7ad00a65a42fb4f2843152c92 gDesklets-0.34.3.tar.bz2 679069
 MD5 bba42e71aa3a0d310ad6ee763fcbac25 develbook.tar.bz2 445919
+RMD160 1695ec4f8e86ff622b1a07214408104902db0bc5 develbook.tar.bz2 445919
+SHA256 0e5e96e3a36ad84218da96d62db4e776a7f2f4547bd8f3538749e0034c07a06d develbook.tar.bz2 445919
+MD5 83f8a3f7ad00a65a42fb4f2843152c92 gDesklets-0.34.3.tar.bz2 679069
+RMD160 41ec140cd3a3bf75c3ec3a3a15ee298add33a43c gDesklets-0.34.3.tar.bz2 679069
+SHA256 2c0d5554c2ee0d2d13ffbb6ffdd9b8810fc0a27d828e127cfab795761a0d7ce8 gDesklets-0.34.3.tar.bz2 679069
diff --git a/gnome-extra/gdesklets-core/files/digest-gdesklets-core-0.35.2-r1 b/gnome-extra/gdesklets-core/files/digest-gdesklets-core-0.35.2-r1
index 4fa49d4d02eb..70efb06f1d22 100644
--- a/gnome-extra/gdesklets-core/files/digest-gdesklets-core-0.35.2-r1
+++ b/gnome-extra/gdesklets-core/files/digest-gdesklets-core-0.35.2-r1
@@ -2,3 +2,5 @@ MD5 8d77add2c07cb374a79a30d1d2055f54 gDesklets-0.35.2.tar.bz2 745088
 RMD160 23aeca219fbdb1c54b9ed5ba412c7fc93d428e53 gDesklets-0.35.2.tar.bz2 745088
 SHA256 b70f959244751b8cf5694abcdc4baeae56d2bf53cd7bac1cef51a254dfe0e2dc gDesklets-0.35.2.tar.bz2 745088
 MD5 964769163e8548d133d7d39c125508d3 gdesklets-develbook-0.35.2.tar.bz2 547039
+RMD160 867790a8482bf822a42d0d240636df351c6cd460 gdesklets-develbook-0.35.2.tar.bz2 547039
+SHA256 dc83853745c032f78d401b8a835b9a7ac162c6c1e7f8357b4d91e2102d898d14 gdesklets-develbook-0.35.2.tar.bz2 547039
diff --git a/gnome-extra/gdesklets-core/gdesklets-core-0.34.3-r1.ebuild b/gnome-extra/gdesklets-core/gdesklets-core-0.34.3-r1.ebuild
index 7d8030dc6733..046ab75ee987 100644
--- a/gnome-extra/gdesklets-core/gdesklets-core-0.34.3-r1.ebuild
+++ b/gnome-extra/gdesklets-core/gdesklets-core-0.34.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/gdesklets-core-0.34.3-r1.ebuild,v 1.5 2006/09/25 03:17:55 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/gdesklets-core-0.34.3-r1.ebuild,v 1.6 2006/10/16 01:41:39 nixphoeni Exp $
 
 WANT_AUTOMAKE=latest
 WANT_AUTOCONF=latest
@@ -65,9 +65,9 @@ src_install() {
 	# Install the Developer's book documentation
 	use doc && dohtml -r ${WORKDIR}/develbook/*
 
-	# Remove conflicts with x11-misc/shared-mime-info
+	# Remove conflicts with x11-misc/shared-mime-info and auto-generated MIME info
 	rm -rf ${D}/usr/share/mime/aliases ${D}/usr/share/mime/magic ${D}/usr/share/mime/globs \
-		${D}/usr/share/mime/subclasses ${D}/usr/share/mime/XMLnamespaces
+		${D}/usr/share/mime/subclasses ${D}/usr/share/mime/XMLnamespaces ${D}/usr/share/mime/mime.cache
 
 }
 
diff --git a/gnome-extra/gdesklets-core/gdesklets-core-0.35.2-r1.ebuild b/gnome-extra/gdesklets-core/gdesklets-core-0.35.2-r1.ebuild
index eb0bb80b986f..c83309d78cc9 100644
--- a/gnome-extra/gdesklets-core/gdesklets-core-0.35.2-r1.ebuild
+++ b/gnome-extra/gdesklets-core/gdesklets-core-0.35.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/gdesklets-core-0.35.2-r1.ebuild,v 1.12 2006/09/25 03:17:55 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/gdesklets-core-0.35.2-r1.ebuild,v 1.13 2006/10/16 01:41:39 nixphoeni Exp $
 
 WANT_AUTOMAKE=latest
 WANT_AUTOCONF=latest
@@ -55,9 +55,9 @@ src_install() {
 		einfo "/usr/share/doc/${PF}/html" && \
 		dohtml -r ${WORKDIR}/gdesklets-develbook/*
 
-	# Remove conflicts with x11-misc/shared-mime-info
+	# Remove conflicts with x11-misc/shared-mime-info and auto-generated MIME info
 	rm -rf ${D}/usr/share/mime/aliases ${D}/usr/share/mime/magic ${D}/usr/share/mime/globs \
-		${D}/usr/share/mime/subclasses ${D}/usr/share/mime/XMLnamespaces
+		${D}/usr/share/mime/subclasses ${D}/usr/share/mime/XMLnamespaces ${D}/usr/share/mime/mime.cache
 
 }
 
diff --git a/gnome-extra/gdesklets-core/gdesklets-core-0.35.3-r1.ebuild b/gnome-extra/gdesklets-core/gdesklets-core-0.35.3-r1.ebuild
index b22ecc1c153a..5ab653629d73 100644
--- a/gnome-extra/gdesklets-core/gdesklets-core-0.35.3-r1.ebuild
+++ b/gnome-extra/gdesklets-core/gdesklets-core-0.35.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/gdesklets-core-0.35.3-r1.ebuild,v 1.2 2006/09/25 03:17:55 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/gdesklets-core-0.35.3-r1.ebuild,v 1.3 2006/10/16 01:41:39 nixphoeni Exp $
 
 WANT_AUTOMAKE=latest
 WANT_AUTOCONF=latest
@@ -74,9 +74,9 @@ src_install() {
 	# Install the man page
 	doman ${S}/doc/man/*.1
 
-	# Remove conflicts with x11-misc/shared-mime-info
+	# Remove conflicts with x11-misc/shared-mime-info and auto-generated MIME info
 	rm -rf ${D}/usr/share/mime/aliases ${D}/usr/share/mime/magic ${D}/usr/share/mime/globs \
-		${D}/usr/share/mime/subclasses ${D}/usr/share/mime/XMLnamespaces
+		${D}/usr/share/mime/subclasses ${D}/usr/share/mime/XMLnamespaces ${D}/usr/share/mime/mime.cache
 
 }
 
diff --git a/gnome-extra/gdesklets-core/gdesklets-core-0.35.3.ebuild b/gnome-extra/gdesklets-core/gdesklets-core-0.35.3.ebuild
index 144a5fb60472..182642988269 100644
--- a/gnome-extra/gdesklets-core/gdesklets-core-0.35.3.ebuild
+++ b/gnome-extra/gdesklets-core/gdesklets-core-0.35.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/gdesklets-core-0.35.3.ebuild,v 1.6 2006/10/15 16:29:42 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/gdesklets-core-0.35.3.ebuild,v 1.7 2006/10/16 01:41:39 nixphoeni Exp $
 
 WANT_AUTOMAKE=latest
 WANT_AUTOCONF=latest
@@ -72,9 +72,9 @@ src_install() {
 	# Install the man page
 	doman ${S}/doc/man/*.1
 
-	# Remove conflicts with x11-misc/shared-mime-info
+	# Remove conflicts with x11-misc/shared-mime-info and auto-generated MIME info
 	rm -rf ${D}/usr/share/mime/aliases ${D}/usr/share/mime/magic ${D}/usr/share/mime/globs \
-		${D}/usr/share/mime/subclasses ${D}/usr/share/mime/XMLnamespaces
+		${D}/usr/share/mime/subclasses ${D}/usr/share/mime/XMLnamespaces ${D}/usr/share/mime/mime.cache
 
 }