gentoo resync : 18.01.2010

2 files changed, 1 insertions, 197 deletions

diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index 9e640979cd47..3d7a11fa7d87 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -17,5 +17,5 @@ DIST clamav-0.101.4.tar.gz 21408145 BLAKE2B 5eba85dcf203f56cbd943e479e660469dcc1
 DIST clamav-0.102.1.tar.gz 13215586 BLAKE2B 653e5506ed0b19c154038e960184abf2773a8a12a775dda81ce4f69fe7e58c457c39d85e24ce43bda9f09f43766c81af69d5462e7459077b0e4886f73a2a5ba2 SHA512 2d0cd2dece771ab8228771f9a95eb0342e756083a0107b2bef31bd2f5f46c36aa692e15d7eb2ea321f535ea4e18c8df043c8663ae350d40fbe1bdb4d073dcb90
 EBUILD clamav-0.101.2-r1.ebuild 5574 BLAKE2B 6a81f3b8382419d3ff5292d44192e5ce56f9929a82ed7d23b35dc6acc5f891cf0d1a65ca07192c70395dbe13122b0267791ebb420ba80d77409de165515d2866 SHA512 1c90b67907aef36f8b2496dc8273919145f7388383545da4a98280f74ba0113ec31da45f815dcac80f37d918f36f3777647e2920c4dfc69ac6bce5da695678fe
 EBUILD clamav-0.101.4.ebuild 5575 BLAKE2B 9b9c9cc85eafd5b34d5b027ed1f532eedaadbd363e49d26e516d0bea22290c43023dcfe52957843ba6a6361e6081cf100c4fdf8f03cd78ae6dbc2cbc7332407d SHA512 ebdb4e06350b524a844f42d8cb6f818135c2e541b088b4e49859440aebb4390438fb52198f9a65e0844c9e3d6fec2fe5c80b572289b965fb27b69cef06b02fd3
-EBUILD clamav-0.102.1-r2.ebuild 6292 BLAKE2B ba0a2e26cdb0e2f93520f5b87482fc730b06cbd8f46731281e4ad641c247eb17b0bf32628aecaa340466a898fd09df5b1b6dbecd1d57810e22f78757adc9b34e SHA512 dbad51d4ffa9e748e4108d93ef7c20496714db7278935e8bd5f3b29e2dec1e964e8458bcce06101c86210446cfe11090827aab3e79ce1c664441645ce5b6cebe
+EBUILD clamav-0.102.1-r3.ebuild 6509 BLAKE2B a426c60b5be4dba7d4a6f2fbae5a7747e5ad3d9ff529b16c69b90bb5efd4c1cdf7f81d471a850acdf5a6f87eebc7584c886c6e26499eb4357d603fbe7d524db6 SHA512 f161f99091461613be7d5b02833dbdd87e7ca5e02ad71fe2316c595976d3dfbb5ebd4ab4f1d45728a57f535f4fd4c11fdfec6723fa6d853d6e5ba9bfba490fb6
 MISC metadata.xml 861 BLAKE2B fa97cb689d37536e3d128d2033038b1a6331ae3d8f435e39330506731c96f742b55f579ca02c678393c0af21fbab88189de8754d80b97fba35cf5a4f4eb2dd9a SHA512 5e2c58dfbb033270cfa014bc207d83799be06aaa02d1b490d6c202ffc151b54be72cd4e15380faffed2e3957c395e43b6853d1abfee99fa42de81159b7656a00
diff --git a/app-antivirus/clamav/clamav-0.102.1-r2.ebuild b/app-antivirus/clamav/clamav-0.102.1-r2.ebuild
deleted file mode 100644
index 8a85bf5c1129..000000000000
--- a/app-antivirus/clamav/clamav-0.102.1-r2.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils flag-o-matic user systemd
-
-DESCRIPTION="Clam Anti-Virus Scanner"
-HOMEPAGE="https://www.clamav.net/"
-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 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="bzip2 doc clamdtop clamsubmit iconv ipv6 libclamav-only libressl milter metadata-analysis-api selinux static-libs test uclibc xml"
-RESTRICT="!test? ( test )"
-
-CDEPEND="bzip2? ( app-arch/bzip2 )
-	clamdtop? ( sys-libs/ncurses:0 )
-	iconv? ( virtual/libiconv )
-	metadata-analysis-api? ( dev-libs/json-c:= )
-	milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
-	>=sys-libs/zlib-1.2.2:=
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	dev-libs/libltdl
-	|| ( dev-libs/libpcre2 >dev-libs/libpcre-6 )
-	dev-libs/libmspack
-	xml? ( dev-libs/libxml2 )
-	elibc_musl? ( sys-libs/fts-standalone )
-	!libclamav-only? ( net-misc/curl )
-	clamsubmit? ( net-misc/curl dev-libs/json-c:=  )
-	!!<app-antivirus/clamav-0.99"
-REQUIRED_USE="
-	libclamav-only? ( !clamsubmit )
-	clamsubmit? ( !libclamav-only )
-"
-# hard block clamav < 0.99 due to linking problems Bug #567680
-# openssl is now *required* see this link as to why
-# https://blog.clamav.net/2014/02/introducing-openssl-as-dependency-to.html
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	test? ( dev-libs/check )"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-clamav )"
-
-HTML_DOCS=( docs/html/. )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.101.2-tinfo.patch" #670729
-	"${FILESDIR}/${PN}-0.102.1-libxml2_pkgconfig.patch" #661328
-)
-
-pkg_setup() {
-	enewgroup clamav
-	enewuser clamav -1 -1 /dev/null clamav
-}
-
-src_prepare() {
-	default
-	eautoconf
-}
-
-src_configure() {
-	use elibc_musl && append-ldflags -lfts
-	use ppc64 && append-flags -mminimal-toc
-	use uclibc && export ac_cv_type_error_t=yes
-
-	# according to configure help it should be
-	# $(use_enable xml)
-	# but that does not work
-	# do not add this, since --disable-xml seems to override
-	# --without-xml
-	JSONUSE="--without-libjson"
-
-	if use clamsubmit || use metadata-analysis-api; then
-		# either of those 2 requires libjson.
-		# clamsubmit will be built as soon as libjson and curl are found
-		# but we only install the binary if requested
-		JSONUSE="--with-libjson=${EPREFIX}/usr"
-	fi
-
-	local myeconfargs=(
-		$(use_enable bzip2)
-		$(use_enable clamdtop)
-		$(use_enable ipv6)
-		$(use_enable milter)
-		$(use_enable static-libs static)
-		$(use_enable test check)
-		$(use_with xml)
-		$(use_with iconv)
-		${JSONUSE}
-		$(use_enable libclamav-only)
-		$(use_with !libclamav-only libcurl)
-		--with-system-libmspack
-		--cache-file="${S}"/config.cache
-		--disable-experimental
-		--disable-zlib-vcheck
-		--enable-id-check
-		--with-dbdir="${EPREFIX}"/var/lib/clamav
-		# Don't call --with-zlib=/usr (see bug #699296)
-		--with-zlib
-		--disable-llvm
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	rm -rf "${ED}"/var/lib/clamav
-	newinitd "${FILESDIR}"/clamd.initd-r6 clamd
-	newconfd "${FILESDIR}"/clamd.conf-r1 clamd
-
-	systemd_dotmpfilesd "${FILESDIR}/tmpfiles.d/clamav.conf"
-	systemd_newunit "${FILESDIR}/clamd_at.service" "clamd@.service"
-	systemd_dounit "${FILESDIR}/clamd.service"
-	systemd_dounit "${FILESDIR}/freshclamd.service"
-
-	keepdir /var/lib/clamav
-	fowners clamav:clamav /var/lib/clamav
-	keepdir /var/log/clamav
-	fowners clamav:clamav /var/log/clamav
-
-	dodir /etc/logrotate.d
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/clamav.logrotate clamav
-
-	# Modify /etc/{clamd,freshclam}.conf to be usable out of the box
-	sed -i -e "s:^\(Example\):\# \1:" \
-		-e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/clamd.pid:" \
-		-e "s:.*\(LocalSocket\) .*:\1 ${EPREFIX}/var/run/clamav/clamd.sock:" \
-		-e "s:.*\(User\) .*:\1 clamav:" \
-		-e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamd.log:" \
-		-e "s:^\#\(LogTime\).*:\1 yes:" \
-		-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
-		-e "s:^\#\(DatabaseDirectory\).*:\1 /var/lib/clamav:" \
-		"${ED}"/etc/clamd.conf.sample || die
-	sed -i -e "s:^\(Example\):\# \1:" \
-		-e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/freshclam.pid:" \
-		-e "s:.*\(DatabaseOwner\) .*:\1 clamav:" \
-		-e "s:^\#\(UpdateLogFile\) .*:\1 ${EPREFIX}/var/log/clamav/freshclam.log:" \
-		-e "s:^\#\(NotifyClamd\).*:\1 ${EPREFIX}/etc/clamd.conf:" \
-		-e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \
-		-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
-		-e "s:^\#\(DatabaseDirectory\).*:\1 /var/lib/clamav:" \
-		"${ED}"/etc/freshclam.conf.sample || die
-
-	if use milter ; then
-		# MilterSocket one to include ' /' because there is a 2nd line for
-		# inet: which we want to leave
-		##dodoc "${FILESDIR}"/clamav-milter.README.gentoo
-		sed -i -e "s:^\(Example\):\# \1:" \
-			-e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/clamav-milter.pid:" \
-			-e "s+^\#\(ClamdSocket\) .*+\1 unix:${EPREFIX}/var/run/clamav/clamd.sock+" \
-			-e "s:.*\(User\) .*:\1 clamav:" \
-			-e "s+^\#\(MilterSocket\) /.*+\1 unix:${EPREFIX}/var/run/clamav/clamav-milter.sock+" \
-			-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
-			-e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamav-milter.log:" \
-			"${ED}"/etc/clamav-milter.conf.sample || die
-		cat >> "${ED}"/etc/conf.d/clamd <<-EOF
-			MILTER_NICELEVEL=19
-			START_MILTER=no
-		EOF
-
-		systemd_newunit "${FILESDIR}/clamav-milter.service-r1" clamav-milter.service
-	fi
-
-	if use doc; then
-	   einstalldocs
-	   doman docs/man/*.[1-8]
-	fi
-
-	for i in clamd freshclam clamav-milter
-	do
-		[[ -f "${D}"/etc/"${i}".conf.sample ]] && mv "${D}"/etc/"${i}".conf{.sample,}
-	done
-
-	prune_libtool_files --all
-}
-
-src_test() {
-	emake quick-check
-}
-
-pkg_postinst() {
-	if use milter ; then
-		elog "For simple instructions how to setup the clamav-milter read the"
-		elog "clamav-milter.README.gentoo in /usr/share/doc/${PF}"
-	fi
-	if test -z $(find "${ROOT}"var/lib/clamav -maxdepth 1 -name 'main.c*' -print -quit) ; then
-		ewarn "You must run freshclam manually to populate the virus database files"
-		ewarn "before starting clamav for the first time.\n"
-	fi
-	elog "For instructions on how to use clamonacc see https://www.clamav.net/documents/on-access-scanning"
-}