Gentoo Archives: gentoo-commits

From: "Tim Harder (radhermit)" <radhermit@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-antivirus/clamav: ChangeLog clamav-0.97.ebuild
Date: Tue, 22 Feb 2011 16:04:53
Message-Id: 20110222160443.9288220054@flycatcher.gentoo.org
1 radhermit 11/02/22 16:04:43
2
3 Modified: ChangeLog clamav-0.97.ebuild
4 Log:
5 Revert back to EAPI 2 for stabilization.
6
7 (Portage version: 2.2.0_alpha24/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.377 app-antivirus/clamav/ChangeLog
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-antivirus/clamav/ChangeLog?rev=1.377&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-antivirus/clamav/ChangeLog?rev=1.377&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-antivirus/clamav/ChangeLog?r1=1.376&r2=1.377
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v
19 retrieving revision 1.376
20 retrieving revision 1.377
21 diff -u -r1.376 -r1.377
22 --- ChangeLog 22 Feb 2011 10:23:14 -0000 1.376
23 +++ ChangeLog 22 Feb 2011 16:04:43 -0000 1.377
24 @@ -1,6 +1,9 @@
25 # ChangeLog for app-antivirus/clamav
26 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.376 2011/02/22 10:23:14 radhermit Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.377 2011/02/22 16:04:43 radhermit Exp $
29 +
30 + 22 Feb 2011; Tim Harder <radhermit@g.o> clamav-0.97.ebuild:
31 + Revert back to EAPI 2 for stabilization.
32
33 *clamav-0.97 (22 Feb 2011)
34
35
36
37
38 1.2 app-antivirus/clamav/clamav-0.97.ebuild
39
40 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-antivirus/clamav/clamav-0.97.ebuild?rev=1.2&view=markup
41 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-antivirus/clamav/clamav-0.97.ebuild?rev=1.2&content-type=text/plain
42 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-antivirus/clamav/clamav-0.97.ebuild?r1=1.1&r2=1.2
43
44 Index: clamav-0.97.ebuild
45 ===================================================================
46 RCS file: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.97.ebuild,v
47 retrieving revision 1.1
48 retrieving revision 1.2
49 diff -u -r1.1 -r1.2
50 --- clamav-0.97.ebuild 22 Feb 2011 10:23:14 -0000 1.1
51 +++ clamav-0.97.ebuild 22 Feb 2011 16:04:43 -0000 1.2
52 @@ -1,8 +1,8 @@
53 # Copyright 1999-2011 Gentoo Foundation
54 # Distributed under the terms of the GNU General Public License v2
55 -# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.97.ebuild,v 1.1 2011/02/22 10:23:14 radhermit Exp $
56 +# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.97.ebuild,v 1.2 2011/02/22 16:04:43 radhermit Exp $
57
58 -EAPI=4
59 +EAPI=2
60
61 inherit eutils flag-o-matic
62
63 @@ -52,8 +52,8 @@
64 }
65
66 src_install() {
67 - emake DESTDIR="${ED}" install
68 - rm -rf "${ED}"/var/lib/clamav
69 + emake DESTDIR="${D}" install || die "emake install failed"
70 + rm -rf "${D}"/var/lib/clamav
71 dodoc AUTHORS BUGS ChangeLog FAQ INSTALL NEWS README UPGRADE
72 newinitd "${FILESDIR}"/clamd.rc clamd
73 newconfd "${FILESDIR}"/clamd.conf clamd
74 @@ -77,7 +77,7 @@
75 -e "s:^\#\(LogFile\) .*:\1 /var/log/clamav/clamd.log:" \
76 -e "s:^\#\(LogTime\).*:\1 yes:" \
77 -e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
78 - "${ED}"/etc/clamd.conf
79 + "${D}"/etc/clamd.conf
80 sed -i -e "s:^\(Example\):\# \1:" \
81 -e "s:.*\(PidFile\) .*:\1 /var/run/clamav/freshclam.pid:" \
82 -e "s:.*\(DatabaseOwner\) .*:\1 clamav:" \
83 @@ -85,7 +85,7 @@
84 -e "s:^\#\(NotifyClamd\).*:\1 /etc/clamd.conf:" \
85 -e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \
86 -e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
87 - "${ED}"/etc/freshclam.conf
88 + "${D}"/etc/freshclam.conf
89
90 if use milter ; then
91 # MilterSocket one to include ' /' because there is a 2nd line for
92 @@ -98,8 +98,8 @@
93 -e "s+^\#\(MilterSocket\) /.*+\1 unix:/var/run/clamav/clamav-milter.sock+" \
94 -e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
95 -e "s:^\#\(LogFile\) .*:\1 /var/log/clamav/clamav-milter.log:" \
96 - "${ED}"/etc/clamav-milter.conf
97 - cat << EOF >> "${ED}"/etc/conf.d/clamd
98 + "${D}"/etc/clamav-milter.conf
99 + cat << EOF >> "${D}"/etc/conf.d/clamd
100 MILTER_NICELEVEL=19
101 START_MILTER=no
102 EOF