Version bump for bug 171570, thanks to Eike Hein <hein AT kde.org> for reporting.

(Portage version: 2.1.2.3)

6 files changed, 47 insertions, 74 deletions

diff --git a/x11-misc/shared-mime-info/ChangeLog b/x11-misc/shared-mime-info/ChangeLog
index 5daf3c4b4891..0647012f7885 100644
--- a/x11-misc/shared-mime-info/ChangeLog
+++ b/x11-misc/shared-mime-info/ChangeLog
@@ -1,6 +1,14 @@
 # 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.77 2007/02/04 08:47:35 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/shared-mime-info/ChangeLog,v 1.78 2007/04/04 14:29:25 drac Exp $
+
+*shared-mime-info-0.20 (04 Apr 2007)
+
+  04 Apr 2007; Samuli Suominen <drac@gentoo.org>
+  -files/shared-mime-info-0.18-m4a_offset.patch,
+  -shared-mime-info-0.18-r1.ebuild, +shared-mime-info-0.20.ebuild:
+  Version bump for bug 171570, thanks to Eike Hein <hein AT kde.org> for
+  reporting.
 
   04 Feb 2007; Markus Rothe <corsair@gentoo.org>
   shared-mime-info-0.19.ebuild:
diff --git a/x11-misc/shared-mime-info/files/digest-shared-mime-info-0.18-r1 b/x11-misc/shared-mime-info/files/digest-shared-mime-info-0.18-r1
deleted file mode 100644
index aaf0552548ee..000000000000
--- a/x11-misc/shared-mime-info/files/digest-shared-mime-info-0.18-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 63398294a078dd9f72a7c4e122a668c8 shared-mime-info-0.18.tar.gz 599826
-RMD160 7406ac3af0639ee4e28c0d909fc95b6f1f1cff67 shared-mime-info-0.18.tar.gz 599826
-SHA256 b51ef82454788abd940d78656ba4bec0760ddfe9b04df810dcea940c79936aa3 shared-mime-info-0.18.tar.gz 599826
diff --git a/x11-misc/shared-mime-info/files/digest-shared-mime-info-0.20 b/x11-misc/shared-mime-info/files/digest-shared-mime-info-0.20
new file mode 100644
index 000000000000..c2beaa214547
--- /dev/null
+++ b/x11-misc/shared-mime-info/files/digest-shared-mime-info-0.20
@@ -0,0 +1,3 @@
+MD5 62184241d497d34138285bc248b3fabc shared-mime-info-0.20.tar.bz2 429405
+RMD160 74fb58dcf9a6b7a651a0708a81b5f37b9e5eb617 shared-mime-info-0.20.tar.bz2 429405
+SHA256 6febe616fb850f4319efa7017312abb796024e7ac20da37c4d2ce34afa41776c shared-mime-info-0.20.tar.bz2 429405
diff --git a/x11-misc/shared-mime-info/files/shared-mime-info-0.18-m4a_offset.patch b/x11-misc/shared-mime-info/files/shared-mime-info-0.18-m4a_offset.patch
deleted file mode 100644
index 0c85a9aa6172..000000000000
--- a/x11-misc/shared-mime-info/files/shared-mime-info-0.18-m4a_offset.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr shared-mime-info-0.18/freedesktop.org.xml.in shared-mime-info-0.18.patched/freedesktop.org.xml.in
---- shared-mime-info-0.18/freedesktop.org.xml.in	2006-06-19 14:57:25.000000000 +0200
-+++ shared-mime-info-0.18.patched/freedesktop.org.xml.in	2006-08-03 19:59:54.000000000 +0200
-@@ -1884,7 +1884,7 @@
-     <_comment>MPEG-4 audio</_comment>
-     <alias type="audio/x-m4a"/>
-     <magic priority="50">
--      <match type="string" value="ftypM4A" offset="0"/>
-+      <match type="string" value="ftypM4A" offset="4"/>
-     </magic>
-     <glob pattern="*.m4a"/>
-   </mime-type>
diff --git a/x11-misc/shared-mime-info/shared-mime-info-0.18-r1.ebuild b/x11-misc/shared-mime-info/shared-mime-info-0.18-r1.ebuild
deleted file mode 100644
index 7b6243d0ff06..000000000000
--- a/x11-misc/shared-mime-info/shared-mime-info-0.18-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# 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.18-r1.ebuild,v 1.6 2007/01/17 23:40:25 tester 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/~hadess/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x86-fbsd"
-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}
-	# make pkgconfig .pc libdir safe
-	epatch ${FILESDIR}/${PN}-0.17-fix_pc.patch
-	# fix m4a match pattern offset (#142342)
-	epatch ${FILESDIR}/${P}-m4a_offset.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.20.ebuild b/x11-misc/shared-mime-info/shared-mime-info-0.20.ebuild
new file mode 100644
index 000000000000..cebddd050398
--- /dev/null
+++ b/x11-misc/shared-mime-info/shared-mime-info-0.20.ebuild
@@ -0,0 +1,35 @@
+# 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.20.ebuild,v 1.1 2007/04/04 14:29:25 drac Exp $
+
+inherit fdo-mime
+
+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.2
+	>=dev-libs/libxml2-2.4"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	>=dev-util/intltool-0.35"
+
+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
+}