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

Package-Manager: portage-2.1.2.3

diff --git a/x11-misc/shared-mime-info/ChangeLog b/x11-misc/shared-mime-info/ChangeLog
index 5daf3c4b4891e013aaed789491fd09e5f2ec737f..0647012f7885c7aaeb8e8cbe2b5571d47ee7a350 100644 (file)
--- 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/Manifest b/x11-misc/shared-mime-info/Manifest
index 425ce0346059c3b6d857cda8bf7ecfebfa7d91f1..0fc93ce06186412f08ffb552de4ba02c52016f8c 100644 (file)
--- a/x11-misc/shared-mime-info/Manifest
+++ b/x11-misc/shared-mime-info/Manifest
@@ -10,29 +10,25 @@ AUX shared-mime-info-0.17-ps_plain_text.patch 764 RMD160 90d51b17bd4b9d781026107
 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
-AUX shared-mime-info-0.18-m4a_offset.patch 580 RMD160 888a543385c6773a1b253f9923b24fe45d014247 SHA1 97227d519b1f2b1fc69307395c554c8ff62158a8 SHA256 96e57cd4802198bfaedd250d1233f0c629fea1854ab86ad74a7a0d74489de4b0
-MD5 823eb0f8a7827e98658ba740a9f906fe files/shared-mime-info-0.18-m4a_offset.patch 580
-RMD160 888a543385c6773a1b253f9923b24fe45d014247 files/shared-mime-info-0.18-m4a_offset.patch 580
-SHA256 96e57cd4802198bfaedd250d1233f0c629fea1854ab86ad74a7a0d74489de4b0 files/shared-mime-info-0.18-m4a_offset.patch 580
 DIST shared-mime-info-0.17.tar.gz 571770 RMD160 3b97a0bbabc1782ed0c4430c19a7fa40b479ae28 SHA1 a9c9bd3de93e5bb0910abf0facad88251449be2e SHA256 5ca9bc3db2ceffa1ee51016ea8b590545b21351b89a1482a8a3533e22b45148e
-DIST shared-mime-info-0.18.tar.gz 599826 RMD160 7406ac3af0639ee4e28c0d909fc95b6f1f1cff67 SHA1 4e7a7850098824476270405ac7bd7759d9b89e43 SHA256 b51ef82454788abd940d78656ba4bec0760ddfe9b04df810dcea940c79936aa3
 DIST shared-mime-info-0.19.tar.gz 595168 RMD160 edb36ea4c23f608749cb9e8bfa747297a10afed1 SHA1 c589906365c591d67b4d7280b0a52297b4bb7dcc SHA256 4aae542285cdf011d8486ece8c2c8b0431ce1e25e7eb7efd39593f04bc76d118
+DIST shared-mime-info-0.20.tar.bz2 429405 RMD160 74fb58dcf9a6b7a651a0708a81b5f37b9e5eb617 SHA1 5918a9bb72da72fea63a480d07eb1c1150b14c3a SHA256 6febe616fb850f4319efa7017312abb796024e7ac20da37c4d2ce34afa41776c
 EBUILD shared-mime-info-0.17-r2.ebuild 1238 RMD160 d01f38b49aa4f077af2525b09543b9aece3bd7df SHA1 9fc7c161e694f2ee4f96db8a1482296d06f1eab1 SHA256 32a668ad17aa52d3a573f7f3461d80983f4faf975ad8cf2f16067e0ce3285bcd
 MD5 9d6b59b4ee7a850fd2b539f463ca84ed shared-mime-info-0.17-r2.ebuild 1238
 RMD160 d01f38b49aa4f077af2525b09543b9aece3bd7df shared-mime-info-0.17-r2.ebuild 1238
 SHA256 32a668ad17aa52d3a573f7f3461d80983f4faf975ad8cf2f16067e0ce3285bcd shared-mime-info-0.17-r2.ebuild 1238
-EBUILD shared-mime-info-0.18-r1.ebuild 1202 RMD160 5ee15d19431e658066829f9d9ea4f1a8ad63d3f6 SHA1 2d67c65b1cbeff991a8febdbc9cc0ddb5b616f98 SHA256 03fcf8dfcfec9a89d3796b4224bc21c9d44a8ec93cdb3e8a8660a6fde54dc0e5
-MD5 232f18e64c2a74762bb101a22e831967 shared-mime-info-0.18-r1.ebuild 1202
-RMD160 5ee15d19431e658066829f9d9ea4f1a8ad63d3f6 shared-mime-info-0.18-r1.ebuild 1202
-SHA256 03fcf8dfcfec9a89d3796b4224bc21c9d44a8ec93cdb3e8a8660a6fde54dc0e5 shared-mime-info-0.18-r1.ebuild 1202
 EBUILD shared-mime-info-0.19.ebuild 997 RMD160 b1dbc38364bc5456116016f30da4d6d2db9c96c1 SHA1 6d11fd752a2aa61a8c165505a096315698c5f93f SHA256 7f55efb717ff1dc4ae896d957e6c69112505c71cba3d85265f485f4abd7ebe33
 MD5 91bf98885ff0b51ef865165107b95ec8 shared-mime-info-0.19.ebuild 997
 RMD160 b1dbc38364bc5456116016f30da4d6d2db9c96c1 shared-mime-info-0.19.ebuild 997
 SHA256 7f55efb717ff1dc4ae896d957e6c69112505c71cba3d85265f485f4abd7ebe33 shared-mime-info-0.19.ebuild 997
-MISC ChangeLog 9508 RMD160 fcecd490284ba4e29cdbfdb517a35b88cfc14f42 SHA1 1cebad839cb9c2e1d609ad8498df5050541007d0 SHA256 f8c76eddda519269228035a014f6359cba87efc189569229a46ec1faeb02446b
-MD5 aa9c9c0c46dc7360beef8b20f4fb36a6 ChangeLog 9508
-RMD160 fcecd490284ba4e29cdbfdb517a35b88cfc14f42 ChangeLog 9508
-SHA256 f8c76eddda519269228035a014f6359cba87efc189569229a46ec1faeb02446b ChangeLog 9508
+EBUILD shared-mime-info-0.20.ebuild 921 RMD160 82d903521486c5ffcadbf755747998373b87adeb SHA1 bc518a8ab4a38f9b6f723b58009776804ba2a500 SHA256 f44e8cc56a7f0e8f7462d87edf0768b74f967c0b7facd73c9511e07242638cc0
+MD5 0460b90a34546654485b904e267728dd shared-mime-info-0.20.ebuild 921
+RMD160 82d903521486c5ffcadbf755747998373b87adeb shared-mime-info-0.20.ebuild 921
+SHA256 f44e8cc56a7f0e8f7462d87edf0768b74f967c0b7facd73c9511e07242638cc0 shared-mime-info-0.20.ebuild 921
+MISC ChangeLog 9795 RMD160 845403ee26126301bb5f1f5541e407c7d9e7dfbf SHA1 d551e2d9a9ea746bf61c55fb5c284235786c927a SHA256 e6973324f56905b118d237910007af5fd1473919fc9c2dbbd5876fb14453d40b
+MD5 3e21f8c896b7aadfb7c5e92517d34adf ChangeLog 9795
+RMD160 845403ee26126301bb5f1f5541e407c7d9e7dfbf ChangeLog 9795
+SHA256 e6973324f56905b118d237910007af5fd1473919fc9c2dbbd5876fb14453d40b ChangeLog 9795
 MISC metadata.xml 250 RMD160 6a1670e034a6b50f55ddd7840ac863f70f3e4180 SHA1 697376b17aa0428906128e8cb7fc6960d96362b2 SHA256 0d3086585ef210c5488d0496aed33a1b30d4d652e68be25566c5c5ced7797b27
 MD5 b93af9a9fc7d706533a75b1fcef6b648 metadata.xml 250
 RMD160 6a1670e034a6b50f55ddd7840ac863f70f3e4180 metadata.xml 250
@@ -40,9 +36,9 @@ SHA256 0d3086585ef210c5488d0496aed33a1b30d4d652e68be25566c5c5ced7797b27 metadata
 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 186e3d4b6b4c687778f8f11bf7757aa2 files/digest-shared-mime-info-0.18-r1 265
-RMD160 15eca7892526de2d7c29aea5093b63c14b6c15c3 files/digest-shared-mime-info-0.18-r1 265
-SHA256 50078806c5843b1e43dc1ee116483185d1acd2c31b28a26f0ba17fa6b129cf94 files/digest-shared-mime-info-0.18-r1 265
 MD5 33b246534d95f9456e8df2f1a990d18c files/digest-shared-mime-info-0.19 265
 RMD160 e1cab2d274b2da090a7fd194bf82ae3cf8ed92d1 files/digest-shared-mime-info-0.19 265
 SHA256 46aa5603ea8f150abf85733b340782008b2e1d18f024d302d84c9475342c9265 files/digest-shared-mime-info-0.19 265
+MD5 9c9560a46b4254af1c3c076a13949e52 files/digest-shared-mime-info-0.20 268
+RMD160 a663a0215ec6fd37bc9b2a939dffcac4926313c8 files/digest-shared-mime-info-0.20 268
+SHA256 8d7a5bc9038240a85f52529757ba9c9c96414078c2eb59bc2775a0f9fca5023d files/digest-shared-mime-info-0.20 268

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 (file)
index aaf0552..0000000
--- 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 (file)
index 0000000..c2beaa2
--- /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 (file)
index 0c85a9a..0000000
--- 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 (file)
index 7b6243d..0000000
--- 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 (file)
index 0000000..cebddd0
--- /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
+}