Don't run libtoolize, if you need to, what you want is eautoreconf, so fix handling. Also fix quoting.

Package-Manager: portage-2.1.2_rc4-r5

4 files changed, 51 insertions, 29 deletions

diff --git a/app-admin/fam/ChangeLog b/app-admin/fam/ChangeLog
index 4c564acf7df0..b46739e0a1b9 100644
--- a/app-admin/fam/ChangeLog
+++ b/app-admin/fam/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/fam
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/fam/ChangeLog,v 1.45 2006/02/27 00:22:33 jer Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/fam/ChangeLog,v 1.46 2007/01/04 13:48:37 flameeyes Exp $
+
+  04 Jan 2007; Diego Pettenò <flameeyes@gentoo.org> fam-2.7.0-r4.ebuild:
+  Don't run libtoolize, if you need to, what you want is eautoreconf, so fix
+  handling. Also fix quoting.
 
   27 Feb 2006; Jeroen Roovers <jer@gentoo.org> fam-2.7.0-r4.ebuild:
   Stable on hppa (bug #123829).
diff --git a/app-admin/fam/Manifest b/app-admin/fam/Manifest
index 94b9bf01c02e..0a0f14865197 100644
--- a/app-admin/fam/Manifest
+++ b/app-admin/fam/Manifest
@@ -1,24 +1,43 @@
-MD5 dcd68bccebff81a748c29ebb44e2ab5b ChangeLog 9240
-RMD160 c323eef4b7db1ac489fbbb08b1dc9f7c5a483135 ChangeLog 9240
-SHA256 f12c74450fbaaeb0f8b328fbe1e0a0df9e54f8533605e6ad62cb71d9dae7e70d ChangeLog 9240
-MD5 b2e57532d3263061eb9728a528ca5d79 fam-2.7.0-r4.ebuild 2342
-RMD160 8a92aacd35e85a6a69f45b100fb3f98dc2f80b41 fam-2.7.0-r4.ebuild 2342
-SHA256 77ccd498e410b174b2df981b69685ba29336eb1ec9ba08a7d5010aa70006fe47 fam-2.7.0-r4.ebuild 2342
-MD5 e70eb4d8ddb0a9ab5f670edb44717e79 files/digest-fam-2.7.0-r4 128
-RMD160 6bdd7cb303be3fad677823045928d2fc6bab36c4 files/digest-fam-2.7.0-r4 128
-SHA256 de895b409efdc77f2225989a163d62be1fc69b8ef532905029edba9c29b90346 files/digest-fam-2.7.0-r4 128
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX fam-2.7.0-gcc41.patch 724 RMD160 a10d46759952e51ccbdcd50e0d3a109e2bf93fda SHA1 3d1c34a593b3880602ae71d90e891162a84ada45 SHA256 cad37a5a6b756b1c2b536f1b8dc9b73abf97f0d6cf98f50e15e8003001270043
 MD5 8c541d3766c6671c15c8cad4d6ef671b files/fam-2.7.0-gcc41.patch 724
 RMD160 a10d46759952e51ccbdcd50e0d3a109e2bf93fda files/fam-2.7.0-gcc41.patch 724
 SHA256 cad37a5a6b756b1c2b536f1b8dc9b73abf97f0d6cf98f50e15e8003001270043 files/fam-2.7.0-gcc41.patch 724
+AUX fam-2.7.0-largefiles.patch 326 RMD160 949475406175c0f221ab7b4f34abbd26f4e56533 SHA1 6394d99517fa8a614f5bcb64bbf175e6cc9fb05b SHA256 cbe4260704d2cdff34ad0ed52b51b49af36200bc7e801e2e19f1857e2177f7af
 MD5 47b41e0b0498793af004696a096d7da1 files/fam-2.7.0-largefiles.patch 326
 RMD160 949475406175c0f221ab7b4f34abbd26f4e56533 files/fam-2.7.0-largefiles.patch 326
 SHA256 cbe4260704d2cdff34ad0ed52b51b49af36200bc7e801e2e19f1857e2177f7af files/fam-2.7.0-largefiles.patch 326
+AUX fam-2.7.0-limits.patch 316 RMD160 13df15ec643cb8b976b3704b8e6dc9d5aaeb83d0 SHA1 b5b22453affab7f724b5fdd3f23fe22cabbc4e4c SHA256 6030c74c7663a618630886b046e4e919fc61713cb3849a267814978b9444bf2a
 MD5 363f25f0db08bacef13b12e81b32d624 files/fam-2.7.0-limits.patch 316
 RMD160 13df15ec643cb8b976b3704b8e6dc9d5aaeb83d0 files/fam-2.7.0-limits.patch 316
 SHA256 6030c74c7663a618630886b046e4e919fc61713cb3849a267814978b9444bf2a files/fam-2.7.0-limits.patch 316
+AUX famd 490 RMD160 ba0a1761b473c946d645aac2cc6b20d6bfbe8382 SHA1 a705c2b8dda3fb79fad015523ea2fced12569170 SHA256 1ce8019d276ef5f9ddaa38d0fc0eff12f66934eea21931b1f98ad8bcafc22bd9
 MD5 4c750113abbc289ee93c3aa378692f07 files/famd 490
 RMD160 ba0a1761b473c946d645aac2cc6b20d6bfbe8382 files/famd 490
 SHA256 1ce8019d276ef5f9ddaa38d0fc0eff12f66934eea21931b1f98ad8bcafc22bd9 files/famd 490
+DIST fam-2.7.0-dnotify.patch 26419 RMD160 e30e8fc0090af026951316218223fd322f3dc690 SHA1 650bee425eaa45355875267520f683fd5315d9c1 SHA256 8d0bc57a587bd374ff1ad5c75852dc655b71a2cd9cb355f0abdeb882ae7aed4c
+DIST fam-2.7.0.tar.gz 301974 RMD160 1895b578d6a141c36d5bee4e3fbbc2a298a91430 SHA1 6c2316f02acf89a41c42ffc3d7fd9cf5eada83a8 SHA256 1e0aa136693a3e9f4b43ebd71e7bd934cea31817a4a6cba2edc7aac353b8a93f
+EBUILD fam-2.7.0-r4.ebuild 2176 RMD160 2a87f47b1d1dfd5096b06e723831e0e4e0948a7b SHA1 fb74169779b63eacec636f29a05070e7306f4ca2 SHA256 8b56957dbbd48422e513ce9a397915ef5968d92584d37287014105bf86a88df1
+MD5 4c349bbe7fc6ade10fa444968dd4f678 fam-2.7.0-r4.ebuild 2176
+RMD160 2a87f47b1d1dfd5096b06e723831e0e4e0948a7b fam-2.7.0-r4.ebuild 2176
+SHA256 8b56957dbbd48422e513ce9a397915ef5968d92584d37287014105bf86a88df1 fam-2.7.0-r4.ebuild 2176
+MISC ChangeLog 9428 RMD160 ecdc4dc86d4eee6025a713a9b5468c4c7bc10d8c SHA1 155eb772c81714b54e61ad0a98c15d9d035d5b95 SHA256 40394aa34b810b42781da6a82c5aac78ec6d6fe8a79b3fdf9d6c550b915f6b5e
+MD5 3fe3b96f63345cba2e0f2b242d202dce ChangeLog 9428
+RMD160 ecdc4dc86d4eee6025a713a9b5468c4c7bc10d8c ChangeLog 9428
+SHA256 40394aa34b810b42781da6a82c5aac78ec6d6fe8a79b3fdf9d6c550b915f6b5e ChangeLog 9428
+MISC metadata.xml 221 RMD160 71f7378b604618cc82dd25cf498259ca9e971437 SHA1 815132082c51c63027ec0e5bcf545404ee69a5a2 SHA256 f5caf0a487300525ba716466e1fffb0d9ab526e3c6477d61db48f7e7d84612d0
 MD5 68a04e23ccfb7971cff8ce012aee659c metadata.xml 221
 RMD160 71f7378b604618cc82dd25cf498259ca9e971437 metadata.xml 221
 SHA256 f5caf0a487300525ba716466e1fffb0d9ab526e3c6477d61db48f7e7d84612d0 metadata.xml 221
+MD5 470bb622543d0a6c63ce46c825d7da71 files/digest-fam-2.7.0-r4 476
+RMD160 a28b1bc241df6b5f3ebadc747f2c63e728f96409 files/digest-fam-2.7.0-r4 476
+SHA256 9c647dbaa62a905866bd95eb4df6efe9bfea1c88a4fc524305f7979d76c24350 files/digest-fam-2.7.0-r4 476
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.1 (GNU/Linux)
+
+iD8DBQFFnQW8AiZjviIA2XgRAgA6AKCHAKh4U5Fr+4m0jhL7odgOn2iPYACg896w
+DDPjj9GPeOSQ7JT3NYKONPQ=
+=g8lp
+-----END PGP SIGNATURE-----
diff --git a/app-admin/fam/fam-2.7.0-r4.ebuild b/app-admin/fam/fam-2.7.0-r4.ebuild
index 7a41f004d996..70ec39113e1b 100644
--- a/app-admin/fam/fam-2.7.0-r4.ebuild
+++ b/app-admin/fam/fam-2.7.0-r4.ebuild
@@ -1,8 +1,11 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/fam/fam-2.7.0-r4.ebuild,v 1.14 2006/03/05 03:51:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/fam/fam-2.7.0-r4.ebuild,v 1.15 2007/01/04 13:48:37 flameeyes Exp $
 
-inherit libtool eutils gnuconfig
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+
+inherit libtool eutils autotools
 
 DESCRIPTION="FAM, the File Alteration Monitor"
 HOMEPAGE="http://oss.sgi.com/projects/fam/"
@@ -21,29 +24,21 @@ PROVIDE="virtual/fam"
 src_unpack() {
 	unpack ${A}
 
-	cd ${S}
+	cd "${S}"
 
 	# large file patch #76679
-	epatch ${FILESDIR}/${P}-largefiles.patch
+	epatch "${FILESDIR}/${P}-largefiles.patch"
 
 	# dnotify patch #43027
-	epatch ${DISTDIR}/${P}-dnotify.patch
+	epatch "${DISTDIR}/${P}-dnotify.patch"
 
 	# Use limits correctly -#89478
 	epatch "${FILESDIR}/${P}-limits.patch"
 
 	# Fix gcc 4.1 problems
-	epatch ${FILESDIR}/${P}-gcc41.patch
-
-	# Fix permission problems with user* in FEATURES (#35307)
-	chmod u+w ${S}/configure
-
-	gnuconfig_update
-	libtoolize --copy --force
+	epatch "${FILESDIR}/${P}-gcc41.patch"
 
-	# Please do not remove this again - fixes $S and $D in libtool linker
-	# scripts (.la files)
-	elibtoolize
+	eautoreconf
 }
 
 src_install() {
@@ -53,7 +48,7 @@ src_install() {
 	dosed "s:local_only = false:local_only = true:g" /etc/fam.conf
 
 	exeinto /etc/init.d
-	doexe ${FILESDIR}/famd
+	doexe "${FILESDIR}/famd"
 
 	dodoc AUTHORS ChangeLog INSTALL NEWS TODO README
 
@@ -61,7 +56,7 @@ src_install() {
 
 pkg_postinst() {
 
-	einfo "To enable fam on  boot you will have to add it to the"
+	einfo "To enable fam on	 boot you will have to add it to the"
 	einfo "default profile, issue the following command as root to do so."
 	echo
 	einfo "rc-update add famd default"
diff --git a/app-admin/fam/files/digest-fam-2.7.0-r4 b/app-admin/fam/files/digest-fam-2.7.0-r4
index fe95384a429e..3848434da0a6 100644
--- a/app-admin/fam/files/digest-fam-2.7.0-r4
+++ b/app-admin/fam/files/digest-fam-2.7.0-r4
@@ -1,2 +1,6 @@
 MD5 46e90fb6975cfcaa7f5946ab36aa2023 fam-2.7.0-dnotify.patch 26419
+RMD160 e30e8fc0090af026951316218223fd322f3dc690 fam-2.7.0-dnotify.patch 26419
+SHA256 8d0bc57a587bd374ff1ad5c75852dc655b71a2cd9cb355f0abdeb882ae7aed4c fam-2.7.0-dnotify.patch 26419
 MD5 1bf3ae6c0c58d3201afc97c6a4834e39 fam-2.7.0.tar.gz 301974
+RMD160 1895b578d6a141c36d5bee4e3fbbc2a298a91430 fam-2.7.0.tar.gz 301974
+SHA256 1e0aa136693a3e9f4b43ebd71e7bd934cea31817a4a6cba2edc7aac353b8a93f fam-2.7.0.tar.gz 301974