From c66bad06e124dedfdc35cc36fdb17749457e605b Mon Sep 17 00:00:00 2001
From: Marinus Schraal <foser@gentoo.org>
Date: Wed, 29 Mar 2006 10:14:04 +0000
Subject: readd libdir fix and clean out old releases (Portage version:
 2.1_pre4-r1)

---
 x11-misc/shared-mime-info/ChangeLog                |   6 +-
 .../files/digest-shared-mime-info-0.14             |   1 -
 .../files/digest-shared-mime-info-0.14-r2          |   1 -
 .../files/digest-shared-mime-info-0.15             |   1 -
 .../files/shared-mime-info-0.14-text_plain.patch   | 220 ---------------------
 .../shared-mime-info-0.15-ALL_CFLAGS_LIBS.patch    |  11 --
 .../files/shared-mime-info-0.17-fix_pc.patch       |  14 ++
 .../shared-mime-info-0.14-r2.ebuild                |  55 ------
 .../shared-mime-info/shared-mime-info-0.14.ebuild  |  23 ---
 .../shared-mime-info/shared-mime-info-0.15.ebuild  |  52 -----
 .../shared-mime-info/shared-mime-info-0.17.ebuild  |  12 +-
 11 files changed, 30 insertions(+), 366 deletions(-)
 delete mode 100644 x11-misc/shared-mime-info/files/digest-shared-mime-info-0.14
 delete mode 100644 x11-misc/shared-mime-info/files/digest-shared-mime-info-0.14-r2
 delete mode 100644 x11-misc/shared-mime-info/files/digest-shared-mime-info-0.15
 delete mode 100644 x11-misc/shared-mime-info/files/shared-mime-info-0.14-text_plain.patch
 delete mode 100644 x11-misc/shared-mime-info/files/shared-mime-info-0.15-ALL_CFLAGS_LIBS.patch
 create mode 100644 x11-misc/shared-mime-info/files/shared-mime-info-0.17-fix_pc.patch
 delete mode 100644 x11-misc/shared-mime-info/shared-mime-info-0.14-r2.ebuild
 delete mode 100644 x11-misc/shared-mime-info/shared-mime-info-0.14.ebuild
 delete mode 100644 x11-misc/shared-mime-info/shared-mime-info-0.15.ebuild

(limited to 'x11-misc/shared-mime-info')

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/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
-- 
cgit v1.2.3-65-gdbad