From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1331854-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 2236F158086
for <garchives@archives.gentoo.org>; Tue, 19 Oct 2021 07:44:14 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 379F0E084A;
Tue, 19 Oct 2021 07:44:13 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 1BBB4E084A
for <gentoo-commits@lists.gentoo.org>; Tue, 19 Oct 2021 07:44:13 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 23928343981
for <gentoo-commits@lists.gentoo.org>; Tue, 19 Oct 2021 07:44:12 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 8C6CC164
for <gentoo-commits@lists.gentoo.org>; Tue, 19 Oct 2021 07:44:10 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1634629438.a3770605158f94fa53b5845aa264be0f0bdf0915.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-antivirus/clamav/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-antivirus/clamav/clamav-0.104.0-r1.ebuild
X-VCS-Directories: app-antivirus/clamav/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: a3770605158f94fa53b5845aa264be0f0bdf0915
X-VCS-Branch: master
Date: Tue, 19 Oct 2021 07:44:10 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: d32d6a9f-0737-4234-9f25-b27b118667e8
X-Archives-Hash: 9092dc27209d8bec27f1d9693d911bdb
commit: a3770605158f94fa53b5845aa264be0f0bdf0915
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 19 07:42:13 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Oct 19 07:43:58 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3770605
app-antivirus/clamav: use consistent style, misc tidying
CMAKE_ECLASS doesn't do anything for cmake.eclass (it
does for cmake-multilib.eclass in <= EAPI 7 though).
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-antivirus/clamav/clamav-0.104.0-r1.ebuild | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/app-antivirus/clamav/clamav-0.104.0-r1.ebuild b/app-antivirus/clamav/clamav-0.104.0-r1.ebuild
index 9b3bb334bb9..ee0e19b9500 100644
--- a/app-antivirus/clamav/clamav-0.104.0-r1.ebuild
+++ b/app-antivirus/clamav/clamav-0.104.0-r1.ebuild
@@ -3,7 +3,6 @@
EAPI=7
-CMAKE_ECLASS=cmake
inherit cmake flag-o-matic systemd tmpfiles
DESCRIPTION="Clam Anti-Virus Scanner"
@@ -13,7 +12,7 @@ SRC_URI="https://www.clamav.net/downloads/production/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="doc clamonacc +clamapp libclamav-only milter rar selinux systemd test uclibc"
+IUSE="doc clamonacc +clamapp libclamav-only milter rar selinux systemd test"
REQUIRED_USE="libclamav-only? ( !clamonacc !clamapp !milter )
clamonacc? ( clamapp )
@@ -58,7 +57,7 @@ PATCHES=(
src_configure() {
use elibc_musl && append-ldflags -lfts
use ppc64 && append-flags -mminimal-toc
- use uclibc && export ac_cv_type_error_t=yes
+ use elibc_uclibc && export ac_cv_type_error_t=yes
local mycmakeargs=(
-DDATABASE_DIRECTORY="${EPREFIX}"/var/lib/clamav
@@ -98,7 +97,7 @@ src_install() {
rm -rf "${ED}"/var/lib/clamav || die
if ! use libclamav-only ; then
- if use systemd; then
+ if use systemd ; then
# The tmpfiles entry is behind USE=systemd because the
# upstream OpenRC service files should (and do) ensure that
# the directories they need exist and have the correct
@@ -113,7 +112,7 @@ src_install() {
"freshclamd.service"
fi
- if use clamapp; then
+ if use clamapp ; then
# Modify /etc/{clamd,freshclam}.conf to be usable out of the box
sed -e "s:^\(Example\):\# \1:" \
-e "s/^#\(PidFile .*\)/\1/" \
@@ -152,7 +151,7 @@ src_install() {
local i
for i in clamd freshclam clamav-milter
do
- if [[ -f "${ED}"/etc/"${i}".conf.sample ]]; then
+ if [[ -f "${ED}"/etc/"${i}".conf.sample ]] ; then
mv "${ED}"/etc/"${i}".conf{.sample,} || die
fi
done