Remove package.

16 files changed, 0 insertions, 1120 deletions

diff --git a/mail-filter/dk-milter/ChangeLog b/mail-filter/dk-milter/ChangeLog
deleted file mode 100644
index 5386f5dbd4e5..000000000000
--- a/mail-filter/dk-milter/ChangeLog
+++ /dev/null
@@ -1,97 +0,0 @@
-# ChangeLog for mail-filter/dk-milter
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dk-milter/ChangeLog,v 1.21 2012/04/06 21:50:00 pacho Exp $
-
-  06 Apr 2012; Pacho Ramos <pacho@gentoo.org> metadata.xml:
-  Drop maintainer due retirement, bug #63588
-
-  10 Jun 2011; Eray Aslan <eras@gentoo.org> files/dk-filter.init:
-  Remove stale socket on start up - bug #355443. Thanks to Alexey Lapitsky
-
-*dk-milter-1.0.2-r1 (22 Aug 2009)
-
-  22 Aug 2009; Alin Năstac <mrness@gentoo.org> -dk-milter-1.0.2.ebuild,
-  +dk-milter-1.0.2-r1.ebuild:
-  Use shared libmilter library (#245950).
-
-  15 Aug 2009; Alin Năstac <mrness@gentoo.org> dk-milter-1.0.2.ebuild:
-  Set /var/lib/milter as home directory for milter user (#280571).
-
-  09 May 2009; Alin Năstac <mrness@gentoo.org>
-  -files/dk-milter-1.0.1-as-needed.patch, -dk-milter-1.0.1-r1.ebuild,
-  dk-milter-1.0.2.ebuild:
-  Migrate to EAPI 2.
-
-*dk-milter-1.0.2 (07 Mar 2009)
-
-  07 Mar 2009; Alin Năstac <mrness@gentoo.org>
-  +files/dk-milter-1.0.2-as-needed.patch, +dk-milter-1.0.2.ebuild:
-  Version bump.
-
-*dk-milter-1.0.1-r1 (12 Dec 2008)
-
-  12 Dec 2008; Alin Năstac <mrness@gentoo.org>
-  +files/dk-milter-1.0.1-as-needed.patch, files/gentoo.config.m4,
-  -dk-milter-1.0.0.ebuild, -dk-milter-1.0.1.ebuild,
-  +dk-milter-1.0.1-r1.ebuild:
-  Set LDFLAGS and fix linker errors when --as-needed is used (#247715).
-
-*dk-milter-1.0.1 (19 Oct 2008)
-
-  19 Oct 2008; Alin Năstac <mrness@gentoo.org> -dk-milter-0.6.0.ebuild,
-  +dk-milter-1.0.1.ebuild:
-  Version bump.
-
-*dk-milter-1.0.0 (08 Jun 2008)
-
-  08 Jun 2008; Alin Năstac <mrness@gentoo.org> +dk-milter-1.0.0.ebuild:
-  Version bump.
-
-  29 Jan 2008; Alin Năstac <mrness@gentoo.org> dk-milter-0.6.0.ebuild:
-  Remove libmilter atom from run-time dependencies.
-
-  04 Jan 2008; Alin Năstac <mrness@gentoo.org> metadata.xml:
-  Correct maintaner attribute.
-
-  04 Nov 2007; Alin Năstac <mrness@gentoo.org> dk-milter-0.6.0.ebuild:
-  Remove useless pkg_setup call from pkg_postinst.
-
-*dk-milter-0.6.0 (12 Oct 2007)
-
-  12 Oct 2007; Alin Năstac <mrness@gentoo.org>
-  -files/dk-milter-0.4.1-queueID.patch, files/dk-filter.conf,
-  files/dk-filter.init, +files/gentoo.config.m4, -files/gentxt.sh,
-  -files/site.config.m4, metadata.xml, -dk-milter-0.4.1.ebuild,
-  +dk-milter-0.6.0.ebuild:
-  Redesign the ebuild taking dkim-milter as model (#178501).
-  Add myself as maintainer. Add ~amd64 keyword.
-
-  20 Jul 2006; Tuấn Văn <langthang@gentoo.org> files/dk-filter.init:
-  add some sanity checking.
-
-  18 Jul 2006; Tuấn Văn <langthang@gentoo.org>
-  +files/dk-milter-0.4.1-queueID.patch, files/dk-filter.conf,
-  files/dk-filter.init, dk-milter-0.4.1.ebuild:
-  add postfix queue ID patch workaround.
-  cosmetic clean up.
-
-  16 Jul 2006; Tuấn Văn <langthang@gentoo.org> dk-milter-0.4.1.ebuild:
-  add man pages.
-
-  15 Jul 2006; Tuấn Văn <langthang@gentoo.org> dk-milter-0.4.1.ebuild:
-  another s/milter/filter.
-
-  15 Jul 2006; Tuấn Văn <langthang@gentoo.org> +files/gentxt.sh,
-  dk-milter-0.4.1.ebuild:
-  convert gentxt.csh to gentxt.sh
-
-  15 Jul 2006; Tuấn Văn <langthang@gentoo.org> dk-milter-0.4.1.ebuild:
-  s/milter/filter
-
-*dk-milter-0.4.1 (15 Jul 2006)
-
-  15 Jul 2006; Tuấn Văn <langthang@gentoo.org> +files/dk-filter.conf,
-  +files/dk-filter.init, +files/site.config.m4, +metadata.xml,
-  +dk-milter-0.4.1.ebuild:
-  Initial commit.
-
diff --git a/mail-filter/dk-milter/Manifest b/mail-filter/dk-milter/Manifest
deleted file mode 100644
index d1eb03d3d1d6..000000000000
--- a/mail-filter/dk-milter/Manifest
+++ /dev/null
@@ -1,18 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX dk-filter.conf 346 RMD160 9a247255de0200e34cca4a4df03f73252ac1d5b6 SHA1 4e8548264e4513de98992f8523d5adefa54ea2f5 SHA256 b2e1ed85f0c05bb3fccc4fafaabb8b169919f0b2256e70d8e777f5241912192c
-AUX dk-filter.init 1494 RMD160 a4c9245f0054fd6738c8ad652a158ce50cc61fd6 SHA1 34c54bba2bd52b1e0d86ddc6aad6bc403b087f14 SHA256 4fc531c1a71122ae81c333485cc4388b726228cfc6501288ec770b12ee190644
-AUX dk-milter-1.0.2-as-needed.patch 1088 RMD160 73fd57228aaa12cca34a44602556f580c9d75c07 SHA1 8eca272134ff114d12c46dd3eb28cc5887871b7f SHA256 67d3412716e7bcca62fce50bcfe3cdb14e3b67a9cf51c411008b29b2579ffb4c
-AUX gentoo.config.m4 170 RMD160 bb4afa7a2414c94100efce7033ebc9cdac5dbdef SHA1 8069d083ba6eadf6655ac02a5463eb2f4909371f SHA256 1b2a20a5290b7c60ea512509aaaacb773bc37964bfe0d27c1082a582a5991cd2
-DIST dk-milter-1.0.2.tar.gz 362255 RMD160 24c1b3f023257937f212e38e15b151b9a5e81caf SHA1 95b60ebb9d28c8213ce36c3fcf383faeaa3f0e6a SHA256 b671234ca4089bfe71ab4685b7ed6efaae51017ee5b389b7bf60656b182a20d9
-EBUILD dk-milter-1.0.2-r1.ebuild 4675 RMD160 84009fcf5089ed3fc767cc06cf8eb82152167c22 SHA1 47aec9b006eb90f9d2730243d1ab57f6d252f7fd SHA256 1068dc074ffd75a44a48ccccde47f1f741fc1f87b65d230047c04c446eff1bbe
-MISC ChangeLog 3396 RMD160 babce6419fce32134a9e6e8266f7298e797f9ebb SHA1 cf348e9de851bb27d45f23e8a0c8576817bd9ab7 SHA256 504072b3a1026e6b207eef337dac745a1deb638b267f8857d56bc9bf486eb71c
-MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk9/ZQ0ACgkQCaWpQKGI+9Q3wACeKVdXqDkrGx6Q7cqyyKvMUaAb
-XB0AniKGnXSNtweLG2p4qrQr1FfELsa1
-=RSx0
------END PGP SIGNATURE-----
diff --git a/mail-filter/dk-milter/dk-milter-1.0.2-r1.ebuild b/mail-filter/dk-milter/dk-milter-1.0.2-r1.ebuild
deleted file mode 100644
index d66ab6718f37..000000000000
--- a/mail-filter/dk-milter/dk-milter-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dk-milter/dk-milter-1.0.2-r1.ebuild,v 1.1 2009/08/22 22:47:13 mrness Exp $
-
-EAPI="2"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A milter-based application provide DomainKeys service"
-HOMEPAGE="http://sourceforge.net/projects/dk-milter/"
-SRC_URI="mirror://sourceforge/dk-milter/${P}.tar.gz"
-
-LICENSE="Sendmail-Open-Source"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ipv6"
-
-DEPEND="dev-libs/openssl
-	>=sys-libs/db-3.2
-	|| ( mail-filter/libmilter mail-mta/sendmail )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup milter
-	# mail-milter/spamass-milter creates milter user with this home directory
-	# For consistency reasons, milter user must be created here with this home directory
-	# even though this package doesn't need a home directory for this user (#280571)
-	enewuser milter -1 -1 /var/lib/milter milter
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-as-needed.patch
-
-	local ENVDEF=""
-	use ipv6 && ENVDEF="${ENVDEF} -DNETINET6"
-	sed -e "s:@@CFLAGS@@:${CFLAGS}:" \
-		-e "s:@@LDFLAGS@@:${LDFLAGS}:" \
-		-e "s/@@ENVDEF@@/${ENVDEF}/" \
-		"${FILESDIR}/gentoo.config.m4" > "${S}/devtools/Site/site.config.m4" \
-		|| die "failed to generate site.config.m4"
-}
-
-src_compile() {
-	emake -j1 CC="$(tc-getCC)" || die "emake failed"
-}
-
-src_install() {
-	# no other program need to read from here
-	dodir /etc/mail/dk-filter
-	fowners milter:milter /etc/mail/dk-filter
-	fperms 700 /etc/mail/dk-filter
-
-	newinitd "${FILESDIR}/dk-filter.init" dk-filter \
-		|| die "newinitd failed"
-	newconfd "${FILESDIR}/dk-filter.conf" dk-filter \
-		|| die "newconfd failed"
-
-	# prepare directory for .pid and .sock files
-	dodir /var/run/dk-filter
-	fowners milter:milter /var/run/dk-filter
-
-	dodir /usr/bin
-	emake -j1 DESTDIR="${D}" \
-		SBINOWN=root SBINGRP=root UBINOWN=root UBINGRP=root \
-		install || die "make install failed"
-
-	# man build is broken; do man page installation by hand
-	doman */*.8
-
-	# some people like docs
-	dodoc README RELEASE_NOTES KNOWNBUGS *.txt
-}
-
-pkg_postinst() {
-	ewarn "DomainKeys RFC is obsoleted by DKIM and therefore you should only use"
-	ewarn "dk-milter for verifying mail signed with DomainKeys-Signature."
-	echo
-	elog "However, if you still want to use this in sign mode, you should run"
-	elog "	emerge --config ${CATEGORY}/${PN}"
-	elog "It will help you create your key and give you hints on how"
-	elog "to configure your DNS and MTA."
-}
-
-pkg_config() {
-	local selector pubkey
-
-	read -p "Enter the selector name (default ${HOSTNAME}): " selector
-	[[ -n "${selector}" ]] || selector=${HOSTNAME}
-	if [[ -z "${selector}" ]]; then
-		eerror "Oddly enough, you don't have a HOSTNAME."
-		return 1
-	fi
-	if [[ -f "${ROOT}"etc/mail/dk-filter/${selector}.private ]]; then
-		ewarn "The private key for this selector already exists."
-	else
-		einfo "Select the size of private key:"
-		einfo "  [1] 512 bits"
-		einfo "  [2] 1024 bits"
-		while read -n 1 -s -p "  Press 1 or 2 on the keyboard to select the key size " keysize ; do
-			[[ "${keysize}" == "1" || "${keysize}" == "2" ]] && echo && break
-		done
-		case ${keysize} in
-			1) keysize=512 ;;
-			*) keysize=1024 ;;
-		esac
-
-		# generate the private and public keys
-		openssl genrsa -out "${ROOT}"etc/mail/dk-filter/${selector}.private ${keysize} && \
-			chown milter:milter "${ROOT}"etc/mail/dk-filter/${selector}.private && chmod u=r,g-rwx,o-rwx "${ROOT}"etc/mail/dk-filter/${selector}.private &&
-			openssl rsa -in "${ROOT}"etc/mail/dk-filter/${selector}.private -out "${ROOT}"etc/mail/dk-filter/${selector}.public -pubout -outform PEM || \
-				{ eerror "Failed to create private and public keys." ; return 1; }
-	fi
-
-	# dk-filter selector configuration
-	echo
-	einfo "Make sure you add these parameters to your dk-filter command line:"
-	einfo "  -b sv -d your-domain.com -H -s /etc/mail/dk-filter/${selector}.private -S ${selector}"
-
-	# MTA configuration
-	echo
-	einfo "If you are using Postfix, add following lines to your main.cf:"
-	einfo "  smtpd_milters     = unix:/var/run/dk-filter/dk-filter.sock"
-	einfo "  non_smtpd_milters = unix:/var/run/dk-filter/dk-filter.sock"
-
-	# DNS configuration
-	{
-		local line
-		pubkey=
-		while read line; do
-			[[ "${line}" == "--"* ]] || pubkey="${pubkey}${line}"
-		done
-	} < "${ROOT}"etc/mail/dk-filter/${selector}.public
-	echo
-	einfo "After you configured your MTA, publish your key by adding this TXT record to your domain:"
-	einfo "  ${selector}._domainkey   IN   TXT  \"g=\\; k=rsa\\; t=y\\; o=~\\; p=${pubkey}\""
-	echo
-	einfo "t=y signifies you only test the DK on your domain."
-	einfo "See the DomainKeys specification for more info."
-}
diff --git a/mail-filter/dk-milter/files/dk-filter.conf b/mail-filter/dk-milter/files/dk-filter.conf
deleted file mode 100644
index 89ca30d3ca28..000000000000
--- a/mail-filter/dk-milter/files/dk-filter.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-# dk-filter parameters; following ones are mandatory
-DAEMON_USER="milter"
-SOCKET_SPEC="local:/var/run/dk-filter/dk-filter.sock"
-
-# Additional options for the Domain Key Milter see dk-filter(8) for more information.
-ADDITIONAL_OPTS="-l -b v \
-	-C badsignature=reject,dnserror=tempfail,internal=tempfail,nosignature=accept,signaturemissing=reject"
diff --git a/mail-filter/dk-milter/files/dk-filter.init b/mail-filter/dk-milter/files/dk-filter.init
deleted file mode 100755
index 148a22ad8221..000000000000
--- a/mail-filter/dk-milter/files/dk-filter.init
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dk-milter/files/dk-filter.init,v 1.5 2011/06/10 11:49:10 eras Exp $
-
-depend() {
-	use dns logger net
-}
-
-PIDFILE="/var/run/dk-filter/${SVCNAME}.pid"
-
-check_cfg() {
-
-	if [ -z "${DAEMON_USER}" ] ; then
-		eerror "DAEMON_USER is unset"
-		return 1
-	fi
-
-	SOCKET_TYPE=${SOCKET_SPEC%%:*}
-	SOCKET_ADDRESS=${SOCKET_SPEC#*:}
-	if [ -z "${SOCKET_TYPE}" -o -z "${SOCKET_ADDRESS}" ]; then
-		eerror "SOCKET_SPEC is invalid"
-		return 1
-	fi
-
-	if [[ " ${ADDITIONAL_OPTS} " == *" -"[fpP]" "* ]]; then
-		eerror "-f, -p or -P are not allowed in ADDITIONAL_OPTS"
-		return 1
-	fi
-
-	if [[ "${SOCKET_TYPE}" == "local" && -S "${SOCKET_ADDRESS}" ]] ; then
-		ewarn "Strange, the socket file already exist in \"${SOCKET_ADDRESS}\""
-		ewarn "it will be removed now and re-created by the service"
-		ewarn "BUT please make your checks."
-		rm -f "${SOCKET_ADDRESS}"
-	fi
-}
-
-start() {
-	local SOCKET_TYPE SOCKET_ADDRESS
-	check_cfg || return 1
-	
-	ebegin "Starting DomainKeys filter"
-	start-stop-daemon --start --pidfile "${PIDFILE}" \
-		--exec /usr/bin/dk-filter -- -u "${DAEMON_USER}" -p "${SOCKET_SPEC}" -P "${PIDFILE}" ${ADDITIONAL_OPTS} && \
-		[ "${SOCKET_TYPE}" != "local" -a "${SOCKET_TYPE}" != "unix" ] || chmod a+rwx "${SOCKET_ADDRESS}"
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping DomainKeys filter"
-	start-stop-daemon --stop --pidfile "${PIDFILE}"
-	eend $?
-}
diff --git a/mail-filter/dk-milter/files/dk-milter-1.0.2-as-needed.patch b/mail-filter/dk-milter/files/dk-milter-1.0.2-as-needed.patch
deleted file mode 100644
index e49e3b5e03fe..000000000000
--- a/mail-filter/dk-milter/files/dk-milter-1.0.2-as-needed.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Nru dk-milter-1.0.2.orig/devtools/M4/UNIX/defines.m4 dk-milter-1.0.2/devtools/M4/UNIX/defines.m4
---- dk-milter-1.0.2.orig/devtools/M4/UNIX/defines.m4	2006-10-06 05:44:44.000000000 +0000
-+++ dk-milter-1.0.2/devtools/M4/UNIX/defines.m4	2009-03-07 14:02:10.000000000 +0000
-@@ -26,7 +26,7 @@
- CCLINK = ifdef(`confCCLINK', `confCCLINK', `confCC')
- # Linker for libraries
- LD=	ifdef(`confLD', `confLD', `confCC')
--LDOPTS=	ifdef(`confLDOPTS', `confLDOPTS') ifdef(`confMT', ifdef(`confMTLDOPTS', `confMTLDOPTS', `'), `')
-+LDOPTS=	ifdef(`confLDOPTS', `confLDOPTS')
- LDOPTS_SO= ${LDOPTS} ifdef(`confLDOPTS_SO', `confLDOPTS_SO', `-shared')
- 
- # Shell
-@@ -68,7 +68,7 @@
- LIBDIRS=confLIBDIRS
- 
- # Additional libs needed
--LIBADD= ifdef(`conf_'bldCURRENT_PRD`_LIBS', `conf_'bldCURRENT_PRD`_LIBS') 
-+LIBADD= ifdef(`conf_'bldCURRENT_PRD`_LIBS', `conf_'bldCURRENT_PRD`_LIBS') ifdef(`confMT', ifdef(`confMTLDOPTS', `confMTLDOPTS', `'), `')
- 
- # libraries required on your system
- LIBS= ${LIBADD} ifdef(`confLIBS', `confLIBS') ifdef(`conf_'bldCURRENT_PRD`_LIB_POST', `conf_'bldCURRENT_PRD`_LIB_POST') 
diff --git a/mail-filter/dk-milter/files/gentoo.config.m4 b/mail-filter/dk-milter/files/gentoo.config.m4
deleted file mode 100644
index 42fb7d3491b1..000000000000
--- a/mail-filter/dk-milter/files/gentoo.config.m4
+++ /dev/null
@@ -1,5 +0,0 @@
-define(`confNO_MAN_BUILD',`')
-define(`confOPTIMIZE', `@@CFLAGS@@')
-define(`confLDOPTS', `@@LDFLAGS@@')
-define(`confENVDEF', `@@ENVDEF@@')
-define(`bld_USE_ARLIB', `true')
diff --git a/mail-filter/dk-milter/metadata.xml b/mail-filter/dk-milter/metadata.xml
deleted file mode 100644
index 51f94e3fbe0e..000000000000
--- a/mail-filter/dk-milter/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>net-mail</herd>
-</pkgmetadata>
diff --git a/mail-filter/dkim-milter/ChangeLog b/mail-filter/dkim-milter/ChangeLog
deleted file mode 100644
index ee3ddefcfc43..000000000000
--- a/mail-filter/dkim-milter/ChangeLog
+++ /dev/null
@@ -1,231 +0,0 @@
-# ChangeLog for mail-filter/dkim-milter
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dkim-milter/ChangeLog,v 1.37 2012/04/06 21:50:36 pacho Exp $
-
-  06 Apr 2012; Pacho Ramos <pacho@gentoo.org> metadata.xml:
-  Drop maintainer due retirement, bug #63588
-
-  20 Jul 2011; Pacho Ramos <pacho@gentoo.org> metadata.xml:
-  Drop maintainer due retirement, bug #34534
-
-  27 Jun 2011; Eray Aslan <eras@gentoo.org> metadata.xml:
-  Herd from no-herd to net-mail
-
-  03 Nov 2009; Raúl Porcel <armin76@gentoo.org>
-  dkim-milter-2.8.3-r1.ebuild:
-  Add ~ia64 wrt #282951
-
-*dkim-milter-2.8.3-r1 (22 Aug 2009)
-
-  22 Aug 2009; Alin Năstac <mrness@gentoo.org>
-  -files/dkim-milter-2.8.2-exit-on-error.patch,
-  -files/dkim-milter-2.8.2-gentoo.patch,
-  -files/dkim-milter-2.8.2-mkdir.patch,
-  -files/dkim-milter-2.8.2-test115.patch,
-  files/dkim-milter-2.8.3-gentoo.patch, -dkim-milter-2.8.2.ebuild,
-  -dkim-milter-2.8.3.ebuild, +dkim-milter-2.8.3-r1.ebuild:
-  Use shared libmilter library (#245950).
-
-  15 Aug 2009; Alin Năstac <mrness@gentoo.org> dkim-milter-2.8.2.ebuild,
-  dkim-milter-2.8.3.ebuild:
-  Set /var/lib/milter as home directory for milter user (#280571). Stable on x86.
-
-*dkim-milter-2.8.3 (19 Jul 2009)
-
-  19 Jul 2009; Alin Năstac <mrness@gentoo.org>
-  +files/dkim-milter-2.8.3-gentoo.patch,
-  +files/dkim-milter-build-system.patch, +dkim-milter-2.8.3.ebuild:
-  Version bump.
-
-  09 May 2009; Alin Năstac <mrness@gentoo.org>
-  -files/dkim-milter-2.8.0-gentoo.patch, -dkim-milter-2.8.1.ebuild,
-  dkim-milter-2.8.2.ebuild:
-  Migrate to EAPI 2. Stable on x86.
-
-*dkim-milter-2.8.2 (28 Feb 2009)
-
-  28 Feb 2009; Alin Năstac <mrness@gentoo.org>
-  +files/dkim-milter-2.8.2-exit-on-error.patch,
-  +files/dkim-milter-2.8.2-gentoo.patch,
-  +files/dkim-milter-2.8.2-mkdir.patch,
-  +files/dkim-milter-2.8.2-test115.patch, +dkim-milter-2.8.2.ebuild:
-  Install libdkim.a library and API documentation.
-
-*dkim-milter-2.8.1 (17 Jan 2009)
-
-  17 Jan 2009; Daniel Black <dragonheart@gentoo.org>
-  -files/dkim-milter-2.7.0-gentoo.patch,
-  -files/dkim-milter-2.7.2-gentoo.patch, -dkim-milter-2.7.0.ebuild,
-  -dkim-milter-2.7.2.ebuild, -dkim-milter-2.8.0.ebuild,
-  +dkim-milter-2.8.1.ebuild:
-  version bump that fixes security vulnerability (dkim validation weakness -
-  see release notes). old vulnerable versions removed
-
-*dkim-milter-2.8.0 (11 Jan 2009)
-
-  11 Jan 2009; Daniel Black <dragonheart@gentoo.org>
-  +files/dkim-milter-2.8.0-gentoo.patch, +dkim-milter-2.8.0.ebuild:
-  version bump
-
-*dkim-milter-2.7.2 (16 Oct 2008)
-
-  16 Oct 2008; Alin Năstac <mrness@gentoo.org>
-  -files/dkim-milter-2.5.5-gentoo.patch,
-  -files/dkim-milter-2.6.0-gentoo.patch,
-  +files/dkim-milter-2.7.2-gentoo.patch, -dkim-milter-2.5.5.ebuild,
-  -dkim-milter-2.6.0.ebuild, +dkim-milter-2.7.2.ebuild:
-  Version bump (#242164).
-
-  23 Aug 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
-  add GLEP 56 USE flag desc from use.local.desc
-
-*dkim-milter-2.7.0 (25 Jul 2008)
-
-  25 Jul 2008; Daniel Black <dragonheart@gentoo.org>
-  +files/dkim-milter-2.7.0-gentoo.patch, +dkim-milter-2.7.0.ebuild:
-  version bump
-
-*dkim-milter-2.6.0 (13 Jun 2008)
-
-  13 Jun 2008; Daniel Black <dragonheart@gentoo.org>
-  +files/dkim-milter-2.6.0-gentoo.patch, +dkim-milter-2.6.0.ebuild:
-  version bump
-
-  08 Jun 2008; Alin Năstac <mrness@gentoo.org>
-  -files/dkim-milter-2.4.3-gentoo.patch,
-  -files/dkim-milter-2.4.4-gentoo.patch,
-  -files/dkim-milter-2.5.2-gentoo.patch,
-  +files/dkim-milter-2.5.5-gentoo.patch, -dkim-milter-2.4.3.ebuild,
-  -dkim-milter-2.4.4.ebuild, -dkim-milter-2.5.2.ebuild,
-  dkim-milter-2.5.5.ebuild:
-  Remove old versions.
-
-*dkim-milter-2.5.5 (02 May 2008)
-
-  02 May 2008; Daniel Black <dragonheart@gentoo.org>
-  +dkim-milter-2.5.5.ebuild:
-  version bump
-
-*dkim-milter-2.5.2 (03 Apr 2008)
-
-  03 Apr 2008; Daniel Black <dragonheart@gentoo.org>
-  +files/dkim-milter-2.5.2-gentoo.patch, +dkim-milter-2.5.2.ebuild:
-  version bump
-
-  29 Jan 2008; Alin Năstac <mrness@gentoo.org>
-  -files/dkim-milter-2.4.1-gentoo.patch, -files/dkim-filter-2.4.1-init,
-  -files/dkim-milter-2.4.2-gentoo.patch, -dkim-milter-2.4.2.ebuild,
-  dkim-milter-2.4.4.ebuild:
-  Remove libmilter atom from run-time dependencies.
-
-*dkim-milter-2.4.4 (28 Jan 2008)
-
-  28 Jan 2008; Daniel Black <dragonheart@gentoo.org>
-  +files/dkim-milter-2.4.4-gentoo.patch, +dkim-milter-2.4.4.ebuild:
-  version bump
-
-*dkim-milter-2.4.3 (24 Jan 2008)
-
-  24 Jan 2008; Alin Năstac <mrness@gentoo.org>
-  -files/dkim-milter-2.3.2-diffheaders.patch,
-  -files/dkim-milter-2.3.2-gentoo.patch,
-  +files/dkim-milter-2.4.3-gentoo.patch, files/dkim-filter.init,
-  -dkim-milter-2.3.2.ebuild, -dkim-milter-2.4.1.ebuild,
-  +dkim-milter-2.4.3.ebuild:
-  Version bump. Remove stalled Unix socket before starting the service (#205097).
-
-  06 Jan 2008; Alin Năstac <mrness@gentoo.org> dkim-milter-2.4.2.ebuild:
-  Use dkim-genkey for generating the key as it was in previous version.
-
-  04 Jan 2008; Alin Năstac <mrness@gentoo.org> metadata.xml:
-  Correct maintainer attribute.
-
-*dkim-milter-2.4.2 (04 Jan 2008)
-
-  04 Jan 2008; Alin Năstac <mrness@gentoo.org>
-  +files/dkim-milter-2.4.2-gentoo.patch,
-  +files/dkim-milter-diffheaders.patch, +dkim-milter-2.4.2.ebuild:
-  Version bump.
-
-*dkim-milter-2.4.1 (28 Dec 2007)
-
-  28 Dec 2007; Daniel Black <dragonheart@gentoo.org>
-  +files/dkim-milter-2.4.1-gentoo.patch, +files/dkim-filter-2.4.1-init,
-  +dkim-milter-2.4.1.ebuild:
-  version bump
-
-  14 Nov 2007; Alin Năstac <mrness@gentoo.org>
-  -files/dkim-milter-2.3.0-diffheaders.patch,
-  -files/dkim-milter-2.3.0-gentoo.patch,
-  -files/dkim-milter-2.3.1-diffheaders.patch,
-  +files/dkim-milter-2.3.2-diffheaders.patch,
-  +files/dkim-milter-2.3.2-gentoo.patch, -dkim-milter-2.3.1.ebuild,
-  dkim-milter-2.3.2.ebuild:
-  Remove obsolete version. Correct selector TXT record (#199100).
-
-  04 Nov 2007; Alin Năstac <mrness@gentoo.org> dkim-milter-2.3.1.ebuild,
-  dkim-milter-2.3.2.ebuild:
-  Remove useless pkg_setup call from pkg_postinst.
-
-*dkim-milter-2.3.2 (20 Oct 2007)
-
-  20 Oct 2007; Daniel Black <dragonheart@gentoo.org>
-  -files/dkim-milter-2.3.0-test-headers.patch, -dkim-milter-2.3.0-r2.ebuild,
-  +dkim-milter-2.3.2.ebuild:
-  version bump
-
-*dkim-milter-2.3.1 (13 Oct 2007)
-
-  13 Oct 2007; Daniel Black <dragonheart@gentoo.org>
-  +files/dkim-milter-2.3.1-diffheaders.patch, +dkim-milter-2.3.1.ebuild:
-  version bump
-
-  12 Oct 2007; Alin Năstac <mrness@gentoo.org>
-  files/dkim-milter-2.3.0-gentoo.patch, dkim-milter-2.3.0-r2.ebuild:
-  Add ipv6 USE flag (#178501).
-
-  11 Oct 2007; Alin Năstac <mrness@gentoo.org> metadata.xml,
-  dkim-milter-2.3.0-r2.ebuild:
-  Correct my name in metadata. Replace einfo with elog (#195334). Create keys
-  even if the orphaned public key already exists.
-
-  10 Oct 2007; Daniel Black <dragonheart@gentoo.org>
-  files/dkim-milter-2.3.0-gentoo.patch,
-  +files/dkim-milter-2.3.0-test-headers.patch, metadata.xml,
-  dkim-milter-2.3.0-r2.ebuild:
-  patch fix -cvs markings. Fixed qa on test. Installed docs. Added Alin to
-  metadata.
-
-*dkim-milter-2.3.0-r2 (10 Oct 2007)
-
-  10 Oct 2007; Alin Năstac <mrness@gentoo.org>
-  +files/dkim-milter-2.3.0-diffheaders.patch,
-  files/dkim-milter-2.3.0-gentoo.patch, -files/dkim-filter.conf,
-  files/dkim-filter.init, -files/dkim-gettxt.sh, -files/site.config.m4,
-  -dkim-milter-2.2.1.ebuild, -dkim-milter-2.3.0.ebuild,
-  -dkim-milter-2.3.0-r1.ebuild, +dkim-milter-2.3.0-r2.ebuild:
-  Add diffheaders support and rename approx-regex useflag in diffheaders
-  (#195334). Add pkg_config for creating cryptographic keys needed by this
-  package. More code cleanups.
-
-*dkim-milter-2.3.0-r1 (09 Oct 2007)
-
-  09 Oct 2007; Alin Năstac <mrness@gentoo.org>
-  +files/dkim-milter-2.3.0-gentoo.patch, files/dkim-filter.conf,
-  +dkim-milter-2.3.0-r1.ebuild:
-  Build with user selected CFLAGS. Cleanup the ebuild code. Add ~x86 keyword.
-  Add approx-regex local USE flag.
-
-*dkim-milter-2.3.0 (08 Oct 2007)
-
-  08 Oct 2007; Daniel Black <dragonheart@gentoo.org> files/dkim-filter.init,
-  +dkim-milter-2.3.0.ebuild:
-  version bump
-
-*dkim-milter-2.2.1 (06 Oct 2007)
-
-  06 Oct 2007; Daniel Black <dragonheart@gentoo.org>
-  +files/dkim-filter.conf, +files/dkim-filter.init, +files/dkim-gettxt.sh,
-  +files/site.config.m4, +metadata.xml, +dkim-milter-2.2.1.ebuild:
-  initial import - bug #153922 -  many thanks to Eray Aslan
-
diff --git a/mail-filter/dkim-milter/Manifest b/mail-filter/dkim-milter/Manifest
deleted file mode 100644
index b576a41a142d..000000000000
--- a/mail-filter/dkim-milter/Manifest
+++ /dev/null
@@ -1,18 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX dkim-filter.init 1437 RMD160 96b90dc6d2d08231d2b09ca86429231a468a2b2a SHA1 1ff377494b79cb3b0c531c8a0ba60d2736e08884 SHA256 f55aa7ad32db175987fd4adc1e7a86426ccb8eec3d7b5d4adebd71a445a3d9f0
-AUX dkim-milter-2.8.3-gentoo.patch 5634 RMD160 97ef587212c735f42fa234d4031ecfa36c703b6e SHA1 904ddbc992b1180df0f9a13dd068b15eae709675 SHA256 ee2efd5512bfa39171efed29229e52af47fceb62049d3f4aad79d79b7ed53e1e
-AUX dkim-milter-build-system.patch 8767 RMD160 2efec563b3ee740c87a804bc00aa59b2b0e7a366 SHA1 137287ba0f9e612e8e836d465fce48581c60a49d SHA256 1e40dbb8a9e487c26de43f93ed3035937c147080dc26bc9107738a6e8ea7d40e
-AUX dkim-milter-diffheaders.patch 612 RMD160 20fa51c4229ed6f8ecb3311d542f02356036bc45 SHA1 54db370a5772dcd322def7828f9d228066bd9a5f SHA256 37456d614a83eebeba0c622e1a0a022d2d009d3763ac27f36dc31d476edab762
-DIST dkim-milter-2.8.3.tar.gz 748415 RMD160 339886a8ec02615a785b5a5605b2b752e8e946bb SHA1 ee8f7aa1429f763f6a4012e902296733df0fa0e6 SHA256 222afc936b70b823289e8e327c06c2920a5f33df43f07024b5f931856406048f
-EBUILD dkim-milter-2.8.3-r1.ebuild 5198 RMD160 e7436355ed42b0d7b50928481f3b50e4fcfd3fb9 SHA1 7861482b9afbe4c5264bc26da53815bab34a8c3e SHA256 b7673146575bbbd805f33c12160139450e2d1a5ff7c709af55d69aca26e79703
-MISC ChangeLog 8338 RMD160 afdc58225c696f412a6d41c8319a46970585b54c SHA1 894d91f3ade68bd8080e1c80bbfa6a62be9ff6cd SHA256 53bd94954a1004effee96b108f69379e51ceab95c66f1a4ef47956b375cddb12
-MISC metadata.xml 430 RMD160 d549d3fa1cf0e6c1520ddcada1aaa7076d05af1d SHA1 1acf12dd338258fcea1b5236adb16e3fc8b257cb SHA256 e9b3767f3cf9c9aa887b9e267b2d4cd7813093b1a8517fcb9ee0de90b4d9a0f5
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk9/ZTEACgkQCaWpQKGI+9TZ5ACdE+pqNSCKnZFoIkThZejvx/JW
-RQIAnR0SyeLl4r9If+mgqw58sGxcZGzD
-=sHZj
------END PGP SIGNATURE-----
diff --git a/mail-filter/dkim-milter/dkim-milter-2.8.3-r1.ebuild b/mail-filter/dkim-milter/dkim-milter-2.8.3-r1.ebuild
deleted file mode 100644
index 9a6157e227dc..000000000000
--- a/mail-filter/dkim-milter/dkim-milter-2.8.3-r1.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dkim-milter/dkim-milter-2.8.3-r1.ebuild,v 1.2 2009/11/03 17:31:26 armin76 Exp $
-
-EAPI="2"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A milter-based application to provide DomainKeys Identified Mail (DKIM) service"
-HOMEPAGE="http://sourceforge.net/projects/dkim-milter/"
-SRC_URI="mirror://sourceforge/dkim-milter/${P}.tar.gz"
-
-LICENSE="Sendmail-Open-Source"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 x86"
-IUSE="ipv6 diffheaders"
-
-DEPEND="dev-libs/openssl
-	>=sys-libs/db-3.2
-	|| ( mail-filter/libmilter mail-mta/sendmail )
-	diffheaders? ( dev-libs/tre )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup milter
-	# mail-milter/spamass-milter creates milter user with this home directory
-	# For consistency reasons, milter user must be created here with this home directory
-	# even though this package doesn't need a home directory for this user (#280571)
-	enewuser milter -1 -1 /var/lib/milter milter
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-build-system.patch
-
-	cp site.config.m4.dist devtools/Site/site.config.m4 || \
-		die "failed to copy site.config.m4"
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-
-	local CC="$(tc-getCC)"
-	local ENVDEF=""
-	use ipv6 && ENVDEF="${ENVDEF} -DNETINET6"
-	sed -i -e "s:@@CC@@:${CC}:" \
-		-e "s:@@CFLAGS@@:${CFLAGS}:" \
-		-e "s:@@LDFLAGS@@:${LDFLAGS}:" \
-		-e "s:@@ENVDEF@@:${ENVDEF}:" \
-		-e "s:@@LIBDIR@@:/usr/$(get_libdir):" \
-		devtools/Site/site.config.m4
-
-	if use diffheaders ; then
-		epatch "${FILESDIR}/${PN}-diffheaders.patch"
-
-		sed -i -e 's/^dnl \(APPENDDEF.*-D_FFR_DIFFHEADERS.*\)/\1/' \
-			devtools/Site/site.config.m4
-	fi
-}
-
-src_compile() {
-	emake -j1 || die "emake failed"
-}
-
-src_test() {
-	emake -j1 OPTIONS=check || die "emake check failed"
-}
-
-src_install() {
-	# no other program need to read from here
-	dodir /etc/mail/dkim-filter
-	fowners milter:milter /etc/mail/dkim-filter
-	fperms 700 /etc/mail/dkim-filter
-
-	insinto /etc/mail/dkim-filter
-	newins dkim-filter/dkim-filter.conf.sample dkim-filter.conf
-
-	newinitd "${FILESDIR}/dkim-filter.init" dkim-filter \
-		|| die "newinitd failed"
-	sed -i -e s:bin/dkim-filter:sbin/dkim-filter: "${D}/etc/init.d/dkim-filter" \
-		|| die 'failed to correct dkim-filter path'
-
-	# prepare directory for .pid, .sock and .stats files
-	dodir /var/run/dkim-filter
-	fowners milter:milter /var/run/dkim-filter
-
-	dodir /usr/bin /usr/sbin
-	emake -j1 DESTDIR="${D}" \
-		SBINOWN=root SBINGRP=root UBINOWN=root UBINGRP=root \
-		install || die "make install failed"
-
-	# man build is broken; do man page installation by hand
-	doman */*.{3,5,8} || die "failed to install man pages"
-
-	# some people like docs
-	dodoc README RELEASE_NOTES *.txt &&
-		dohtml -r libdkim/docs/* ||
-		die "failed to install docs"
-}
-
-pkg_postinst() {
-	elog "If you want to sign your mail messages, you will have to run"
-	elog "  emerge --config ${CATEGORY}/${PN}"
-	elog "It will help you create your key and give you hints on how"
-	elog "to configure your DNS and MTA."
-
-	ewarn "Make sure your MTA has r/w access to the socket file."
-	ewarn "This can be done either by setting UMask to 002 and adding MTA's user"
-	ewarn "to milter group or you can simply set UMask to 000."
-}
-
-pkg_config() {
-	local selector keysize pubkey
-
-	read -p "Enter the selector name (default ${HOSTNAME}): " selector
-	[[ -n "${selector}" ]] || selector=${HOSTNAME}
-	if [[ -z "${selector}" ]]; then
-		eerror "Oddly enough, you don't have a HOSTNAME."
-		return 1
-	fi
-	if [[ -f "${ROOT}"etc/mail/dkim-filter/${selector}.private ]]; then
-		ewarn "The private key for this selector already exists."
-	else
-		einfo "Select the size of private key:"
-		einfo "  [1] 512 bits"
-		einfo "  [2] 1024 bits"
-		while read -n 1 -s -p "  Press 1 or 2 on the keyboard to select the key size " keysize ; do
-			[[ "${keysize}" == "1" || "${keysize}" == "2" ]] && echo && break
-		done
-		case ${keysize} in
-			1) keysize=512 ;;
-			*) keysize=1024 ;;
-		esac
-
-		# generate the private and public keys
-		dkim-genkey -b ${keysize} -D "${ROOT}"etc/mail/dkim-filter/ \
-			-s ${selector} && \
-			chown milter:milter \
-			"${ROOT}"etc/mail/dkim-filter/"${selector}".private || \
-				{ eerror "Failed to create private and public keys." ; return 1; }
-	fi
-
-	# dkim-filter selector configuration
-	echo
-	einfo "Make sure you have the following settings in your dkim-filter.conf:"
-	einfo "  Keyfile /etc/mail/dkim-filter/${selector}.private"
-	einfo "  Selector ${selector}"
-
-	# MTA configuration
-	echo
-	einfo "If you are using Postfix, add following lines to your main.cf:"
-	einfo "  smtpd_milters     = unix:/var/run/dkim-filter/dkim-filter.sock"
-	einfo "  non_smtpd_milters = unix:/var/run/dkim-filter/dkim-filter.sock"
-
-	# DNS configuration
-	einfo "After you configured your MTA, publish your key by adding this TXT record to your domain:"
-	cat "${ROOT}"etc/mail/dkim-filter/${selector}.txt
-	einfo "t=y signifies you only test the DKIM on your domain. See following page for the complete list of tags:"
-	einfo "  http://www.dkim.org/specs/rfc4871-dkimbase.html#key-text"
-	einfo
-	einfo "Also look at the draft ASP http://www.dkim.org/specs/draft-ietf-dkim-ssp-03.html"
-}
diff --git a/mail-filter/dkim-milter/files/dkim-filter.init b/mail-filter/dkim-milter/files/dkim-filter.init
deleted file mode 100644
index 9f9d5a75c28e..000000000000
--- a/mail-filter/dkim-milter/files/dkim-filter.init
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dkim-milter/files/dkim-filter.init,v 1.4 2008/01/24 11:39:15 mrness Exp $
-
-CONFFILE=/etc/mail/dkim-filter/${SVCNAME}.conf
-PIDFILE=/var/run/dkim-filter/${SVCNAME}.pid
-
-depend() {
-	use dns logger net
-}
-
-check_cfg() {
-
-	if [ ! -f "${CONFFILE}" ] ; then
-		eerror "Configuration file ${CONFFILE} is missing"
-		return 1
-	fi
-
-	if egrep -q '^[[:space:]]*Background[[:space:]]+no' "${CONFFILE}" ; then
-		eerror "${SVCNAME} service cannot run with Background key set to yes!"
-		return 1
-	fi
-
-	if egrep -q '^[[:space:]]*PidFile[[:space:]]' "${CONFFILE}"; then
-		eerror "Please remove PidFile key from your configuration file!"
-		eerror "${SVCNAME} is automatically configured to use ${PIDFILE} as pid file."
-		return 1
-	fi
-}
-
-start() {
-	check_cfg || return 1
-	
-	# Remove stalled Unix socket if no other process is using it
-	local UNIX_SOCKET=$(sed -ne 's/^[[:space:]]*Socket[[:space:]]\+\(unix\|local\)://p' "${CONFFILE}")
-	if [ -S "${UNIX_SOCKET}" ] && ! fuser -s "${UNIX_SOCKET}"; then
-		rm "${UNIX_SOCKET}"
-	fi
-
-	ebegin "Starting DKIM filter"
-	start-stop-daemon --start --pidfile "${PIDFILE}" \
-		--exec /usr/bin/dkim-filter -- -x "${CONFFILE}" -P "${PIDFILE}"
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping DKIM filter"
-	start-stop-daemon --stop --pidfile "${PIDFILE}"
-	eend $?
-}
diff --git a/mail-filter/dkim-milter/files/dkim-milter-2.8.3-gentoo.patch b/mail-filter/dkim-milter/files/dkim-milter-2.8.3-gentoo.patch
deleted file mode 100644
index 3e67f051fd5f..000000000000
--- a/mail-filter/dkim-milter/files/dkim-milter-2.8.3-gentoo.patch
+++ /dev/null
@@ -1,174 +0,0 @@
-diff -Nru dkim-milter-2.8.3.orig/devtools/Site/site.config.m4 dkim-milter-2.8.3/devtools/Site/site.config.m4
---- dkim-milter-2.8.3.orig/devtools/Site/site.config.m4	2009-08-23 00:52:05.000000000 +0200
-+++ dkim-milter-2.8.3/devtools/Site/site.config.m4	2009-08-23 00:56:05.000000000 +0200
-@@ -11,7 +11,15 @@
- dnl If you are encountering coredumps and want to be able to analyze them
- dnl using something like "gdb", enable this next line by deleting the "dnl"
- dnl at the front of it.
--dnl define(`confOPTIMIZE', `-g')
-+define(`confCC', `@@CC@@')
-+define(`confOPTIMIZE', `@@CFLAGS@@')
-+define(`confLDOPTS', `@@LDFLAGS@@')
-+define(`confENVDEF', `@@ENVDEF@@')
-+define(`confMKDIR', `mkdir')
-+define(`confLIBDIR', `@@LIBDIR@@')
-+define(`confSHAREDLIBDIR', `@@LIBDIR@@')
-+dnl man build is broken
-+define(`confNO_MAN_BUILD',`')
- 
- dnl Shared library for libdkim
- dnl
-@@ -26,7 +34,7 @@
- dnl the package, enable this next line by deleting the "dnl" at the front
- dnl of it.  This is done automatically if you've requested the shared
- dnl library.
--dnl define(`bld_LIBDKIM_INSTALL', `true')
-+define(`bld_LIBDKIM_INSTALL', `true')
- 
- dnl Use native strlcat()/strlcpy() functions
- dnl
-@@ -53,7 +61,7 @@
- dnl 
- dnl If you want to use the provided asynchronous resolver library, enable this
- dnl next line by deleting the "dnl" at the front of it.
--dnl define(`bld_USE_ARLIB', `true')
-+define(`bld_USE_ARLIB', `true')
- dnl 
- dnl libar normally uses res_init() or res_ninit() to load the contents
- dnl of resolv.conf for its use.  If neither of these work on your system
-@@ -94,7 +102,7 @@
- dnl it has seen, rather than relying on the DNS server to provide caching,
- dnl enable this next line by deleting the "dnl" at the front of it.  Also
- dnl see the section below called "BerkeleyDB".
--dnl APPENDDEF(`confENVDEF', `-DQUERY_CACHE ')
-+APPENDDEF(`confENVDEF', `-DQUERY_CACHE ')
- 
- dnl BerkeleyDB -- Berkeley DB ("Sleepycat") database
- dnl 
-@@ -107,7 +115,7 @@
- dnl by deleting "dnl" from the front of them:
- dnl APPENDDEF(`confINCDIRS', `-I/usr/local/BerkeleyDB/include ')
- dnl APPENDDEF(`confLIBDIRS', `-L/usr/local/BerkeleyDB/lib ')
--dnl APPENDDEF(`confLIBS', `-ldb ')
-+APPENDDEF(`confLIBS', `-ldb ')
- 
- dnl OpenSSL -- cryptography library
- dnl
-@@ -146,7 +154,7 @@
- dnl APPENDDEF(`confENVDEF', `-D_FFR_REPORT_INTERVALS ')
- dnl APPENDDEF(`confENVDEF', `-D_FFR_SELECT_CANONICALIZATION ')
- dnl APPENDDEF(`confENVDEF', `-D_FFR_SELECTOR_HEADER ')
--dnl APPENDDEF(`confENVDEF', `-D_FFR_STATS ')
-+APPENDDEF(`confENVDEF', `-D_FFR_STATS ')
- dnl APPENDDEF(`confENVDEF', `-D_FFR_VBR ')
- dnl APPENDDEF(`confENVDEF', `-D_FFR_ZTAGS ')
- 
-diff -Nru dkim-milter-2.8.3.orig/dkim-filter/dkim-filter.conf.sample dkim-milter-2.8.3/dkim-filter/dkim-filter.conf.sample
---- dkim-milter-2.8.3.orig/dkim-filter/dkim-filter.conf.sample	2008-12-27 06:21:56.000000000 +0100
-+++ dkim-milter-2.8.3/dkim-filter/dkim-filter.conf.sample	2009-08-23 00:52:30.000000000 +0200
-@@ -90,13 +90,6 @@
- 
- # AutoRestartRate	n/tu
- 
--##  Background { yes | no }
--##  	default "yes"
--##
--##  Indicate whether or not the filter should run in the background.
--
--# Background		Yes
--
- ##  BaseDirectory path
- ##  	default (none)
- ##
-@@ -193,7 +186,7 @@
- ##  hosts from which mail should be signed rather than verified.
- ##  Automatically contains 127.0.0.1.  See man page for file format.
- 
--# InternalHosts		filename
-+# InternalHosts		/etc/mail/dkim-filter/internalhosts
- 
- ##  KeepTemporaryFiles { yes | no }
- ##  	default "no"
-@@ -209,7 +202,7 @@
- ##  Specifies the path to the private key to use when signing.  Ignored if
- ##  Keylist is set.  No default; must be specified for signing.
- 
--KeyFile			/var/db/dkim/example.private
-+KeyFile			/etc/mail/dkim-filter/my-selector-name.private
- 
- ##  KeyList filename
- ##
-@@ -226,7 +219,7 @@
- ##  as the beginning of a comment.  See dkim-filter.conf(5) for more
- ##  information.
- 
--# KeyList		/var/db/dkim/keylist
-+# KeyList		/etc/mail/dkim-filter/keylist
- 
- ##  LocalADSP filename
- ##
-@@ -350,24 +343,6 @@
- ##  page for file format.
- 
- # PeerList		filename
--
--##  PidFile filename
--## 
--##  Name of the file where the filter should write its pid before beginning
--##  normal operations.
--
--# PidFile		filename
--
--##  POPDBFile filename
--##
--##  Names a database which should be checked for "POP before SMTP" records
--##  as a form of authentication of users who may be sending mail through
--##  the MTA for signing.  Requires special compilation of the filter.
--##  See dkim-filter.conf(5) for more information.
--
--# POPDBFile		filename
--
--##  Quarantine { yes | no }
- ##  	default "no"
- ##
- ##  Indicates whether or not the filter should arrange to quarantine mail
-@@ -486,7 +461,7 @@
- ##  inet:port			to listen on all interfaces
- ##  local:/path/to/socket	to listen on a UNIX domain socket
- 
--Socket			inet:port@localhost
-+Socket			local:/var/run/dkim-filter/dkim-filter.sock
- 
- ##  StrictTestMode { yes | no }
- ##  	default "no"
-@@ -553,7 +528,7 @@
- ##  The system has its own default which will be used (usually 022).
- ##  See the umask(2) man page for more information.
- 
--# UMask			022
-+UMask			002
- 
- ##  Userid userid
- ##  	default (none)
-@@ -561,7 +536,7 @@
- ##  Change to user "userid" before starting normal operation?  May include
- ##  a group ID as well, separated from the userid by a colon.
- 
--# UserID		userid
-+UserID		milter
- 
- ##  X-Header { yes | no }
- ##  	default "no"
-@@ -570,3 +545,12 @@
- ##  messages it has processed.
- 
- # X-Header		No
-+#
-+
-+##  Statistics filename
-+##
-+##  Names a file to which useful statistics will be saved.
-+##  See man dkim-stats page
-+
-+Statistics            /var/run/dkim-filter/dkim-filter.stats
-+
diff --git a/mail-filter/dkim-milter/files/dkim-milter-build-system.patch b/mail-filter/dkim-milter/files/dkim-milter-build-system.patch
deleted file mode 100644
index 12d594c360ff..000000000000
--- a/mail-filter/dkim-milter/files/dkim-milter-build-system.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-diff -Nru dkim-milter-2.8.3.orig/devtools/M4/UNIX/defines.m4 dkim-milter-2.8.3/devtools/M4/UNIX/defines.m4
---- dkim-milter-2.8.3.orig/devtools/M4/UNIX/defines.m4	2006-10-06 08:44:44.000000000 +0300
-+++ dkim-milter-2.8.3/devtools/M4/UNIX/defines.m4	2009-07-19 09:52:08.000000000 +0300
-@@ -26,7 +26,7 @@
- CCLINK = ifdef(`confCCLINK', `confCCLINK', `confCC')
- # Linker for libraries
- LD=	ifdef(`confLD', `confLD', `confCC')
--LDOPTS=	ifdef(`confLDOPTS', `confLDOPTS') ifdef(`confMT', ifdef(`confMTLDOPTS', `confMTLDOPTS', `'), `')
-+LDOPTS=	ifdef(`confLDOPTS', `confLDOPTS')
- LDOPTS_SO= ${LDOPTS} ifdef(`confLDOPTS_SO', `confLDOPTS_SO', `-shared')
- 
- # Shell
-@@ -71,7 +71,7 @@
- LIBADD= ifdef(`conf_'bldCURRENT_PRD`_LIBS', `conf_'bldCURRENT_PRD`_LIBS') 
- 
- # libraries required on your system
--LIBS= ${LIBADD} ifdef(`confLIBS', `confLIBS') ifdef(`conf_'bldCURRENT_PRD`_LIB_POST', `conf_'bldCURRENT_PRD`_LIB_POST') 
-+LIBS= ${LIBADD} ifdef(`confLIBS', `confLIBS') ifdef(`conf_'bldCURRENT_PRD`_LIB_POST', `conf_'bldCURRENT_PRD`_LIB_POST')  ifdef(`confMT', ifdef(`confMTLDOPTS', `confMTLDOPTS', `'), `')
- 
- # location of sendmail binary (usually /usr/sbin or /usr/lib)
- BINDIR=	ifdef(`confMBINDIR', `confMBINDIR', `/usr/sbin')
-diff -Nru dkim-milter-2.8.3.orig/devtools/M4/UNIX/executable.m4 dkim-milter-2.8.3/devtools/M4/UNIX/executable.m4
---- dkim-milter-2.8.3.orig/devtools/M4/UNIX/executable.m4	2006-10-06 08:44:44.000000000 +0300
-+++ dkim-milter-2.8.3/devtools/M4/UNIX/executable.m4	2009-07-19 09:51:59.000000000 +0300
-@@ -30,12 +30,12 @@
- 
- ifdef(`bldNO_INSTALL', ,
- `install-`'bldCURRENT_PRODUCT: bldCURRENT_PRODUCT ifdef(`bldTARGET_INST_DEP', `bldTARGET_INST_DEP')
--	ifdef(`confMKDIR', `if [ ! -d ${DESTDIR}${bldINSTALL_DIR`'BINDIR} ]; then confMKDIR -p ${DESTDIR}${bldINSTALL_DIR`'BINDIR}; else :; fi ')
--	${INSTALL} -c -o ${bldBIN_TYPE`'BINOWN} -g ${bldBIN_TYPE`'BINGRP} -m ${bldBIN_TYPE`'BINMODE} bldCURRENT_PRODUCT ${DESTDIR}${bldINSTALL_DIR`'BINDIR}
-+	ifdef(`confMKDIR', `if [ ! -d "${DESTDIR}${bldINSTALL_DIR`'BINDIR}" ]; then confMKDIR -p "${DESTDIR}${bldINSTALL_DIR`'BINDIR}"; else :; fi ')
-+	${INSTALL} -c -o ${bldBIN_TYPE`'BINOWN} -g ${bldBIN_TYPE`'BINGRP} -m ${bldBIN_TYPE`'BINMODE} bldCURRENT_PRODUCT "${DESTDIR}${bldINSTALL_DIR`'BINDIR}"
- ifdef(`bldTARGET_LINKS', `bldMAKE_TARGET_LINKS(${bldINSTALL_DIR`'BINDIR}/bldCURRENT_PRODUCT, ${bldCURRENT_PRODUCT`'TARGET_LINKS})')')
- 
- strip-`'bldCURRENT_PRODUCT: bldCURRENT_PRODUCT
--	${STRIP} ${STRIPOPTS} ${DESTDIR}${bldINSTALL_DIR`'BINDIR}`'/bldCURRENT_PRODUCT
-+	${STRIP} ${STRIPOPTS} "${DESTDIR}${bldINSTALL_DIR`'BINDIR}`'/bldCURRENT_PRODUCT"
- 
- bldCURRENT_PRODUCT-clean:
- 	rm -f ${OBJS} bldCURRENT_PRODUCT ${MANPAGES}
-diff -Nru dkim-milter-2.8.3.orig/devtools/M4/UNIX/library.m4 dkim-milter-2.8.3/devtools/M4/UNIX/library.m4
---- dkim-milter-2.8.3.orig/devtools/M4/UNIX/library.m4	2006-09-06 01:56:53.000000000 +0300
-+++ dkim-milter-2.8.3/devtools/M4/UNIX/library.m4	2009-07-19 09:51:59.000000000 +0300
-@@ -27,8 +27,8 @@
- ifdef(`bldLINK_SOURCES', `bldMAKE_SOURCE_LINKS(bldLINK_SOURCES)')
- 
- install-`'bldCURRENT_PRODUCT: bldCURRENT_PRODUCT.a
--ifdef(`bldINSTALLABLE', `	ifdef(`confMKDIR', `if [ ! -d ${DESTDIR}${bldINSTALL_DIR`'LIBDIR} ]; then confMKDIR -p ${DESTDIR}${bldINSTALL_DIR`'LIBDIR}; else :; fi ')
--	${INSTALL} -c -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} bldCURRENT_PRODUCT.a ${DESTDIR}${LIBDIR}')
-+ifdef(`bldINSTALLABLE', `	ifdef(`confMKDIR', `if [ ! -d "${DESTDIR}${LIBDIR}" ]; then confMKDIR -p "${DESTDIR}${LIBDIR}"; else :; fi ')
-+	${INSTALL} -c -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} bldCURRENT_PRODUCT.a "${DESTDIR}${LIBDIR}"')
- 
- bldCURRENT_PRODUCT-clean:
- 	rm -f ${OBJS} bldCURRENT_PRODUCT.a ${MANPAGES}
-diff -Nru dkim-milter-2.8.3.orig/devtools/M4/UNIX/manpage.m4 dkim-milter-2.8.3/devtools/M4/UNIX/manpage.m4
---- dkim-milter-2.8.3.orig/devtools/M4/UNIX/manpage.m4	2006-09-08 01:13:07.000000000 +0300
-+++ dkim-milter-2.8.3/devtools/M4/UNIX/manpage.m4	2009-07-19 09:51:59.000000000 +0300
-@@ -68,11 +68,11 @@
- ifdef(`confNO_MAN_INSTALL', `divert(-1)', `dnl')
- define(`bldMAN_INSTALL_CMD', 
- `ifdef(`confDONT_INSTALL_CATMAN', `dnl', 
--`	ifdef(`confMKDIR', `if [ ! -d ${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`SRC} ]; then confMKDIR -p ${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`SRC}; else :; fi ')
--	${INSTALL} -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} bldGET_MAN_BASE_NAME($1).`${MAN'bldGET_MAN_SOURCE_NUM($1)`SRC}' `${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)}/bldGET_MAN_BASE_NAME($1)`.${MAN'bldGET_MAN_SOURCE_NUM($1)`EXT}'')
-+`	ifdef(`confMKDIR', `if [ ! -d "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)}" ]; then confMKDIR -p "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)}"; else :; fi ')
-+	${INSTALL} -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} bldGET_MAN_BASE_NAME($1).`${MAN'bldGET_MAN_SOURCE_NUM($1)`SRC}' "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)}/bldGET_MAN_BASE_NAME($1)`.${MAN'bldGET_MAN_SOURCE_NUM($1)`EXT}''")
- ifdef(`confINSTALL_RAWMAN', 
--`	ifdef(`confMKDIR', `if [ ! -d ${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN} ]; then confMKDIR -p ${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN}; else :; fi ')
--	${INSTALL} -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} bldGET_MAN_BASE_NAME($1).bldGET_MAN_SOURCE_NUM($1) `${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN}'/bldGET_MAN_BASE_NAME($1)`.${MAN'bldGET_MAN_SOURCE_NUM($1)`EXT}'', `dnl')'
-+`	ifdef(`confMKDIR', `if [ ! -d "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN}'" ]; then confMKDIR -p "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN}'"; else :; fi ')
-+	${INSTALL} -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} bldGET_MAN_BASE_NAME($1).bldGET_MAN_SOURCE_NUM($1) "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN}'/bldGET_MAN_BASE_NAME($1)`.${MAN'bldGET_MAN_SOURCE_NUM($1)`EXT}''", `dnl')'
- )dnl
- bldFOREACH(`bldMAN_INSTALL_CMD(', `bldMAN_PAGES')
- ifdef(`confNO_MAN_INSTALL', `divert(0)', `dnl')
-diff -Nru dkim-milter-2.8.3.orig/devtools/M4/UNIX/sharedlib.m4 dkim-milter-2.8.3/devtools/M4/UNIX/sharedlib.m4
---- dkim-milter-2.8.3.orig/devtools/M4/UNIX/sharedlib.m4	2009-01-22 04:18:32.000000000 +0200
-+++ dkim-milter-2.8.3/devtools/M4/UNIX/sharedlib.m4	2009-07-19 09:51:59.000000000 +0300
-@@ -53,10 +53,10 @@
- ifdef(`bldLINK_SOURCES', `bldMAKE_SOURCE_LINKS(bldLINK_SOURCES)')
- 
- install-`'bldCURRENT_PRODUCT: ${SHAREDLIB}
--	ifdef(`confMKDIR', `if [ ! -d ${DESTDIR}${SHAREDLIBDIR} ]; then confMKDIR -p ${DESTDIR}${SHAREDLIBDIR}; else :; fi ')
--	${INSTALL} -c -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} ${SHAREDLIB} ${DESTDIR}${SHAREDLIBDIR}
--	ifelse(bldOS, `AIX', `${AR} ${AROPTS} ${DESTDIR}${SHAREDLIBDIR}bldCURRENT_PRODUCT.a ${SHAREDLIB}', `rm -f ${DESTDIR}${SHAREDLIBDIR}${SHAREDLIB_LINK}
--	${LN} ${LNOPTS} ${DESTDIR}${SHAREDLIBDIR}${SHAREDLIB} ${DESTDIR}${SHAREDLIBDIR}${SHAREDLIB_LINK}')
-+	ifdef(`confMKDIR', `if [ ! -d "${DESTDIR}${SHAREDLIBDIR}" ]; then confMKDIR -p "${DESTDIR}${SHAREDLIBDIR}"; else :; fi ')
-+	${INSTALL} -c -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} ${SHAREDLIB} "${DESTDIR}${SHAREDLIBDIR}"
-+	ifelse(bldOS, `AIX', `${AR} ${AROPTS} "${DESTDIR}${SHAREDLIBDIR}bldCURRENT_PRODUCT.a ${SHAREDLIB}"', `rm -f "${DESTDIR}${SHAREDLIBDIR}${SHAREDLIB_LINK}"
-+	${LN} ${LNOPTS} ${SHAREDLIB} "${DESTDIR}${SHAREDLIBDIR}${SHAREDLIB_LINK}"')
- 
- bldCURRENT_PRODUCT-clean:
- 	rm -f ${OBJS} ${SHAREDLIB} bldCURRENT_PRODUCT.a ${MANPAGES} ifelse(bldOS, `AIX', `shr.o', `bldCURRENT_PRODUCT${SHAREDLIB_EXT}')
-diff -Nru dkim-milter-2.8.3.orig/dkim-filter/Makefile.m4 dkim-milter-2.8.3/dkim-filter/Makefile.m4
---- dkim-milter-2.8.3.orig/dkim-filter/Makefile.m4	2009-02-09 21:53:09.000000000 +0200
-+++ dkim-milter-2.8.3/dkim-filter/Makefile.m4	2009-07-19 09:51:59.000000000 +0300
-@@ -74,7 +74,8 @@
- divert(bldTARGETS_SECTION)
- 
- install-genkey:
--	${INSTALL} -c -o ${UBINOWN} -g ${UBINGRP} -m 555 ${SRCDIR}/dkim-filter/dkim-genkey.sh ${DESTDIR}${UBINDIR}/dkim-genkey
-+	ifdef(`confMKDIR', `if [ ! -d "${DESTDIR}${UBINDIR}" ]; then confMKDIR -p "${DESTDIR}${UBINDIR}"; else :; fi ')
-+	${INSTALL} -c -o ${UBINOWN} -g ${UBINGRP} -m 555 ${SRCDIR}/dkim-filter/dkim-genkey.sh "${DESTDIR}${UBINDIR}/dkim-genkey"
- 
- divert(0)
- bldPRODUCT_END
-diff -Nru dkim-milter-2.8.3.orig/libdkim/Makefile.m4 dkim-milter-2.8.3/libdkim/Makefile.m4
---- dkim-milter-2.8.3.orig/libdkim/Makefile.m4	2009-05-26 20:03:39.000000000 +0300
-+++ dkim-milter-2.8.3/libdkim/Makefile.m4	2009-07-19 09:51:59.000000000 +0300
-@@ -42,7 +42,8 @@
- divert(bldTARGETS_SECTION)
- 
- install-dkim-includes:
--	${INSTALL} -c -o ${UBINOWN} -g ${UBINGRP} -m 555 ${SRCDIR}/libdkim/dkim.h ${DESTDIR}${INCLUDEDIR}/dkim.h
-+	ifdef(`confMKDIR', `if [ ! -d "${DESTDIR}${INCLUDEDIR}" ]; then confMKDIR -p "${DESTDIR}${INCLUDEDIR}"; else :; fi ')
-+	${INSTALL} -c -o ${UBINOWN} -g ${UBINGRP} -m 444 ${SRCDIR}/libdkim/dkim.h "${DESTDIR}${INCLUDEDIR}/dkim.h"
- bldPRODUCT_END
- 
- define(`confCHECK_LIBS', `libdkim.a')dnl
diff --git a/mail-filter/dkim-milter/files/dkim-milter-diffheaders.patch b/mail-filter/dkim-milter/files/dkim-milter-diffheaders.patch
deleted file mode 100644
index 309fad4bd3d3..000000000000
--- a/mail-filter/dkim-milter/files/dkim-milter-diffheaders.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- devtools/Site/site.config.m4.orig	2007-10-13 13:44:57.000000000 +1000
-+++ devtools/Site/site.config.m4	2007-10-13 13:45:45.000000000 +1000
-@@ -67,9 +67,9 @@
- dnl to have the "tre" library and its header files installed.  If necessary,
- dnl enable these lines by deleting "dnl" from the front of them and edit
- dnl paths as needed.
--dnl APPENDDEF(`confINCDIRS', `-I/usr/local/include/tre ')
-+APPENDDEF(`confINCDIRS', `-I/usr/include/tre ')
- dnl APPENDDEF(`confLIBDIRS', `-L/usr/local/lib/tre ')
--dnl APPENDDEF(`confLIBS', `-ltre ')
-+APPENDDEF(`confLIBS', `-ltre ')
- 
- dnl Code For Future Release (FFRs):
- dnl
diff --git a/mail-filter/dkim-milter/metadata.xml b/mail-filter/dkim-milter/metadata.xml
deleted file mode 100644
index db6b72ef3954..000000000000
--- a/mail-filter/dkim-milter/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>net-mail</herd>
-<longdescription>A program implementing the Milter API that signs and verifies
-using the DKIM standard</longdescription>
-<use>
-	<flag name='diffheaders'>On verification failure, compare the original and
-		the received headers to look for possible munging</flag>
-</use>
-</pkgmetadata>