Remove old.

(Portage version: 2.2.0_alpha179/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)

12 files changed, 8 insertions, 1342 deletions

diff --git a/app-antivirus/clamav/ChangeLog b/app-antivirus/clamav/ChangeLog
index 06f512cad9d8..10eafbba40fa 100644
--- a/app-antivirus/clamav/ChangeLog
+++ b/app-antivirus/clamav/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-antivirus/clamav
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.456 2013/04/23 18:02:01 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.457 2013/06/12 21:05:37 radhermit Exp $
+
+  12 Jun 2013; Tim Harder <radhermit@gentoo.org> -clamav-0.97.5-r1.ebuild,
+  -clamav-0.97.6.ebuild, -clamav-0.97.6-r1.ebuild, -clamav-0.97.6-r2.ebuild,
+  -clamav-0.97.6-r3.ebuild, -clamav-0.97.7-r1.ebuild, -clamav-0.97.7-r2.ebuild,
+  -files/clamd.initd, -files/clamd.initd-r1, -files/clamd.initd-r2,
+  -files/clamd.initd-r4:
+  Remove old.
 
 *clamav-0.97.8 (23 Apr 2013)
 
diff --git a/app-antivirus/clamav/clamav-0.97.5-r1.ebuild b/app-antivirus/clamav/clamav-0.97.5-r1.ebuild
deleted file mode 100644
index 8c3099f3f6eb..000000000000
--- a/app-antivirus/clamav/clamav-0.97.5-r1.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.97.5-r1.ebuild,v 1.10 2013/04/23 18:02:01 lordvan Exp $
-
-EAPI=4
-
-inherit eutils flag-o-matic user
-
-DESCRIPTION="Clam Anti-Virus Scanner"
-HOMEPAGE="http://www.clamav.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="bzip2 clamdtop iconv ipv6 milter selinux static-libs"
-
-CDEPEND="bzip2? ( app-arch/bzip2 )
-	clamdtop? ( sys-libs/ncurses )
-	iconv? ( virtual/libiconv )
-	milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
-	dev-libs/libtommath
-	>=sys-libs/zlib-1.2.2
-	sys-devel/libtool"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-clamav )"
-
-RESTRICT="test"
-
-DOCS=( AUTHORS BUGS ChangeLog FAQ INSTALL NEWS README UPGRADE )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.97-nls.patch
-)
-
-pkg_setup() {
-	enewgroup clamav
-	enewuser clamav -1 -1 /dev/null clamav
-}
-
-src_prepare() {
-	use ppc64 && append-flags -mminimal-toc
-}
-
-src_configure() {
-	econf \
-		--disable-experimental \
-		--enable-id-check \
-		--with-dbdir="${EPREFIX}"/var/lib/clamav \
-		--with-system-tommath \
-		--with-zlib="${EPREFIX}"/usr \
-		$(use_enable bzip2) \
-		$(use_enable clamdtop) \
-		$(use_enable ipv6) \
-		$(use_enable milter) \
-		$(use_enable static-libs static) \
-		$(use_with iconv)
-}
-
-src_install() {
-	default
-
-	rm -rf "${ED}"/var/lib/clamav
-	newinitd "${FILESDIR}"/clamd.initd clamd
-	newconfd "${FILESDIR}"/clamd.conf clamd
-
-	keepdir /var/lib/clamav
-	fowners clamav:clamav /var/lib/clamav
-	keepdir /var/run/clamav
-	fowners clamav:clamav /var/run/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:" \
-		"${ED}"/etc/clamd.conf
-	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:" \
-		"${ED}"/etc/freshclam.conf
-
-	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
-		cat > "${ED}"/etc/conf.d/clamd <<-EOF
-			MILTER_NICELEVEL=19
-			START_MILTER=no
-		EOF
-	fi
-
-	prune_libtool_files
-}
-
-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
-}
diff --git a/app-antivirus/clamav/clamav-0.97.6-r1.ebuild b/app-antivirus/clamav/clamav-0.97.6-r1.ebuild
deleted file mode 100644
index eb40c300a990..000000000000
--- a/app-antivirus/clamav/clamav-0.97.6-r1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.97.6-r1.ebuild,v 1.1 2012/12/06 10:18:29 eras Exp $
-
-EAPI=4
-
-inherit eutils flag-o-matic user
-
-DESCRIPTION="Clam Anti-Virus Scanner"
-HOMEPAGE="http://www.clamav.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="bzip2 clamdtop iconv ipv6 milter selinux static-libs uclibc"
-
-CDEPEND="bzip2? ( app-arch/bzip2 )
-	clamdtop? ( sys-libs/ncurses )
-	iconv? ( virtual/libiconv )
-	milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
-	dev-libs/libtommath
-	>=sys-libs/zlib-1.2.2
-	sys-devel/libtool"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-clamav )"
-
-RESTRICT="test"
-
-DOCS=( AUTHORS BUGS ChangeLog FAQ INSTALL NEWS README UPGRADE )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.97-nls.patch
-)
-
-pkg_setup() {
-	enewgroup clamav
-	enewuser clamav -1 -1 /dev/null clamav
-}
-
-src_prepare() {
-	use ppc64 && append-flags -mminimal-toic
-	use uclibc && export ac_cv_type_error_t=yes
-}
-
-src_configure() {
-	econf \
-		--disable-experimental \
-		--enable-id-check \
-		--with-dbdir="${EPREFIX}"/var/lib/clamav \
-		--with-system-tommath \
-		--with-zlib="${EPREFIX}"/usr \
-		$(use_enable bzip2) \
-		$(use_enable clamdtop) \
-		$(use_enable ipv6) \
-		$(use_enable milter) \
-		$(use_enable static-libs static) \
-		$(use_with iconv)
-}
-
-src_install() {
-	default
-
-	rm -rf "${ED}"/var/lib/clamav
-	newinitd "${FILESDIR}"/clamd.initd-r1 clamd
-	newconfd "${FILESDIR}"/clamd.conf clamd
-
-	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:" \
-		"${ED}"/etc/clamd.conf
-	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:" \
-		"${ED}"/etc/freshclam.conf
-
-	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
-		cat > "${ED}"/etc/conf.d/clamd <<-EOF
-			MILTER_NICELEVEL=19
-			START_MILTER=no
-		EOF
-	fi
-
-	prune_libtool_files --all
-}
-
-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
-}
diff --git a/app-antivirus/clamav/clamav-0.97.6-r2.ebuild b/app-antivirus/clamav/clamav-0.97.6-r2.ebuild
deleted file mode 100644
index 8099c8adbfd5..000000000000
--- a/app-antivirus/clamav/clamav-0.97.6-r2.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.97.6-r2.ebuild,v 1.9 2013/02/26 14:50:41 jer Exp $
-
-EAPI=4
-
-inherit eutils flag-o-matic user
-
-DESCRIPTION="Clam Anti-Virus Scanner"
-HOMEPAGE="http://www.clamav.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="bzip2 clamdtop iconv ipv6 milter selinux static-libs uclibc"
-
-CDEPEND="bzip2? ( app-arch/bzip2 )
-	clamdtop? ( sys-libs/ncurses )
-	iconv? ( virtual/libiconv )
-	milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
-	dev-libs/libtommath
-	>=sys-libs/zlib-1.2.2
-	sys-devel/libtool"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-clamav )"
-
-RESTRICT="test"
-
-DOCS=( AUTHORS BUGS ChangeLog FAQ INSTALL NEWS README UPGRADE )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.97-nls.patch
-)
-
-pkg_setup() {
-	enewgroup clamav
-	enewuser clamav -1 -1 /dev/null clamav
-}
-
-src_prepare() {
-	use ppc64 && append-flags -mminimal-toic
-	use uclibc && export ac_cv_type_error_t=yes
-}
-
-src_configure() {
-	econf \
-		--disable-experimental \
-		--enable-id-check \
-		--with-dbdir="${EPREFIX}"/var/lib/clamav \
-		--with-system-tommath \
-		--with-zlib="${EPREFIX}"/usr \
-		$(use_enable bzip2) \
-		$(use_enable clamdtop) \
-		$(use_enable ipv6) \
-		$(use_enable milter) \
-		$(use_enable static-libs static) \
-		$(use_with iconv)
-}
-
-src_install() {
-	default
-
-	rm -rf "${ED}"/var/lib/clamav
-	newinitd "${FILESDIR}"/clamd.initd-r2 clamd
-	newconfd "${FILESDIR}"/clamd.conf clamd
-
-	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:" \
-		"${ED}"/etc/clamd.conf
-	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:" \
-		"${ED}"/etc/freshclam.conf
-
-	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
-		cat > "${ED}"/etc/conf.d/clamd <<-EOF
-			MILTER_NICELEVEL=19
-			START_MILTER=no
-		EOF
-	fi
-
-	prune_libtool_files --all
-}
-
-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
-}
diff --git a/app-antivirus/clamav/clamav-0.97.6-r3.ebuild b/app-antivirus/clamav/clamav-0.97.6-r3.ebuild
deleted file mode 100644
index ebe6786d3f6d..000000000000
--- a/app-antivirus/clamav/clamav-0.97.6-r3.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.97.6-r3.ebuild,v 1.1 2013/03/01 08:18:17 eras Exp $
-
-EAPI=4
-
-inherit eutils flag-o-matic user
-
-DESCRIPTION="Clam Anti-Virus Scanner"
-HOMEPAGE="http://www.clamav.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="bzip2 clamdtop iconv ipv6 milter selinux static-libs uclibc"
-
-CDEPEND="bzip2? ( app-arch/bzip2 )
-	clamdtop? ( sys-libs/ncurses )
-	iconv? ( virtual/libiconv )
-	milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
-	dev-libs/libtommath
-	>=sys-libs/zlib-1.2.2
-	sys-devel/libtool"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-clamav )"
-
-RESTRICT="test"
-
-DOCS=( AUTHORS BUGS ChangeLog FAQ INSTALL NEWS README UPGRADE )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.97-nls.patch
-)
-
-pkg_setup() {
-	enewgroup clamav
-	enewuser clamav -1 -1 /dev/null clamav
-}
-
-src_prepare() {
-	use ppc64 && append-flags -mminimal-toic
-	use uclibc && export ac_cv_type_error_t=yes
-}
-
-src_configure() {
-	econf \
-		--disable-experimental \
-		--enable-id-check \
-		--with-dbdir="${EPREFIX}"/var/lib/clamav \
-		--with-system-tommath \
-		--with-zlib="${EPREFIX}"/usr \
-		$(use_enable bzip2) \
-		$(use_enable clamdtop) \
-		$(use_enable ipv6) \
-		$(use_enable milter) \
-		$(use_enable static-libs static) \
-		$(use_with iconv)
-}
-
-src_install() {
-	default
-
-	rm -rf "${ED}"/var/lib/clamav
-	newinitd "${FILESDIR}"/clamd.initd-r3 clamd
-	newconfd "${FILESDIR}"/clamd.conf clamd
-
-	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:" \
-		"${ED}"/etc/clamd.conf
-	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:" \
-		"${ED}"/etc/freshclam.conf
-
-	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
-		cat > "${ED}"/etc/conf.d/clamd <<-EOF
-			MILTER_NICELEVEL=19
-			START_MILTER=no
-		EOF
-	fi
-
-	prune_libtool_files --all
-}
-
-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
-}
diff --git a/app-antivirus/clamav/clamav-0.97.6.ebuild b/app-antivirus/clamav/clamav-0.97.6.ebuild
deleted file mode 100644
index 44df2ecd8784..000000000000
--- a/app-antivirus/clamav/clamav-0.97.6.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.97.6.ebuild,v 1.1 2012/09/18 09:04:23 radhermit Exp $
-
-EAPI=4
-
-inherit eutils flag-o-matic user
-
-DESCRIPTION="Clam Anti-Virus Scanner"
-HOMEPAGE="http://www.clamav.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="bzip2 clamdtop iconv ipv6 milter selinux static-libs"
-
-CDEPEND="bzip2? ( app-arch/bzip2 )
-	clamdtop? ( sys-libs/ncurses )
-	iconv? ( virtual/libiconv )
-	milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
-	dev-libs/libtommath
-	>=sys-libs/zlib-1.2.2
-	sys-devel/libtool"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-clamav )"
-
-RESTRICT="test"
-
-DOCS=( AUTHORS BUGS ChangeLog FAQ INSTALL NEWS README UPGRADE )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.97-nls.patch
-)
-
-pkg_setup() {
-	enewgroup clamav
-	enewuser clamav -1 -1 /dev/null clamav
-}
-
-src_prepare() {
-	use ppc64 && append-flags -mminimal-toc
-}
-
-src_configure() {
-	econf \
-		--disable-experimental \
-		--enable-id-check \
-		--with-dbdir="${EPREFIX}"/var/lib/clamav \
-		--with-system-tommath \
-		--with-zlib="${EPREFIX}"/usr \
-		$(use_enable bzip2) \
-		$(use_enable clamdtop) \
-		$(use_enable ipv6) \
-		$(use_enable milter) \
-		$(use_enable static-libs static) \
-		$(use_with iconv)
-}
-
-src_install() {
-	default
-
-	rm -rf "${ED}"/var/lib/clamav
-	newinitd "${FILESDIR}"/clamd.initd clamd
-	newconfd "${FILESDIR}"/clamd.conf clamd
-
-	keepdir /var/lib/clamav
-	fowners clamav:clamav /var/lib/clamav
-	keepdir /var/run/clamav
-	fowners clamav:clamav /var/run/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:" \
-		"${ED}"/etc/clamd.conf
-	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:" \
-		"${ED}"/etc/freshclam.conf
-
-	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
-		cat > "${ED}"/etc/conf.d/clamd <<-EOF
-			MILTER_NICELEVEL=19
-			START_MILTER=no
-		EOF
-	fi
-
-	prune_libtool_files --all
-}
-
-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
-}
diff --git a/app-antivirus/clamav/clamav-0.97.7-r1.ebuild b/app-antivirus/clamav/clamav-0.97.7-r1.ebuild
deleted file mode 100644
index bef8efd86559..000000000000
--- a/app-antivirus/clamav/clamav-0.97.7-r1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.97.7-r1.ebuild,v 1.1 2013/03/25 14:34:52 eras Exp $
-
-EAPI=5
-
-inherit eutils flag-o-matic user
-
-DESCRIPTION="Clam Anti-Virus Scanner"
-HOMEPAGE="http://www.clamav.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="bzip2 clamdtop iconv ipv6 milter selinux static-libs uclibc"
-
-CDEPEND="bzip2? ( app-arch/bzip2 )
-	clamdtop? ( sys-libs/ncurses )
-	iconv? ( virtual/libiconv )
-	milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
-	dev-libs/libtommath
-	>=sys-libs/zlib-1.2.2
-	sys-devel/libtool"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-clamav )"
-
-RESTRICT="test"
-
-DOCS=( AUTHORS BUGS ChangeLog FAQ INSTALL NEWS README UPGRADE )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.97-nls.patch
-)
-
-pkg_setup() {
-	enewgroup clamav
-	enewuser clamav -1 -1 /dev/null clamav
-}
-
-src_prepare() {
-	use ppc64 && append-flags -mminimal-toic
-	use uclibc && export ac_cv_type_error_t=yes
-}
-
-src_configure() {
-	econf \
-		--disable-experimental \
-		--enable-id-check \
-		--with-dbdir="${EPREFIX}"/var/lib/clamav \
-		--with-system-tommath \
-		--with-zlib="${EPREFIX}"/usr \
-		$(use_enable bzip2) \
-		$(use_enable clamdtop) \
-		$(use_enable ipv6) \
-		$(use_enable milter) \
-		$(use_enable static-libs static) \
-		$(use_with iconv)
-}
-
-src_install() {
-	default
-
-	rm -rf "${ED}"/var/lib/clamav
-	newinitd "${FILESDIR}"/clamd.initd-r4 clamd
-	newconfd "${FILESDIR}"/clamd.conf clamd
-
-	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:" \
-		"${ED}"/etc/clamd.conf
-	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:" \
-		"${ED}"/etc/freshclam.conf
-
-	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
-		cat > "${ED}"/etc/conf.d/clamd <<-EOF
-			MILTER_NICELEVEL=19
-			START_MILTER=no
-		EOF
-	fi
-
-	prune_libtool_files --all
-}
-
-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
-}
diff --git a/app-antivirus/clamav/clamav-0.97.7-r2.ebuild b/app-antivirus/clamav/clamav-0.97.7-r2.ebuild
deleted file mode 100644
index c5c2e32e58d3..000000000000
--- a/app-antivirus/clamav/clamav-0.97.7-r2.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.97.7-r2.ebuild,v 1.1 2013/04/01 12:51:53 eras Exp $
-
-EAPI=5
-
-inherit eutils flag-o-matic user
-
-DESCRIPTION="Clam Anti-Virus Scanner"
-HOMEPAGE="http://www.clamav.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="bzip2 clamdtop iconv ipv6 milter selinux static-libs uclibc"
-
-CDEPEND="bzip2? ( app-arch/bzip2 )
-	clamdtop? ( sys-libs/ncurses )
-	iconv? ( virtual/libiconv )
-	milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
-	dev-libs/libtommath
-	>=sys-libs/zlib-1.2.2
-	sys-devel/libtool"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-clamav )"
-
-RESTRICT="test"
-
-DOCS=( AUTHORS BUGS ChangeLog FAQ INSTALL NEWS README UPGRADE )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.97-nls.patch
-)
-
-pkg_setup() {
-	enewgroup clamav
-	enewuser clamav -1 -1 /dev/null clamav
-}
-
-src_prepare() {
-	use ppc64 && append-flags -mminimal-toic
-	use uclibc && export ac_cv_type_error_t=yes
-}
-
-src_configure() {
-	econf \
-		--disable-experimental \
-		--enable-id-check \
-		--with-dbdir="${EPREFIX}"/var/lib/clamav \
-		--with-system-tommath \
-		--with-zlib="${EPREFIX}"/usr \
-		$(use_enable bzip2) \
-		$(use_enable clamdtop) \
-		$(use_enable ipv6) \
-		$(use_enable milter) \
-		$(use_enable static-libs static) \
-		$(use_with iconv)
-}
-
-src_install() {
-	default
-
-	rm -rf "${ED}"/var/lib/clamav
-	newinitd "${FILESDIR}"/clamd.initd-r5 clamd
-	newconfd "${FILESDIR}"/clamd.conf clamd
-
-	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:" \
-		"${ED}"/etc/clamd.conf
-	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:" \
-		"${ED}"/etc/freshclam.conf
-
-	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
-		cat > "${ED}"/etc/conf.d/clamd <<-EOF
-			MILTER_NICELEVEL=19
-			START_MILTER=no
-		EOF
-	fi
-
-	prune_libtool_files --all
-}
-
-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
-}
diff --git a/app-antivirus/clamav/files/clamd.initd b/app-antivirus/clamav/files/clamd.initd
deleted file mode 100755
index 40ccd00bd6be..000000000000
--- a/app-antivirus/clamav/files/clamd.initd
+++ /dev/null
@@ -1,119 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/files/clamd.initd,v 1.2 2012/08/11 13:12:35 eras Exp $
-
-daemon_clamd="/usr/sbin/clamd"
-daemon_freshclam="/usr/bin/freshclam"
-daemon_milter="/usr/sbin/clamav-milter"
-
-extra_commands="logfix"
-
-depend() {
-	use net
-	provide antivirus
-}
-
-get_config() {
-	clamconf | sed 's/["=]//g' | \
-	awk "{
-	if(\$0==\"Config file: $1.conf\") S=1
-	if(S==1&&\$0==\"\") {
-		print \"$3\"
-		exit
-	}
-	if(S==1&&\$1~\"^$2\$\") {
-		print \$2!=\"disabled\"?\$2:\"$3\"
-		exit
-	}
-	}"
-}
-
-start() {
-	local clamd_socket=$(get_config clamd LocalSocket /tmp/clamd)
-	logfix
-
-	if [ "${START_CLAMD}" = "yes" ]; then
-		checkpath --quiet \
-			--owner $(get_config clamd User clamav):root \
-			--directory `dirname ${clamd_socket}`
-		if [ -S "${clamd_socket}" ]; then
-			rm -f ${clamd_socket}
-		fi
-		ebegin "Starting clamd"
-		start-stop-daemon --start --quiet \
-			--nicelevel ${CLAMD_NICELEVEL:-0} \
-			--exec ${daemon_clamd}
-		eend $? "Failed to start clamd"
-	fi
-
-	if [ "${START_FRESHCLAM}" = "yes" ]; then
-		ebegin "Starting freshclam"
-		start-stop-daemon --start --quiet \
-			--nicelevel ${FRESHCLAM_NICELEVEL:-0} \
-			--exec ${daemon_freshclam} -- -d
-		retcode=$?
-		if [ ${retcode} = 1 ]; then
-			eend 0
-			einfo "Virus databases are already up to date."
-		else
-			eend ${retcode} "Failed to start freshclam"
-		fi
-	fi
-
-	if [ "${START_MILTER}" = "yes" ]; then
-		if [ -z "${MILTER_CONF_FILE}" ]; then
-			MILTER_CONF_FILE="/etc/clamav-milter.conf"
-		fi
-
-		ebegin "Starting clamav-milter"
-		start-stop-daemon --start --quiet \
-			--nicelevel ${MILTER_NICELEVEL:-0} \
-			--exec ${daemon_milter} -- -c ${MILTER_CONF_FILE}
-		eend $? "Failed to start clamav-milter"
-	fi
-}
-
-stop() {
-	if [ "${START_CLAMD}" = "yes" ]; then
-		ebegin "Stopping clamd"
-		start-stop-daemon --stop --quiet --name clamd
-		eend $? "Failed to stop clamd"
-	fi
-	if [ "${START_FRESHCLAM}" = "yes" ]; then
-		ebegin "Stopping freshclam"
-		start-stop-daemon --stop --quiet --name freshclam
-		eend $? "Failed to stop freshclam"
-	fi
-	if [ "${START_MILTER}" = "yes" ]; then
-		ebegin "Stopping clamav-milter"
-		start-stop-daemon --stop --quiet --name clamav-milter
-		eend $? "Failed to stop clamav-milter"
-	fi
-}
-
-logfix() {
-	if [ "${START_CLAMD}" = "yes" ]; then
-		# fix clamd log permissions
-		# (might be clobbered by logrotate or something)
-		local logfile=$(get_config clamd LogFile)
-		if [ -n "${logfile}" ]; then
-			checkpath --quiet \
-				--owner $(get_config clamd User clamav):root \
-				--mode 640 \
-				--file ${logfile}
-		fi
-	fi
-
-	if [ "${START_FRESHCLAM}" = "yes" ]; then
-		# fix freshclam log permissions
-		# (might be clobbered by logrotate or something)
-		local logfile=$(get_config freshclam UpdateLogFile)
-		if [ -n "${logfile}" ]; then
-			checkpath --quiet \
-				--owner $(get_config freshclam DatabaseOwner clamav):root \
-				--mode 640 \
-				--file ${logfile}
-		fi
-	fi
-}
diff --git a/app-antivirus/clamav/files/clamd.initd-r1 b/app-antivirus/clamav/files/clamd.initd-r1
deleted file mode 100755
index f49db70c2218..000000000000
--- a/app-antivirus/clamav/files/clamd.initd-r1
+++ /dev/null
@@ -1,119 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/files/clamd.initd-r1,v 1.1 2012/12/06 10:18:29 eras Exp $
-
-daemon_clamd="/usr/sbin/clamd"
-daemon_freshclam="/usr/bin/freshclam"
-daemon_milter="/usr/sbin/clamav-milter"
-
-extra_commands="logfix"
-
-depend() {
-	use net
-	provide antivirus
-}
-
-get_config() {
-	clamconf | sed 's/["=]//g' | \
-	awk "{
-	if(\$0==\"Config file: $1.conf\") S=1
-	if(S==1&&\$0==\"\") {
-		print \"$3\"
-		exit
-	}
-	if(S==1&&\$1~\"^$2\$\") {
-		print \$2!=\"disabled\"?\$2:\"$3\"
-		exit
-	}
-	}"
-}
-
-start() {
-	local clamd_socket=$(get_config clamd LocalSocket /tmp/clamd)
-	logfix
-
-	if [ "${START_CLAMD}" = "yes" ]; then
-		checkpath --quiet --mode 755 \
-			--owner $(get_config clamd User clamav):root \
-			--directory `dirname ${clamd_socket}`
-		if [ -S "${clamd_socket}" ]; then
-			rm -f ${clamd_socket}
-		fi
-		ebegin "Starting clamd"
-		start-stop-daemon --start --quiet \
-			--nicelevel ${CLAMD_NICELEVEL:-0} \
-			--exec ${daemon_clamd}
-		eend $? "Failed to start clamd"
-	fi
-
-	if [ "${START_FRESHCLAM}" = "yes" ]; then
-		ebegin "Starting freshclam"
-		start-stop-daemon --start --quiet \
-			--nicelevel ${FRESHCLAM_NICELEVEL:-0} \
-			--exec ${daemon_freshclam} -- -d
-		retcode=$?
-		if [ ${retcode} = 1 ]; then
-			eend 0
-			einfo "Virus databases are already up to date."
-		else
-			eend ${retcode} "Failed to start freshclam"
-		fi
-	fi
-
-	if [ "${START_MILTER}" = "yes" ]; then
-		if [ -z "${MILTER_CONF_FILE}" ]; then
-			MILTER_CONF_FILE="/etc/clamav-milter.conf"
-		fi
-
-		ebegin "Starting clamav-milter"
-		start-stop-daemon --start --quiet \
-			--nicelevel ${MILTER_NICELEVEL:-0} \
-			--exec ${daemon_milter} -- -c ${MILTER_CONF_FILE}
-		eend $? "Failed to start clamav-milter"
-	fi
-}
-
-stop() {
-	if [ "${START_CLAMD}" = "yes" ]; then
-		ebegin "Stopping clamd"
-		start-stop-daemon --stop --quiet --name clamd
-		eend $? "Failed to stop clamd"
-	fi
-	if [ "${START_FRESHCLAM}" = "yes" ]; then
-		ebegin "Stopping freshclam"
-		start-stop-daemon --stop --quiet --name freshclam
-		eend $? "Failed to stop freshclam"
-	fi
-	if [ "${START_MILTER}" = "yes" ]; then
-		ebegin "Stopping clamav-milter"
-		start-stop-daemon --stop --quiet --name clamav-milter
-		eend $? "Failed to stop clamav-milter"
-	fi
-}
-
-logfix() {
-	if [ "${START_CLAMD}" = "yes" ]; then
-		# fix clamd log permissions
-		# (might be clobbered by logrotate or something)
-		local logfile=$(get_config clamd LogFile)
-		if [ -n "${logfile}" ]; then
-			checkpath --quiet \
-				--owner $(get_config clamd User clamav):root \
-				--mode 640 \
-				--file ${logfile}
-		fi
-	fi
-
-	if [ "${START_FRESHCLAM}" = "yes" ]; then
-		# fix freshclam log permissions
-		# (might be clobbered by logrotate or something)
-		local logfile=$(get_config freshclam UpdateLogFile)
-		if [ -n "${logfile}" ]; then
-			checkpath --quiet \
-				--owner $(get_config freshclam DatabaseOwner clamav):root \
-				--mode 640 \
-				--file ${logfile}
-		fi
-	fi
-}
diff --git a/app-antivirus/clamav/files/clamd.initd-r2 b/app-antivirus/clamav/files/clamd.initd-r2
deleted file mode 100755
index 12257e191f8f..000000000000
--- a/app-antivirus/clamav/files/clamd.initd-r2
+++ /dev/null
@@ -1,119 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/files/clamd.initd-r2,v 1.1 2012/12/11 18:38:00 eras Exp $
-
-daemon_clamd="/usr/sbin/clamd"
-daemon_freshclam="/usr/bin/freshclam"
-daemon_milter="/usr/sbin/clamav-milter"
-
-extra_commands="logfix"
-
-depend() {
-	use net
-	provide antivirus
-}
-
-get_config() {
-	clamconf | sed 's/["=]//g' | \
-	awk "{
-	if(\$0==\"Config file: $1.conf\") S=1
-	if(S==1&&\$0==\"\") {
-		print \"$3\"
-		exit
-	}
-	if(S==1&&\$1~\"^$2\$\") {
-		print \$2!=\"disabled\"?\$2:\"$3\"
-		exit
-	}
-	}"
-}
-
-start() {
-	local clamd_socket=$(get_config clamd LocalSocket /var/run/clamav/clamd.sock)
-	logfix
-
-	if [ "${START_CLAMD}" = "yes" ]; then
-		checkpath --quiet --mode 755 \
-			--owner $(get_config clamd User clamav):root \
-			--directory `dirname ${clamd_socket}`
-		if [ -S "${clamd_socket}" ]; then
-			rm -f ${clamd_socket}
-		fi
-		ebegin "Starting clamd"
-		start-stop-daemon --start --quiet \
-			--nicelevel ${CLAMD_NICELEVEL:-0} \
-			--exec ${daemon_clamd}
-		eend $? "Failed to start clamd"
-	fi
-
-	if [ "${START_FRESHCLAM}" = "yes" ]; then
-		ebegin "Starting freshclam"
-		start-stop-daemon --start --quiet \
-			--nicelevel ${FRESHCLAM_NICELEVEL:-0} \
-			--exec ${daemon_freshclam} -- -d
-		retcode=$?
-		if [ ${retcode} = 1 ]; then
-			eend 0
-			einfo "Virus databases are already up to date."
-		else
-			eend ${retcode} "Failed to start freshclam"
-		fi
-	fi
-
-	if [ "${START_MILTER}" = "yes" ]; then
-		if [ -z "${MILTER_CONF_FILE}" ]; then
-			MILTER_CONF_FILE="/etc/clamav-milter.conf"
-		fi
-
-		ebegin "Starting clamav-milter"
-		start-stop-daemon --start --quiet \
-			--nicelevel ${MILTER_NICELEVEL:-0} \
-			--exec ${daemon_milter} -- -c ${MILTER_CONF_FILE}
-		eend $? "Failed to start clamav-milter"
-	fi
-}
-
-stop() {
-	if [ "${START_CLAMD}" = "yes" ]; then
-		ebegin "Stopping clamd"
-		start-stop-daemon --stop --quiet --name clamd
-		eend $? "Failed to stop clamd"
-	fi
-	if [ "${START_FRESHCLAM}" = "yes" ]; then
-		ebegin "Stopping freshclam"
-		start-stop-daemon --stop --quiet --name freshclam
-		eend $? "Failed to stop freshclam"
-	fi
-	if [ "${START_MILTER}" = "yes" ]; then
-		ebegin "Stopping clamav-milter"
-		start-stop-daemon --stop --quiet --name clamav-milter
-		eend $? "Failed to stop clamav-milter"
-	fi
-}
-
-logfix() {
-	if [ "${START_CLAMD}" = "yes" ]; then
-		# fix clamd log permissions
-		# (might be clobbered by logrotate or something)
-		local logfile=$(get_config clamd LogFile)
-		if [ -n "${logfile}" ]; then
-			checkpath --quiet \
-				--owner $(get_config clamd User clamav):root \
-				--mode 640 \
-				--file ${logfile}
-		fi
-	fi
-
-	if [ "${START_FRESHCLAM}" = "yes" ]; then
-		# fix freshclam log permissions
-		# (might be clobbered by logrotate or something)
-		local logfile=$(get_config freshclam UpdateLogFile)
-		if [ -n "${logfile}" ]; then
-			checkpath --quiet \
-				--owner $(get_config freshclam DatabaseOwner clamav):root \
-				--mode 640 \
-				--file ${logfile}
-		fi
-	fi
-}
diff --git a/app-antivirus/clamav/files/clamd.initd-r4 b/app-antivirus/clamav/files/clamd.initd-r4
deleted file mode 100755
index e54aba48db7e..000000000000
--- a/app-antivirus/clamav/files/clamd.initd-r4
+++ /dev/null
@@ -1,121 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/files/clamd.initd-r4,v 1.2 2013/03/27 08:52:03 eras Exp $
-
-daemon_clamd="/usr/sbin/clamd"
-daemon_freshclam="/usr/bin/freshclam"
-daemon_milter="/usr/sbin/clamav-milter"
-
-extra_commands="logfix"
-
-depend() {
-	use net
-	provide antivirus
-}
-
-get_config() {
-	clamconf | sed 's/["=]//g' | \
-	awk "{
-	if(\$0==\"Config file: $1.conf\") S=1
-	if(S==1&&\$0==\"\") {
-		print \"$3\"
-		exit
-	}
-	if(S==1&&\$1~\"^$2\$\") {
-		print \$2!=\"disabled\"?\$2:\"$3\"
-		exit
-	}
-	}"
-}
-
-start() {
-	clamd_socket=$(get_config clamd LocalSocket /var/run/clamav/clamd.sock)
-	clamd_user=$(get_config clamd User clamav)
-	freshclam_user=$(get_config freshclam DatabaseOwner clamav)
-	logfix
-
-	if [ "${START_CLAMD}" = "yes" ]; then
-		checkpath --quiet --mode 755 \
-			--owner "${clamd_user}":"${clamd_user}" \
-			--directory `dirname ${clamd_socket}`
-		if [ -S "${clamd_socket}" ]; then
-			rm -f ${clamd_socket}
-		fi
-		ebegin "Starting clamd"
-		start-stop-daemon --start --quiet \
-			--nicelevel ${CLAMD_NICELEVEL:-0} \
-			--exec ${daemon_clamd}
-		eend $? "Failed to start clamd"
-	fi
-
-	if [ "${START_FRESHCLAM}" = "yes" ]; then
-		ebegin "Starting freshclam"
-		start-stop-daemon --start --quiet \
-			--nicelevel ${FRESHCLAM_NICELEVEL:-0} \
-			--exec ${daemon_freshclam} -- -d
-		retcode=$?
-		if [ ${retcode} = 1 ]; then
-			eend 0
-			einfo "Virus databases are already up to date."
-		else
-			eend ${retcode} "Failed to start freshclam"
-		fi
-	fi
-
-	if [ "${START_MILTER}" = "yes" ]; then
-		if [ -z "${MILTER_CONF_FILE}" ]; then
-			MILTER_CONF_FILE="/etc/clamav-milter.conf"
-		fi
-
-		ebegin "Starting clamav-milter"
-		start-stop-daemon --start --quiet \
-			--nicelevel ${MILTER_NICELEVEL:-0} \
-			--exec ${daemon_milter} -- -c ${MILTER_CONF_FILE}
-		eend $? "Failed to start clamav-milter"
-	fi
-}
-
-stop() {
-	if [ "${START_CLAMD}" = "yes" ]; then
-		ebegin "Stopping clamd"
-		start-stop-daemon --stop --quiet --name clamd
-		eend $? "Failed to stop clamd"
-	fi
-	if [ "${START_FRESHCLAM}" = "yes" ]; then
-		ebegin "Stopping freshclam"
-		start-stop-daemon --stop --quiet --name freshclam
-		eend $? "Failed to stop freshclam"
-	fi
-	if [ "${START_MILTER}" = "yes" ]; then
-		ebegin "Stopping clamav-milter"
-		start-stop-daemon --stop --quiet --name clamav-milter
-		eend $? "Failed to stop clamav-milter"
-	fi
-}
-
-logfix() {
-	if [ "${START_CLAMD}" = "yes" ]; then
-		# fix clamd log permissions
-		# (might be clobbered by logrotate or something)
-		local logfile=$(get_config clamd LogFile)
-		if [ -n "${logfile}" ]; then
-			checkpath --quiet \
-				--owner "${clamd_user}":"${clamd_user}" \
-				--mode 640 \
-				--file ${logfile}
-		fi
-	fi
-
-	if [ "${START_FRESHCLAM}" = "yes" ]; then
-		# fix freshclam log permissions
-		# (might be clobbered by logrotate or something)
-		local logfile=$(get_config freshclam UpdateLogFile)
-		if [ -n "${logfile}" ]; then
-			checkpath --quiet \
-				--owner "${freshclam_user}":"${freshclam_user}" \
-				--mode 640 \
-				--file ${logfile}
-		fi
-	fi
-}