Use prune_libtool_files instead of autotools-utils.

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

3 files changed, 29 insertions, 32 deletions

diff --git a/app-antivirus/clamav/ChangeLog b/app-antivirus/clamav/ChangeLog
index 550a3505f7c2..40ae1ce2abd8 100644
--- a/app-antivirus/clamav/ChangeLog
+++ b/app-antivirus/clamav/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-antivirus/clamav
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.417 2012/06/24 16:34:40 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.418 2012/06/24 20:07:37 radhermit Exp $
+
+  24 Jun 2012; Tim Harder <radhermit@gentoo.org> clamav-0.97.5.ebuild:
+  Use prune_libtool_files instead of autotools-utils.
 
 *clamav-0.97.5 (24 Jun 2012)
 
diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index e598b148cebd..52f9c1b61522 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX clamav-0.97-nls.patch 269 RMD160 038abf3964f555f909a33b627546a3260479f356 SHA1 c9bc151ff7c029718feae91f6e0d0f6b25bea337 SHA256 088b9edcdb678ce9c072042cf51266e061ab5f5ab0e8e42bd953242138c64fd1
 AUX clamav-0.97.4-gcc47.patch 875 RMD160 1d69232eef0268151a8afc46a109933b7871fe9f SHA1 334798fc11c12e06406f76b758b4fc70b184915d SHA256 62a54f42bcb068953f7af80d52b3e03b5506408695c09b87b29abfb8dd3ca7b9
@@ -12,23 +12,17 @@ DIST clamav-0.97.4.tar.gz 48386114 RMD160 a8da7621d6c8bce05adf2521f082b3e5e94dd9
 DIST clamav-0.97.5.tar.gz 14754465 RMD160 882294b892c7660669e9164918b1e08651b37d77 SHA1 1bb317ead4a1a677a9a11a063fc35a63f22309e9 SHA256 db6c5e1a5ec8ca0b8006cf82661d3158d3365ba1b4bc14c03c5d0bca89a93c0d
 EBUILD clamav-0.97.3.ebuild 3631 RMD160 879b42ff44465b1b45b676975d9d86fb5833ddd4 SHA1 13af6ed4597a32108ddefb86c1301c0a2cea76e3 SHA256 50f6f775d254bc9c85689ad22b7cdf262ea87c0da9e88d680c85360415b2d6e4
 EBUILD clamav-0.97.4.ebuild 3681 RMD160 733a552f4b62777ec781d86d188dbeabda824370 SHA1 bec0acdb25424d437f6126c26d73619af7ca570f SHA256 0c710c93eec32d44d28ea7940892d157e2224f5e42310a4bc272275933471019
-EBUILD clamav-0.97.5.ebuild 3637 RMD160 9b82a7fe4c16d972c2bc6bc671010638ba0d52b3 SHA1 1bdf4ce2e6e4c4b430842ba45400a8c8affe8fd9 SHA256 a290fdbc9bfd45cbb27d2c20b42b0ade1ec2c9ec77add840bb060fe14dd553f0
-MISC ChangeLog 61489 RMD160 3e6b21b1ed95eecffe81f8360235d3c4186a0051 SHA1 11404df6d7f60fc2ed959296eaa80fa04a625b23 SHA256 8e4c3c585cfd4418217c87d7c138342e167cc275e104a6e3f40120a6e6336b61
+EBUILD clamav-0.97.5.ebuild 3605 RMD160 39b187c90db89afa182ae64dfd1dd8de42a2c777 SHA1 63eee61beaf4b9914d9a1ce3ff9765ddc47421ff SHA256 27e8697709c41729013e43b15f608846e9582ca0c1495a3c22941a2c894167c7
+MISC ChangeLog 61619 RMD160 3eb9c895ea929bde557a967fbf2bee85bb68349a SHA1 da0c4cc5ae3c4fa0e6618bf9bf8a72c637680f4f SHA256 fe4acea03a8cdfe9088c4b8b8696252744d396aed747c50224d2f4f21dc2e689
 MISC metadata.xml 320 RMD160 3546393e30d87f0b0a2fb17e2f15f57dd8c19661 SHA1 b959e38933418e6fc818ed40cd9a4921b8c66102 SHA256 e2a8c4c8bedbffe50a126c1c7395a4d92652c2d95347b9496d54aea1f230a22d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJP50GYAAoJEKWIAHK7tR5CykEQAIg1tzWUkzwIkWbqcExL9pqb
-+Th3qTLiyS6MKmtZ2CHGS0S01NrdYPYiyoeFpGlhVkKtV3PzqMhtvxe923qpsJYV
-LFPFGcaD32tjeepjK3pZVpRCMi3IgJFF7oSlPXrSkSbpMgqzTQH7p4kIOWd6duss
-PfGBhrcXaAHf5FNrELAO944jj7s49EyUVlchHGmx7rLMXZPSqH2oDKpQjcDPSg2o
-A03YPGhOjK9gS84zD1HGqT2CleQfGjsPJmhkB1scAdxj4/cquwKoVAM6MIVgUiC+
-RqAov4UI3SDCWC/Um1adQ21SzbyrCP0ZkHjUHexUeyB6iJJMVhvqqpOPL85/7gTz
-s5TRXCFclLHq3Ho2T1Jp2348OWw85n+tgzxDuEzm0a6ntw4geiANWcQNrNFzkmCa
-UeMBinXN/GBWOnVzP3VmBbvdKoWvIhcEvXFnPxCVZkeMviKLPD39/ksTQfDGziYb
-KDjzDMS0GRMScP6nEEbXJvjElF4qxMU22llHLmdNE+kZb857LwKI2/lmmgI651J2
-DZZUcBD7fJXODppnYMOUjqvw84J8mKbP0CGW4H3PjHcuRaUhK41n2QJbooInyLT6
-+lKshqmOddiM3AOsG44TZ1jEPk6Mw8ahma/yr11OtCgLn10b3xDjkhEFknureO6n
-VcxoGvLgn3Pi9lPQAsuS
-=5Abs
+iQEcBAEBCgAGBQJP53OSAAoJEEqz6FtPBkyjSTYIAKqMRlrpskCkf5iVcy1QESI+
+IXvldilebPFaF3k5qCUJp8nsYcP3yUWyVXOJjDUlJo9SN3cGbY+ACzi2HSS9TUEd
+Bs1byPEaONbp3GLVvRO0UM9XlYbVJF3sTNYVFmrfJqKzZfRAyWCVdqrkwaHTW1lB
+tcHFLm1zrqgF/12kJ8RKeYrisS9760nl/9/8EH6gbep+tpiJvhyjkyurLFOpClhx
+JRagDTWS16DOsE7TO+Gp8BL9sZaFuKi1I6ZKiu8NNqi5e/tEj00/qmRoHEF/co4e
+1bHauFofkmuJmGtsCX9ur/MlmpSVyiwhof9yccqa2KKpFt2ab/QgZCEd0QCeqSs=
+=YeAN
 -----END PGP SIGNATURE-----
diff --git a/app-antivirus/clamav/clamav-0.97.5.ebuild b/app-antivirus/clamav/clamav-0.97.5.ebuild
index a0b30f08225b..67de6acf7bea 100644
--- a/app-antivirus/clamav/clamav-0.97.5.ebuild
+++ b/app-antivirus/clamav/clamav-0.97.5.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.97.5.ebuild,v 1.1 2012/06/24 16:34:40 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.97.5.ebuild,v 1.2 2012/06/24 20:07:37 radhermit Exp $
 
 EAPI=4
 
-inherit eutils autotools-utils flag-o-matic user
+inherit eutils flag-o-matic user
 
 DESCRIPTION="Clam Anti-Virus Scanner"
 HOMEPAGE="http://www.clamav.net/"
@@ -42,26 +42,24 @@ pkg_setup() {
 
 src_prepare() {
 	use ppc64 && append-flags -mminimal-toc
-	autotools-utils_src_prepare
 }
 
 src_configure() {
-	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)
+	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) \
 		$(use_with iconv)
-	)
-	autotools-utils_src_configure
 }
 
 src_install() {
-	autotools-utils_src_install
+	default
 
 	rm -rf "${ED}"/var/lib/clamav
 	newinitd "${FILESDIR}"/clamd.rc clamd
@@ -113,6 +111,8 @@ src_install() {
 			START_MILTER=no
 		EOF
 	fi
+
+	prune_libtool_files
 }
 
 pkg_postinst() {