Add upstream patches to fix ISO image detection (bug #548676, thanks to i.Dark_Templar). Add epatch_user.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x18E5B6F2D8D5EC8D

5 files changed, 160 insertions, 16 deletions

diff --git a/x11-misc/shared-mime-info/ChangeLog b/x11-misc/shared-mime-info/ChangeLog
index e3d04dfc35f2..7ea595243353 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 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/shared-mime-info/ChangeLog,v 1.222 2015/04/28 09:53:32 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/shared-mime-info/ChangeLog,v 1.223 2015/05/25 22:35:57 tetromino Exp $
+
+*shared-mime-info-1.4-r1 (25 May 2015)
+
+  25 May 2015; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +shared-mime-info-1.4-r1.ebuild, +files/shared-mime-info-1.4-iso-1.patch,
+  +files/shared-mime-info-1.4-iso-2.patch:
+  Add upstream patches to fix ISO image detection (bug #548676, thanks to
+  i.Dark_Templar). Add epatch_user.
 
   28 Apr 2015; Agostino Sarubbo <ago@gentoo.org> shared-mime-info-1.4.ebuild:
   Stable for sparc, wrt bug #545866
diff --git a/x11-misc/shared-mime-info/Manifest b/x11-misc/shared-mime-info/Manifest
index b61c11ea1b4b..1de3c0b01d6d 100644
--- a/x11-misc/shared-mime-info/Manifest
+++ b/x11-misc/shared-mime-info/Manifest
@@ -2,28 +2,33 @@
 Hash: SHA256
 
 AUX shared-mime-info-1.2-g_type_init.patch 696 SHA256 5a0add1740c052a8ed0e3b069eaf717468fc27c48f7134a143899cbb568729ab SHA512 b3b7b2539d4d6faf555b34ec490d51d6c5de4582ac7a2b891ce26a3315d33437377566434bf26ff094aca9a0b12b1383c0b94af737fc0a2e11c0c6c6f9e8d4d3 WHIRLPOOL 6e38b3fb21cd4f7f7cf61e753a4fff07a431be281102cf82d5b2ca2f835fc850529f036ad90107a5fac7e4c87c1e5a27904d473140e3782bd329f8529e5684eb
+AUX shared-mime-info-1.4-iso-1.patch 1589 SHA256 cb42b4d522810dff58ae31c0cdaef847292a783df681147e1d3c5726ed7b3a1c SHA512 89be5ccdf28137a57ae50e433fde319babf7b4dc8c2c971344943b8172c0e1ce4c775a5289301243199b7991e79911569d09a9765d94e74d94517f6b7b9066f5 WHIRLPOOL ec4c0011d6336321c267e3fd0b8171127ec97ec0abae029b7d72080e93c758b7b39b2311ef54004813609697e335ac5ed112ec3213c9b0c39749002e06682ed0
+AUX shared-mime-info-1.4-iso-2.patch 997 SHA256 3149a6189679293b0a06b68f027736d28b08174272708397da66d9a816944676 SHA512 406e404fee8d0a221ef756e702e879c79a274662ad3299e71e4d2cee3440ba4cd040ebc5e829beb56806a70e93da3aa1351752022f8dacd5555dae04cba628c4 WHIRLPOOL 8b73eae2ddfa7977e3e9f2f730ae00593464bc8be30ad797903d4dbd632303c67219cc603b3732f2f88bcddcdd81c31bb5fcea8af1577146f08b75b96eefc151
 DIST shared-mime-info-1.2.tar.xz 514612 SHA256 a5516ae241b95a948a6749b1cbf65dc20c3bb563a73cc7bedb7065933788bb78 SHA512 25888c2500e21a9dfdb189e7f48edf409523e0c1566d1f5b0d61eaf4faa4bcb83eca5f56d6d2ab03e44d5d4a0cc4504a566b9c773c8a634c0798f7560fe83d4c WHIRLPOOL 40a6cbf9dbba7fd037d01a34a711f3f484e3be5c240232f6925d31ffb5eda129f1f6f29edb4cff168938161f68558577099d6e9750e5e2a0659df5982c2df6aa
 DIST shared-mime-info-1.3.tar.xz 517420 SHA256 4fd49c8c7ca9ecb10c59845094a18dbb73b69c72b4bad3db5e864f2111cb323a SHA512 ef74f71e877a9117ca796e0425ffdc0a47200b543c9989c9952d59d5a4c8ed9d086c1f5b73af343b7e59d8080d1813b5c2fe2896fe619f753af315460136fb5d WHIRLPOOL 0eb482d7aaa6ea89f7fa72bb463f1ba38435ef20b2d086b0011e5f4a88fe329581d740a13126b0fa58df7bece2018930be39e66bbd7bbdfe97218497e1e234be
 DIST shared-mime-info-1.4.tar.xz 537916 SHA256 bbc0bd023f497dfd75e1ca73441cbbb5a63617d9e14f2790b868361cc055b5b1 SHA512 ac643a5360c1e4811b2df8e3c52434e5ee48f8e62a01ede3fb0895d30721b58b5b26c0edc43f779576ff899bd1a8b181699a08dbbb1e956394555f6ca983a582 WHIRLPOOL 32cb301cd54140b83af8c321b7ebc571b87b07ca86bfc68e6760e4dd3551188a092a96087042b13f1278c11cd88c261879fc816d0c2efcbee473211d929194bf
 EBUILD shared-mime-info-1.2-r1.ebuild 1686 SHA256 7e8f378b92f968a883e3e70b71cfec5517ecfdcc694d5ff8e0b12ef6355c8d65 SHA512 bc5fc241a6415b88834e320c1ab623046e2c97dbce2174618884d5d8dc44ca6bc33daec45809824efcbd005c52e614aa219bd4b0770c2cdb31366dfea7cfb238 WHIRLPOOL 68ea9d563935d94fd6e80bc9902ada8f7f318228933643e20e70061976d60d449e03aa18bea6494c5e710be25d51ff47ade8e66b9ca48b5956c81791d4114ccb
 EBUILD shared-mime-info-1.3.ebuild 1637 SHA256 425f0c1bd92a78766f156f09e033e779810061a56d1d3bd4159dc1dae727fa08 SHA512 a60f648a98b6a6a3c44828bc2ff2cb737212a5551e9822ae62d46bc4278502ddc2c4b3fb01390a5770ab5f13e5cb0081f2b60562ec591afba0f163b858d6ec87 WHIRLPOOL cb8435b922a2e4a26e450e10e95a396c0f99fe58bc692997fdf61a7f837db22c5a81b0c0eafeba907eb3850e1022c37acb1f1767321637192846a16c68c7b5a0
+EBUILD shared-mime-info-1.4-r1.ebuild 1812 SHA256 03833ac2716b29237fcb94702227c484596a5906d86ce4d65694a5658b9b86eb SHA512 868fdd8850f136067840cc05d47d341cbdd4287b923ccc4d78f8464460e13b4ba48abadea0b05c79c9fab34cd10c94d2641b5e508ee6b7720b03936a275ba8c3 WHIRLPOOL 55383ee7ee6efe6d2e698f66e3392f1600043842bebf62f82fd94acedf7e334f76030c73f9965e37fcc1e9586310819f42d4d0b6de5797a181ce5e1827145f64
 EBUILD shared-mime-info-1.4.ebuild 1623 SHA256 cf43a64099cf10342607c2a187391e440a9e3c4ceae372c94ef8d3b228f1833c SHA512 87894ed99b596c355f140f7aed49a0769728385d376a15c60509ef0d0e9a5d6d0fdfa22112157b37c924588627886e7345e40674a6fe567fb48dd6cdcd3adf98 WHIRLPOOL b2aab2c8e9dd01e6f0d1c80abf97fea03acd8aa5babe3e6822be6474bfa180aadd4524351420f11ba11984a1cb1b10f2e04d3dc0330da57b31ef79f4cb0cc6de
-MISC ChangeLog 27873 SHA256 fe3dd46ea6f145aa4b31a40a23515f31b25345335660eea0fd23feb8d20454da SHA512 c48a14e77da6fde958b8a787521630181a31ff0ac61857570e018e3ed916adee1655b5e4b727791c6e4867fce6b8882fe94cc090a21542a57fe249806552fcc6 WHIRLPOOL ad9e894c4b74050eb2723c0e015c658b27ef05fc5e2bfa93757f1a9fe688fbfd1541ddbde43a75e711add1a1fc08da50b8e3792968e25da5087d97848ce96b3e
+MISC ChangeLog 28208 SHA256 f85f1ab77df445c279a82e68ea667e37d3440cc99ad676cbdee7a954cbf3bdc4 SHA512 b0177b0ac33ccce50042051c1b2aeca3716e219e3f5b9dce14e350ffcaa02fdc08b5e6dd0277931451b543b4dce8c713b485f94fb7fd2239cee62203bba9340a WHIRLPOOL 2068cee2d78f56ae81cd3cdc2448cf0ece14264955cc735ee42be95a4f533d8048118a124ce0463f10349e0ebbc4abb91d9842fa02d9a8c2f70df166f6a2d5a3
 MISC metadata.xml 234 SHA256 3018e3b31ed690a57bfc14e35699dd20ea3b352fc28b918f699e6955b57a2d97 SHA512 eed880663c66280f6688f896bd6b82d600cac0063eb79da7b1be0fe3bf866e7289edb389a505dfbf45bd9c7e5282748dadd7bf3477759788c1024300796545c3 WHIRLPOOL 79028c7efb93b6255351aebe7f35d1587d07ec1405e8fbee4fd874e42e57e6d10368b0f4ab60c89e115493a094f36af8be1bc2fe79fc2d34daae83dc0f8d7b16
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJVP1icAAoJELp701BxlEWf8zAP/i9pStMm+d6HCbp3hewg7Niy
-ZGA/LzvxCxJgB86PvAb3G/gW/oZgU/9NpWu34DbDFXWxGYK2+rOnMBlOq5A9NSR8
-ZUov5ZY4ETxHrArSYhTtTtBph0bmTE/nA9f+fSVudt12j1xaRRfIj0UbFIDKbZwb
-c9hPbbdIaVepFKBv6O2qDX6jwNYBGBqrLwFa7Dzt3G5iDe8X+AF12WnBuyELBZuN
-Q7vSUIG34vb23xi3yOCb75q3f/Dv/qo+tkQu3LyLdKjP5Z2Gkt56Hac5CsWtgjg1
-aB4utI+9ttcioQ/Nnwptcz/4IJhL425V3Nk36+BLnhMSAqQSR6yB/GggJmriwoIw
-7FGUTu4kCJ3ccXqaGUkuMjxIwtnwSc6PpH1ysGXt45bnPOgPw7N8j7oh2Rk64ZYP
-c5nixxwaRDXOlylMvdlZjcDBmIztbQE1FskH67qWWyRycRDQ3LD0B5v/v/+cj9i0
-CtLWUcvPy6y1Y54Fcj6bhyUA6+lrVezg+cV1d6GEj6RvUjRhSkpzYj7C0qav3KaO
-aA06VolTuB5henqJqDJRU5Grsf5jTu+GOEp7bPLOlwJZFIdYGVBI6ruXK+zLNS1H
-uxyGIHbq4HIpU5yrPx3i/S5AHT5BaaxAHpqmCKc4rxVTrXwJOUeGqWQJqVtvclhO
-QJHzS3IFpBcryxQ1EtF1
-=LKqr
+iQJ8BAEBCABmBQJVY6POXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RTNCRkUzRDRBNkI2MEEwQkYwQzMyOEEx
+OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyNn/gQAKV1HwHvySZdsN39cPKlI/Sa
+FLsvIudid+aWqhgAtRyDiuXrTkrDHe29uqy2+YakLcZ7BPtS7XBrJiHe0MVP+PM5
+LSe/i77c3xR24xf1a/aINjJUvjayQulP2MgDCoyWh1ppNVdeNokl66Tc89JkUH6R
+HZ1dsEOBYOYnRN7XN7mHwjANor7kIkfzY61HCnLT2MSE5I5A8GqbuR4NJgEcM7P/
+SQYn2+MhIKW/kKjM0a1XMuZJFD41atIaqbuBze3IuKv6NLMKTUB4/dj9ZCol3Mf8
+8+wALVpYfwbJo/Tsqg0kQlUotYT0KSX7LiWQ6dWInzSZJouTgIn2HEfq/625Zk0l
+6Xlg+cN447ZXgGIwfqyWzXiVbBnrOKFYHkOPzF5FtNOOff5sI0jz5M2TdFbN2sMF
+6jEwkPXpnivH9Q5RUpcV2TzJ4rxbuj1sPRVVb1/sZhn+xmPyHZd816ztqUQLY+F5
+FiLQDm27t5gxWkn4zMtBaa1JXeWkJOze2qQI/OB5fjymHhxaZ9qZj8v19STzYGsB
+XYLKPMbucV4K4TEICzxTYodKST5tYZs9xCUqv6C8aEN8bZySQunhIUoxw279FHvE
+SuLLxY3t2pGTPhVtJ46Si7TNQE36JCATylVYDBjtKK7cL2lM7vdBnbjjZa95zCOv
+ia9wuIery4v7obAReD7G
+=/Hn+
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/shared-mime-info/files/shared-mime-info-1.4-iso-1.patch b/x11-misc/shared-mime-info/files/shared-mime-info-1.4-iso-1.patch
new file mode 100644
index 000000000000..601e8aff5caa
--- /dev/null
+++ b/x11-misc/shared-mime-info/files/shared-mime-info-1.4-iso-1.patch
@@ -0,0 +1,40 @@
+From 0e93784410db711eef67fa2a56b0ec4bc4b5e08d Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Sun, 15 Feb 2015 18:43:49 +0100
+Subject: [PATCH] Add a note about ISO image magic
+
+And the fact that we cannot implement it here.
+---
+ HACKING                | 3 +++
+ freedesktop.org.xml.in | 1 +
+ 2 files changed, 4 insertions(+)
+
+diff --git a/HACKING b/HACKING
+index 260025b..370fb68 100644
+--- a/HACKING
++++ b/HACKING
+@@ -10,6 +10,9 @@ A few ground rules for people interested in adding new mime-types.
+ * Mime-types/file formats proprietary to one application should only
+   be added to a private .xml file and be bundled with the application
+   itself
++* Magic offset must be as small as possible. For example, the worst case
++  scenario for ISO images is 32k inside the file. This is too big for a sniff
++  buffer, especially on remote locations. Avoid those.
+ * No commits should be done that break the test suite, or the test suite
+   test in question should be amended, and reason for the changes clearly
+   documented in the commit message
+diff --git a/freedesktop.org.xml.in b/freedesktop.org.xml.in
+index 7321d40..093c260 100644
+--- a/freedesktop.org.xml.in
++++ b/freedesktop.org.xml.in
+@@ -1514,6 +1514,7 @@ command to generate the output files.
+     <_comment>raw CD image</_comment>
+     <sub-class-of type="application/x-raw-disk-image"/>
+     <alias type="application/x-iso9660-image"/>
++    <!-- No magic, see https://bugs.freedesktop.org/show_bug.cgi?id=10049 -->
+     <glob pattern="*.iso"/>
+     <glob pattern="*.iso9660"/>
+   </mime-type>
+-- 
+2.4.1
+
diff --git a/x11-misc/shared-mime-info/files/shared-mime-info-1.4-iso-2.patch b/x11-misc/shared-mime-info/files/shared-mime-info-1.4-iso-2.patch
new file mode 100644
index 000000000000..5c0bb0357b29
--- /dev/null
+++ b/x11-misc/shared-mime-info/files/shared-mime-info-1.4-iso-2.patch
@@ -0,0 +1,29 @@
+From 824cff3da0f17812715795f0e64a47f7331a338b Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Wed, 18 Feb 2015 10:37:36 +0100
+Subject: [PATCH] Bump priority for ISO images glob matching
+
+To work-around file managers that cannot use magic to differentiate
+mime-types.
+
+https://bugs.freedesktop.org/show_bug.cgi?id=80877
+---
+ freedesktop.org.xml.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/freedesktop.org.xml.in b/freedesktop.org.xml.in
+index 64f34b9..59e399c 100644
+--- a/freedesktop.org.xml.in
++++ b/freedesktop.org.xml.in
+@@ -1515,7 +1515,7 @@ command to generate the output files.
+     <sub-class-of type="application/x-raw-disk-image"/>
+     <alias type="application/x-iso9660-image"/>
+     <!-- No magic, see https://bugs.freedesktop.org/show_bug.cgi?id=10049 -->
+-    <glob pattern="*.iso"/>
++    <glob pattern="*.iso" weight="80"/>
+     <glob pattern="*.iso9660"/>
+   </mime-type>
+   <mime-type type="application/x-cdrdao-toc">
+-- 
+2.4.1
+
diff --git a/x11-misc/shared-mime-info/shared-mime-info-1.4-r1.ebuild b/x11-misc/shared-mime-info/shared-mime-info-1.4-r1.ebuild
new file mode 100644
index 000000000000..daf377c76a6a
--- /dev/null
+++ b/x11-misc/shared-mime-info/shared-mime-info-1.4-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 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-1.4-r1.ebuild,v 1.1 2015/05/25 22:35:57 tetromino Exp $
+
+EAPI=5
+inherit eutils fdo-mime
+
+DESCRIPTION="The Shared MIME-info Database specification"
+HOMEPAGE="http://freedesktop.org/wiki/Software/shared-mime-info"
+SRC_URI="http://people.freedesktop.org/~hadess/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND=">=dev-libs/glib-2
+	dev-libs/libxml2"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+DOCS=( ChangeLog HACKING NEWS README )
+
+src_prepare() {
+	# Useful patches from usptream git, will be in next release
+	epatch "${FILESDIR}"/${P}-iso-1.patch
+	epatch "${FILESDIR}"/${P}-iso-2.patch
+
+	epatch_user
+}
+
+src_configure() {
+	export ac_cv_func_fdatasync=no #487504
+
+	econf \
+		$(use_enable test default-make-check) \
+		--disable-update-mimedb
+}
+
+src_compile() {
+	# FIXME: 0.91 fails with -j9 every second time like:
+	# update_mime_database-update-mime-database.o: file not recognized: File truncated
+	# collect2: ld returned 1 exit status
+	emake -j1
+}
+
+src_install() {
+	default
+
+	# in prefix, install an env.d entry such that prefix patch is used/added
+	if use prefix; then
+		echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share\"" > "${T}"/50mimeinfo
+		doenvd "${T}"/50mimeinfo
+	fi
+}
+
+pkg_postinst() {
+	use prefix && export XDG_DATA_DIRS="${EPREFIX}"/usr/share
+	fdo-mime_mime_database_update
+}