Revert back to EAPI 2 for stabilization.

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

3 files changed, 21 insertions, 18 deletions

diff --git a/app-antivirus/clamav/ChangeLog b/app-antivirus/clamav/ChangeLog
index 3d702ff5674c..83887661d9b2 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.376 2011/02/22 10:23:14 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.377 2011/02/22 16:04:43 radhermit Exp $
+
+  22 Feb 2011; Tim Harder <radhermit@gentoo.org> clamav-0.97.ebuild:
+  Revert back to EAPI 2 for stabilization.
 
 *clamav-0.97 (22 Feb 2011)
 
diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index 85b7bf6c59c3..52fe47f8f13a 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -19,17 +19,17 @@ EBUILD clamav-0.96.3.ebuild 4118 RMD160 98714b503c3e6ab1cd8623273e3e36c5dfa7e598
 EBUILD clamav-0.96.4.ebuild 4111 RMD160 61330fc41b8fa27f77547a4a6aad0c5a83107353 SHA1 2a733e7dd4aa08a017f2a3187c7d16ca39794715 SHA256 5664d24ba2c16a48926d8daacfa3b644ecaeae4bac920c93c71cd5ba8dbf4263
 EBUILD clamav-0.96.5.ebuild 4115 RMD160 5ab993f549d0faa6ab90773b50a59da7ff539859 SHA1 cf8f431f6727e0ce6fe0967b1026455be1ba8bb3 SHA256 14b1233006bf3e6a01e953257634722caf70281ba1a480cd11ffe5a3e462cac5
 EBUILD clamav-0.96.ebuild 4109 RMD160 a4e65643997c22c70dfcfd23dbab0e49deca3b48 SHA1 9e80b3e5010eadaf928ccebd74e7202893c4c561 SHA256 a97c2006eac1cad62162d1f509bcb4f88a756a0d9b69c1979222bbcbf5362f3b
-EBUILD clamav-0.97.ebuild 3784 RMD160 0b86bb63040460935a2236d10a61178b1ac7ba50 SHA1 1c1e715059d2c0c6223a7ccdac9b5f7c54b850c6 SHA256 81524bc21545d131c960d0e45eda823bfc412ea360d24a28feea45ab48c0559c
-MISC ChangeLog 56436 RMD160 ececb69e49d8f325ee8eb24d0ef0d3f578c13a76 SHA1 f78b1dffe1a9d873245d6e81896075e2aa8f54ad SHA256 43fc2017a1e24f1f6e6a3f9fe2ee68e2e600d13c6041083e5997600aa4d19b28
+EBUILD clamav-0.97.ebuild 3808 RMD160 96c852d918451f38cd4bfcf777ea1542b32261f9 SHA1 4d93ab8ba3b7cc9e6cb761094fa8046f6926083f SHA256 afb451b65f188abcfdb5a3f7f193880dc1f62634b41f0e923682455457f53cd0
+MISC ChangeLog 56549 RMD160 b23645573d01753c641ea0c9a804e7238783d5ae SHA1 da7468f388f7789c86c284b3fab40574ca0b592b SHA256 76dac9426ecd2b60e513334a1360397fd656bc4b11929d4ba1adbb6ba3006005
 MISC metadata.xml 320 RMD160 3546393e30d87f0b0a2fb17e2f15f57dd8c19661 SHA1 b959e38933418e6fc818ed40cd9a4921b8c66102 SHA256 e2a8c4c8bedbffe50a126c1c7395a4d92652c2d95347b9496d54aea1f230a22d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJNY46bAAoJEEqz6FtPBkyjpHkIAIDThN4lgsv+UFDnDNAaxv+K
-/ZDlX/+q1D+q7IQVyXBB5uK1APxKwD+anYYzQrTRMuWMZ7t15OKGy+UsjTYxxKQo
-HjR6wtIDHwS7CGJSrZ7HB2euD2q87Kspcygi9L6UukeGuU3RIFii3Y1Q2yLbn0GL
-zJoQw/u56KGKAc4yXiqZkgpIFseEzS4jTO4d/Yn2E9nGllqFP72Lp0fb93lRKeWH
-z21xCZYPvhGMpb7nxHdAhXzqc1wUoGk25pi84VIMg4qCzvxHueFW5d4zC8Q5j8qE
-Kj2Yud6VP6ATFOBCos4KqqcjcDoYFtS209FEDfBDLpZkd1sAfk46gNM+nVhKYP0=
-=gPCV
+iQEcBAEBAgAGBQJNY96kAAoJEEqz6FtPBkyjnvgH/jYHUq3Y/Q6CfTHjLY7JEqTr
+wdyV7wr/+5x1QrkCG94xxZd8eq85oSaWfi6Hbja2VqXwHLIKgsGknn776lySRxtP
+TuCkJBA6pWinysFGdrWMW3S2NKjZPu9bz3GEoDkd5QDktkC1RiaN1lK+xnCkLj5Q
+50ydXkOaCYMkyBtFin+BxI89+AbHdvb8o+CRc73C7fDcV5VNBPsjxcrmgdi5DTX9
+AGG2qmgS4qfmoSqV9IlhrU9ixiAnMu9UUp33Dgt5KiHE0d1FR555yVzI71bkaLo9
+caLiiImo+5u5p0PI3uuWbmEoOp4p+mU1UU2CWp5D2uRbSjKMqBgvp4OjmPgLr1w=
+=uqU9
 -----END PGP SIGNATURE-----
diff --git a/app-antivirus/clamav/clamav-0.97.ebuild b/app-antivirus/clamav/clamav-0.97.ebuild
index 1512fc6f648b..a1c772676975 100644
--- a/app-antivirus/clamav/clamav-0.97.ebuild
+++ b/app-antivirus/clamav/clamav-0.97.ebuild
@@ -1,8 +1,8 @@
 # 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.ebuild,v 1.1 2011/02/22 10:23:14 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.97.ebuild,v 1.2 2011/02/22 16:04:43 radhermit Exp $
 
-EAPI=4
+EAPI=2
 
 inherit eutils flag-o-matic
 
@@ -52,8 +52,8 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${ED}" install
-	rm -rf "${ED}"/var/lib/clamav
+	emake DESTDIR="${D}" install || die "emake install failed"
+	rm -rf "${D}"/var/lib/clamav
 	dodoc AUTHORS BUGS ChangeLog FAQ INSTALL NEWS README UPGRADE
 	newinitd "${FILESDIR}"/clamd.rc clamd
 	newconfd "${FILESDIR}"/clamd.conf clamd
@@ -77,7 +77,7 @@ src_install() {
 		-e "s:^\#\(LogFile\) .*:\1 /var/log/clamav/clamd.log:" \
 		-e "s:^\#\(LogTime\).*:\1 yes:" \
 		-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
-		"${ED}"/etc/clamd.conf
+		"${D}"/etc/clamd.conf
 	sed -i -e "s:^\(Example\):\# \1:" \
 		-e "s:.*\(PidFile\) .*:\1 /var/run/clamav/freshclam.pid:" \
 		-e "s:.*\(DatabaseOwner\) .*:\1 clamav:" \
@@ -85,7 +85,7 @@ src_install() {
 		-e "s:^\#\(NotifyClamd\).*:\1 /etc/clamd.conf:" \
 		-e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \
 		-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
-		"${ED}"/etc/freshclam.conf
+		"${D}"/etc/freshclam.conf
 
 	if use milter ; then
 		# MilterSocket one to include ' /' because there is a 2nd line for
@@ -98,8 +98,8 @@ src_install() {
 			-e "s+^\#\(MilterSocket\) /.*+\1 unix:/var/run/clamav/clamav-milter.sock+" \
 			-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
 			-e "s:^\#\(LogFile\) .*:\1 /var/log/clamav/clamav-milter.log:" \
-			"${ED}"/etc/clamav-milter.conf
-		cat << EOF >> "${ED}"/etc/conf.d/clamd
+			"${D}"/etc/clamav-milter.conf
+		cat << EOF >> "${D}"/etc/conf.d/clamd
 MILTER_NICELEVEL=19
 START_MILTER=no
 EOF