Fix autotools-utils usage (bug #392135).

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

3 files changed, 28 insertions, 26 deletions

diff --git a/app-antivirus/clamav/ChangeLog b/app-antivirus/clamav/ChangeLog
index f4937dad5017..3335cf4d3d55 100644
--- a/app-antivirus/clamav/ChangeLog
+++ b/app-antivirus/clamav/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-antivirus/clamav
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.409 2011/11/27 03:37:41 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.410 2011/11/28 05:26:07 radhermit Exp $
+
+  28 Nov 2011; Tim Harder <radhermit@gentoo.org> clamav-0.97.3.ebuild:
+  Fix autotools-utils usage (bug #392135).
 
   27 Nov 2011; Tim Harder <radhermit@gentoo.org> clamav-0.97.3.ebuild:
   Build in the source tree.
diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index dc8cb4f5f5c9..166bbb70ee4e 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -7,17 +7,17 @@ AUX clamav.logrotate 355 RMD160 f59cd8ce96da8210aa858ee59ee3b6940e3253a6 SHA1 5f
 AUX clamd.conf 234 RMD160 b517b05e587637cbdd443f7ca3625d582e32722f SHA1 564b1e2f6cf85567f69f2e20cbc942967fa6304b SHA256 17bf4fe3596dc5b145e4163d85181e2edcaa214df3cf9072d852ba0e7a569891
 AUX clamd.rc 2839 RMD160 3dae59c683e5c3566ab0c8c14e20c1da64646054 SHA1 ed542b9c1259ccaff12ba8949c375e012225bbdd SHA256 0508ad290f20e5a785fb932ee6c5d7e4413cc068ece3dcd1f4dd5b2d3cce01c9
 DIST clamav-0.97.3.tar.gz 45793398 RMD160 9fee55f0b115fafa622e1092483e380afd0dc5b9 SHA1 263c7b8b7dc1536652ab64e32263d1c60e138655 SHA256 3a8cece5b7e6b15410f6b8f96ff5591b2c5a72f290ee8a28fefda44cb5ae7aba
-EBUILD clamav-0.97.3.ebuild 3635 RMD160 df8e43bcd4929a134fd31dcbe057ca1e33e16e66 SHA1 b728d5850230fe8513132f3efab3ed2f01758031 SHA256 f08b05a5607840b7b4b8c08e11f019b314ab8d4fa19b277af59bdc27d9dab7f1
-MISC ChangeLog 60511 RMD160 e604b29d83b8dfa4e6e5fc4311dfe8cfe466233e SHA1 1b634ad7bf2b810229780cf34b68777265540fc4 SHA256 b3882c16b5bf5dd83606a987a5ab500d487c80b4413e808ce2b92742fc70c67b
+EBUILD clamav-0.97.3.ebuild 3630 RMD160 73de51e9417474d954bd4ede2a06c54688c9e5f9 SHA1 521c7aca6fad2ba42a6d6e0e740a15c2f1a343d7 SHA256 1be3156c3b0370905638484654924e7fc43f14ca63055b17691b276d8a8512bf
+MISC ChangeLog 60626 RMD160 4016cc21e837a0efb9cd990367bdfabfb09794d8 SHA1 0709ac432e592e877ff02f262b6b0f5505e5572a SHA256 8fd56f65c8eaed80c2f277760be297fc6954c18a05213d5693a4acdf4201bd5e
 MISC metadata.xml 320 RMD160 3546393e30d87f0b0a2fb17e2f15f57dd8c19661 SHA1 b959e38933418e6fc818ed40cd9a4921b8c66102 SHA256 e2a8c4c8bedbffe50a126c1c7395a4d92652c2d95347b9496d54aea1f230a22d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJO0bCLAAoJEEqz6FtPBkyjMrsH/RBxFhHhtVNEzrPGFyxQ+zuZ
-yNCpB9UymTF6auG8BQDxpfEXmc2/9vM7ffMCHSiByIDE5NRR21hPyODnGM1EAYyl
-WIpD5rCraMxYfIwA40TOzd6EukLzXQ7Gn1M4Zjc3OV/X5Y7vbGCRIopufqEPrghi
-YRwj5ZjVhc5D2NsdJcgmZTAo7BqOASOMqz1HrPEl6/R+Dtrq9KOjYDDzJcZvYSMC
-cBpygfZw2K2/iJsNIKtHxcXamz+7Ftrrmta+UPAQVDgHzc4RGyt01Rh7REo0BKrb
-5LeoePZG9vnmJeZapXOve3YmygkLrwHQIKVSrgje2ZkBHKTxPW6KI4iZG8m1zBg=
-=TOR7
+iQEbBAEBCgAGBQJO0xt6AAoJEEqz6FtPBkyjbTgH+NstYVXKggQ4FlMAle81mtE0
+EQ1cNq9PyvJ5Hu1zPSy+sOcupeagA/y10sa3WOB/k2Y0Q6hOynGnpPurTtOe3XB+
+O4P6Jvk2XcUMri9iItTiWsBNMt2zCaOF2Sk2L5OOjjJUqxeEAXyhOI5QF9/5Zz5j
+1ar1/N0whc9twBF6hNA6IKEfiiLLXXuGCFtvyAdKPJ8tPL8x5K2JvzaJVDwUwwgd
+06ZhKaz3rbsTDclF6WBrI1CQ80ZO1lBrRlhVyvDYVJk9x33OmFCRqCH+ZHuL/sdJ
+2TkcGYceB4T3umpmcKtoWoX4AyP5gFVzOuTPSHPy6jSTthVZ1CbEmeSKzq7k/g==
+=Nq5C
 -----END PGP SIGNATURE-----
diff --git a/app-antivirus/clamav/clamav-0.97.3.ebuild b/app-antivirus/clamav/clamav-0.97.3.ebuild
index a19914b65b5a..45a8d0471e6d 100644
--- a/app-antivirus/clamav/clamav-0.97.3.ebuild
+++ b/app-antivirus/clamav/clamav-0.97.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.97.3.ebuild,v 1.7 2011/11/27 03:37:41 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.97.3.ebuild,v 1.8 2011/11/28 05:26:07 radhermit Exp $
 
 EAPI=4
 
@@ -31,7 +31,7 @@ RESTRICT="test"
 
 DOCS=( AUTHORS BUGS ChangeLog FAQ INSTALL NEWS README UPGRADE )
 
-AUTOTOOLS_IN_SOURCE_BUILD=1
+PATCHES=( "${FILESDIR}"/${PN}-0.97-nls.patch )
 
 pkg_setup() {
 	enewgroup clamav
@@ -39,26 +39,27 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.97-nls.patch
 	use ppc64 && append-flags -mminimal-toc
+	autotools-utils_src_prepare
 }
 
 src_configure() {
-	econf \
-		--disable-experimental \
-		--enable-id-check \
-		--with-dbdir=/var/lib/clamav \
-		--with-system-tommath \
-		$(use_enable bzip2) \
-		$(use_enable clamdtop) \
-		$(use_enable ipv6) \
-		$(use_enable milter) \
-		$(use_enable static-libs static) \
+	local myeconfargs=(
+		--disable-experimental
+		--enable-id-check
+		--with-dbdir=/var/lib/clamav
+		--with-system-tommath
+		$(use_enable bzip2)
+		$(use_enable clamdtop)
+		$(use_enable ipv6)
+		$(use_enable milter)
 		$(use_with iconv)
+	)
+	autotools-utils_src_configure
 }
 
 src_install() {
-	default
+	autotools-utils_src_install
 
 	rm -rf "${ED}"/var/lib/clamav
 	newinitd "${FILESDIR}"/clamd.rc clamd
@@ -75,8 +76,6 @@ src_install() {
 	insinto /etc/logrotate.d
 	newins "${FILESDIR}"/clamav.logrotate clamav
 
-	remove_libtool_files
-
 	# Modify /etc/{clamd,freshclam}.conf to be usable out of the box
 	sed -i -e "s:^\(Example\):\# \1:" \
 		-e "s:.*\(PidFile\) .*:\1 /var/run/clamav/clamd.pid:" \