diff options
| -rw-r--r-- | x11-misc/shared-mime-info/ChangeLog | 10 | ||||
| -rw-r--r-- | x11-misc/shared-mime-info/Manifest | 21 | ||||
| -rw-r--r-- | x11-misc/shared-mime-info/files/shared-mime-info-0.60-parallel-make.patch | 13 | ||||
| -rw-r--r-- | x11-misc/shared-mime-info/shared-mime-info-0.23.ebuild | 35 | ||||
| -rw-r--r-- | x11-misc/shared-mime-info/shared-mime-info-0.30.ebuild | 35 | ||||
| -rw-r--r-- | x11-misc/shared-mime-info/shared-mime-info-0.60.ebuild (renamed from x11-misc/shared-mime-info/shared-mime-info-0.40.ebuild) | 28 |
6 files changed, 55 insertions, 87 deletions
diff --git a/x11-misc/shared-mime-info/ChangeLog b/x11-misc/shared-mime-info/ChangeLog index 71d63e1389c9..98c8aa2df249 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-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/shared-mime-info/ChangeLog,v 1.142 2009/03/06 02:33:21 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/shared-mime-info/ChangeLog,v 1.143 2009/03/07 14:12:19 eva Exp $ + +*shared-mime-info-0.60 (07 Mar 2009) + + 07 Mar 2009; Gilles Dartiguelongue <eva@gentoo.org> + +files/shared-mime-info-0.60-parallel-make.patch, + -shared-mime-info-0.23.ebuild, -shared-mime-info-0.30.ebuild, + -shared-mime-info-0.40.ebuild, +shared-mime-info-0.60.ebuild: + Bump to 0.60, closes #261183. Clean up old revisions. 06 Mar 2009; Jeroen Roovers <jer@gentoo.org> shared-mime-info-0.51.ebuild: Stable for HPPA (bug #256718). diff --git a/x11-misc/shared-mime-info/Manifest b/x11-misc/shared-mime-info/Manifest index ef3ddf97f38d..4cae21ffd8eb 100644 --- a/x11-misc/shared-mime-info/Manifest +++ b/x11-misc/shared-mime-info/Manifest @@ -1,10 +1,17 @@ -DIST shared-mime-info-0.23.tar.bz2 475904 RMD160 7450528c4d8bf595b8097c7fabac92079bf0a743 SHA1 937c6f2f55df6917c633d67366928e9a54bfc18f SHA256 038faac46b629968f98dd8ead54ad0ced71fa438b59fca3a144000e0b7f01620 -DIST shared-mime-info-0.30.tar.bz2 495538 RMD160 8dd8f3dedf18f061b42079d184163390e85e9de8 SHA1 509296f035898877b47eb2a36bdfca83a6d15bfc SHA256 696c90c7b69f8b11be5e74d926d57f72f77c124cfc9d697d363a0294784653c6 -DIST shared-mime-info-0.40.tar.bz2 447145 RMD160 a0ca15090e440ee2d7d9be396b9a7f500d8bda5f SHA1 3d73f96c99fa9576db845bfaf2a6156f7a916668 SHA256 82f803a5999adb28c422a88894eb95fece53efd08cc1a1c3fdf2ef33fded0775 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX shared-mime-info-0.60-parallel-make.patch 418 RMD160 e329a8abff7e730a5aba4582ff2a3e1d6f2b4112 SHA1 42542aeff7c5ac0efab1304fbf2c58da4a680ead SHA256 e0f07fa76db6fb4adaae295b15c089a6a0c290e46678160b687fd8d64f13fa0e DIST shared-mime-info-0.51.tar.bz2 445565 RMD160 9e0281f3bd9ac44af60833ec6b15af9f58936cc7 SHA1 4428b572e6d0fd1d8cf5d2f3eb887d7ab90e151f SHA256 1c247e03418d6b90bcbc0da6c1abe6ac9cd5bacf9c3a2f3b6105376cf7b0eed8 -EBUILD shared-mime-info-0.23.ebuild 934 RMD160 db7af506d3884ba79df270b4dd3560e81c7853b0 SHA1 9fdb285d19774d8acab762f53e1245e7e2610890 SHA256 5774e6c040a1da48d8b18444e591e8b763c396f08c07d707d155d68396e7b423 -EBUILD shared-mime-info-0.30.ebuild 970 RMD160 5daeb968da9d70350fa69ae0cabecbf66796691d SHA1 7323a8898065fcb636f63e711c6892cd73342f79 SHA256 8c4218dab3263d75a19ceb34ccd1fbe045f7889d2f2a876de6c4d94fa08fbdeb -EBUILD shared-mime-info-0.40.ebuild 1328 RMD160 cb0c8152ef8aa0cbf0e62bd1489d5904e25aaa0c SHA1 24f38295e6321e46d818ac0ec2a5121bdc97d8c7 SHA256 17b5cb8362d92808b4265f7ee40751623de950ae93cd780eab1603fe8d44d858 +DIST shared-mime-info-0.60.tar.bz2 457377 RMD160 b7f781b248c2dd65e51575502fe427f964866e65 SHA1 5c071da5a6fca3116ac39a1b06c10d52d85e37ec SHA256 a0d0a948fbb8d0de576876791d53efd1c5e8dd782eb9e5369cafc06c3969de22 EBUILD shared-mime-info-0.51.ebuild 1317 RMD160 c1c9b754330a579637aaecd432d6122d02d332a3 SHA1 6a9a1a14998d53bcb47684b5195dcae35e213a82 SHA256 96ebbb23cc24c38d811549d4f7ecbcbaa45810fb891bcd669bbfacd8e02454a4 -MISC ChangeLog 17935 RMD160 0f33d926c476d55cdf755f90ca4edc1b3c33a0dd SHA1 2cc3b2fc3616e65f69d0427c368b09af96c41684 SHA256 91958bd2400adfb3a98de78c3e29bca09c120d26d519af28d82b764ae496100d +EBUILD shared-mime-info-0.60.ebuild 1489 RMD160 b207f2a7ebbda600ae489f9854bf760b60783cc8 SHA1 b4e71eef8aa9443846d9d62625e9730c984d3afe SHA256 065ea9e593d92413f1ccdcf2a2f96ac6a418f5de11321bbec877d7fd7ca5d5f4 +MISC ChangeLog 18264 RMD160 da6221045615653b5157076a9fe77ff626b01a7d SHA1 7c5151c33c704aa1c8f27c0f69f8cf061f0ba5c9 SHA256 3eb6caae2632ddce6931e0a752062b37c09baf862b98bc3dddd407d055bd7b69 MISC metadata.xml 234 RMD160 bd496dac30573bf707591b2b2ad497860e5aa029 SHA1 4641c1e70e35e944e7019aeae967deb1d2c28186 SHA256 3018e3b31ed690a57bfc14e35699dd20ea3b352fc28b918f699e6955b57a2d97 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.10 (GNU/Linux) + +iEYEARECAAYFAkmygMkACgkQ1fmVwcYIWAbQGwCg66fC6+SDeOWddAMqZrDiZad3 +5t0AoOHK/cP6q1EM1huyRpClNHIkZkyC +=0jwf +-----END PGP SIGNATURE----- diff --git a/x11-misc/shared-mime-info/files/shared-mime-info-0.60-parallel-make.patch b/x11-misc/shared-mime-info/files/shared-mime-info-0.60-parallel-make.patch new file mode 100644 index 000000000000..16518ef0a2b9 --- /dev/null +++ b/x11-misc/shared-mime-info/files/shared-mime-info-0.60-parallel-make.patch @@ -0,0 +1,13 @@ +# https://bugs.freedesktop.org/show_bug.cgi?id=20522 +# Fix broken custom rule to allow parallel make. +--- a/Makefile.am 2009-03-07 13:23:41.792257755 +0100 ++++ b/Makefile.am 2009-03-07 13:24:01.933251494 +0100 +@@ -68,7 +68,7 @@ + rm -f "$(DESTDIR)$(datadir)/mime/types" + + all: check +- make -C po shared-mime-info.pot ++ $(MAKE) -C po shared-mime-info.pot + + check: freedesktop.org.xml + if test -n $(XMLLINT) ; then \ diff --git a/x11-misc/shared-mime-info/shared-mime-info-0.23.ebuild b/x11-misc/shared-mime-info/shared-mime-info-0.23.ebuild deleted file mode 100644 index 76d3cd91bf60..000000000000 --- a/x11-misc/shared-mime-info/shared-mime-info-0.23.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2008 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.23.ebuild,v 1.9 2008/04/20 02:30:21 vapier Exp $ - -inherit fdo-mime - -DESCRIPTION="The Shared MIME-info Database specification" -HOMEPAGE="http://freedesktop.org/wiki/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.3.2 - >=dev-libs/libxml2-2.4" -DEPEND="${RDEPEND} - dev-util/pkgconfig - dev-util/intltool - sys-devel/gettext" - -src_compile() { - econf --disable-update-mimedb - emake || die "emake failed." -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed." - dodoc ChangeLog HACKING NEWS README -} - -pkg_postinst() { - fdo-mime_mime_database_update -} diff --git a/x11-misc/shared-mime-info/shared-mime-info-0.30.ebuild b/x11-misc/shared-mime-info/shared-mime-info-0.30.ebuild deleted file mode 100644 index 6c68bc5f25cb..000000000000 --- a/x11-misc/shared-mime-info/shared-mime-info-0.30.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2008 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.30.ebuild,v 1.9 2008/11/04 01:13:27 vapier Exp $ - -inherit 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.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.6 - >=dev-libs/libxml2-2.4" -DEPEND="${RDEPEND} - dev-util/pkgconfig - dev-util/intltool - sys-devel/gettext" - -src_compile() { - econf --disable-dependency-tracking --disable-update-mimedb - emake || die "emake failed." -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed." - dodoc ChangeLog HACKING NEWS README TODO -} - -pkg_postinst() { - fdo-mime_mime_database_update -} diff --git a/x11-misc/shared-mime-info/shared-mime-info-0.40.ebuild b/x11-misc/shared-mime-info/shared-mime-info-0.60.ebuild index e60948e18730..0e4ab9725761 100644 --- a/x11-misc/shared-mime-info/shared-mime-info-0.40.ebuild +++ b/x11-misc/shared-mime-info/shared-mime-info-0.60.ebuild @@ -1,8 +1,10 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 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.40.ebuild,v 1.3 2008/06/25 13:23:18 remi Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/shared-mime-info/shared-mime-info-0.60.ebuild,v 1.1 2009/03/07 14:12:19 eva Exp $ -inherit fdo-mime +EAPI="2" + +inherit autotools eutils fdo-mime DESCRIPTION="The Shared MIME-info Database specification" HOMEPAGE="http://freedesktop.org/wiki/Software/shared-mime-info" @@ -13,21 +15,29 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" IUSE="" -RDEPEND=">=dev-libs/glib-2.6 +RDEPEND=">=dev-libs/glib-2.16 >=dev-libs/libxml2-2.4" DEPEND="${RDEPEND} dev-util/pkgconfig - dev-util/intltool + >=dev-util/intltool-0.35 sys-devel/gettext" -src_compile() { - econf --disable-dependency-tracking --disable-update-mimedb - emake || die "emake failed." +src_prepare() { + # Fix broken make call, upstream bug #20522. + epatch "${FILESDIR}/${P}-parallel-make.patch" + + eautomake +} + +src_configure() { + econf \ + --disable-dependency-tracking \ + --disable-update-mimedb } src_install() { emake DESTDIR="${D}" install || die "emake install failed." - dodoc ChangeLog HACKING NEWS README + dodoc ChangeLog HACKING NEWS README || die "dodoc failed." } pkg_postinst() { |