From: Marinus Schraal <foser@gentoo.org>
Date: Wed, 29 Mar 2006 10:14:04 +0000 (+0000)
Subject: readd libdir fix and clean out old releases
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b5facb02569619db124a3bd5d84c5459a2468771;p=gentoo.git

readd libdir fix and clean out old releases
Package-Manager: portage-2.1_pre4-r1
---

diff --git a/x11-misc/shared-mime-info/ChangeLog b/x11-misc/shared-mime-info/ChangeLog
index 092755ff5beb..022fceedb37e 100644
--- a/x11-misc/shared-mime-info/ChangeLog
+++ b/x11-misc/shared-mime-info/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/shared-mime-info
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/shared-mime-info/ChangeLog,v 1.47 2006/03/28 23:01:46 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/shared-mime-info/ChangeLog,v 1.48 2006/03/29 10:14:02 foser Exp $
+
+  29 Mar 2006; Marinus Schraal <foser@gentoo.org>
+  shared-mime-info-0.17.ebuild, files/shared-mime-info-0.17-fix_pc.patch :
+  Add patch to make the pkgconfig file libdir safe
 
 *shared-mime-info-0.17 (29 Mar 2006)
 
diff --git a/x11-misc/shared-mime-info/Manifest b/x11-misc/shared-mime-info/Manifest
index a83b281212da..9901fcd156ba 100644
--- a/x11-misc/shared-mime-info/Manifest
+++ b/x11-misc/shared-mime-info/Manifest
@@ -1,42 +1,21 @@
-MD5 8e8339011bdae9950e90d21f3c3b74b2 ChangeLog 5457
-RMD160 81412213dba267f963edb021bb4d7aa0801efcac ChangeLog 5457
-SHA256 1e344c9417350a2e8422f75523a77e5e9aafe625949b3bb2bfef7f85e88751d8 ChangeLog 5457
-MD5 e22d66c3b0f0daaae096665812da282c files/digest-shared-mime-info-0.14 73
-RMD160 74be9db1774a81e9b457edcb0134e194ba33695d files/digest-shared-mime-info-0.14 73
-SHA256 d80c1e8d5723630ed765942e7547d83a4e437b796b2463cf0947d45e7c7320d6 files/digest-shared-mime-info-0.14 73
-MD5 e22d66c3b0f0daaae096665812da282c files/digest-shared-mime-info-0.14-r2 73
-RMD160 74be9db1774a81e9b457edcb0134e194ba33695d files/digest-shared-mime-info-0.14-r2 73
-SHA256 d80c1e8d5723630ed765942e7547d83a4e437b796b2463cf0947d45e7c7320d6 files/digest-shared-mime-info-0.14-r2 73
-MD5 67aa86e5f21d4e23fe3cb4aef1984df7 files/digest-shared-mime-info-0.15 73
-RMD160 0b79d8bca8e2a5c030cb4908faf6f52f33680328 files/digest-shared-mime-info-0.15 73
-SHA256 66b45162a595bd1fc01483f30f0645770d1addf4d46fa879decac7a74101af35 files/digest-shared-mime-info-0.15 73
+MD5 a2a084fa2c8d49d97e847b59e1a58671 ChangeLog 5634
+RMD160 03acdd9d77813c7116477bb4868fc19c9c93c909 ChangeLog 5634
+SHA256 368e4dff4aa751e4e2a87208991725311f38a871c2afa878c60e11690c2bb97f ChangeLog 5634
 MD5 ef9e940db1ccddfec652d897511fcc27 files/digest-shared-mime-info-0.16 73
 RMD160 27d5f9d6d8ed16a1a950e06eee86b3e6dea57e64 files/digest-shared-mime-info-0.16 73
 SHA256 a857d96bb629ba87318e82d6a6b88c41185701a0feb6490ed3e5dbc24f26322c files/digest-shared-mime-info-0.16 73
 MD5 2d291bd0dff18268f6fa80397ec70cdd files/digest-shared-mime-info-0.17 265
 RMD160 e2a8ee47d95887fbb4ee614f2bac3c5c07c1e919 files/digest-shared-mime-info-0.17 265
 SHA256 29cd85d0bb6027b17335217c5fdc08d3f02b8f2fa68f4cf3287beae0eff7efa0 files/digest-shared-mime-info-0.17 265
-MD5 d321aa82774706113fca9f5c62f7923b files/shared-mime-info-0.14-text_plain.patch 7403
-RMD160 2d43e47213ce852f6dfbbb7cc578e5b017324150 files/shared-mime-info-0.14-text_plain.patch 7403
-SHA256 53c2ea8e2f6a4e46a64be4d81a98cfac362168dd3a2fd620eb865ec9d24eaf0c files/shared-mime-info-0.14-text_plain.patch 7403
-MD5 2ba3279e9293282a945a64b94e679c25 files/shared-mime-info-0.15-ALL_CFLAGS_LIBS.patch 232
-RMD160 55b4dbf9f56469baf4cf697b9f824875bc5b7bf4 files/shared-mime-info-0.15-ALL_CFLAGS_LIBS.patch 232
-SHA256 8cac5a3e4265fad66e9ee07cef58490c2d25153ad4bd6aa6cfad581952be48b9 files/shared-mime-info-0.15-ALL_CFLAGS_LIBS.patch 232
+MD5 3bb8a3593c757b80777d4097f9044e2b files/shared-mime-info-0.17-fix_pc.patch 496
+RMD160 0540b1a86865fc3aabecf59685d7a90204bdfd52 files/shared-mime-info-0.17-fix_pc.patch 496
+SHA256 c6d5134a52d7c53d1b50a0c6c18993faae876cf8e1a9bfc2bbc9713ff6bc0d45 files/shared-mime-info-0.17-fix_pc.patch 496
 MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253
 RMD160 bfa92d311ac4e8cc9a2190f578925f333ae096a8 metadata.xml 253
 SHA256 8e0389110e0cd8cc331b484cde34c22dd93f9f49df16c2263eea4d8e84093976 metadata.xml 253
-MD5 815789b8e64fe470218a56cf678b177b shared-mime-info-0.14-r2.ebuild 1084
-RMD160 2014c0669447bf8bca0c5936bf31e9d7abf9d6b0 shared-mime-info-0.14-r2.ebuild 1084
-SHA256 979f91a2a43143cf8ff3674b7c65e7385c3fd606f4f38233ec160c3e17842c9b shared-mime-info-0.14-r2.ebuild 1084
-MD5 ddf992d263ea6441be3038531e88a571 shared-mime-info-0.14.ebuild 723
-RMD160 e6d708fadd13ad243fc797b7f072d616c066a011 shared-mime-info-0.14.ebuild 723
-SHA256 a5a9921e8c29b6096563710286e93a3566c80376f3434eddaa76ebfed6412f77 shared-mime-info-0.14.ebuild 723
-MD5 34cb3f14ceed8d406a18bfb2dd67735f shared-mime-info-0.15.ebuild 1096
-RMD160 c877c4947617f81af5f1ce35df3149ef43c78256 shared-mime-info-0.15.ebuild 1096
-SHA256 e681ac72707aa257216a0a1faeeb29e4e0d99ad486f1326b28fd265ffaecd6a1 shared-mime-info-0.15.ebuild 1096
 MD5 42291430214466dfdaab30331bf5773b shared-mime-info-0.16.ebuild 1086
 RMD160 f75341a635fb329690691f2ba93ed595f5861b99 shared-mime-info-0.16.ebuild 1086
 SHA256 2bac3f56c2432024686f05ee73585a05a176ef53ed059a82d2d172e78a685b2b shared-mime-info-0.16.ebuild 1086
-MD5 3c564c323c3d59e9e108ba9f9296e708 shared-mime-info-0.17.ebuild 988
-RMD160 85aac5ff6532d07fb8f6a9b10be23dd9f3298c10 shared-mime-info-0.17.ebuild 988
-SHA256 7cfe677562dacd795d0479de82316ccd844bf634a765de4cbca1257159e29d8f shared-mime-info-0.17.ebuild 988
+MD5 72648300858107c0d8d80617d25b3789 shared-mime-info-0.17.ebuild 1103
+RMD160 e7f0e0f013278798df8091458e33f931b73ccda0 shared-mime-info-0.17.ebuild 1103
+SHA256 d2dd60698c4c570b3224375f6e752988341dca2ff259db5fba82f586ea3185af shared-mime-info-0.17.ebuild 1103
diff --git a/x11-misc/shared-mime-info/files/digest-shared-mime-info-0.14 b/x11-misc/shared-mime-info/files/digest-shared-mime-info-0.14
deleted file mode 100644
index 8ffc33ce5354..000000000000
--- a/x11-misc/shared-mime-info/files/digest-shared-mime-info-0.14
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c5fc523a8c2b3464c7aa521b6014e5c8 shared-mime-info-0.14.tar.gz 355379
diff --git a/x11-misc/shared-mime-info/files/digest-shared-mime-info-0.14-r2 b/x11-misc/shared-mime-info/files/digest-shared-mime-info-0.14-r2
deleted file mode 100644
index 8ffc33ce5354..000000000000
--- a/x11-misc/shared-mime-info/files/digest-shared-mime-info-0.14-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c5fc523a8c2b3464c7aa521b6014e5c8 shared-mime-info-0.14.tar.gz 355379
diff --git a/x11-misc/shared-mime-info/files/digest-shared-mime-info-0.15 b/x11-misc/shared-mime-info/files/digest-shared-mime-info-0.15
deleted file mode 100644
index b0ab921c6769..000000000000
--- a/x11-misc/shared-mime-info/files/digest-shared-mime-info-0.15
+++ /dev/null
@@ -1 +0,0 @@
-MD5 51793b041edc68717c3f87e26a4bc087 shared-mime-info-0.15.tar.gz 422311
diff --git a/x11-misc/shared-mime-info/files/shared-mime-info-0.14-text_plain.patch b/x11-misc/shared-mime-info/files/shared-mime-info-0.14-text_plain.patch
deleted file mode 100644
index ef11053bc837..000000000000
--- a/x11-misc/shared-mime-info/files/shared-mime-info-0.14-text_plain.patch
+++ /dev/null
@@ -1,220 +0,0 @@
---- shared-mime-info-0.14/freedesktop.org.xml.in	2004-03-22 04:38:24.000000000 +0100
-+++ shared-mime-info-0.15/freedesktop.org.xml.in	2004-08-16 12:29:23.000000000 +0200
-@@ -131,6 +119,7 @@
-     <glob pattern="*.ps"/>
-   </mime-type>
-   <mime-type type="application/rtf">
-+    <sub-class-of type="text/plain"/>
-     <_comment>Rich Text Format</_comment>
-     <magic priority="50">
-       <match type="string" value="{\\rtf" offset="0"/>
-@@ -138,6 +127,7 @@
-     <glob pattern="*.rtf"/>
-   </mime-type>
-   <mime-type type="application/smil">
-+    <sub-class-of type="text/plain"/>
-     <_comment>Synchronized Multimedia Integration Language</_comment>
-     <glob pattern="*.smil"/>
-     <glob pattern="*.smi"/>
-@@ -280,6 +286,7 @@
-     <glob pattern="*.wpd"/>
-   </mime-type>
-   <mime-type type="application/x-xbel">
-+    <sub-class-of type="text/plain"/>
-     <_comment>XBEL bookmarks</_comment>
-     <magic priority="50">
-       <match type="string" value="&lt;!DOCTYPE\ xbel" offset="0:64"/>
-@@ -345,10 +353,12 @@
-     <glob pattern="*.arj"/>
-   </mime-type>
-   <mime-type type="application/x-asp">
-+    <sub-class-of type="text/plain"/>
-     <_comment>active server page</_comment>
-     <glob pattern="*.asp"/>
-   </mime-type>
-   <mime-type type="application/x-awk">
-+    <sub-class-of type="text/plain"/>
-     <_comment>AWK script</_comment>
-     <magic priority="50">
-       <match type="string" value="#!/bin/gawk" offset="0"/>
-@@ -401,6 +411,7 @@
-     <glob pattern="*.iso"/>
-   </mime-type>
-   <mime-type type="application/x-cgi">
-+    <sub-class-of type="text/plain"/>
-     <_comment>CGI script</_comment>
-     <glob pattern="*.cgi"/>
-   </mime-type>
-@@ -457,6 +468,7 @@
-     <glob pattern="*.cpio.gz"/>
-   </mime-type>
-   <mime-type type="application/x-csh">
-+    <sub-class-of type="text/plain"/>
-     <_comment>C shell script</_comment>
-   </mime-type>
-   <mime-type type="application/x-dbase">
-@@ -486,6 +498,7 @@
-     <glob pattern="*.ui"/>
-   </mime-type>
-   <mime-type type="application/x-desktop">
-+    <sub-class-of type="text/plain"/>
-     <_comment>desktop configuration file</_comment>
-     <magic priority="50">
-       <match type="string" value="[Desktop Entry]" offset="0:32"/>
-@@ -680,6 +694,7 @@
-     <glob pattern="*.gmo"/>
-   </mime-type>
-   <mime-type type="application/x-glade">
-+    <sub-class-of type="text/plain"/>
-     <_comment>Glade project</_comment>
-     <glob pattern="*.glade"/>
-   </mime-type>
-@@ -976,6 +996,7 @@
-     <glob pattern="*.lzo"/>
-   </mime-type>
-   <mime-type type="application/x-magicpoint">
-+    <sub-class-of type="text/plain"/>
-     <_comment>MagicPoint presentation</_comment>
-     <glob pattern="*.mgp"/>
-   </mime-type>
-@@ -1026,6 +1048,7 @@
-     <glob pattern="*.n64"/>
-   </mime-type>
-   <mime-type type="application/x-nautilus-link">
-+    <sub-class-of type="text/plain"/>
-     <_comment>Nautilus link</_comment>
-     <magic priority="50">
-       <match type="string" value="&lt;nautilus_object nautilus_link" offset="0:32"/>
-@@ -1041,6 +1064,7 @@
-     <glob pattern="*.nc"/>
-   </mime-type>
-   <mime-type type="application/x-netscape-bookmarks">
-+    <sub-class-of type="text/plain"/>
-     <_comment>Netscape bookmarks</_comment>
-     <magic priority="80">
-       <match type="string" value="&lt;!DOCTYPE NETSCAPE-Bookmark-file-1&gt;" offset="0:64"/>
-@@ -1094,6 +1118,7 @@
-     </magic>
-   </mime-type>
-   <mime-type type="application/x-perl">
-+    <sub-class-of type="text/plain"/>
-     <_comment>Perl script</_comment>
-     <magic priority="50">
-       <match type="string" value='eval \"exec /usr/local/bin/perl' offset="0"/>
-@@ -1106,6 +1131,7 @@
-     <glob pattern="*.perl"/>
-   </mime-type>
-   <mime-type type="application/x-php">
-+    <sub-class-of type="text/plain"/>
-     <_comment>PHP script</_comment>
-     <magic priority="80">
-       <match type="string" value="&lt;?php" offset="0:64"/>
-@@ -1120,6 +1146,7 @@
-     <glob pattern="*.pfx"/>
-   </mime-type>
-   <mime-type type="application/x-profile">
-+    <sub-class-of type="text/plain"/>
-     <_comment>profiler results</_comment>
-     <glob pattern="gmon.out"/>
-   </mime-type>
-@@ -1128,6 +1155,7 @@
-     <glob pattern="*.pw"/>
-   </mime-type>
-   <mime-type type="application/x-python">
-+    <sub-class-of type="text/plain"/>
-     <_comment>Python script</_comment>
-     <magic priority="50">
-       <match type="string" value="#!/bin/python" offset="0"/>
-@@ -1169,6 +1197,7 @@
-     <glob pattern="*.rar"/>
-   </mime-type>
-   <mime-type type="application/x-reject">
-+    <sub-class-of type="text/plain"/>
-     <_comment>rejected patch</_comment>
-     <glob pattern="*.rej"/>
-   </mime-type>
-@@ -1180,6 +1209,7 @@
-     <glob pattern="*.rpm"/>
-   </mime-type>
-   <mime-type type="application/x-ruby">
-+    <sub-class-of type="text/plain"/>
-     <_comment>Ruby script</_comment>
-     <magic>
-       <match type="string" value="/bin/env ruby" offset="1:16"/>
-@@ -1191,6 +1221,7 @@
-     </magic>
-   </mime-type>
-   <mime-type type="application/x-shar">
-+    <sub-class-of type="text/plain"/>
-     <_comment>shell archive</_comment>
-     <glob pattern="*.shar"/>
-   </mime-type>
-@@ -1219,6 +1250,7 @@
-     <glob pattern="*.so"/>
-   </mime-type>
-   <mime-type type="application/x-shellscript">
-+    <sub-class-of type="text/plain"/>
-     <_comment>shell script</_comment>
-     <magic priority="50">
-       <match type="string" value="#!/bin/ksh" offset="0"/>
-@@ -1303,6 +1335,7 @@
-     <glob pattern="*.obj"/>
-   </mime-type>
-   <mime-type type="application/x-theme">
-+    <sub-class-of type="text/plain"/>
-     <_comment>theme</_comment>
-     <glob pattern="*.theme"/>
-   </mime-type>
-@@ -1318,6 +1351,7 @@
-     <glob pattern="*.sik"/>
-   </mime-type>
-   <mime-type type="application/x-troff">
-+    <sub-class-of type="text/plain"/>
-     <_comment>Troff document</_comment>
-     <magic priority="50">
-       <match type="string" value='.\\\"' offset="0"/>
-@@ -1330,6 +1364,7 @@
-     <glob pattern="*.t"/>
-   </mime-type>
-   <mime-type type="application/x-troff-man">
-+    <sub-class-of type="text/plain"/>
-     <_comment>Troff document (with manpage macros)</_comment>
-     <glob pattern="*.man"/>
-   </mime-type>
-@@ -1372,6 +1407,7 @@
-     <glob pattern="*.zoo"/>
-   </mime-type>
-   <mime-type type="application/xhtml+xml">
-+    <sub-class-of type="text/plain"/>
-     <_comment>XHTML page</_comment>
-     <glob pattern="*.xhtml"/>
-     <root-XML namespaceURI='http://www.w3.org/1999/xhtml' localName='html'/>
-@@ -1887,6 +1921,7 @@
-     <_comment>symbolic link</_comment>
-   </mime-type>
-   <mime-type type="message/delivery-status">
-+    <sub-class-of type="text/plain"/>
-     <_comment>mail delivery report</_comment>
-   </mime-type>
-   <mime-type type="message/disposition-notification">
-@@ -1896,6 +1931,7 @@
-     <_comment>reference to remote file</_comment>
-   </mime-type>
-   <mime-type type="message/news">
-+    <sub-class-of type="text/plain"/>
-     <_comment>Usenet news message</_comment>
-     <magic priority="50">
-       <match type="string" value="Article" offset="0"/>
-@@ -1904,9 +1940,11 @@
-     </magic>
-   </mime-type>
-   <mime-type type="message/partial">
-+    <sub-class-of type="text/plain"/>
-     <_comment>partial email message</_comment>
-   </mime-type>
-   <mime-type type="message/rfc822">
-+    <sub-class-of type="text/plain"/>
-     <_comment>email message</_comment>
-     <magic priority="50">
-       <match type="string" value="#! rnews" offset="0"/>
-
diff --git a/x11-misc/shared-mime-info/files/shared-mime-info-0.15-ALL_CFLAGS_LIBS.patch b/x11-misc/shared-mime-info/files/shared-mime-info-0.15-ALL_CFLAGS_LIBS.patch
deleted file mode 100644
index a7a1ea375674..000000000000
--- a/x11-misc/shared-mime-info/files/shared-mime-info-0.15-ALL_CFLAGS_LIBS.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure-original	2004-09-26 12:40:42.251398112 +1000
-+++ configure	2004-09-26 12:41:35.123360352 +1000
-@@ -5059,8 +5059,6 @@
-    { (exit 1); exit 1; }; }
-   fi
- 
-- (ALL_CFLAGS)
-- (ALL_LIBS)
- 
- 
- if test "x$GCC" = "xyes"; then
diff --git a/x11-misc/shared-mime-info/files/shared-mime-info-0.17-fix_pc.patch b/x11-misc/shared-mime-info/files/shared-mime-info-0.17-fix_pc.patch
new file mode 100644
index 000000000000..099b1ae7a7d7
--- /dev/null
+++ b/x11-misc/shared-mime-info/files/shared-mime-info-0.17-fix_pc.patch
@@ -0,0 +1,14 @@
+diff -uNr shared-mime-info-0.17/shared-mime-info.pc.in shared-mime-info-0.17.patched/shared-mime-info.pc.in
+--- shared-mime-info-0.17/shared-mime-info.pc.in	2004-01-21 20:29:34.000000000 +0100
++++ shared-mime-info-0.17.patched/shared-mime-info.pc.in	2006-03-29 11:59:47.000000000 +0200
+@@ -1,7 +1,7 @@
+ prefix=@prefix@
+-exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
+-includedir=${prefix}/include
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
+ 
+ 
+ Name: shared-mime-info
diff --git a/x11-misc/shared-mime-info/shared-mime-info-0.14-r2.ebuild b/x11-misc/shared-mime-info/shared-mime-info-0.14-r2.ebuild
deleted file mode 100644
index 6b3c453f2e59..000000000000
--- a/x11-misc/shared-mime-info/shared-mime-info-0.14-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/shared-mime-info/shared-mime-info-0.14-r2.ebuild,v 1.9 2005/07/11 23:13:02 geoman Exp $
-
-inherit fdo-mime eutils
-
-DESCRIPTION="The Shared MIME-info Database specification"
-HOMEPAGE="http://www.freedesktop.org/software/shared-mime-info"
-SRC_URI="http://www.freedesktop.org/software/shared-mime-info/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2
-	>=dev-libs/libxml2-2.4"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=dev-util/intltool-0.29"
-
-src_unpack() {
-
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}-text_plain.patch
-
-}
-
-src_compile() {
-
-	econf --disable-update-mimedb || die
-	emake || die
-
-}
-
-src_install() {
-
-	make DESTDIR=${D} install || die
-
-	dodoc ChangeLog NEWS README
-
-}
-
-pkg_postinst() {
-
-	fdo-mime_mime_database_update
-
-}
-
-# FIXME :
-# This ebuild should probably also remove the stuff it now leaves behind
-# in /usr/share/mime
diff --git a/x11-misc/shared-mime-info/shared-mime-info-0.14.ebuild b/x11-misc/shared-mime-info/shared-mime-info-0.14.ebuild
deleted file mode 100644
index bbd7112756c6..000000000000
--- a/x11-misc/shared-mime-info/shared-mime-info-0.14.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/shared-mime-info/shared-mime-info-0.14.ebuild,v 1.14 2005/01/17 13:05:13 gustavoz Exp $
-
-DESCRIPTION="The Shared MIME-info Database specification."
-HOMEPAGE="http://www.freedesktop.org/software/shared-mime-info"
-SRC_URI="http://www.freedesktop.org/software/shared-mime-info/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 ppc64 s390"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2
-	>=dev-libs/libxml2-2.4"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=dev-util/intltool-0.29"
-
-src_install() {
-	einstall || die
-	dodoc ChangeLog NEWS README
-}
diff --git a/x11-misc/shared-mime-info/shared-mime-info-0.15.ebuild b/x11-misc/shared-mime-info/shared-mime-info-0.15.ebuild
deleted file mode 100644
index 5703b1a9bf68..000000000000
--- a/x11-misc/shared-mime-info/shared-mime-info-0.15.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/shared-mime-info/shared-mime-info-0.15.ebuild,v 1.2 2005/01/17 13:05:13 gustavoz Exp $
-
-inherit eutils fdo-mime
-
-DESCRIPTION="The Shared MIME-info Database specification"
-HOMEPAGE="http://www.freedesktop.org/software/shared-mime-info"
-SRC_URI="http://www.freedesktop.org/software/shared-mime-info/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2
-	>=dev-libs/libxml2-2.4"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=dev-util/intltool-0.29"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-ALL_CFLAGS_LIBS.patch
-}
-
-src_compile() {
-
-	econf --disable-update-mimedb || die
-	emake || die
-
-}
-
-src_install() {
-
-	make DESTDIR=${D} install || die
-
-	dodoc ChangeLog NEWS README
-
-}
-
-pkg_postinst() {
-
-	fdo-mime_mime_database_update
-
-}
-
-# FIXME :
-# This ebuild should probably also remove the stuff it now leaves behind
-# in /usr/share/mime
diff --git a/x11-misc/shared-mime-info/shared-mime-info-0.17.ebuild b/x11-misc/shared-mime-info/shared-mime-info-0.17.ebuild
index d94d51ac8d0a..d4b45e41a06b 100644
--- a/x11-misc/shared-mime-info/shared-mime-info-0.17.ebuild
+++ b/x11-misc/shared-mime-info/shared-mime-info-0.17.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/x11-misc/shared-mime-info/shared-mime-info-0.17.ebuild,v 1.1 2006/03/28 23:00:18 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/shared-mime-info/shared-mime-info-0.17.ebuild,v 1.2 2006/03/29 10:14:04 foser Exp $
 
 inherit eutils fdo-mime
 
@@ -20,6 +20,16 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	>=dev-util/intltool-0.29"
 
+src_unpack() {
+
+	unpack ${A}
+
+	cd ${S}
+	# make pkgconfig .pc libdir safe
+	epatch ${FILESDIR}/${P}-fix_pc.patch
+
+}
+
 src_compile() {
 
 	econf --disable-update-mimedb || die