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.

Package-Manager: portage-2.2.0_alpha10/cvs/Linux x86_64

4 files changed, 104 insertions, 74 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/Manifest b/x11-libs/libfm/Manifest
index 5d497b614647..3c3c82d0cbb5 100644
--- a/x11-libs/libfm/Manifest
+++ b/x11-libs/libfm/Manifest
@@ -1,17 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST libfm-0.1.12.tar.gz 607593 RMD160 5c7da7e3e4717b1a147a4fc9b066e58f7bfc2b92 SHA1 15b9d56c2ddf26838217764c95ab739b6b25e7c7 SHA256 9746ce0c1771c7156214058f6972f6e3594d9612c2b4915836164e0e79efbe19
 DIST libfm-0.1.14.tar.gz 785220 RMD160 639e490d1a5f77d7684bdcc18827e087f9bb3d98 SHA1 980fc93d8f00035a7a35c0dcb947232fe4b19ef9 SHA256 e97bf3f9ed4f33b9f0be73e67d360b89337cccf816361faacd8422722269806b
 EBUILD libfm-0.1.12.ebuild 822 RMD160 dc527115b56881a8fc56fb75c84e609e9cdb7808 SHA1 e00a78c07d96cac8e8172e92487c1a20dfbe5210 SHA256 821b67ede415630dfc872ddd1dc22aab286a0e729c1d2fe2164c6016e947a29f
-EBUILD libfm-0.1.14.ebuild 1312 RMD160 495874ee02efb75509a6169bb39b4263eca6df8e SHA1 e4421500e7094898b3f246c3e62f0d9b69d54e23 SHA256 56cb9aa6668a235effc3a34a66c84bcc1a48e75792c4a85f9d19bb160d36f83b
-EBUILD libfm-9999.ebuild 1324 RMD160 797ef52ac2fa05a5f05e2f8f33b6fb83f2eebb71 SHA1 e886860743f0eb6be1869e410d2dd802070c0405 SHA256 38ad7c10e108d40ebd16ce7e29d682d74c2dfbb455fdef66c6c0112028b31948
-MISC ChangeLog 2736 RMD160 f08d6c4e08f8d118de2de7f6da8afa0adb619182 SHA1 c2f076127052d4775584e9e913104cd52d4c4d8c SHA256 8bb8dae6a18e8f72aa2672e74b4f9544e580e442596a7e91cc8d9d3904039baa
+EBUILD libfm-0.1.14.ebuild 1537 RMD160 f1a27b5760244a16422d814ab53f3adf7fecc7f4 SHA1 4496c69e5c38209545cf2801920ad160146c79fd SHA256 66d7eadd96bb876d2d6636376fced1990d5f3be81d18cb4d28628cad9e39bd28
+EBUILD libfm-9999.ebuild 1535 RMD160 837cce6a5473978985a615129864910ec8ba2a94 SHA1 017642e59feee55103ef082c4de5520e79a1fbf6 SHA256 ccb4e381da950742a7041b4dc3713b2da49c8cc4d3a4a58928c5b1faa27f022e
+MISC ChangeLog 3050 RMD160 e216d9a25ae48249882921d2415783c4c7800bde SHA1 136b4386bde829f4a47b81f5935c4af5aafb5bb5 SHA256 b8322668b34dbdc406cd61070fae31716d545307a954e7cbd2095614ddd50c25
 MISC metadata.xml 315 RMD160 b97bee0eac6e3d997d55ef2f1f56df0ea4b81650 SHA1 8a2649a802082dd219590897d39798a0e14bff02 SHA256 1fc7172db4f825aa57aad8210f32c984d470b65c608f2e3cb6bda786c5902cef
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkzElFIACgkQkKaRLQcq0GKgkQCgjba4Nv6/QeOpd8XhdvBHaVyC
-onQAn0em8OVPPLOHgEw0ox8ObySzOWNm
-=Hl6v
------END PGP SIGNATURE-----
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
 }