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

Package-Manager: portage-2.1.11.18/cvs/Linux x86_64

6 files changed, 110 insertions, 35 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/Manifest b/x11-libs/libfm/Manifest
index fa97b692b16c..2d54b3494dbb 100644
--- a/x11-libs/libfm/Manifest
+++ b/x11-libs/libfm/Manifest
@@ -3,26 +3,28 @@ Hash: SHA256
 
 AUX libfm-0.1.17-ssp-fix.patch 908 SHA256 f8fb5e8f6a712de882151f50a9a23d002b8719da5dff8be33a92cfea7c93b85e SHA512 2e7701bf501bdef33a2c91fa5d9bc9fbcb1edcbf7ced323fd6d499cc1971b75fafdc0ba57b538bff1ebb4d5ed65776cdef18962cdaec6a43ebb4aa8178facecd WHIRLPOOL d2056cd5984577a031e11fba9275a040f2c29ed3a49d624a7ea3d0b425ba16b3bdcfaf963117dda7b79beb1ab75822e492d2bd3885d4dda6f39e6fbbe8ef4268
 DIST libfm-0.1.17.tar.gz 874556 SHA256 1740681cff4cd4c5a2eaa9805d8898269cfb6a49a0bda0acb242def15bc7131b SHA512 83d62e78c68f5a212dc464774f4ac9a965f58741b9cc31bf6599c7304e0fde668edd99e33a2f9d19d2c342483d92ed36031c388c92c858c55217e47b5c8ba044 WHIRLPOOL c55471431e4130cf96412cf4943e993954139c319dd5434f1d718d9c0609a12bde3dbb8e43b889bb4cefd300e5073b59b4b8fe6eeb732d87d52d8a9d536733b4
+DIST libfm-1.0.1.tar.gz 1089506 SHA256 3bfdc2da27c579466c54ef226ac9b7798b43a8636a1a64000ce6c68f6a8f4af0 SHA512 87010af6e29c3a321cfc8752c6902cd3547c00acc92790f987a46806f4bd3e9577f3df60ec594d414a467a5f449b7ae315f3f146710d4c5e8127a30a0e0b8bfd WHIRLPOOL 989a3c00163abf5c6cea1668c4f398856f05d730cabb2f052d390c1e62a81ad698962bbd754aa6f5c4d09359c5625724b61db3cba2da876437d0b2f0a65c4ad4
 DIST libfm-1.0.tar.gz 1051268 SHA256 317ea0b92136bf1791d91261125f8e4b461c4c93a468babf7bdb919d62f7e502 SHA512 bbd0d0967dfa7eef0e5860514c1565cfa8172eed4a6be288a5887a274474898a15c3fcc5ebce24062b2990af3113ab33fc2b4740a34465cb3d74323cf7d282c6 WHIRLPOOL 841ce65ad9265b88b674327680612ed150c93a655d955095a07550db45bd9110928cdca6e82cbf686f44c013e70efba6c90f8b21db86f632a89784532d9a8380
 EBUILD libfm-0.1.17-r1.ebuild 1744 SHA256 f95b9a221f951124a89b7e067b2534bc8cb98131e3112781e5f0de2106ca5588 SHA512 60400b6633ce414d29b6797904d1a3eacfb3d372e89cc765a822e92a2ba6f26294401d6989d0dd3a939b01572fcf5f89eedd6416ea15cfb2e8eed7cf45b99f90 WHIRLPOOL 05c0eb3b9813ccd33fa352e5904928e6f8fbd48a325832765a294a394de951bfa5fb2113cf3be7d786c743cddf8ad75b291bc9a5915d5a0de6083f7499f7b519
-EBUILD libfm-1.0.ebuild 1745 SHA256 8bc285e49be7c57a82bf8005c7bcbf2b11f5cbf54c5a61104392b5ae14021ecd SHA512 035e511b63015da57285b62ed80c691d950d8b46b341e69d33ec20ec1b9c07c89390f8d24101c1c21a2d2332f3bfdba01f9c8392c57d6fb5ba56c12b1fa20417 WHIRLPOOL 4300b0a10e8bab6ed386c57b6dd99e192211060f6ab4d0140f8b419495a2290558f83540d974b56cd4c85ac961ea4de61a658db75b6cceb5b693b0a54451283d
-EBUILD libfm-9999.ebuild 2270 SHA256 24d76db7371cd53e0ee3542636b6b4575eea31c3a7e42e4c5b0fb23f2e3a343a SHA512 86a0460b7faf22a30eaa448793e9eb9ee69485ce04b741df6130af5a3fecc6a8d0cd40e00ce580150c4c524d874a13aa5656d4a5468c9f67c08cf3fb6177b0d7 WHIRLPOOL 8768eaf303bc6c5d2ff29aea14089c9515a9de65b4baafcc4b426e41239fc8316e9d26ff90d1e7333bdc4689e0ebf7f721240a631b97717247ffb6eec997cc41
-MISC ChangeLog 10668 SHA256 42c42b27918cca3698df0724f87a9b5d55be53eaa51ed76ddc2b385ef093ae50 SHA512 62a8d965c9516f8b9663f8fe43d0033c8d39a64c9240560bf163973986ce838210727bc8ed8f64f396f09d1c9893d47fa27a1688ad442a2e2dbe4a367cefc26e WHIRLPOOL e0287a0bfcd1d66c247f7dd605c5cf2e0b3ab63fabd259145fd7e55d0525a163302a04f52a7fa9d4d8d552aafd8fd9564f4c8468e533c5440da8bd78dd8b2bcb
-MISC metadata.xml 315 SHA256 1fc7172db4f825aa57aad8210f32c984d470b65c608f2e3cb6bda786c5902cef SHA512 5eeebacbba6bcd6d7439a18ae040794e3279ff55abb5f7a912e6d9f4503aa40db93493439b7d2d38dc7d0cef0c4fbe5c506a012f3f769545958a61c9e238548a WHIRLPOOL 2c483612c6f66e0d45fe04ec9b5ddd46c5a6f4e0c8b303cce2fcf78be365f79323cf3ed0d47b50d8c5d0e9673dce9776ce558cf6de0cc42f81006cb7e22c1787
+EBUILD libfm-1.0.1.ebuild 1791 SHA256 3644fba0bf0c9b22e5a114edcd51778af3fb111f87f9e6ffe50c480574dd3eda SHA512 c8d3cf50bbdbde04343f07a9d66470a46ad91f8af957ea53a913ccd8934e5ce47ee1bd52de3b1facfdfaf2fc460cfa0b27f5449b96c2631ee613d53a99427f13 WHIRLPOOL 499dc5120527f725355dc598d3615c935179130129c16187ba9abff3bc72ac63c3ed05c584dcfcf893655a8b3c1cdb5692c2461a9a3e0a09e00dff37ddc9e32f
+EBUILD libfm-1.0.ebuild 1736 SHA256 be6d18702f3e3261ceec910dca9bdaaf5811f46c23521ae99b7f23c262d1384c SHA512 b0559d23545e28049fe3e163668885d309b02b8bfbe239405f775f9876040addd443098967853e86cdae7a6f190bfda73603fb1ac9d9dbd597d2c67a65309ccc WHIRLPOOL 6886c173fcaf3ca70024cedfed7b5b32a636cd51288a3c9cec5416f6b079cbecf3a5ed829487d4bc9684d1448d664151440c6a77effb467aefe8db337eb32ec9
+EBUILD libfm-9999.ebuild 2060 SHA256 47c5e4f41b328fe5d0a243881da51031519cb91433826e171e0b2fd70da00c35 SHA512 6a953a1896c305a4cc7174f02c0a9d03c0cda9b5d26d95d324d7e102b52e4603f64ea1d685e6e660267729abaeb3ac32bd55d572b352566e20a7269e415a1f43 WHIRLPOOL cafc0b1387e291d05231575f2e52d4594a1b8e2d504873c11e1b154b58b1e53c572f44da2f368e481c1744b231de4df3a2d947c58ed9a0eb5850ae3716e28013
+MISC ChangeLog 10923 SHA256 66f20d0313425df4d5203861e689e8ec5072943e548ac97f1833d802c845b1c3 SHA512 44164417fdba46d6f9fe2e1e4873d3d7616b21bf24a0d5baa01180ae601029dd09be106702e01be315e7bb6d7cbbe3747adbed670a7a71bb59dbb6c55536b95d WHIRLPOOL 4cf608abd7be8f9068de705b44e41be6fe2bfdc901faf35a120c9e98d18494a5a9656899b387df2398f7c27dc257d38ac67d13c506c39fcdec12cd2ba865c9f0
+MISC metadata.xml 333 SHA256 2b8b8fa5d91b0d1621729114380656e8c4236289beeacccd7c2523a824277610 SHA512 6baa6bcb510be3ec56280e4a8a803e1a06212a1f1896f8466f8948e17ccadb0993c5fae14242c9706e3e1d6d849bbc8cc52be3639bbb2a8eef0d8dab4a312219 WHIRLPOOL 89355edf375d07566cbec581ab43e6287c7a1501720a5e576f797abfde06e20dd5ae0d6d485da54058ba9c6e671f312b60de21a45283aaf573e617c1cbcfec6d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQOBdzAAoJEPqDWhW0r/LCYCkQAJziAtokfAdnt66BB7tpM5ot
-EcVr8SsgEMVVfUSZb7sGxkmpSmJsXL+50zMgxG4ImVI9MQG8QcWydzOuOnCiAFe9
-h6yrlNf1w1HmAClvDhWKPVMQwlIE73JHatcEFbV/HklwcNBg+lI/nenbhqHP4Nzx
-pzt79Ou/llvZEEjcHm7MHlNdNaPbaeP3AJca8m9ok3BGcuFrG+AuzeUy8Y2fOuqy
-nG8+nYFVm8lY91VKa5OM/fbAAyHlp8DIVwkxuUWBdPicEGwny38DEK6HheEP9T5l
-xEKbPjvyC0eBTVDKldJze2ycZzDZUaA0aonIFlNmS7ee+D58aQHn/GwPveekasKy
-eEKKLtYsQ1ZYP6BeCM7tWF3/CE4FYRLUD0fsoLL8igSiMUjon6R0Rtc758svbHYj
-/zSPOPR/WXyC3vyptOC5Es42hnhJJ8SoVtcsNkkVYVzaeCpDBdsBQR3NtcXrGxSf
-eQJFaiO/g8xKBxmDaCQbpHlc/AkMiEgeA8JJOh9JNKl1PSrNB2bcTCp4dksjKsY8
-uV5GDr/fRIXyh7pT3pqFs1j83kXo7d6izAuKfI+UL+Xs073TM/3QcDbd4v7hSvNv
-q/z4DJCzjRTiwab01P/iqGyVpaZ9KgKOUNKl5FK+J2KDpBnZXIu8PO8XnlxfzEx0
-Siwpj5hSYv0THhKEF+/6
-=Nwg2
+iQIcBAEBCAAGBQJQXegrAAoJEPqDWhW0r/LCoEQQAI2EUr8+cmNen8MAOnBqqrVX
+zs/Nm69kUXDw9dEje3WDfY+or+hB31ir/DTC3u0eCyFOSwsS+zD5+sOCiTFZ/6+0
+uDUjxwOXHBIBBA9om9zTx9X1UhIplt/Ia6BLMs3A3POT0mY8nzdKpglf1a/WSgyN
+4/1HVOKPU43r7TjNuO/Kh7SnKswF4LRl0XL3k40WO8kbQ2MivwMIaX9qcniB7OrB
+ZGxtnzcImA/+2xEyU+S/zzmCHfptWUcAMsvCDNocIAr/fbniQDC+pzTXb+jX+62T
+kYtI7zwzb9mtydOX1wTm/nBixR6K3Y8ff0TQTJfjMYL+mTtMTkm3ZNxj2s6LDy//
+7JOQ8WwUv41ZC6M/EXazFz/RnWT/o+lFRq2QqI78loKtnRYFZeuJ5Mco1QVRfl76
+tCTZfMypilYQTDPCufuAp21hDQHHTHeXijVHxHSpSeskxRhfQNBCVmuPZAEHKoBV
+4Erf/7y9EPjaeCvjqdNK9EldFL+els+OF5TVgdzhYnikuF5UHhPNWe539yrhmCOV
+KYORD6fv+Rgv4UvbuGXCT7ayOheE0rBlEjDsPCPb5ZsopS1z487aOTQE0veu3+pu
+nvGDkb/jW4j3JQJD6u7N/QCLXX9A0cAnGAbpTYYYgHKmXGlDCyeLhvdXCCOG2wHr
+m87mamDY4mZJ1axUODie
+=bKhc
 -----END PGP SIGNATURE-----
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>