Bump to 0.22-r1

	- Include upstream patch to make html files recognized as html
	  files, rather than as netscape bookmark files.  Bug #198118

(Portage version: 2.1.3.18)

4 files changed, 68 insertions, 1 deletions

diff --git a/x11-misc/shared-mime-info/ChangeLog b/x11-misc/shared-mime-info/ChangeLog
index e64abd5d94d6..2e0cf2764d6b 100644
--- a/x11-misc/shared-mime-info/ChangeLog
+++ b/x11-misc/shared-mime-info/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-misc/shared-mime-info
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/shared-mime-info/ChangeLog,v 1.107 2007/09/27 11:37:16 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/shared-mime-info/ChangeLog,v 1.108 2007/11/05 16:56:13 dang Exp $
+
+*shared-mime-info-0.22-r1 (05 Nov 2007)
+
+  05 Nov 2007; Daniel Gryniewicz <dang@gentoo.org>
+  +files/shared-mime-info-0.22-html-fix.patch,
+  +shared-mime-info-0.22-r1.ebuild:
+  Bump to 0.22-r1
+  	- Include upstream patch to make html files recognized as html
+  	  files, rather than as netscape bookmark files.  Bug #198118
 
   27 Sep 2007; Raúl Porcel <armin76@gentoo.org>
   shared-mime-info-0.22.ebuild:
diff --git a/x11-misc/shared-mime-info/files/digest-shared-mime-info-0.22-r1 b/x11-misc/shared-mime-info/files/digest-shared-mime-info-0.22-r1
new file mode 100644
index 000000000000..8a6eaca630d6
--- /dev/null
+++ b/x11-misc/shared-mime-info/files/digest-shared-mime-info-0.22-r1
@@ -0,0 +1,3 @@
+MD5 b3b4b45ef3f76f720fd0c389f131dd4c shared-mime-info-0.22.tar.bz2 417120
+RMD160 fdf2c0d17e44f4b5d189c68a6893a88eab60778c shared-mime-info-0.22.tar.bz2 417120
+SHA256 d933caa25caacd57dc8b37f68d222acec3ba3c9d076828d34f006499f6301fb2 shared-mime-info-0.22.tar.bz2 417120
diff --git a/x11-misc/shared-mime-info/files/shared-mime-info-0.22-html-fix.patch b/x11-misc/shared-mime-info/files/shared-mime-info-0.22-html-fix.patch
new file mode 100644
index 000000000000..33351bf6a55f
--- /dev/null
+++ b/x11-misc/shared-mime-info/files/shared-mime-info-0.22-html-fix.patch
@@ -0,0 +1,12 @@
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN shared-mime-info-0.22.orig/freedesktop.org.xml.in shared-mime-info-0.22/freedesktop.org.xml.in
+--- shared-mime-info-0.22.orig/freedesktop.org.xml.in	2007-07-27 12:00:53.000000000 -0400
++++ shared-mime-info-0.22/freedesktop.org.xml.in	2007-11-05 11:49:02.000000000 -0500
+@@ -1686,8 +1686,6 @@ command to generate the output files.
+       <match type="string" value="&lt;!DOCTYPE NETSCAPE-Bookmark-file-1&gt;" offset="0:64"/>
+     </magic>
+     <alias type="application/x-netscape-bookmarks"/>
+-    <glob pattern="*.html"/>
+-    <glob pattern="*.htm"/>
+   </mime-type>
+   <mime-type type="application/x-ms-dos-executable">
+     <_comment>DOS/Windows executable</_comment>
diff --git a/x11-misc/shared-mime-info/shared-mime-info-0.22-r1.ebuild b/x11-misc/shared-mime-info/shared-mime-info-0.22-r1.ebuild
new file mode 100644
index 000000000000..c1158c59c604
--- /dev/null
+++ b/x11-misc/shared-mime-info/shared-mime-info-0.22-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2007 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.22-r1.ebuild,v 1.1 2007/11/05 16:56:13 dang 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/~hadess/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.3.2
+	>=dev-libs/libxml2-2.4"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	dev-util/intltool
+	sys-devel/gettext"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Fix html files showing up as netscape bookmark files; bug #198118
+	epatch "${FILESDIR}"/${P}-html-fix.patch
+}
+
+src_compile() {
+	econf --disable-update-mimedb
+	emake || die "emake failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc ChangeLog NEWS README
+}
+
+pkg_postinst() {
+	fdo-mime_mime_database_update
+}