Add vala use flag #435414. Thanks to Mr. B. Disable udisks support. Bump to EAPI4. Enable docs

(Portage version: 2.1.11.18/cvs/Linux x86_64)

5 files changed, 91 insertions, 18 deletions

diff --git a/x11-libs/libfm/ChangeLog b/x11-libs/libfm/ChangeLog
index 8886319d5939..b4e21525104a 100644
--- a/x11-libs/libfm/ChangeLog
+++ b/x11-libs/libfm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/libfm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/ChangeLog,v 1.74 2012/08/25 00:08:13 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/ChangeLog,v 1.75 2012/09/22 16:32:37 hwoarang Exp $
+
+*libfm-1.0.1 (22 Sep 2012)
+
+  22 Sep 2012; Markos Chandras <hwoarang@gentoo.org> +libfm-1.0.1.ebuild,
+  libfm-1.0.ebuild, libfm-9999.ebuild, metadata.xml:
+  Add vala use flag #435414. Thanks to Mr. B. Disable udisks support. Bump to
+  EAPI4. Enable docs
 
   25 Aug 2012; Markos Chandras <hwoarang@gentoo.org> -libfm-0.1.12.ebuild:
   Remove old ebuilds
diff --git a/x11-libs/libfm/libfm-1.0.1.ebuild b/x11-libs/libfm/libfm-1.0.1.ebuild
new file mode 100644
index 000000000000..4097ca3d9d34
--- /dev/null
+++ b/x11-libs/libfm/libfm-1.0.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/libfm-1.0.1.ebuild,v 1.1 2012/09/22 16:32:37 hwoarang Exp $
+
+EAPI=4
+
+inherit autotools fdo-mime vala
+
+MY_PV=${PV/_/}
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="A library for file management"
+HOMEPAGE="http://pcmanfm.sourceforge.net/"
+SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${MY_P}.tar.gz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug doc examples vala"
+
+COMMON_DEPEND=">=dev-libs/glib-2.18:2
+	>=x11-libs/gtk+-2.16:2
+	>=lxde-base/menu-cache-0.3.2"
+RDEPEND="${COMMON_DEPEND}
+	x11-misc/shared-mime-info
+	|| ( gnome-base/gvfs[udev,udisks] gnome-base/gvfs[udev,gdu] )"
+DEPEND="${COMMON_DEPEND}
+	vala? ( $(vala_depend) )
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig
+	sys-devel/gettext"
+
+S="${WORKDIR}"/${MY_P}
+
+src_prepare() {
+	sed -ie '/SUBDIRS=/s#docs##' "${S}"/Makefile.am || die "sed failed"
+	sed -i -e '/^[[:space:]]*docs/d' -e "s:-O0::" -e "/-DG_ENABLE_DEBUG/s: -g::" \
+		configure.ac || die "sed failed"
+	#Remove -Werror for automake-1.12. Bug #421101
+	sed -i "s:-Werror::" configure.ac || die
+	eautoreconf
+	use vala && export VALAC="$(type -p valac-$(vala_best_api_version))"
+}
+
+src_configure() {
+	econf \
+		--sysconfdir="${EPREFIX}/etc" \
+		--disable-dependency-tracking \
+		--disable-static \
+		--disable-udisks \
+		$(use_enable examples demo) \
+		$(use_enable debug) \
+		$(use_enable vala actions) \
+		$(use_enable doc gtk-doc)
+		--with-html-dir=/usr/share/doc/${PF}/html
+}
+
+src_install() {
+	default
+	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-1.0.ebuild b/x11-libs/libfm/libfm-1.0.ebuild
index b0a3b0c804a8..b3a9f93b8f2c 100644
--- a/x11-libs/libfm/libfm-1.0.ebuild
+++ b/x11-libs/libfm/libfm-1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/libfm-1.0.ebuild,v 1.1 2012/08/12 19:58:01 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/libfm-1.0.ebuild,v 1.2 2012/09/22 16:32:37 hwoarang Exp $
 
 EAPI=4
 
@@ -45,7 +45,7 @@ src_configure() {
 		--sysconfdir="${EPREFIX}/etc" \
 		--disable-dependency-tracking \
 		--disable-static \
-		$(use_enable udev udisks) \
+		--disable-udisks \
 		$(use_enable examples demo) \
 		$(use_enable debug) \
 		# Documentation fails to build at the moment
diff --git a/x11-libs/libfm/libfm-9999.ebuild b/x11-libs/libfm/libfm-9999.ebuild
index 95953c6077bb..ddaa25e63e93 100644
--- a/x11-libs/libfm/libfm-9999.ebuild
+++ b/x11-libs/libfm/libfm-9999.ebuild
@@ -1,19 +1,19 @@
 # Copyright 1999-2012 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.25 2012/07/21 11:07:26 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/libfm-9999.ebuild,v 1.26 2012/09/22 16:32:37 hwoarang Exp $
 
-EAPI=3
+EAPI=4
 
 EGIT_REPO_URI="git://pcmanfm.git.sourceforge.net/gitroot/pcmanfm/${PN}"
 
-inherit autotools git-2 fdo-mime
+inherit autotools git-2 fdo-mime vala
 
 DESCRIPTION="A library for file management"
 HOMEPAGE="http://pcmanfm.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="debug doc examples"
+IUSE="debug doc examples vala"
 KEYWORDS=""
 
 COMMON_DEPEND=">=dev-libs/glib-2.18:2
@@ -32,6 +32,8 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 	sys-devel/gettext"
 
+DOCS=( AUTHORS TODO )
+
 src_prepare() {
 	if ! use doc; then
 		sed -ie '/SUBDIRS=/s#docs##' "${S}"/Makefile.am || die "sed failed"
@@ -46,13 +48,10 @@ src_prepare() {
 		echo "data/ui/"${trans}.ui >> po/POTFILES.in
 	done
 	sed -i -e "s:-O0::" -e "/-DG_ENABLE_DEBUG/s: -g::" "${S}"/configure.ac || die
-	myvalaver="$(best_version dev-lang/vala | sed -e's@dev-lang/vala-\([0-9]*\.[0-9]*\)\..*@\1@g')"
-	myvalac="$(type -p valac-${myvalaver})"
-	[[ -x "${myvalac}" ]] || die "Vala compiler ${myvalac} not found"
-	export VALAC=${myvalac}
 	#Remove -Werror for automake-1.12. Bug #421101
 	sed -i "s:-Werror::" configure.ac || die
 	eautoreconf
+	use vala && export VALAC="$(type -p valac-$(vala_best_api_version))"
 }
 
 src_configure() {
@@ -60,18 +59,16 @@ src_configure() {
 		--sysconfdir="${EPREFIX}/etc" \
 		--disable-dependency-tracking \
 		--disable-static \
+		--disable-udisks \
 		$(use_enable examples demo) \
 		$(use_enable debug) \
-		# Documentation fails to build at the moment
-		# $(use_enable doc gtk-doc) \
-		# $(use_enable doc gtk-doc-html) \
+		$(use_enable vala actions) \
+		$(use_enable doc gtk-doc) \
 		--with-html-dir=/usr/share/doc/${PF}/html
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS TODO
-
+	default
 	find "${D}" -name '*.la' -exec rm -f '{}' +
 }
 
diff --git a/x11-libs/libfm/metadata.xml b/x11-libs/libfm/metadata.xml
index d7819891e887..6af3b9a5d43a 100644
--- a/x11-libs/libfm/metadata.xml
+++ b/x11-libs/libfm/metadata.xml
@@ -7,6 +7,6 @@
   <name>Markos Chandras</name>
   </maintainer>
   <use>
-    <flag name='demo'>Build demo</flag>
+	<flag name='vala'>Support custom actions in menus</flag>
   </use>
 </pkgmetadata>