From ab18933511a28722a212068ed3ae0e058d744201 Mon Sep 17 00:00:00 2001 From: Gilles Dartiguelongue Date: Sat, 7 Mar 2009 14:12:19 +0000 Subject: Bump to 0.60, closes #261183. Clean up old revisions. (Portage version: 2.2_rc23/cvs/Linux x86_64) --- x11-misc/shared-mime-info/ChangeLog | 10 +++- .../shared-mime-info-0.60-parallel-make.patch | 13 ++++++ .../shared-mime-info/shared-mime-info-0.23.ebuild | 35 -------------- .../shared-mime-info/shared-mime-info-0.30.ebuild | 35 -------------- .../shared-mime-info/shared-mime-info-0.40.ebuild | 44 ------------------ .../shared-mime-info/shared-mime-info-0.60.ebuild | 54 ++++++++++++++++++++++ 6 files changed, 76 insertions(+), 115 deletions(-) create mode 100644 x11-misc/shared-mime-info/files/shared-mime-info-0.60-parallel-make.patch delete mode 100644 x11-misc/shared-mime-info/shared-mime-info-0.23.ebuild delete mode 100644 x11-misc/shared-mime-info/shared-mime-info-0.30.ebuild delete mode 100644 x11-misc/shared-mime-info/shared-mime-info-0.40.ebuild create mode 100644 x11-misc/shared-mime-info/shared-mime-info-0.60.ebuild (limited to 'x11-misc/shared-mime-info') 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 + +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 shared-mime-info-0.51.ebuild: Stable for HPPA (bug #256718). 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.40.ebuild deleted file mode 100644 index e60948e18730..000000000000 --- a/x11-misc/shared-mime-info/shared-mime-info-0.40.ebuild +++ /dev/null @@ -1,44 +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.40.ebuild,v 1.3 2008/06/25 13:23:18 remi 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 -} - -pkg_postinst() { - fdo-mime_mime_database_update - - # see bug #228885 - elog - elog "The database format has changed between 0.30 and 0.40." - elog "You may need to update all your local databases and caches." - elog "To do so, please run the following commands:" - elog "(for each user) $ update-mime-database ~/.local/share/mime/" - elog "(as root) # update-mime-database /usr/local/share/mime/" - elog -} diff --git a/x11-misc/shared-mime-info/shared-mime-info-0.60.ebuild b/x11-misc/shared-mime-info/shared-mime-info-0.60.ebuild new file mode 100644 index 000000000000..0e4ab9725761 --- /dev/null +++ b/x11-misc/shared-mime-info/shared-mime-info-0.60.ebuild @@ -0,0 +1,54 @@ +# 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.60.ebuild,v 1.1 2009/03/07 14:12:19 eva Exp $ + +EAPI="2" + +inherit autotools 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.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.16 + >=dev-libs/libxml2-2.4" +DEPEND="${RDEPEND} + dev-util/pkgconfig + >=dev-util/intltool-0.35 + sys-devel/gettext" + +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 || die "dodoc failed." +} + +pkg_postinst() { + fdo-mime_mime_database_update + + # see bug #228885 + elog + elog "The database format has changed between 0.30 and 0.40." + elog "You may need to update all your local databases and caches." + elog "To do so, please run the following commands:" + elog "(for each user) $ update-mime-database ~/.local/share/mime/" + elog "(as root) # update-mime-database /usr/local/share/mime/" + elog +} -- cgit v1.2.3-65-gdbad