Update mime database. Punt static (.a) and libtool (.la) files. Fix dependencies in general to match reality. Now bumping can be done by keeping -9999.ebuild up to date and copying it over to versioned ones.

(Portage version: 2.2.0_alpha10/cvs/Linux x86_64)

3 files changed, 101 insertions, 61 deletions

diff --git a/x11-libs/libfm/ChangeLog b/x11-libs/libfm/ChangeLog
index 5d059a736094..0a4897ac75b5 100644
--- a/x11-libs/libfm/ChangeLog
+++ b/x11-libs/libfm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/libfm
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/ChangeLog,v 1.19 2010/10/24 20:16:05 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/ChangeLog,v 1.20 2010/12/26 00:06:46 ssuominen Exp $
+
+  26 Dec 2010; Samuli Suominen <ssuominen@gentoo.org> libfm-0.1.14.ebuild,
+  libfm-9999.ebuild:
+  Update mime database. Punt static (.a) and libtool (.la) files. Fix
+  dependencies in general to match reality. Now bumping can be done by keeping
+  -9999.ebuild up to date and copying it over to versioned ones.
 
   24 Oct 2010; Markus Meier <maekke@gentoo.org> libfm-0.1.12.ebuild:
   add ~arm, bug #341031
diff --git a/x11-libs/libfm/libfm-0.1.14.ebuild b/x11-libs/libfm/libfm-0.1.14.ebuild
index 59ca5f9d2666..ae2baa35d8c6 100644
--- a/x11-libs/libfm/libfm-0.1.14.ebuild
+++ b/x11-libs/libfm/libfm-0.1.14.ebuild
@@ -1,53 +1,70 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/libfm-0.1.14.ebuild,v 1.2 2010/10/17 12:00:33 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/libfm-0.1.14.ebuild,v 1.3 2010/12/26 00:06:47 ssuominen Exp $
 
-EAPI="2"
+EAPI=2
 
-inherit autotools eutils
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="git://pcmanfm.git.sourceforge.net/gitroot/pcmanfm/${PN}"
+	inherit autotools git
+	SRC_URI=""
+	EXTRA_DEPEND="dev-util/gtk-doc-am"
+else
+	SRC_URI="mirror://sourceforge/pcmanfm/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc ~x86"
+fi
 
-DESCRIPTION="Library for file management"
+inherit fdo-mime
+
+DESCRIPTION="A library for file management"
 HOMEPAGE="http://pcmanfm.sourceforge.net/"
-SRC_URI="mirror://sourceforge/pcmanfm/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug demo gnome hal udev"
-
-RDEPEND="dev-libs/glib:2
-	x11-libs/gtk+:2
-	udev? ( sys-fs/udisks )
-	gnome? ( hal? ( gnome-base/gnome-mount ) )
-	gnome? ( gnome-base/gvfs[hal?,udev?] )
+IUSE="debug examples udev"
+
+COMMON_DEPEND=">=dev-libs/glib-2.18:2
+	>=x11-libs/gtk+-2.16:2
+	udev? ( dev-libs/dbus-glib )
 	>=lxde-base/menu-cache-0.3.2"
-DEPEND="${RDEPEND}
+RDEPEND="${COMMON_DEPEND}
+	udev? ( sys-fs/udisks )"
+DEPEND="${COMMON_DEPEND}
 	>=dev-util/intltool-0.40
-	dev-util/gtk-doc
 	dev-util/pkgconfig
-	sys-devel/gettext"
+	sys-devel/gettext
+	${EXTRA_DEPEND}"
 
 src_prepare() {
-	for file in app-chooser.ui ask-rename.ui file-prop.ui preferred-apps.ui \
-		progress.ui;do
-			echo "data/ui/${file}" >> po/POTFILES.in
-	done
-	echo "src/udisks/g-udisks-device.c" >> po/POTFILES.in
-	gtkdocize
-	eautoreconf
-	einfo "Running intltoolize ..."
-	intltoolize --force --copy --automake || die
-	strip-linguas -i "${S}/po"
+	if [[ ${PV} == 9999 ]]; then
+		gtkdocize --copy || die
+		intltoolize --force --copy --automake || die
+		eautoreconf
+	fi
 }
 
 src_configure() {
-	econf --sysconfdir=/etc \
+	econf \
+		--sysconfdir=/etc \
+		--disable-dependency-tracking \
+		--disable-static \
+		$(use_enable udev udisks) \
+		$(use_enable examples demo) \
 		$(use_enable debug) \
-		$(use_enable demo) \
-		$(use_enable udev udisks)
+		--with-html-dir=/usr/share/doc/${PF}/html
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS TODO || die
+	dodoc AUTHORS TODO
+
+	find "${D}" -name '*.la' -exec rm -f '{}' +
+}
+
+pkg_postinst() {
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_mime_database_update
 }
diff --git a/x11-libs/libfm/libfm-9999.ebuild b/x11-libs/libfm/libfm-9999.ebuild
index e79aed76d27b..564bb4d5ae61 100644
--- a/x11-libs/libfm/libfm-9999.ebuild
+++ b/x11-libs/libfm/libfm-9999.ebuild
@@ -1,53 +1,70 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/libfm-9999.ebuild,v 1.5 2010/10/17 12:00:33 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/libfm-9999.ebuild,v 1.6 2010/12/26 00:06:46 ssuominen Exp $
 
-EAPI="2"
+EAPI=2
 
-inherit autotools eutils git
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="git://pcmanfm.git.sourceforge.net/gitroot/pcmanfm/${PN}"
+	inherit autotools git
+	SRC_URI=""
+	EXTRA_DEPEND="dev-util/gtk-doc-am"
+else
+	SRC_URI="mirror://sourceforge/pcmanfm/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc ~x86"
+fi
 
-DESCRIPTION="Library for file management"
+inherit fdo-mime
+
+DESCRIPTION="A library for file management"
 HOMEPAGE="http://pcmanfm.sourceforge.net/"
-EGIT_REPO_URI="git://pcmanfm.git.sourceforge.net/gitroot/pcmanfm/${PN}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
-IUSE="debug demo gnome hal udev"
-
-RDEPEND="dev-libs/glib:2
-	x11-libs/gtk+:2
-	udev? ( sys-fs/udisks )
-	gnome? ( hal? ( gnome-base/gnome-mount ) )
-	gnome? ( gnome-base/gvfs[hal?,udev?] )
+IUSE="debug examples udev"
+
+COMMON_DEPEND=">=dev-libs/glib-2.18:2
+	>=x11-libs/gtk+-2.16:2
+	udev? ( dev-libs/dbus-glib )
 	>=lxde-base/menu-cache-0.3.2"
-DEPEND="${RDEPEND}
+RDEPEND="${COMMON_DEPEND}
+	udev? ( sys-fs/udisks )"
+DEPEND="${COMMON_DEPEND}
 	>=dev-util/intltool-0.40
-	dev-util/gtk-doc
 	dev-util/pkgconfig
-	sys-devel/gettext"
+	sys-devel/gettext
+	${EXTRA_DEPEND}"
 
 src_prepare() {
-	for file in app-chooser.ui ask-rename.ui file-prop.ui preferred-apps.ui \
-		progress.ui;do
-			echo "data/ui/${file}" >> po/POTFILES.in
-	done
-	echo "src/udisks/g-udisks-device.c" >> po/POTFILES.in
-	gtkdocize
-	eautoreconf
-	einfo "Running intltoolize ..."
-	intltoolize --force --copy --automake || die
-	strip-linguas -i "${S}/po"
+	if [[ ${PV} == 9999 ]]; then
+		gtkdocize --copy || die
+		intltoolize --force --copy --automake || die
+		eautoreconf
+	fi
 }
 
 src_configure() {
-	econf --sysconfdir=/etc \
+	econf \
+		--sysconfdir=/etc \
+		--disable-dependency-tracking \
+		--disable-static \
+		$(use_enable udev udisks) \
+		$(use_enable examples demo) \
 		$(use_enable debug) \
-		$(use_enable demo) \
-		$(use_enable udev udisks)
+		--with-html-dir=/usr/share/doc/${PF}/html
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS TODO || die
+	dodoc AUTHORS TODO
+
+	find "${D}" -name '*.la' -exec rm -f '{}' +
+}
+
+pkg_postinst() {
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_mime_database_update
 }