Elimitate package conflict with x11-misc/shared-mime-info as per bug #74793.

diff --git a/app-crypt/seahorse/ChangeLog b/app-crypt/seahorse/ChangeLog
index 3e412c61f7b7be81a66a3fcf40d4232c11399463..75e1cfaf00f954ef99fde966aa1d63df9445da0c 100644 (file)
--- a/app-crypt/seahorse/ChangeLog
+++ b/app-crypt/seahorse/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/seahorse
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/ChangeLog,v 1.27 2004/11/30 12:04:17 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/ChangeLog,v 1.28 2004/12/18 23:32:02 dragonheart Exp $
+
+  19 Dec 2004; Daniel Black <dragonheart@gentoo.org> seahorse-0.7.5.ebuild:
+  Elimitate package conflict with x11-misc/shared-mime-info as per bug #74793.
+  Thanks to Jon Lund Steffensen <jonls@users.sourceforge.net> for the bug report
 
   30 Nov 2004; Mike Gardiner <obz@gentoo.org> -seahorse-0.6.3.ebuild:
   Removed, see bug #72620

diff --git a/app-crypt/seahorse/Manifest b/app-crypt/seahorse/Manifest
index 65cbb229cf8bd25b69a929ec56621cef4a5db92f..77edd3b40431a52836e40d0b01b33e5821ba81b8 100644 (file)
--- a/app-crypt/seahorse/Manifest
+++ b/app-crypt/seahorse/Manifest
@@ -1,6 +1,16 @@
-MD5 5fcd1726ff807d1f90005c753efe0bed ChangeLog 3687
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 dc8dc039f66c58bee0c7dd119afb8717 ChangeLog 3932
 MD5 887271fc00711d11fb72536de7b1f7ec metadata.xml 1073
 MD5 d590f30824faa32ba65691531d2d1e7a seahorse-0.6.3-r1.ebuild 807
-MD5 f2f8bf16cdee9004fc83d625b780b70f seahorse-0.7.5.ebuild 928
+MD5 266ea984bd8439bc6676e1cbc9fd8775 seahorse-0.7.5.ebuild 1177
 MD5 052f1fee75fc120426817f6e7c0726f6 files/digest-seahorse-0.6.3-r1 66
 MD5 ddd1af247311013096cded4265d69eaf files/digest-seahorse-0.7.5 67
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBxL35mdTrptrqvGERAr7HAJ9LfktjBn3rXQIXqvCZH/cumWVCTgCgkoTl
+E4MCSnatGHZnqrpEN+FLD0I=
+=KAod
+-----END PGP SIGNATURE-----

diff --git a/app-crypt/seahorse/seahorse-0.7.5.ebuild b/app-crypt/seahorse/seahorse-0.7.5.ebuild
index 7bbb304ad3847ec334ef800cf93096bba61e1e3a..7c07017635d6699797fd8e2bff585c3a6a6e94da 100644 (file)
--- a/app-crypt/seahorse/seahorse-0.7.5.ebuild
+++ b/app-crypt/seahorse/seahorse-0.7.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-0.7.5.ebuild,v 1.4 2004/11/16 08:51:12 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-0.7.5.ebuild,v 1.5 2004/12/18 23:32:02 dragonheart Exp $
 
 inherit gnome2
 
@@ -24,7 +24,8 @@ RDEPEND="virtual/x11
        >=gnome-base/gnome-vfs-2
        >=app-editors/gedit-2.8.0
        dev-util/intltool
-       dev-libs/glib"
+       dev-libs/glib
+       x11-misc/shared-mime-info"
 
 #no ~ppc64 keyword yet         >=gnome-base/bonobo-activation-2
 
@@ -34,3 +35,12 @@ DEPEND="${RDEPEND}
 
 DOCS="AUTHORS ChangeLog NEWS README TODO THANKS"
 IUSE="doc"
+
+
+src_install() {
+       gnome2_src_install
+
+       # remove conflicts with x11-misc/shared-mime-info
+       rm -rf ${D}/usr/share/mime/application ${D}/usr/share/mime/magic ${D}/usr/share/mime/globs \
+               ${D}/usr/share/mime/XMLnamespaces
+}