fix m4a pattern match offset (#142342)

(Portage version: 2.1)

4 files changed, 80 insertions, 1 deletions

diff --git a/x11-misc/shared-mime-info/ChangeLog b/x11-misc/shared-mime-info/ChangeLog
index 86cc86dd774a..ae5ce3f5ad34 100644
--- a/x11-misc/shared-mime-info/ChangeLog
+++ b/x11-misc/shared-mime-info/ChangeLog
@@ -1,6 +1,12 @@
 # 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.60 2006/08/02 18:26:31 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/shared-mime-info/ChangeLog,v 1.61 2006/08/03 18:22:12 foser Exp $
+
+*shared-mime-info-0.18-r1 (03 Aug 2006)
+
+  03 Aug 2006; Marinus Schraal <foser@gentoo.org> shared-mime-info-0.18-r1.ebuild,
+  files/shared-mime-info-0.18-m4a_offset.patch :
+  Fix m4a pattern match offset, thanks to Robin Ince in #142342
 
   02 Aug 2006; Gustavo Zacarias <gustavoz@gentoo.org>
   shared-mime-info-0.17-r2.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
new file mode 100644
index 000000000000..aaf0552548ee
--- /dev/null
+++ b/x11-misc/shared-mime-info/files/digest-shared-mime-info-0.18-r1
@@ -0,0 +1,3 @@
+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/shared-mime-info-0.18-m4a_offset.patch b/x11-misc/shared-mime-info/files/shared-mime-info-0.18-m4a_offset.patch
new file mode 100644
index 000000000000..0c85a9aa6172
--- /dev/null
+++ b/x11-misc/shared-mime-info/files/shared-mime-info-0.18-m4a_offset.patch
@@ -0,0 +1,12 @@
+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
new file mode 100644
index 000000000000..c40a83effef2
--- /dev/null
+++ b/x11-misc/shared-mime-info/shared-mime-info-0.18-r1.ebuild
@@ -0,0 +1,58 @@
+# 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.18-r1.ebuild,v 1.1 2006/08/03 18:22:12 foser 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