add patch, rev bump, mark 0.14-r1 x86

10 files changed, 290 insertions, 49 deletions

diff --git a/x11-misc/shared-mime-info/ChangeLog b/x11-misc/shared-mime-info/ChangeLog
index cdd4c64c8fcb..aa1963b5a601 100644
--- a/x11-misc/shared-mime-info/ChangeLog
+++ b/x11-misc/shared-mime-info/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/shared-mime-info
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/shared-mime-info/ChangeLog,v 1.27 2004/09/26 09:20:25 lanius Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/shared-mime-info/ChangeLog,v 1.28 2005/01/16 19:08:45 foser Exp $
+
+*shared-mime-info-0.14-r2 (16 Jan 2005)
+
+  16 Jan 2005; foser <foser@gentoo.org> shared-mime-info-0.14-r2.ebuild
+  Add patch to fix #66195 & #76809
 
 *shared-mime-info-0.15 (26 Sep 2004)
 
diff --git a/x11-misc/shared-mime-info/Manifest b/x11-misc/shared-mime-info/Manifest
index 075eaef30c5c..2714d8b94df6 100644
--- a/x11-misc/shared-mime-info/Manifest
+++ b/x11-misc/shared-mime-info/Manifest
@@ -2,12 +2,15 @@ MD5 911f57c7f776ba6fef48ead3ff200bb4 shared-mime-info-0.15.ebuild 1094
 MD5 52d309795632ed881b0478dc300f0cdc shared-mime-info-0.12.ebuild 615
 MD5 e1c5f5dc61148a94f290f999261ca0e1 shared-mime-info-0.14-r1.ebuild 1003
 MD5 2584a45bc48de2fb37551d74fbab5470 shared-mime-info-0.14.ebuild 721
-MD5 2da96655d3a91a4dd27b340e99be349b ChangeLog 3188
+MD5 6f9b3e1bb4e1ed2028d4a1bcbf00647a ChangeLog 3337
 MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253
 MD5 a9bd46aaaf01a81a9ee5ad47b8c4c8c0 shared-mime-info-0.13.ebuild 633
+MD5 80b2b56c8af91c7f9d2dc30cd2347816 shared-mime-info-0.14-r2.ebuild 1079
 MD5 2ba3279e9293282a945a64b94e679c25 files/shared-mime-info-0.15-ALL_CFLAGS_LIBS.patch 232
 MD5 b3db51dac3901aafb456d906112ec0f8 files/digest-shared-mime-info-0.12 73
 MD5 264ab01c148db5f6396544e959c2cc79 files/digest-shared-mime-info-0.13 73
 MD5 e22d66c3b0f0daaae096665812da282c files/digest-shared-mime-info-0.14 73
 MD5 67aa86e5f21d4e23fe3cb4aef1984df7 files/digest-shared-mime-info-0.15 73
 MD5 e22d66c3b0f0daaae096665812da282c files/digest-shared-mime-info-0.14-r1 73
+MD5 e22d66c3b0f0daaae096665812da282c files/digest-shared-mime-info-0.14-r2 73
+MD5 d321aa82774706113fca9f5c62f7923b files/shared-mime-info-0.14-text_plain.patch 7403
diff --git a/x11-misc/shared-mime-info/files/digest-shared-mime-info-0.12 b/x11-misc/shared-mime-info/files/digest-shared-mime-info-0.12
deleted file mode 100644
index dca5c87f4909..000000000000
--- a/x11-misc/shared-mime-info/files/digest-shared-mime-info-0.12
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fd9002d7fffd8edb3622ca9414952dd7 shared-mime-info-0.12.tar.gz 208802
diff --git a/x11-misc/shared-mime-info/files/digest-shared-mime-info-0.13 b/x11-misc/shared-mime-info/files/digest-shared-mime-info-0.13
deleted file mode 100644
index ef413898800b..000000000000
--- a/x11-misc/shared-mime-info/files/digest-shared-mime-info-0.13
+++ /dev/null
@@ -1 +0,0 @@
-MD5 59827a0de271c30581e923190fb7d3df shared-mime-info-0.13.tar.gz 325875
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
new file mode 100644
index 000000000000..8ffc33ce5354
--- /dev/null
+++ b/x11-misc/shared-mime-info/files/digest-shared-mime-info-0.14-r2
@@ -0,0 +1 @@
+MD5 c5fc523a8c2b3464c7aa521b6014e5c8 shared-mime-info-0.14.tar.gz 355379
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
new file mode 100644
index 000000000000..ef11053bc837
--- /dev/null
+++ b/x11-misc/shared-mime-info/files/shared-mime-info-0.14-text_plain.patch
@@ -0,0 +1,220 @@
+--- 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/shared-mime-info-0.12.ebuild b/x11-misc/shared-mime-info/shared-mime-info-0.12.ebuild
deleted file mode 100644
index f2f2b2c24ff8..000000000000
--- a/x11-misc/shared-mime-info/shared-mime-info-0.12.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2004 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.12.ebuild,v 1.6 2004/07/15 00:55:13 agriffis Exp $
-
-DESCRIPTION="The Shared MIME-info Database specification."
-HOMEPAGE="http://www.freedesktop.org"
-SRC_URI="http://www.freedesktop.org/software/shared-mime-info/releases/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc alpha hppa amd64"
-IUSE=""
-
-DEPEND=">=sys-apps/gawk-3.1.0
-	>=dev-libs/glib-2.0.4
-	>=dev-libs/libxml2-2.4.23"
-
-src_install () {
-	einstall || die
-}
diff --git a/x11-misc/shared-mime-info/shared-mime-info-0.13.ebuild b/x11-misc/shared-mime-info/shared-mime-info-0.13.ebuild
deleted file mode 100644
index 047fad4c0ad8..000000000000
--- a/x11-misc/shared-mime-info/shared-mime-info-0.13.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2004 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.13.ebuild,v 1.9 2004/06/24 22:32:22 agriffis Exp $
-
-DESCRIPTION="The Shared MIME-info Database specification."
-HOMEPAGE="http://www.freedesktop.org"
-SRC_URI="http://www.freedesktop.org/software/shared-mime-info/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc alpha hppa ~amd64 ia64"
-IUSE=""
-
-DEPEND=">=sys-apps/gawk-3.1.0
-	>=dev-libs/glib-2.0.4
-	>=dev-libs/libxml2-2.4.23
-	dev-perl/XML-Parser"
-
-src_install () {
-	einstall || die
-}
diff --git a/x11-misc/shared-mime-info/shared-mime-info-0.14-r1.ebuild b/x11-misc/shared-mime-info/shared-mime-info-0.14-r1.ebuild
index 8f8a546585d1..32316ab55b17 100644
--- a/x11-misc/shared-mime-info/shared-mime-info-0.14-r1.ebuild
+++ b/x11-misc/shared-mime-info/shared-mime-info-0.14-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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-r1.ebuild,v 1.2 2004/09/24 16:17:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/shared-mime-info/shared-mime-info-0.14-r1.ebuild,v 1.3 2005/01/16 19:08:45 foser Exp $
 
 inherit fdo-mime
 
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2
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
new file mode 100644
index 000000000000..f9e20932169a
--- /dev/null
+++ b/x11-misc/shared-mime-info/shared-mime-info-0.14-r2.ebuild
@@ -0,0 +1,55 @@
+# 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.1 2005/01/16 19:08:45 foser 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