gentoo resync : 22.01.2021

6 files changed, 170 insertions, 270 deletions

diff --git a/mail-filter/dcc/Manifest b/mail-filter/dcc/Manifest
index be631203ed07..773c02fc73f4 100644
--- a/mail-filter/dcc/Manifest
+++ b/mail-filter/dcc/Manifest
@@ -1,8 +1,7 @@
-AUX dcc-1.3.140-freebsd.patch 381 BLAKE2B 4324c87a09de1027b7df46bab82efbea28ae4f92d2a261d0ba44707a67b07b1d57d7aafad7be3e0bcf263928839b669151b2f7edd1413ab677337c4fe6376043 SHA512 b622085c54246cb38185262f851d611bad6e636d91a4a94ec7b966565a7d01a1a2a0445616eb3086f6c1d62a6c865e7248fcc828efbaaa70cdc7bbe2975c01d4
+AUX dcc-1.3.140-freebsd.patch 316 BLAKE2B 9f5f2bd36516db6708eeb5db4d294b1efc126af5350ae0f13e2eafc42affacd91773ee4dfd36c7e2b9b510362f8a2e440f26c11651c06d344c33d7d477c2441d SHA512 97099c78647d72d06f647c7cec60dd21dc2541076ff9dc0eda57dba69169f73589d5fe39ad970e71b49c03ae215b77bd80b52090c10bbe1bb8494eaa455b4dcf
+AUX dcc-1.3.158-fno-common.patch 543 BLAKE2B 004e1f4bd63b2bda4b7eec0bf45f9115c4c7ee43b38fbe9b46904e544933bfa5cac0a17e414897e7069dcf88bf7787cf30fd4cf8e68ce8cd42dc85a98700ad66 SHA512 4aa5dc43b6f96d12d818ba197d98f48e30748ef231116442428c08d82bf9d71f0e5136943d56ba4c10c7072f50684df04ded101c9321a132e2ce11eee838353b
 AUX dcc.confd 274 BLAKE2B 757f3e751028b0c35c166f708c328b506721549267bf1e87e841b746f5d35a6bcbeab6dcebe5deb1c4207b8b11dc0db34925cb93410b556508105cc4c64b6132 SHA512 15b7e4ded3e56e9d15509305df244e29ec7a6c3c163c49a4597e16274317d88f5aff5522984a2a3002f838d0220d04c2ea3def8d771712a11685408a4983d3b4
 AUX dcc.initd-1.3.154 2793 BLAKE2B 6ad77dfe2a80070c969ed71b0517fdbc0ad0bf2bcc96207fa80a7331d15ba77ac8b5e369c2bec5e164819da876e2ba022f31db3a455d72a6e52387a014d8de38 SHA512 e171e4333d735aa7da99ae322ce04954554a6738b943ca085e51707dd0bf231f7c170211f019027ddf01ec750ed1b8728b5d54b48dee6ee7fc37f8a810aded01
-DIST dcc-1.3.154.tar.Z 1711292 BLAKE2B 3e53488e718b13a1c36c1531f552ee811f42b274f4c24f26b484bd2b184fa3c34e0241be82aad1f6fa1a7a485fc172efdfea1dd7938fe190d9bbffa711f20abf SHA512 703bd3de44ccff3f318239dc2ca26a285f83ae0340a91391bcc5b719c298e77c8122d1502665350ddfc9fb14f12d9b6a56cba422ff8985db9cee6c91091fb987
 DIST dcc-1.3.158.tar.Z 1714175 BLAKE2B 19e11e9e78268e76bf97f16ad6f03f0bb114ec9fbc9b1f8bb6ca7ce72fa419b1e50a6d35ee32ed5352b13da96002d313c00a07395317d33082eb69c9ae60008e SHA512 24fba5ea713e8df1468644508c323d64b3868685716b7cc02263933476940a807cfc4593432a9195371308c83d4ea93653e89634681d95dcb32f5d65c7274599
-EBUILD dcc-1.3.154.ebuild 4336 BLAKE2B 08645b6659dfe8026c186d420967c05a5689f3e7078beba6cee663b946af42d9ecaa3b0d337ee6306532d24562377258f8dc112c9910658de052fba8b8d49307 SHA512 2748020ff1954b8616f1e1546154a4b6dbd6866042276b97f340b6cf8df00e1d8f86a4db138824f70ef2cc2e70928eff61b11256bccb2318442428f8386e1d8b
-EBUILD dcc-1.3.158.ebuild 4339 BLAKE2B 05000ce48213142636f937d8b50fb3a281caaf0c45f7528f2cadaffcd37db5dcd8234cb92c1775b29cb5e4f7819dd55c26e9fceee056cd4ce0a234a0766cef53 SHA512 aec98afa8b82c7ca0885570f2b7d5b079ff0002c24d8a3c934288c3e84e4416bfc9f7241b11297d650ff9ad5c08f50c0cef0211ca91b58ad8c6f07e94be077cb
+EBUILD dcc-1.3.158-r1.ebuild 3750 BLAKE2B 976ca6b2cd285416c6d2703ec294207dc0a45685537a2cbaf2a2f343f4e478ecaa40a8a9ac064e8ae0d3e36540ac83bec3e58b9fc3c18ee4b19a816afdf57e6e SHA512 3d8e190823ec4a46e00262a51a68a4f9d4869fe928de2657659080295647d4eb17a33de488991676d11c6f0ff45d8fd42dbb81b5ac14582084fb3a8fa42d1630
 MISC metadata.xml 316 BLAKE2B 24478ea14c1a25332766f54d5d385ef2e5755880258c2307eb62f649e3ab06c299c4ef0534b44b9f97462313227da016ef89b55ddac493a0b6a9014d098d0b85 SHA512 deaa7ad3b9919c65113f97639885bf7da2281a21dff15a0cfa11315daae55550c95ff411c8448bfe03c6b94b4cc4b7a3475bd6f9cf6315d6aa75abb99f536952
diff --git a/mail-filter/dcc/dcc-1.3.154.ebuild b/mail-filter/dcc/dcc-1.3.154.ebuild
deleted file mode 100644
index b4bdaf7abd15..000000000000
--- a/mail-filter/dcc/dcc-1.3.154.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit base eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="Distributed Checksum Clearinghouse"
-HOMEPAGE="http://www.rhyolite.com/anti-spam/dcc/"
-SRC_URI="http://www.rhyolite.com/anti-spam/dcc/source/old/${P}.tar.Z"
-
-LICENSE="DCC GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" #
-IUSE="cgi ipv6 rrdtool milter"
-
-RDEPEND="dev-lang/perl
-	rrdtool? ( net-analyzer/rrdtool )
-	|| ( net-misc/wget www-client/fetch net-misc/curl net-ftp/ftp )
-	milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )"
-DEPEND="sys-apps/sed
-	sys-devel/gcc
-	${RDEPEND}"
-
-dcc_cgibin=/var/www/localhost/cgi-bin/dcc
-dcc_homedir=/var/dcc
-dcc_libexec=/usr/sbin
-dcc_man=/usr/share/man
-dcc_rundir=/var/run/dcc
-
-PATCHES=( "${FILESDIR}"/dcc-1.3.140-freebsd.patch )
-
-src_configure() {
-	tc-export CC AR RANLIB
-	local myconf
-	myconf="${myconf} --homedir=${dcc_homedir}"
-	myconf="${myconf} --bindir=/usr/bin"
-	myconf="${myconf} --libexecdir=${dcc_libexec}"
-	myconf="${myconf} --mandir=/usr/share/man"
-	myconf="${myconf} --with-updatedcc_pfile=${dcc_homedir}/updatecc.pfile"
-	myconf="${myconf} --with-installroot=${D}"
-	# sigh.  should be DCC-MD5 but see line 486 in the shipped configure script
-	myconf="${myconf} --with-DDC-MD5"
-	myconf="${myconf} --with-uid=root"
-	myconf="${myconf} --enable-server"
-	myconf="${myconf} --enable-dccifd"
-	myconf="${myconf} --with-rundir=${dcc_rundir}"
-	myconf="${myconf} --with-db-memory=64"
-	myconf="${myconf} --with-max-db-mem=128"
-	myconf="${myconf} --with-max-log-size=0"
-	myconf="${myconf} --with-make-cmd=${MAKE:-make}"
-	myconf="${myconf} $(use_enable ipv6 IPv6)"
-	myconf="${myconf} $(use_with cgi cgibin ${dcc_cgibin})"
-	myconf="${myconf} $(use_enable milter dccm)"
-	use milter && myconf="${myconf} --with-sendmail="
-
-	einfo "Using config: ${myconf}"
-
-	# This is NOT a normal configure script.
-	./configure ${myconf} || die "configure failed!"
-}
-
-moveconf() {
-	local into=/etc/dcc/
-	for i in $@; do
-		mv "${D}${dcc_homedir}/${i}" "${D}${into}"
-		dosym "${into}${i}" "${dcc_homedir}/${i}"
-	done
-}
-
-src_install() {
-	# stolen from the RPM .spec and modified for gentoo
-	MANOWN=root MANGRP=$(id -g -n root) export MANOWN MANGRP
-	BINOWN="${MANOWN}" BINGRP="${MANGRP}" export BINOWN BINGRP
-	DCC_PROTO_HOMEDIR="${D}${dcc_homedir}" export DCC_PROTO_HOMEDIR
-	DCC_CGIBINDIR="${D}${dcc_cgibin}" export DCC_CGIBINDIR
-	DCC_SUID="${BINOWN}" DCC_OWN="${BINOWN}" DCC_GRP="${BINGRP}" export DCC_SUID DCC_OWN DCC_GRP
-
-	dodir /etc/cron.daily "${dcc_homedir}" /usr/bin /usr/sbin /usr/share/man/man{0,8} /etc/dcc
-	if use cgi ; then
-		dodir "${dcc_cgibin}"
-	fi
-	keepdir /var/log/dcc
-
-	# This package now takes "${D}" at compile-time!
-	# make DESTDIR="${D}" DCC_BINDIR="${D}"/usr/bin MANDIR="${D}"/usr/share/man/man DCC_HOMEDIR="${D}"${dcc_homedir} install || die
-	emake install
-
-	# branding and setting reasonable defaults
-	sed -e "s/BRAND=\$/BRAND='Gentoo ${PF}'/;" \
-		-e "s/GREY_ENABLE=\$/GREY_ENABLE=off/;" \
-		-e "s/DCCM_LOG_AT=5\$/DCCM_LOG_AT=50/;" \
-		-e "s,DCCM_LOGDIR=\"log\"\$,DCCM_LOGDIR=\"/var/log/dcc\",;" \
-		-e "s/DCCM_ARGS=\$/DCCM_ARGS='-SHELO -Smail_host -SSender -SList-ID'/;" \
-		-e "s/DCCIFD_ARGS=\$/DCCIFD_ARGS=\"\$DCCM_ARGS\"/;" \
-		-e 's/DCCIFD_ENABLE=off/DCCIFD_ENABLE=on/' \
-		-e 's/DBCLEAN_LOGDAYS=14/DBCLEAN_LOGDAYS=1/' \
-		-i "${D}${dcc_homedir}/dcc_conf"
-
-	if use milter ; then
-		# enable milter
-		sed -i -e "s:^[\t #]*\(DCCM_ENABLE[\t ]*=[\t ]*\).*:\1on:g" \
-			"${D}${dcc_homedir}"/dcc_conf
-	fi
-
-	# provide cronjob
-	mv "${D}"/usr/sbin/cron-dccd "${D}"/etc/cron.daily/dccd || die "mv failed"
-
-	# clean up
-	mv "${D}"/usr/sbin/logger "${D}"/usr/sbin/logger-dcc || die "mv failed"
-
-	statslist="${D}/usr/sbin/{dcc-stats-graph,dcc-stats-init,dcc-stats-collect}"
-	if ! use rrdtool; then
-		# remove rrdtool interface scripts
-		eval rm -f ${statslist} || die "Failed to clean up rrdtool scripts"
-	fi
-
-	# clean up
-	rm -f "${D}"/usr/sbin/{rcDCC,updatedcc}
-
-	# place configuration files into /etc instead of /var/dcc
-	moveconf dcc_conf flod grey_flod grey_whitelist ids map map.txt whiteclnt whitecommon whitelist
-
-	newinitd "${FILESDIR}"/dcc.initd-1.3.154 dcc
-	newconfd "${FILESDIR}"/dcc.confd dcc
-
-	rmdir "${D}"/var/dcc/log/
-
-	dodoc CHANGES RESTRICTIONS
-	dohtml *.html
-	doman *.{0,8}
-}
diff --git a/mail-filter/dcc/dcc-1.3.158-r1.ebuild b/mail-filter/dcc/dcc-1.3.158-r1.ebuild
new file mode 100644
index 000000000000..db4459137a86
--- /dev/null
+++ b/mail-filter/dcc/dcc-1.3.158-r1.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Distributed Checksum Clearinghouse"
+HOMEPAGE="https://www.rhyolite.com/dcc/"
+SRC_URI="https://www.rhyolite.com/dcc/source/old/${P}.tar.Z"
+
+LICENSE="DCC GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
+IUSE="cgi ipv6 rrdtool milter"
+
+RDEPEND="
+	dev-lang/perl
+	|| (
+		net-ftp/ftp
+		net-misc/curl
+		net-misc/wget
+		www-client/fetch
+	)
+	milter? (
+		|| (
+			mail-filter/libmilter
+			mail-mta/sendmail
+		)
+	)
+	rrdtool? ( net-analyzer/rrdtool )"
+DEPEND="${RDEPEND}"
+
+dcc_cgibin=var/www/localhost/cgi-bin/dcc
+dcc_homedir=var/dcc
+dcc_libexec=usr/sbin
+dcc_man=usr/share/man
+dcc_rundir=var/run/dcc
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.140-freebsd.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+)
+
+src_configure() {
+	tc-export CC AR RANLIB
+	local myconf=(
+		--bindir="${EPREFIX}"/usr/bin
+		--homedir="${EPREFIX}"/${dcc_homedir}
+		--libexecdir="${EPREFIX}"/${dcc_libexec}
+		--mandir="${EPREFIX}"/usr/share/man
+		--enable-dccifd
+		--enable-server
+		--with-DDC-MD5
+		--with-installroot="${D}"
+		--with-rundir="${EPREFIX}"/${dcc_rundir}
+		--with-uid=root
+		--with-updatedcc_pfile="${EPREFIX}"/${dcc_homedir}/updatecc.pfile
+		--with-db-memory=64
+		--with-max-db-mem=128
+		--with-max-log-size=0
+		--with-make-cmd=${MAKE:-make}
+		$(use_enable ipv6 IPv6)
+		$(use_enable milter dccm)
+		$(use_with cgi cgibin ${dcc_cgibin})
+		$(use_with milter sendmail)
+	)
+
+	einfo "Using config: ${myconf[@]}"
+
+	# This is NOT a normal configure script.
+	./configure "${myconf[@]}" || die "configure failed!"
+}
+
+moveconf() {
+	local i
+	for i in $@; do
+		mv "${ED}/${dcc_homedir}/${i}" "${ED}"/etc/dcc || die
+		dosym ../../etc/dcc/"${i}" "${dcc_homedir}/${i}"
+	done
+}
+
+src_install() {
+	# stolen from the RPM .spec and modified for gentoo
+	export MANOWN=root
+	export MANGRP=$(id -g -n root)
+	export BINOWN="${MANOWN}"
+	export BINGRP="${MANGRP}"
+	export DCC_PROTO_HOMEDIR="${ED}/${dcc_homedir}"
+	export DCC_CGIBINDIR="${ED}/${dcc_cgibin}"
+	export DCC_SUID="${BINOWN}"
+	export DCC_OWN="${BINOWN}"
+	export DCC_GRP="${BINGRP}"
+
+	dodir /etc/cron.daily "${dcc_homedir}" /usr/bin /usr/sbin /usr/share/man/man{0,8} /etc/dcc
+	if use cgi ; then
+		dodir "${dcc_cgibin}"
+	fi
+	keepdir /var/log/dcc
+
+	emake install
+
+	# branding and setting reasonable defaults
+	sed -e "s/BRAND=\$/BRAND='Gentoo ${PF}'/;" \
+		-e "s/GREY_ENABLE=\$/GREY_ENABLE=off/;" \
+		-e "s/DCCM_LOG_AT=5\$/DCCM_LOG_AT=50/;" \
+		-e "s,DCCM_LOGDIR=\"log\"\$,DCCM_LOGDIR=\"/var/log/dcc\",;" \
+		-e "s/DCCM_ARGS=\$/DCCM_ARGS='-SHELO -Smail_host -SSender -SList-ID'/;" \
+		-e "s/DCCIFD_ARGS=\$/DCCIFD_ARGS=\"\$DCCM_ARGS\"/;" \
+		-e 's/DCCIFD_ENABLE=off/DCCIFD_ENABLE=on/' \
+		-e 's/DBCLEAN_LOGDAYS=14/DBCLEAN_LOGDAYS=1/' \
+		-i "${ED}/${dcc_homedir}/dcc_conf" || die
+
+	if use milter ; then
+		# enable milter
+		sed -i -e "s:^[\t #]*\(DCCM_ENABLE[\t ]*=[\t ]*\).*:\1on:g" \
+			"${ED}/${dcc_homedir}"/dcc_conf || die
+	fi
+
+	# provide cronjob
+	mv "${ED}"/usr/sbin/cron-dccd "${ED}"/etc/cron.daily/dccd || die "mv failed"
+
+	# clean up
+	mv "${ED}"/usr/sbin/logger "${ED}"/usr/sbin/logger-dcc || die "mv failed"
+
+	if ! use rrdtool; then
+		# remove rrdtool interface scripts
+		rm "${ED}"/usr/sbin/dcc-stats-{collect,graph,init} || die "Failed to clean up rrdtool scripts"
+	fi
+
+	# clean up
+	rm "${ED}"/usr/sbin/{rcDCC,updatedcc} || die
+
+	# place configuration files into /etc instead of /var/dcc
+	moveconf dcc_conf flod grey_flod grey_whitelist ids map map.txt whiteclnt whitecommon whitelist
+
+	newinitd "${FILESDIR}"/dcc.initd-1.3.154 dcc
+	newconfd "${FILESDIR}"/dcc.confd dcc
+
+	rmdir "${ED}"/var/dcc/log/ || die
+
+	dodoc CHANGES RESTRICTIONS
+	doman *.{0,8}
+}
diff --git a/mail-filter/dcc/dcc-1.3.158.ebuild b/mail-filter/dcc/dcc-1.3.158.ebuild
deleted file mode 100644
index 268c345cb33e..000000000000
--- a/mail-filter/dcc/dcc-1.3.158.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit base eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="Distributed Checksum Clearinghouse"
-HOMEPAGE="http://www.rhyolite.com/anti-spam/dcc/"
-SRC_URI="http://www.rhyolite.com/anti-spam/dcc/source/old/${P}.tar.Z"
-
-LICENSE="DCC GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86" #
-IUSE="cgi ipv6 rrdtool milter"
-
-RDEPEND="dev-lang/perl
-	rrdtool? ( net-analyzer/rrdtool )
-	|| ( net-misc/wget www-client/fetch net-misc/curl net-ftp/ftp )
-	milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )"
-DEPEND="sys-apps/sed
-	sys-devel/gcc
-	${RDEPEND}"
-
-dcc_cgibin=/var/www/localhost/cgi-bin/dcc
-dcc_homedir=/var/dcc
-dcc_libexec=/usr/sbin
-dcc_man=/usr/share/man
-dcc_rundir=/var/run/dcc
-
-PATCHES=( "${FILESDIR}"/dcc-1.3.140-freebsd.patch )
-
-src_configure() {
-	tc-export CC AR RANLIB
-	local myconf
-	myconf="${myconf} --homedir=${dcc_homedir}"
-	myconf="${myconf} --bindir=/usr/bin"
-	myconf="${myconf} --libexecdir=${dcc_libexec}"
-	myconf="${myconf} --mandir=/usr/share/man"
-	myconf="${myconf} --with-updatedcc_pfile=${dcc_homedir}/updatecc.pfile"
-	myconf="${myconf} --with-installroot=${D}"
-	# sigh.  should be DCC-MD5 but see line 486 in the shipped configure script
-	myconf="${myconf} --with-DDC-MD5"
-	myconf="${myconf} --with-uid=root"
-	myconf="${myconf} --enable-server"
-	myconf="${myconf} --enable-dccifd"
-	myconf="${myconf} --with-rundir=${dcc_rundir}"
-	myconf="${myconf} --with-db-memory=64"
-	myconf="${myconf} --with-max-db-mem=128"
-	myconf="${myconf} --with-max-log-size=0"
-	myconf="${myconf} --with-make-cmd=${MAKE:-make}"
-	myconf="${myconf} $(use_enable ipv6 IPv6)"
-	myconf="${myconf} $(use_with cgi cgibin ${dcc_cgibin})"
-	myconf="${myconf} $(use_enable milter dccm)"
-	use milter && myconf="${myconf} --with-sendmail="
-
-	einfo "Using config: ${myconf}"
-
-	# This is NOT a normal configure script.
-	./configure ${myconf} || die "configure failed!"
-}
-
-moveconf() {
-	local into=/etc/dcc/
-	for i in $@; do
-		mv "${D}${dcc_homedir}/${i}" "${D}${into}"
-		dosym "${into}${i}" "${dcc_homedir}/${i}"
-	done
-}
-
-src_install() {
-	# stolen from the RPM .spec and modified for gentoo
-	MANOWN=root MANGRP=$(id -g -n root) export MANOWN MANGRP
-	BINOWN="${MANOWN}" BINGRP="${MANGRP}" export BINOWN BINGRP
-	DCC_PROTO_HOMEDIR="${D}${dcc_homedir}" export DCC_PROTO_HOMEDIR
-	DCC_CGIBINDIR="${D}${dcc_cgibin}" export DCC_CGIBINDIR
-	DCC_SUID="${BINOWN}" DCC_OWN="${BINOWN}" DCC_GRP="${BINGRP}" export DCC_SUID DCC_OWN DCC_GRP
-
-	dodir /etc/cron.daily "${dcc_homedir}" /usr/bin /usr/sbin /usr/share/man/man{0,8} /etc/dcc
-	if use cgi ; then
-		dodir "${dcc_cgibin}"
-	fi
-	keepdir /var/log/dcc
-
-	# This package now takes "${D}" at compile-time!
-	# make DESTDIR="${D}" DCC_BINDIR="${D}"/usr/bin MANDIR="${D}"/usr/share/man/man DCC_HOMEDIR="${D}"${dcc_homedir} install || die
-	emake install
-
-	# branding and setting reasonable defaults
-	sed -e "s/BRAND=\$/BRAND='Gentoo ${PF}'/;" \
-		-e "s/GREY_ENABLE=\$/GREY_ENABLE=off/;" \
-		-e "s/DCCM_LOG_AT=5\$/DCCM_LOG_AT=50/;" \
-		-e "s,DCCM_LOGDIR=\"log\"\$,DCCM_LOGDIR=\"/var/log/dcc\",;" \
-		-e "s/DCCM_ARGS=\$/DCCM_ARGS='-SHELO -Smail_host -SSender -SList-ID'/;" \
-		-e "s/DCCIFD_ARGS=\$/DCCIFD_ARGS=\"\$DCCM_ARGS\"/;" \
-		-e 's/DCCIFD_ENABLE=off/DCCIFD_ENABLE=on/' \
-		-e 's/DBCLEAN_LOGDAYS=14/DBCLEAN_LOGDAYS=1/' \
-		-i "${D}${dcc_homedir}/dcc_conf"
-
-	if use milter ; then
-		# enable milter
-		sed -i -e "s:^[\t #]*\(DCCM_ENABLE[\t ]*=[\t ]*\).*:\1on:g" \
-			"${D}${dcc_homedir}"/dcc_conf
-	fi
-
-	# provide cronjob
-	mv "${D}"/usr/sbin/cron-dccd "${D}"/etc/cron.daily/dccd || die "mv failed"
-
-	# clean up
-	mv "${D}"/usr/sbin/logger "${D}"/usr/sbin/logger-dcc || die "mv failed"
-
-	statslist="${D}/usr/sbin/{dcc-stats-graph,dcc-stats-init,dcc-stats-collect}"
-	if ! use rrdtool; then
-		# remove rrdtool interface scripts
-		eval rm -f ${statslist} || die "Failed to clean up rrdtool scripts"
-	fi
-
-	# clean up
-	rm -f "${D}"/usr/sbin/{rcDCC,updatedcc}
-
-	# place configuration files into /etc instead of /var/dcc
-	moveconf dcc_conf flod grey_flod grey_whitelist ids map map.txt whiteclnt whitecommon whitelist
-
-	newinitd "${FILESDIR}"/dcc.initd-1.3.154 dcc
-	newconfd "${FILESDIR}"/dcc.confd dcc
-
-	rmdir "${D}"/var/dcc/log/
-
-	dodoc CHANGES RESTRICTIONS
-	dohtml *.html
-	doman *.{0,8}
-}
diff --git a/mail-filter/dcc/files/dcc-1.3.140-freebsd.patch b/mail-filter/dcc/files/dcc-1.3.140-freebsd.patch
index e72224f41c2f..8d4a8d59c334 100644
--- a/mail-filter/dcc/files/dcc-1.3.140-freebsd.patch
+++ b/mail-filter/dcc/files/dcc-1.3.140-freebsd.patch
@@ -1,5 +1,3 @@
-diff --git a/configure b/configure
-index 5efe49d..de8d6f2 100755
 --- a/configure
 +++ b/configure
 @@ -3677,7 +3677,7 @@ case "$TARGET_SYS" in
diff --git a/mail-filter/dcc/files/dcc-1.3.158-fno-common.patch b/mail-filter/dcc/files/dcc-1.3.158-fno-common.patch
new file mode 100644
index 000000000000..0ff4cb599a17
--- /dev/null
+++ b/mail-filter/dcc/files/dcc-1.3.158-fno-common.patch
@@ -0,0 +1,23 @@
+https://bugs.gentoo.org/706988
+--- a/srvrlib/db.c
++++ b/srvrlib/db.c
+@@ -65,7 +65,7 @@ struct timeval db_time;
+ 
+ int db_debug;
+ 
+-u_char grey_on;
++extern u_char grey_on;
+ 
+ DB_BUF_MODE db_buf_mode_hash, db_buf_mode_db;
+ 
+--- a/thrlib/cmn_defs.h
++++ b/thrlib/cmn_defs.h
+@@ -237,7 +237,7 @@ extern u_int dcc_ctxt_sn;		/* change X-DCC header server name */
+ 
+ extern RCPT_ST *rcpt_st_free;
+ 
+-const char *userdirs;
++extern const char *userdirs;
+ 
+ extern u_char dcc_query_only;
+ extern u_char can_discard_1;		/* 1=can trim targets after DATA */