Clean up ebuild and fix echo/elog usage #294952 by Simeon Maryasin.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 26 insertions, 27 deletions

diff --git a/sys-fs/lufs/ChangeLog b/sys-fs/lufs/ChangeLog
index 9bd5b1c2c04a..2e1ead65433a 100644
--- a/sys-fs/lufs/ChangeLog
+++ b/sys-fs/lufs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-fs/lufs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lufs/ChangeLog,v 1.30 2010/05/22 11:31:55 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lufs/ChangeLog,v 1.31 2010/05/23 01:57:36 vapier Exp $
+
+  23 May 2010; Mike Frysinger <vapier@gentoo.org> lufs-0.9.7-r3.ebuild:
+  Clean up ebuild and fix echo/elog usage #294952 by Simeon Maryasin.
 
   22 May 2010; Torsten Veller <tove@gentoo.org> metadata.xml:
   Remove genstef from metadata.xml (#66339)
diff --git a/sys-fs/lufs/Manifest b/sys-fs/lufs/Manifest
index abc718cb7819..ad44ed6edd3b 100644
--- a/sys-fs/lufs/Manifest
+++ b/sys-fs/lufs/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX lufs-0.9.7-enable-gnome-2.patch 2893 RMD160 1a3b5dcb74a07b661fe65bd823b67c5a43ece7da SHA1 97e985c287c0f163141ccd253044363f3f14bdcb SHA256 727ff1eda0f6f3c5abc0226cec687e35fa443d6336c7bb7de441c4fa2dc92d90
 AUX lufs-0.9.7-fPIC.patch 714 RMD160 b9fc2548e9669c5ea7d3967ceb40e2d0eb40a792 SHA1 2ae19169f42d4fa51c10188bc25c94964c50010b SHA256 6f889e1f17eb265b73666a6eb9feca00402531fa9116a41bee498a228467f323
@@ -7,13 +7,13 @@ AUX lufs-0.9.7-gcc43.patch 877 RMD160 022e4d227c785058888ff14bf06917ec3f68c29e S
 AUX lufs-automount-port.diff 754 RMD160 254ca6ac02e282df1796c3c594201fe2e3f68807 SHA1 d09e6e5d4208288f48129963c6005a7adc5027ed SHA256 87dba7403484e036fc63625c85a7da12efc538e6a5da12013795475dc918791e
 AUX lufs-no-kernel.patch 3347 RMD160 9709ffd5280bc04ee9beb70f4c0f0722adef2432 SHA1 943ed09a8e9a718af880549cfd6b903f57dedfc5 SHA256 4d537437b7af583cf6f3736264c96c53cd2f2b1be1387e058c7c9a7ed97b5d04
 DIST lufs-0.9.7.tar.gz 537772 RMD160 d453c2393cd67b04c13dad04870432bb60fa5749 SHA1 095710e8f8845b2655396ae40149a15ce8339b1a SHA256 2d91457906ee2ff1e26de82987019fe2efe22d9c3b6c7741b7ed8fffbae51411
-EBUILD lufs-0.9.7-r3.ebuild 1872 RMD160 53459e3e9c4de1aa28110b96ff824f083e75e2a1 SHA1 3aae3b6b0c79cd537b2822c50e024eefc46e22fa SHA256 24595b6da18128ff1d8066e4866622b2f1bb78b1d3a66e41748f0d521b7cd6b4
-MISC ChangeLog 6543 RMD160 db7cc058cd3417d2424eca15f25491483ccc84db SHA1 70e6a97926eba6e1a920a40b02c4343109d0aa50 SHA256 6d42ca182a1f8ca145936c22c1c21e3090e3f550d0cf618905ca16a3849cc5dd
+EBUILD lufs-0.9.7-r3.ebuild 1803 RMD160 3adea134fcb2737a44955db8e603016e51c54c65 SHA1 529aa69fc382bce9d8cbe4cc00905eaacbf001a4 SHA256 10a4742a09cdb79d051891173bc3586b66c5d63bf355825e93a60a7ea2a97424
+MISC ChangeLog 6688 RMD160 81ff6de186349b1e47e86b56a5155125c3848830 SHA1 e8f3056f7710ce386d69335c6012c161823c7ae7 SHA256 91aeac7a52b8f9eeee07aea11797a5882fab2f6899b20a6353cf9c039ca517a4
 MISC metadata.xml 166 RMD160 cad049d379f0491ad73203692753b958a751fee9 SHA1 343e18a48dcf2e55a624893f52016a81d63eec97 SHA256 a33d3505ea834e19cd196ef8af9d438f1e476abb2aca27b0ea9f1219e93b8b26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkv3wLAACgkQV3J2n04EauxieQCgidkO6ERR5u6ht8juGzu9APKs
-i3sAnRngC5sbcmCXTU7kpkkJC5GBaicC
-=426i
+iF4EAREIAAYFAkv4i7MACgkQTwhj9JtAlp7UpwEAwsufJ0b++LJOQHY8A563lK+3
+zVjabROhEBDKld1hGTgBAJ1mwLuIIK+TOaI2prkGktm3RoD90DUC6JVzztXDoE47
+=9Et2
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/lufs/lufs-0.9.7-r3.ebuild b/sys-fs/lufs/lufs-0.9.7-r3.ebuild
index 93a578ceac97..efc3ea1e4a3c 100644
--- a/sys-fs/lufs/lufs-0.9.7-r3.ebuild
+++ b/sys-fs/lufs/lufs-0.9.7-r3.ebuild
@@ -1,9 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lufs/lufs-0.9.7-r3.ebuild,v 1.11 2009/02/05 05:08:13 darkside Exp $
-
-WANT_AUTOMAKE="latest"
-WANT_AUTOCONF="latest"
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lufs/lufs-0.9.7-r3.ebuild,v 1.12 2010/05/23 01:57:36 vapier Exp $
 
 inherit eutils autotools
 
@@ -15,10 +12,9 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc ~amd64"
 IUSE="debug"
+
 RDEPEND="sys-fs/lufis"
-DEPEND="${RDEPEND}
-	sys-devel/automake
-	sys-devel/autoconf"
+DEPEND="${RDEPEND}"
 
 src_unpack() {
 	unpack ${A}
@@ -30,8 +26,8 @@ src_unpack() {
 	epatch "${FILESDIR}"/lufs-no-kernel.patch
 	epatch "${FILESDIR}"/${P}-gcc43.patch
 
-	filesystems="ftpfs localfs sshfs"
-	useq amd64 && filesystems="ftpfs localfs"
+	filesystems="ftpfs localfs"
+	use amd64 || filesystems+=" sshfs"
 
 	eautoreconf
 }
@@ -42,20 +38,20 @@ src_compile() {
 	econf $(use_enable debug) || die
 
 	cd filesystems
-	for i in ${filesystems}
-	do
+	local i
+	for i in ${filesystems} ; do
 		cd ${i}
-		emake || die "emake failed"
+		emake || die "emake ${i} failed"
 		cd ..
 	done
 }
 
 src_install() {
 	cd filesystems
-	for i in ${filesystems}
-	do
+	local i
+	for i in ${filesystems} ; do
 		cd ${i}
-		make DESTDIR="${D}" install || die "make install failed"
+		emake DESTDIR="${D}" install || die "emake install ${i} failed"
 		cd ..
 	done
 }
@@ -63,13 +59,13 @@ src_install() {
 pkg_postinst() {
 	ewarn "Lufs Kernel support and lufsd,lufsmnt have been disabled in favour"
 	ewarn "of lufis, please use lufis to mount lufs-filesystems, eg:"
-	if useq amd64; then
-	echo "# lufis fs=ftpfs,host=ftp.kernel.org /mnt/lufis/ -s"
+	if use amd64; then
+		elog "# lufis fs=ftpfs,host=ftp.kernel.org /mnt/lufis/ -s"
 	else
-	echo "# lufis fs=sshfs,host=dev.gentoo.org,username=genstef /mnt/lufis/ -s"
+		elog "# lufis fs=sshfs,host=dev.gentoo.org,username=genstef /mnt/lufis/ -s"
 	fi
 	ewarn "If something does not work for you with this setup please"
 	ewarn "complain to bugs.gentoo.org"
 	einfo "Note: There is also the native sshfs-fuse implementation now"
-	useq amd64 && ewarn "lufs-sshfs does not work on amd64 and is disabled there."
+	use amd64 && ewarn "lufs-sshfs does not work on amd64 and is disabled there."
 }