Removed conflicts with x11-misc/shared-mime-info noted by bug 99900

(Portage version: 2.0.51.22-r2)

6 files changed, 39 insertions, 23 deletions

diff --git a/gnome-extra/gdesklets-core/ChangeLog b/gnome-extra/gdesklets-core/ChangeLog
index bdf3e886b58b..df3b33ac9287 100644
--- a/gnome-extra/gdesklets-core/ChangeLog
+++ b/gnome-extra/gdesklets-core/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for gnome-extra/gdesklets-core
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/ChangeLog,v 1.44 2005/08/01 10:17:55 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/ChangeLog,v 1.45 2005/08/01 23:33:32 nixphoeni Exp $
 
   01 Aug 2005; Simon Stelling <blubb@gentoo.org>
   gdesklets-core-0.34.3.ebuild:
@@ -10,6 +10,14 @@
   gdesklets-core-0.34.3.ebuild:
   ppc stable
 
+*gdesklets-core-0.35.2-r1 (01 Aug 2005)
+*gdesklets-core-0.34.3-r1 (01 Aug 2005)
+
+  01 Aug 2005; Joe Sapp <nixphoeni@gentoo.org>
+  -gdesklets-core-0.34.3.ebuild, +gdesklets-core-0.34.3-r1.ebuild,
+  -gdesklets-core-0.35.2.ebuild, +gdesklets-core-0.35.2-r1.ebuild:
+  Removed conflicts with x11-misc/shared-mime-info noted by bug 99900
+
   21 Jul 2005; Joe Sapp <nixphoeni@gentoo.org> gdesklets-core-0.34.3.ebuild:
   Keyworded x86
 
diff --git a/gnome-extra/gdesklets-core/Manifest b/gnome-extra/gdesklets-core/Manifest
index ef12cb3b63a8..cc100f0e25d5 100644
--- a/gnome-extra/gdesklets-core/Manifest
+++ b/gnome-extra/gdesklets-core/Manifest
@@ -1,30 +1,30 @@
-MD5 7acaefbf35696571fb6c2981644e3b51 gdesklets-core-0.26.1.ebuild 1871
-MD5 120d0db4044c02b9a260350c1045ed35 gdesklets-core-0.26.2.ebuild 1872
-MD5 7de752dcb5d871ca8a6bd77e674ceccf gdesklets-core-0.32.ebuild 2050
-MD5 a98089d6b170082dad015493bddd2e7e gdesklets-core-0.33.1.ebuild 2434
-MD5 43349e125444d410ea11d1fa2298644b ChangeLog 7588
-MD5 a175a96fb7e85b152ade748dbd2360e0 metadata.xml 213
+MD5 66248fdce375bd90c09ad12b210d353f gdesklets-core-0.35-r1.ebuild 2282
+MD5 8274274c1d8e538aba2c647c3f5a07fd gdesklets-core-0.35.2-r1.ebuild 2291
 MD5 a0740066aed09e15019eb17ce383e541 gdesklets-core-0.35_rc1.ebuild 2060
-MD5 b60b8c0d1d2d5e1dcc1d0497f78a0cbc gdesklets-core-0.35.ebuild 2075
 MD5 f8a0b9310dac5018eb5ba6cb1d3c628c gdesklets-core-0.35.1.ebuild 2077
-MD5 66248fdce375bd90c09ad12b210d353f gdesklets-core-0.35-r1.ebuild 2282
+MD5 120d0db4044c02b9a260350c1045ed35 gdesklets-core-0.26.2.ebuild 1872
 MD5 e339012b85e0b107e59eb1f9b97ff310 gdesklets-core-0.35.1-r1.ebuild 2284
-MD5 8058c98aa84ad0f699b8847f21f031c4 gdesklets-core-0.35.2.ebuild 2202
+MD5 aead521c8f147743f4a97e1a3f6bdc9c gdesklets-core-0.34.3-r1.ebuild 2266
+MD5 b60b8c0d1d2d5e1dcc1d0497f78a0cbc gdesklets-core-0.35.ebuild 2075
+MD5 c77f4f2283801bd7f53b388f13aea6e6 ChangeLog 7390
+MD5 a98089d6b170082dad015493bddd2e7e gdesklets-core-0.33.1.ebuild 2434
+MD5 7acaefbf35696571fb6c2981644e3b51 gdesklets-core-0.26.1.ebuild 1871
+MD5 a175a96fb7e85b152ade748dbd2360e0 metadata.xml 213
 MD5 eca6c0fae552cb6b88412c77b87f3d14 gdesklets-core-0.35_rc1-r1.ebuild 2153
-MD5 45c306e1228297b28a840c3ffb91c8c7 gdesklets-core-0.34.3.ebuild 2174
+MD5 7de752dcb5d871ca8a6bd77e674ceccf gdesklets-core-0.32.ebuild 2050
 MD5 c4920c1829bd34f15ee1b85539dd3d4a files/digest-gdesklets-core-0.26.1 69
 MD5 26c6bbd356a7de3f57ffe9036275a5e5 files/digest-gdesklets-core-0.26.2 69
-MD5 ac425079423c7c93f931c3f4df0dc598 files/digest-gdesklets-core-0.32 67
 MD5 312fdc938b56dedf0fab04efe6266cb1 files/digest-gdesklets-core-0.33.1 131
-MD5 8293012469f5859ebfb450e81f87a165 files/digest-gdesklets-core-0.34.3 131
-MD5 8e873c3bd94ee7756f3caf1c0f5b9398 files/dst-fix-0.34.3.patch 1269
-MD5 b9861538d27ddcccf566148374dcd22a files/gdesklets-control-getid 745
-MD5 01751d3aa9192793a33c02d2126192c1 files/gdesklets-displays.desktop 230
-MD5 ac3a171744ef9b36bed102088be244a9 files/digest-gdesklets-core-0.35_rc1 132
-MD5 66ab1d1c9445bb382edafdb15eee161d files/digest-gdesklets-core-0.35 129
 MD5 ca60272587dbc0bfcdaa066753437811 files/digest-gdesklets-core-0.35.1 131
+MD5 ac3a171744ef9b36bed102088be244a9 files/digest-gdesklets-core-0.35_rc1 132
 MD5 66ab1d1c9445bb382edafdb15eee161d files/digest-gdesklets-core-0.35-r1 129
-MD5 ca60272587dbc0bfcdaa066753437811 files/digest-gdesklets-core-0.35.1-r1 131
-MD5 1646a2250df551ca17b94641f23b0201 files/digest-gdesklets-core-0.35.2 131
 MD5 ac3a171744ef9b36bed102088be244a9 files/digest-gdesklets-core-0.35_rc1-r1 132
+MD5 ac425079423c7c93f931c3f4df0dc598 files/digest-gdesklets-core-0.32 67
+MD5 66ab1d1c9445bb382edafdb15eee161d files/digest-gdesklets-core-0.35 129
+MD5 8293012469f5859ebfb450e81f87a165 files/digest-gdesklets-core-0.34.3-r1 131
+MD5 ca60272587dbc0bfcdaa066753437811 files/digest-gdesklets-core-0.35.1-r1 131
+MD5 1646a2250df551ca17b94641f23b0201 files/digest-gdesklets-core-0.35.2-r1 131
+MD5 b9861538d27ddcccf566148374dcd22a files/gdesklets-control-getid 745
+MD5 8e873c3bd94ee7756f3caf1c0f5b9398 files/dst-fix-0.34.3.patch 1269
 MD5 3407f6fa18c84e9c85b7f9321a158ad3 files/gdesklets-migration-tool 7343
+MD5 01751d3aa9192793a33c02d2126192c1 files/gdesklets-displays.desktop 230
diff --git a/gnome-extra/gdesklets-core/files/digest-gdesklets-core-0.34.3 b/gnome-extra/gdesklets-core/files/digest-gdesklets-core-0.34.3-r1
index 36a1c0b701ae..36a1c0b701ae 100644
--- a/gnome-extra/gdesklets-core/files/digest-gdesklets-core-0.34.3
+++ b/gnome-extra/gdesklets-core/files/digest-gdesklets-core-0.34.3-r1
diff --git a/gnome-extra/gdesklets-core/files/digest-gdesklets-core-0.35.2 b/gnome-extra/gdesklets-core/files/digest-gdesklets-core-0.35.2-r1
index 3c5073ce5512..3c5073ce5512 100644
--- a/gnome-extra/gdesklets-core/files/digest-gdesklets-core-0.35.2
+++ b/gnome-extra/gdesklets-core/files/digest-gdesklets-core-0.35.2-r1
diff --git a/gnome-extra/gdesklets-core/gdesklets-core-0.34.3.ebuild b/gnome-extra/gdesklets-core/gdesklets-core-0.34.3-r1.ebuild
index 83f2e8ba0fd3..ce92770ec68b 100644
--- a/gnome-extra/gdesklets-core/gdesklets-core-0.34.3.ebuild
+++ b/gnome-extra/gdesklets-core/gdesklets-core-0.34.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.ebuild,v 1.12 2005/08/01 10:17:55 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/gdesklets-core-0.34.3-r1.ebuild,v 1.1 2005/08/01 23:33:32 nixphoeni Exp $
 
 inherit gnome2 eutils multilib
 
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
 
 SLOT="0"
 IUSE="doc"
-KEYWORDS="~alpha amd64 ppc ~sparc x86"
+KEYWORDS="x86 ppc amd64 ~sparc ~alpha"
 
 RDEPEND=">=dev-lang/python-2.3
 	>=dev-libs/glib-2
@@ -63,6 +63,10 @@ src_install() {
 	# Install the Developer's book documentation
 	use doc && dohtml -r ${WORKDIR}/develbook/*
 
+	# Remove conflicts with x11-misc/shared-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
+
 }
 
 pkg_postinst() {
diff --git a/gnome-extra/gdesklets-core/gdesklets-core-0.35.2.ebuild b/gnome-extra/gdesklets-core/gdesklets-core-0.35.2-r1.ebuild
index 35c3e3067a77..4ecab122fa28 100644
--- a/gnome-extra/gdesklets-core/gdesklets-core-0.35.2.ebuild
+++ b/gnome-extra/gdesklets-core/gdesklets-core-0.35.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.ebuild,v 1.2 2005/07/11 04:10:41 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/gdesklets-core-0.35.2-r1.ebuild,v 1.1 2005/08/01 23:33:32 nixphoeni Exp $
 
 inherit gnome2 eutils multilib
 
@@ -50,6 +50,10 @@ src_install() {
 	# Install the Developer's book documentation
 	use doc && dohtml -r ${WORKDIR}/develbook/*
 
+	# Remove conflicts with x11-misc/shared-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
+
 }
 
 pkg_postinst() {