| 1 |
commit: a3770605158f94fa53b5845aa264be0f0bdf0915 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Oct 19 07:42:13 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Oct 19 07:43:58 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3770605 |
| 7 |
|
| 8 |
app-antivirus/clamav: use consistent style, misc tidying |
| 9 |
|
| 10 |
CMAKE_ECLASS doesn't do anything for cmake.eclass (it |
| 11 |
does for cmake-multilib.eclass in <= EAPI 7 though). |
| 12 |
|
| 13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 14 |
|
| 15 |
app-antivirus/clamav/clamav-0.104.0-r1.ebuild | 11 +++++------ |
| 16 |
1 file changed, 5 insertions(+), 6 deletions(-) |
| 17 |
|
| 18 |
diff --git a/app-antivirus/clamav/clamav-0.104.0-r1.ebuild b/app-antivirus/clamav/clamav-0.104.0-r1.ebuild |
| 19 |
index 9b3bb334bb9..ee0e19b9500 100644 |
| 20 |
--- a/app-antivirus/clamav/clamav-0.104.0-r1.ebuild |
| 21 |
+++ b/app-antivirus/clamav/clamav-0.104.0-r1.ebuild |
| 22 |
@@ -3,7 +3,6 @@ |
| 23 |
|
| 24 |
EAPI=7 |
| 25 |
|
| 26 |
-CMAKE_ECLASS=cmake |
| 27 |
inherit cmake flag-o-matic systemd tmpfiles |
| 28 |
|
| 29 |
DESCRIPTION="Clam Anti-Virus Scanner" |
| 30 |
@@ -13,7 +12,7 @@ SRC_URI="https://www.clamav.net/downloads/production/${P}.tar.gz" |
| 31 |
LICENSE="GPL-2" |
| 32 |
SLOT="0" |
| 33 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" |
| 34 |
-IUSE="doc clamonacc +clamapp libclamav-only milter rar selinux systemd test uclibc" |
| 35 |
+IUSE="doc clamonacc +clamapp libclamav-only milter rar selinux systemd test" |
| 36 |
|
| 37 |
REQUIRED_USE="libclamav-only? ( !clamonacc !clamapp !milter ) |
| 38 |
clamonacc? ( clamapp ) |
| 39 |
@@ -58,7 +57,7 @@ PATCHES=( |
| 40 |
src_configure() { |
| 41 |
use elibc_musl && append-ldflags -lfts |
| 42 |
use ppc64 && append-flags -mminimal-toc |
| 43 |
- use uclibc && export ac_cv_type_error_t=yes |
| 44 |
+ use elibc_uclibc && export ac_cv_type_error_t=yes |
| 45 |
|
| 46 |
local mycmakeargs=( |
| 47 |
-DDATABASE_DIRECTORY="${EPREFIX}"/var/lib/clamav |
| 48 |
@@ -98,7 +97,7 @@ src_install() { |
| 49 |
rm -rf "${ED}"/var/lib/clamav || die |
| 50 |
|
| 51 |
if ! use libclamav-only ; then |
| 52 |
- if use systemd; then |
| 53 |
+ if use systemd ; then |
| 54 |
# The tmpfiles entry is behind USE=systemd because the |
| 55 |
# upstream OpenRC service files should (and do) ensure that |
| 56 |
# the directories they need exist and have the correct |
| 57 |
@@ -113,7 +112,7 @@ src_install() { |
| 58 |
"freshclamd.service" |
| 59 |
fi |
| 60 |
|
| 61 |
- if use clamapp; then |
| 62 |
+ if use clamapp ; then |
| 63 |
# Modify /etc/{clamd,freshclam}.conf to be usable out of the box |
| 64 |
sed -e "s:^\(Example\):\# \1:" \ |
| 65 |
-e "s/^#\(PidFile .*\)/\1/" \ |
| 66 |
@@ -152,7 +151,7 @@ src_install() { |
| 67 |
local i |
| 68 |
for i in clamd freshclam clamav-milter |
| 69 |
do |
| 70 |
- if [[ -f "${ED}"/etc/"${i}".conf.sample ]]; then |
| 71 |
+ if [[ -f "${ED}"/etc/"${i}".conf.sample ]] ; then |
| 72 |
mv "${ED}"/etc/"${i}".conf{.sample,} || die |
| 73 |
fi |
| 74 |
done |
Archives