5 files changed, 28 insertions, 5 deletions
diff --git a/x11-misc/shared-mime-info/ChangeLog b/x11-misc/shared-mime-info/ChangeLog
index 5835ac9ecc09..57a0e90695d1 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.49 2006/04/01 11:13:30 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/shared-mime-info/ChangeLog,v 1.50 2006/04/22 16:05:18 foser Exp $
+
+*shared-mime-info-0.17-r2 (22 Apr 2006)
+
+  22 Apr 2006; Marinus Schraal <foser@gentoo.org>
+  shared-mime-info-0.17-r2.ebuild, files/shared-mime-info-0.17-m3u_plain_text.patch :
+  Fix m3u detection
 
 *shared-mime-info-0.17-r1 (01 Apr 2006)
 
diff --git a/x11-misc/shared-mime-info/Manifest b/x11-misc/shared-mime-info/Manifest
index 3c9d461d52c0..11fec376de54 100644
--- a/x11-misc/shared-mime-info/Manifest
+++ b/x11-misc/shared-mime-info/Manifest
@@ -7,9 +7,15 @@ SHA256 a857d96bb629ba87318e82d6a6b88c41185701a0feb6490ed3e5dbc24f26322c files/di
 MD5 2d291bd0dff18268f6fa80397ec70cdd files/digest-shared-mime-info-0.17-r1 265
 RMD160 e2a8ee47d95887fbb4ee614f2bac3c5c07c1e919 files/digest-shared-mime-info-0.17-r1 265
 SHA256 29cd85d0bb6027b17335217c5fdc08d3f02b8f2fa68f4cf3287beae0eff7efa0 files/digest-shared-mime-info-0.17-r1 265
+MD5 2d291bd0dff18268f6fa80397ec70cdd files/digest-shared-mime-info-0.17-r2 265
+RMD160 e2a8ee47d95887fbb4ee614f2bac3c5c07c1e919 files/digest-shared-mime-info-0.17-r2 265
+SHA256 29cd85d0bb6027b17335217c5fdc08d3f02b8f2fa68f4cf3287beae0eff7efa0 files/digest-shared-mime-info-0.17-r2 265
 MD5 3bb8a3593c757b80777d4097f9044e2b files/shared-mime-info-0.17-fix_pc.patch 496
 RMD160 0540b1a86865fc3aabecf59685d7a90204bdfd52 files/shared-mime-info-0.17-fix_pc.patch 496
 SHA256 c6d5134a52d7c53d1b50a0c6c18993faae876cf8e1a9bfc2bbc9713ff6bc0d45 files/shared-mime-info-0.17-fix_pc.patch 496
+MD5 c17d2049b053abe7bf7ff5bf8b45bc83 files/shared-mime-info-0.17-m3u_plain_text.patch 434
+RMD160 29d13c494e64c177db1a1f3e2e07a1b25681a054 files/shared-mime-info-0.17-m3u_plain_text.patch 434
+SHA256 5fe3e36c580400a00a0afe861ac8d5e94b0aa81a75039b37f9623acd4007fe2d files/shared-mime-info-0.17-m3u_plain_text.patch 434
 MD5 f56d7624cd015afb20f3396433294c4c files/shared-mime-info-0.17-ps_plain_text.patch 764
 RMD160 90d51b17bd4b9d781026107135053391e826d46d files/shared-mime-info-0.17-ps_plain_text.patch 764
 SHA256 43db75cc952d6ed6409f00471bec70a46c4dbd978f2a893a5a6dc4d502120b68 files/shared-mime-info-0.17-ps_plain_text.patch 764
@@ -19,6 +25,6 @@ SHA256 8e0389110e0cd8cc331b484cde34c22dd93f9f49df16c2263eea4d8e84093976 metadata
 MD5 42291430214466dfdaab30331bf5773b shared-mime-info-0.16.ebuild 1086
 RMD160 f75341a635fb329690691f2ba93ed595f5861b99 shared-mime-info-0.16.ebuild 1086
 SHA256 2bac3f56c2432024686f05ee73585a05a176ef53ed059a82d2d172e78a685b2b shared-mime-info-0.16.ebuild 1086
-MD5 9513696e716f3de58045540ffb551760 shared-mime-info-0.17-r1.ebuild 1186
-RMD160 076dc96d50bb0774fcb1a2b58d2d255b9a6d5837 shared-mime-info-0.17-r1.ebuild 1186
-SHA256 f70ae3f2ba04c04b486b23f349e113789bd21a38aa50d293557e26fed6bf6f4b shared-mime-info-0.17-r1.ebuild 1186
+MD5 fa4e9a21ae90e184358718125276b75c shared-mime-info-0.17-r2.ebuild 1232
+RMD160 18aa26a81fb5fa815e7a06420d845fde56956330 shared-mime-info-0.17-r2.ebuild 1232
+SHA256 8675e0a23ef82b0e9321a30a0c37d987e5d784388af90202195488e4c4e3b347 shared-mime-info-0.17-r2.ebuild 1232
diff --git a/x11-misc/shared-mime-info/files/digest-shared-mime-info-0.17-r1 b/x11-misc/shared-mime-info/files/digest-shared-mime-info-0.17-r2
index 328ff38ac266..328ff38ac266 100644
--- a/x11-misc/shared-mime-info/files/digest-shared-mime-info-0.17-r1
+++ b/x11-misc/shared-mime-info/files/digest-shared-mime-info-0.17-r2
diff --git a/x11-misc/shared-mime-info/files/shared-mime-info-0.17-m3u_plain_text.patch b/x11-misc/shared-mime-info/files/shared-mime-info-0.17-m3u_plain_text.patch
new file mode 100644
index 000000000000..30ba416accf6
--- /dev/null
+++ b/x11-misc/shared-mime-info/files/shared-mime-info-0.17-m3u_plain_text.patch
@@ -0,0 +1,10 @@
+--- shared-mime-info-0.17/freedesktop.org.xml.in~	2006-03-13 14:12:01.000000000 +0100
++++ shared-mime-info-0.17/freedesktop.org.xml.in	2006-04-02 18:58:25.000000000 +0200
+@@ -1893,6 +1893,7 @@
+     <_comment>MP3 audio</_comment>
+   </mime-type>
+   <mime-type type="audio/x-mpegurl">
++    <sub-class-of type="text/plain"/>
+     <_comment>MP3 audio (streamed)</_comment>
+     <alias type="audio/mpegurl" />
+     <glob pattern="*.m3u"/>
diff --git a/x11-misc/shared-mime-info/shared-mime-info-0.17-r1.ebuild b/x11-misc/shared-mime-info/shared-mime-info-0.17-r2.ebuild
index 12b235358437..aeb0215cfc85 100644
--- a/x11-misc/shared-mime-info/shared-mime-info-0.17-r1.ebuild
+++ b/x11-misc/shared-mime-info/shared-mime-info-0.17-r2.ebuild
@@ -1,6 +1,6 @@
 # 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.17-r1.ebuild,v 1.1 2006/04/01 11:13:30 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/shared-mime-info/shared-mime-info-0.17-r2.ebuild,v 1.1 2006/04/22 16:05:20 foser Exp $
 
 inherit eutils fdo-mime
 
@@ -29,6 +29,7 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-fix_pc.patch
 	# fix ps file detection (#126880)
 	epatch ${FILESDIR}/${P}-ps_plain_text.patch
+	epatch ${FILESDIR}/${P}-m3u_plain_text.patch
 
 }