Remove old versions.

Package-Manager: portage-2.1.4.4

9 files changed, 29 insertions, 780 deletions

diff --git a/mail-filter/dkim-milter/ChangeLog b/mail-filter/dkim-milter/ChangeLog
index c7f74be51715..e087a93914cd 100644
--- a/mail-filter/dkim-milter/ChangeLog
+++ b/mail-filter/dkim-milter/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for mail-filter/dkim-milter
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dkim-milter/ChangeLog,v 1.20 2008/05/03 00:02:31 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dkim-milter/ChangeLog,v 1.21 2008/06/08 09:52:59 mrness Exp $
+
+  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)
 
diff --git a/mail-filter/dkim-milter/Manifest b/mail-filter/dkim-milter/Manifest
index 65280e0e7466..2632335394fb 100644
--- a/mail-filter/dkim-milter/Manifest
+++ b/mail-filter/dkim-milter/Manifest
@@ -1,15 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX dkim-filter.init 1437 RMD160 96b90dc6d2d08231d2b09ca86429231a468a2b2a SHA1 1ff377494b79cb3b0c531c8a0ba60d2736e08884 SHA256 f55aa7ad32db175987fd4adc1e7a86426ccb8eec3d7b5d4adebd71a445a3d9f0
-AUX dkim-milter-2.4.3-gentoo.patch 5210 RMD160 4ab1a8a145e47ed1ec665c539e5533f667a31f60 SHA1 2d7983abca86c08ea3921f0d33069b9ef81c9658 SHA256 db7fe3aec8d523413947a85c68bc04b18ffbc77f41c7798c522de03db6f1f034
-AUX dkim-milter-2.4.4-gentoo.patch 5210 RMD160 5b50ece60e83f078bd013cbe6e748cbf634d7c57 SHA1 e4ff1f839626d9ff353d77add679749c7970b046 SHA256 281a73c2262fcdf31b0b7a2d070e4a9e48eaf2cc248693a7e9f7fdc8ab3e60fe
-AUX dkim-milter-2.5.2-gentoo.patch 4984 RMD160 231841d0620aabc705150f5b9517540de4ebaac1 SHA1 57e4f1c8cce16f165850035705248a6c72298492 SHA256 cb6791a1bb5baaae22e3e057998ebd3db4752a91f6e225ebd5ca4f31d1b908fe
+AUX dkim-milter-2.5.5-gentoo.patch 4995 RMD160 96d60517a7066c47278002b469bb8cb6a54d7d7e SHA1 b690dc90032997b0c04752ae3d6f258fcc313d97 SHA256 ea5d8b81ed8f5572abc56d296c51269cc77a3f79878e337a0b2fd6eee339a5f0
 AUX dkim-milter-diffheaders.patch 612 RMD160 20fa51c4229ed6f8ecb3311d542f02356036bc45 SHA1 54db370a5772dcd322def7828f9d228066bd9a5f SHA256 37456d614a83eebeba0c622e1a0a022d2d009d3763ac27f36dc31d476edab762
-DIST dkim-milter-2.4.3.tar.gz 616459 RMD160 fc8416eb84c8b4a71a2987b5fc5030f91032996e SHA1 a2c285959e1936b45f69d20c08e37ba9ee4b6fd7 SHA256 3168856fc7760c08abfe37e1291c102293cd8b53b26974f2646693e369eca87b
-DIST dkim-milter-2.4.4.tar.gz 617230 RMD160 744d167f86ad09b0f3856567f812787d18f40349 SHA1 0e945bdca7b70d6b1478ce3e0171f8023de50df2 SHA256 e04323c1d901437f88c1c81bd05118910986027ec5627d68259568178c05833b
-DIST dkim-milter-2.5.2.tar.gz 641510 RMD160 6c9b285af7c73792afde1270b527e2472d5544f9 SHA1 0862b9ea4d1bfbe04bb8cb1240f0b1783d5a0a2c SHA256 367582143815ddcea9f7494beb1dbfc19e5ea918b0fbc1f896051bb00ee20432
 DIST dkim-milter-2.5.5.tar.gz 646196 RMD160 68ab04bed0fcb0b5129f097a4f72b70398210000 SHA1 e42d364c341e16ce5e32ac00d9faf143bb179a27 SHA256 683b9924225e30ec4add5eb3229552fd8f5e3b94f5bace50429f66f2235424fe
-EBUILD dkim-milter-2.4.3.ebuild 4562 RMD160 3ecacc312d2ce2c038604d6d1d5699cf333ca7b2 SHA1 d4d962897db357edef6630b241e60f1c3cf9f9eb SHA256 d2c557059c381679a7f3bf73e129a3f1973f2d200317618a59980ad0b33be1e6
-EBUILD dkim-milter-2.4.4.ebuild 4594 RMD160 dcf5287e751a7ec4afb0faf279ac2b5b7c67d2f0 SHA1 2a00dabac091174a7108dd76f5c86eaba0188ac9 SHA256 a50ee417c679b197ab015bae795291ecbc36c50c5ad0a3280ef5edc78d28a67a
-EBUILD dkim-milter-2.5.2.ebuild 4734 RMD160 851cc3b1eafb810e793ba1ee1ad52c820ac17a62 SHA1 37f429aa016d4a7efe86148c311cca89a13725c9 SHA256 83f71679214cc3be1aa7c92b2c7191ca58ad451d255f7eae0cd8712695127ddb
-EBUILD dkim-milter-2.5.5.ebuild 4782 RMD160 6703ce232eea261f1837419632497eff6ae55c24 SHA1 ac5b040e55e1ce14efaaa3a137bc7a390ad16343 SHA256 a2cadbd32e9760abe176a660719b4943799ad84abfde65ff2acabaaccc25f3f0
-MISC ChangeLog 4904 RMD160 b158573004ae2da7b9963bdb1c7cc92b13f30efb SHA1 94b0509ab25d1e958db50930abb5cb5014005d1d SHA256 53ad9fc90ec8c7a9015f8c9b2c8c62689f16e7ce568335118635ef60b2fa8954
+EBUILD dkim-milter-2.5.5.ebuild 4729 RMD160 0393e818c6db0e3a4bda37ecbb0dfb6612a97ff2 SHA1 e19f1613558c18c7006bd8d5abad873bf41fe0da SHA256 c650f850cf4f3eca4ccc8d37c49de3cc6d87d00592e219cb02588cb06d4157e2
+MISC ChangeLog 5246 RMD160 f13d947c24381a277e21bcb2dd0aa55270ec36cb SHA1 5d9d5a3408d84262826de1dda076b3c25577eae9 SHA256 e561bbf48ab0213aee65496e4d699563331f83dc8bd00409828f1c8d76462417
 MISC metadata.xml 470 RMD160 69ef986fc757159a9b071221508ce641cb2e97b9 SHA1 d00fc7c0fd4a75bb22e932b260ad0ed648046b3f SHA256 f1b8de60056783e5ba04d034882769a26cfe6f8651e2a92825f45751dd60f414
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkhLrAQACgkQ+fWpoTWIA9HcIgCfUn/2E5xkG3xJ2eil4yDGJBUN
+9Q4Anj+ZoivgXxWkrgZdaZXeMufr9Svw
+=c0tE
+-----END PGP SIGNATURE-----
diff --git a/mail-filter/dkim-milter/dkim-milter-2.4.3.ebuild b/mail-filter/dkim-milter/dkim-milter-2.4.3.ebuild
deleted file mode 100644
index f963fbaf31ce..000000000000
--- a/mail-filter/dkim-milter/dkim-milter-2.4.3.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2008 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.4.3.ebuild,v 1.1 2008/01/24 11:39:14 mrness Exp $
-
-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 ~x86"
-IUSE="ipv6 diffheaders"
-
-RDEPEND="dev-libs/openssl
-	>=sys-libs/db-3.2
-	|| ( mail-filter/libmilter mail-mta/sendmail )
-	diffheaders? ( dev-libs/tre )"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	enewgroup milter
-	enewuser milter -1 -1 -1 milter
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}" || die "source dir not found"
-
-	cp site.config.m4.dist devtools/Site/site.config.m4 || \
-		die "failed to copy site.config.m4"
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-
-	local ENVDEF=""
-	use ipv6 && ENVDEF="${ENVDEF} -DNETINET6"
-	sed -i -e "s:@@CFLAGS@@:${CFLAGS}:" -e "s:@@ENVDEF@@:${ENVDEF}:" \
-		devtools/Site/site.config.m4
-	echo "APPENDDEF(\`confNO_MAN_BUILD', \` ')">>devtools/Site/site.config.m4
-
-	use diffheaders && epatch "${FILESDIR}/${PN}-diffheaders.patch"
-}
-
-src_compile() {
-	emake -j1 CC="$(tc-getCC)" || die "emake failed"
-}
-
-src_test() {
-	emake -j1 CC="$(tc-getCC)" 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"
-
-	# prepare directory for .pid, .sock and .stats files
-	dodir /var/run/dkim-filter
-	fowners milter:milter /var/run/dkim-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 */*.{3,5,8}
-
-	# some people like docs
-	dodoc RELEASE_NOTES *.txt
-}
-
-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 SSP http://www.dkim.org/specs/draft-ietf-dkim-ssp-01.html"
-}
diff --git a/mail-filter/dkim-milter/dkim-milter-2.4.4.ebuild b/mail-filter/dkim-milter/dkim-milter-2.4.4.ebuild
deleted file mode 100644
index a14b28cf018d..000000000000
--- a/mail-filter/dkim-milter/dkim-milter-2.4.4.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2008 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.4.4.ebuild,v 1.2 2008/01/29 18:29:26 mrness Exp $
-
-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 ~x86"
-IUSE="ipv6 diffheaders"
-
-RDEPEND="dev-libs/openssl
-	>=sys-libs/db-3.2
-	diffheaders? ( dev-libs/tre )"
-DEPEND="${RDEPEND}
-	|| ( mail-filter/libmilter mail-mta/sendmail )" # libmilter is a static library
-
-pkg_setup() {
-	enewgroup milter
-	enewuser milter -1 -1 -1 milter
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}" || die "source dir not found"
-
-	cp site.config.m4.dist devtools/Site/site.config.m4 || \
-		die "failed to copy site.config.m4"
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-
-	local ENVDEF=""
-	use ipv6 && ENVDEF="${ENVDEF} -DNETINET6"
-	sed -i -e "s:@@CFLAGS@@:${CFLAGS}:" -e "s:@@ENVDEF@@:${ENVDEF}:" \
-		devtools/Site/site.config.m4
-	echo "APPENDDEF(\`confNO_MAN_BUILD', \` ')">>devtools/Site/site.config.m4
-
-	use diffheaders && epatch "${FILESDIR}/${PN}-diffheaders.patch"
-}
-
-src_compile() {
-	emake -j1 CC="$(tc-getCC)" || die "emake failed"
-}
-
-src_test() {
-	emake -j1 CC="$(tc-getCC)" 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"
-
-	# prepare directory for .pid, .sock and .stats files
-	dodir /var/run/dkim-filter
-	fowners milter:milter /var/run/dkim-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 */*.{3,5,8}
-
-	# some people like docs
-	dodoc RELEASE_NOTES *.txt
-}
-
-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 SSP http://www.dkim.org/specs/draft-ietf-dkim-ssp-01.html"
-}
diff --git a/mail-filter/dkim-milter/dkim-milter-2.5.2.ebuild b/mail-filter/dkim-milter/dkim-milter-2.5.2.ebuild
deleted file mode 100644
index 965c99d3f600..000000000000
--- a/mail-filter/dkim-milter/dkim-milter-2.5.2.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2008 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.5.2.ebuild,v 1.1 2008/04/03 11:46:44 dragonheart Exp $
-
-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 ~x86"
-IUSE="ipv6 diffheaders"
-
-RDEPEND="dev-libs/openssl
-	>=sys-libs/db-3.2
-	diffheaders? ( dev-libs/tre )"
-DEPEND="${RDEPEND}
-	|| ( mail-filter/libmilter mail-mta/sendmail )" # libmilter is a static library
-
-pkg_setup() {
-	enewgroup milter
-	enewuser milter -1 -1 -1 milter
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}" || die "source dir not found"
-
-	cp site.config.m4.dist devtools/Site/site.config.m4 || \
-		die "failed to copy site.config.m4"
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-
-	local ENVDEF=""
-	use ipv6 && ENVDEF="${ENVDEF} -DNETINET6"
-	sed -i -e "s:@@CFLAGS@@:${CFLAGS}:" -e "s:@@ENVDEF@@:${ENVDEF}:" \
-		devtools/Site/site.config.m4
-	echo "APPENDDEF(\`confNO_MAN_BUILD', \` ')">>devtools/Site/site.config.m4
-
-	use diffheaders && epatch "${FILESDIR}/${PN}-diffheaders.patch"
-}
-
-src_compile() {
-	emake -j1 CC="$(tc-getCC)" || die "emake failed"
-}
-
-src_test() {
-	emake -j1 CC="$(tc-getCC)" 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}
-
-	# some people like docs
-	dodoc RELEASE_NOTES *.txt
-}
-
-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/dkim-milter-2.5.5.ebuild b/mail-filter/dkim-milter/dkim-milter-2.5.5.ebuild
index 1624b36407df..0a0051c95aa2 100644
--- a/mail-filter/dkim-milter/dkim-milter-2.5.5.ebuild
+++ b/mail-filter/dkim-milter/dkim-milter-2.5.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.5.5.ebuild,v 1.1 2008/05/03 00:02:31 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dkim-milter/dkim-milter-2.5.5.ebuild,v 1.2 2008/06/08 09:52:59 mrness Exp $
 
 inherit eutils toolchain-funcs
 
@@ -31,8 +31,7 @@ src_unpack() {
 
 	cp site.config.m4.dist devtools/Site/site.config.m4 || \
 		die "failed to copy site.config.m4"
-	#epatch "${FILESDIR}/${P}-gentoo.patch"
-	epatch "${FILESDIR}/${PN}-2.5.2-gentoo.patch"
+	epatch "${FILESDIR}/${P}-gentoo.patch"
 
 	local ENVDEF=""
 	use ipv6 && ENVDEF="${ENVDEF} -DNETINET6"
diff --git a/mail-filter/dkim-milter/files/dkim-milter-2.4.3-gentoo.patch b/mail-filter/dkim-milter/files/dkim-milter-2.4.3-gentoo.patch
deleted file mode 100644
index f378939f9d94..000000000000
--- a/mail-filter/dkim-milter/files/dkim-milter-2.4.3-gentoo.patch
+++ /dev/null
@@ -1,165 +0,0 @@
-diff -Nru dkim-milter-2.4.3.orig/devtools/Site/site.config.m4 dkim-milter-2.4.3/devtools/Site/site.config.m4
---- dkim-milter-2.4.3.orig/devtools/Site/site.config.m4	2008-01-24 13:07:10.000000000 +0200
-+++ dkim-milter-2.4.3/devtools/Site/site.config.m4	2008-01-24 13:08:08.000000000 +0200
-@@ -11,7 +11,10 @@
- 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(`confOPTIMIZE', `@@CFLAGS@@')
-+define(`confENVDEF', `@@ENVDEF@@')
-+dnl man build is broken
-+define(`confNO_MAN_BUILD',`')
- 
- dnl Shared library for libdkim
- dnl
-@@ -40,7 +43,7 @@
- dnl
- dnl If you want to use the 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
-@@ -65,7 +68,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 
-@@ -78,7 +81,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
-@@ -114,7 +117,7 @@
- dnl APPENDDEF(`confENVDEF', `-D_FFR_REQUIRED_HEADERS ')
- 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.4.3.orig/dkim-filter/dkim-filter.conf.sample dkim-milter-2.4.3/dkim-filter/dkim-filter.conf.sample
---- dkim-milter-2.4.3.orig/dkim-filter/dkim-filter.conf.sample	2007-12-14 09:22:19.000000000 +0200
-+++ dkim-milter-2.4.3/dkim-filter/dkim-filter.conf.sample	2008-01-24 13:07:51.000000000 +0200
-@@ -20,13 +20,6 @@
- 
- # AutoRestart		No
- 
--##  Background { yes | no }
--##  	default "yes"
--##
--##  Indicate whether or not the filter should run in the background.
--
--# Background		Yes
--
- ##  BodyLengths { yes | no }
- ##  	default "no"
- ##
-@@ -74,7 +67,7 @@
- ##  Specify for which domain(s) signing should be done.  No default; must
- ##  be specified for signing.
- 
--Domain			example.com
-+Domain			my-domain.com
- 
- ##  ExternalIgnoreList filename
- ##
-@@ -89,7 +82,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
- ##
-@@ -106,7 +99,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
- 
- ##  InternalHosts filename
- ##
-@@ -114,7 +107,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
- 
- ##  MacroList macro[=value][,...]
- ##
-@@ -198,22 +191,6 @@
- 
- # 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"
- ##
-@@ -288,7 +265,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
- 
- ##  SubDomains { yes | no }
- ##  	default "no"
-@@ -318,7 +295,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)
-@@ -326,7 +303,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
- 
- ##  UseSSPDeny { yes | no }
- ##  	default "no"
-@@ -344,3 +321,10 @@
- ##  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-2.4.4-gentoo.patch b/mail-filter/dkim-milter/files/dkim-milter-2.4.4-gentoo.patch
deleted file mode 100644
index dfd45597f06b..000000000000
--- a/mail-filter/dkim-milter/files/dkim-milter-2.4.4-gentoo.patch
+++ /dev/null
@@ -1,165 +0,0 @@
-diff -ruN dkim-milter-2.4.4.orig/devtools/Site/site.config.m4 dkim-milter-2.4.4/devtools/Site/site.config.m4
---- dkim-milter-2.4.4.orig/devtools/Site/site.config.m4	2008-01-28 10:38:23.000000000 +1100
-+++ dkim-milter-2.4.4/devtools/Site/site.config.m4	2008-01-28 10:39:35.000000000 +1100
-@@ -11,7 +11,10 @@
- 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(`confOPTIMIZE', `@@CFLAGS@@')
-+define(`confENVDEF', `@@ENVDEF@@')
-+dnl man build is broken
-+define(`confNO_MAN_BUILD',`')
- 
- dnl Shared library for libdkim
- dnl
-@@ -40,7 +43,7 @@
- dnl
- dnl If you want to use the 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
-@@ -65,7 +68,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 
-@@ -78,7 +81,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
-@@ -114,7 +117,7 @@
- dnl APPENDDEF(`confENVDEF', `-D_FFR_REQUIRED_HEADERS ')
- 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 -ruN dkim-milter-2.4.4.orig/dkim-filter/dkim-filter.conf.sample dkim-milter-2.4.4/dkim-filter/dkim-filter.conf.sample
---- dkim-milter-2.4.4.orig/dkim-filter/dkim-filter.conf.sample	2007-12-14 18:22:19.000000000 +1100
-+++ dkim-milter-2.4.4/dkim-filter/dkim-filter.conf.sample	2008-01-28 10:39:35.000000000 +1100
-@@ -20,13 +20,6 @@
- 
- # AutoRestart		No
- 
--##  Background { yes | no }
--##  	default "yes"
--##
--##  Indicate whether or not the filter should run in the background.
--
--# Background		Yes
--
- ##  BodyLengths { yes | no }
- ##  	default "no"
- ##
-@@ -74,7 +67,7 @@
- ##  Specify for which domain(s) signing should be done.  No default; must
- ##  be specified for signing.
- 
--Domain			example.com
-+Domain			my-domain.com
- 
- ##  ExternalIgnoreList filename
- ##
-@@ -89,7 +82,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
- ##
-@@ -106,7 +99,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
- 
- ##  InternalHosts filename
- ##
-@@ -114,7 +107,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
- 
- ##  MacroList macro[=value][,...]
- ##
-@@ -198,22 +191,6 @@
- 
- # 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"
- ##
-@@ -288,7 +265,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
- 
- ##  SubDomains { yes | no }
- ##  	default "no"
-@@ -318,7 +295,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)
-@@ -326,7 +303,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
- 
- ##  UseSSPDeny { yes | no }
- ##  	default "no"
-@@ -344,3 +321,10 @@
- ##  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-2.5.2-gentoo.patch b/mail-filter/dkim-milter/files/dkim-milter-2.5.5-gentoo.patch
index 3f4070512b45..285ebc2ed313 100644
--- a/mail-filter/dkim-milter/files/dkim-milter-2.5.2-gentoo.patch
+++ b/mail-filter/dkim-milter/files/dkim-milter-2.5.5-gentoo.patch
@@ -1,5 +1,5 @@
---- dkim-milter-2.5.2.orig/devtools/Site/site.config.m4 06:29:18.000000000 +1100
-+++ dkim-milter-2.5.2/devtools/Site/site.config.m4	2008-04-03 22:12:18.000000000 +1100
+--- dkim-milter-2.5.5.orig/devtools/Site/site.config.m4	2008-06-08 12:47:04.000000000 +0300
++++ dkim-milter-2.5.5/devtools/Site/site.config.m4	2008-06-08 12:47:37.000000000 +0300
 @@ -11,7 +11,10 @@
  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"
@@ -48,8 +48,8 @@
  dnl APPENDDEF(`confENVDEF', `-D_FFR_VBR ')
  dnl APPENDDEF(`confENVDEF', `-D_FFR_ZTAGS ')
  
---- dkim-milter-2.5.2.orig/dkim-filter/dkim-filter.conf.sample	2008-03-05 09:50:22.000000000 +1100
-+++ dkim-milter-2.5.2/dkim-filter/dkim-filter.conf.sample	2008-04-03 22:12:18.000000000 +1100
+--- dkim-milter-2.5.5.orig/dkim-filter/dkim-filter.conf.sample	2008-03-05 00:50:22.000000000 +0200
++++ dkim-milter-2.5.5/dkim-filter/dkim-filter.conf.sample	2008-06-08 12:47:37.000000000 +0300
 @@ -37,13 +37,6 @@
  
  # AutoRestartRate	n/tu