From: Daniel Black <dragonheart@gentoo.org>
Date: Tue, 18 May 2010 08:08:47 +0000 (+0000)
Subject: version bump and cleanout
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=68e7d38281b48403ef4f9febda14e7b2f87e5b37;p=gentoo.git

version bump and cleanout
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
---

diff --git a/mail-filter/opendkim/ChangeLog b/mail-filter/opendkim/ChangeLog
index f181d2230caf..e9184a24b325 100644
--- a/mail-filter/opendkim/ChangeLog
+++ b/mail-filter/opendkim/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for mail-filter/opendkim
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/ChangeLog,v 1.14 2010/05/01 01:46:59 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/ChangeLog,v 1.15 2010/05/18 08:08:47 dragonheart Exp $
+
+*opendkim-2.0.4 (18 May 2010)
+
+  18 May 2010; Daniel Black <dragonheart@gentoo.org>
+  -opendkim-1.2.2-r1.ebuild, -files/opendkim-1.2.2-repcalc.patch,
+  -opendkim-2.0.0.ebuild, -files/opendkim-2.0.0-lua-ldap.patch,
+  -opendkim-2.0.1.ebuild, -opendkim-2.0.2.ebuild, +opendkim-2.0.4.ebuild:
+  version bump and cleanout
 
 *opendkim-2.0.3 (01 May 2010)
 
diff --git a/mail-filter/opendkim/Manifest b/mail-filter/opendkim/Manifest
index 3b01a64e4280..83e284ff1c89 100644
--- a/mail-filter/opendkim/Manifest
+++ b/mail-filter/opendkim/Manifest
@@ -1,15 +1,7 @@
-AUX opendkim-1.2.2-repcalc.patch 240 RMD160 ed9f5f87d51ef6deb622ebac3e83a7d3261357c1 SHA1 f4e1fd1076bdd2fee78649f2f427844b787051da SHA256 ca0ba7cedcfbf99bef753ae3d9eeb8ae67947e5ce15d02eab66b38c876345fd1
-AUX opendkim-2.0.0-lua-ldap.patch 635 RMD160 737ad31d82afac92e492d90815bfcac60be1e314 SHA1 b97952bae1f77d8b15c0e8b834900ecfa8ee8d25 SHA256 1eb5e3fb8ac2f295dc633cf735bb8326e191c301af985a516e463f2e7a2df94c
 AUX opendkim.init 1417 RMD160 df83c4df3b5a6eaa86ff21f8557bcb41fe5cbf2a SHA1 5d70122b00fd11f2a1b26537faca50bda7647f45 SHA256 a79ff9fed5ee3834aa905f6df613035b1121a3b3e264362a74558d315d3c30d9
-DIST opendkim-1.2.2.tar.gz 879000 RMD160 662bd8abad2c798f0fc4b6769b82b953f1274f66 SHA1 daee04bf5e755c6e910068e56ea38caba16f67de SHA256 dc123a9e1546ec404535a57ecf717728e5cf89681f7cf749ad27ec0942857b06
-DIST opendkim-2.0.0.tar.gz 986884 RMD160 d85a88e4d493f86e0e14af8cec350f532b282aaf SHA1 bb33854bac14409a0b68539c38c2e5e2b9b07ccf SHA256 1d8b96760949821eaaae40aefa5a1b0b3194dfcd0cfaa76d630ff3d1488824ca
-DIST opendkim-2.0.1.tar.gz 959199 RMD160 ab8c19d85b795045dd24a699726d565cb3878c1d SHA1 f6aea1c27e563d1025a96c1d13d3f68430608a6d SHA256 267b1c14d261e8224682a7e0e3ded241b6f73da3f03b64fdddbe0df2bb602be6
-DIST opendkim-2.0.2.tar.gz 960376 RMD160 696b2542586fe71e62ba3bdf64c67dc88538a0d6 SHA1 b108297ba3795a9b2f2e84f92b683182e43da352 SHA256 d318e0d0867ce7f46eaef1191fcd11eeae7fdb04871668cf561ff102613dbe24
 DIST opendkim-2.0.3.tar.gz 964034 RMD160 964659db05799a555a5a5ba8427cc63044862abb SHA1 c26fcf1edd70f1aac767f687043b13a3597cb19d SHA256 7d2ef1e97f2b878ddd902ecf97763da60f439f799f4fc8ec5b0c8d216e84ee38
-EBUILD opendkim-1.2.2-r1.ebuild 5360 RMD160 e6b00eaf843d1856e0658da4ea36bf20083ee758 SHA1 77d96b2c7b6bb01e2fca74cf63706deeea7686c7 SHA256 95ee0ce8ef8aeaa586176555c5577e191bdad0d2cdd8be2c7169883bc9ebb60a
-EBUILD opendkim-2.0.0.ebuild 5725 RMD160 301ada3629785a6f9eaa28b63b8ff7a80b6309bc SHA1 3646562c165f595a07c41bde103793b719526214 SHA256 7100f1267132b864bb6ba06008c344e6d8a5bc3a25ba9508d7c2955b2d379309
-EBUILD opendkim-2.0.1.ebuild 5658 RMD160 432402adf9a0e908c9b28ed16411d676d03687ea SHA1 77fd27729e7702a80364fd108b9d197a48aea289 SHA256 93f5375a6780bde778d5ce348ab2e7560e4d9adc9f8fde4c8f2d4102df670cdb
-EBUILD opendkim-2.0.2.ebuild 5658 RMD160 1f8a8b176f1495eb1fad9882d2eb3ce8e42687d9 SHA1 f6eefb0626804f044e16df78d848dc3937d577b9 SHA256 e663050a97cacb7a3aec7c6a4fab1515ab09759b01a7ff249be66d1a926aceda
+DIST opendkim-2.0.4.tar.gz 965804 RMD160 30bf63ca214942b48d2d4d40f6b1971752ddbf52 SHA1 34b6e315bed100c11b073860406eb77ca320dc82 SHA256 ce1807613a9d194d3c0dce949f8e26bc7b2f1e1c6c908728cdec748c54cda40e
 EBUILD opendkim-2.0.3.ebuild 5658 RMD160 7e9cd6b423417fa2876d4d59ce692b98a6097e56 SHA1 deca71cdb821e873e47fcbba52e430a71054c550 SHA256 78e913ac781113528270a7a774a5b3e0b5e762c545fe9f64cc12d3af1f04c2f8
-MISC ChangeLog 3435 RMD160 7264e583a781eb0333bdedd331f19ce5b814b4e5 SHA1 f236102cdca3ecc3cbdd00f20d019539a0e19f8b SHA256 43b5d1e43dfb5c076b3e9a57d8cc0aa509ed3936398c87d0a1e4dddee3450494
+EBUILD opendkim-2.0.4.ebuild 5658 RMD160 d00e0d19fd674bf0c54ccd0e855a059a81567bb3 SHA1 fbae7747dae33e2caf427e3b1d60ea41bfeda277 SHA256 4d30f8227dbd81cb2d6a95df08caa962f0932d2e70ff4257055baa383ae63858
+MISC ChangeLog 3752 RMD160 a6d93ab2fa3588a37eca1434a59b482d5ceef87d SHA1 6e12cb205f4a9101ba3303351c862e71f3b05422 SHA256 d8e07ce20fc4a127c050ec2d2025519fbfe8c30c2edec4b719d3a21c774fcef1
 MISC metadata.xml 1444 RMD160 25d767047ea540eeb22f7f2356e83548be5954f9 SHA1 a9d03f567205963ded4a26eb9f9b61f13c6a5b58 SHA256 8fb69e68d1fd09bde49461b53470ec8047de2fa2af497278a5fe514a3dd828f4
diff --git a/mail-filter/opendkim/files/opendkim-1.2.2-repcalc.patch b/mail-filter/opendkim/files/opendkim-1.2.2-repcalc.patch
deleted file mode 100644
index 53f45a734262..000000000000
--- a/mail-filter/opendkim/files/opendkim-1.2.2-repcalc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- dkim-rep.c	22 Nov 2009 08:15:50 -0000	1.6
-+++ dkim-rep.c	20 Jan 2010 21:59:36 -0000	1.6.4.1
-@@ -87,7 +87,7 @@
- 		snprintf((char *) cvt, len, "%02x", digest[c]);
- 		cvt += 2;
- 		out += 2;
--		len -= out;
-+		len -= 2;
- 	}
- 
- 	return out;
-
diff --git a/mail-filter/opendkim/files/opendkim-2.0.0-lua-ldap.patch b/mail-filter/opendkim/files/opendkim-2.0.0-lua-ldap.patch
deleted file mode 100644
index b0dc3801c111..000000000000
--- a/mail-filter/opendkim/files/opendkim-2.0.0-lua-ldap.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: configure.ac
-===================================================================
-RCS file: /cvsroot/opendkim/configure.ac,v
-retrieving revision 1.139
-retrieving revision 1.140
-diff -u -b -B -r1.139 -r1.140
---- configure.ac	3 Mar 2010 16:32:55 -0000	1.139
-+++ configure.ac	7 Mar 2010 17:17:57 -0000	1.140
-@@ -1063,7 +1063,6 @@
- 				AC_MSG_RESULT([ok]), 
- 				AC_MSG_ERROR([OpenLDAP version 2.1.3 or later required]))
- 	CPPFLAGS="$saved_CPPFLAGS"
--	AC_DEFINE([USE_LUA], 1, [support for Lua scripting])
- 	AC_DEFINE([USE_LDAP], 1, [OpenLDAP support for datasets enabled])
- fi
- AM_CONDITIONAL(USE_LDAP, test x"$ldap_found" = x"yes")
diff --git a/mail-filter/opendkim/opendkim-1.2.2-r1.ebuild b/mail-filter/opendkim/opendkim-1.2.2-r1.ebuild
deleted file mode 100644
index c20c49e70495..000000000000
--- a/mail-filter/opendkim/opendkim-1.2.2-r1.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/opendkim-1.2.2-r1.ebuild,v 1.2 2010/03/22 05:39:28 dragonheart Exp $
-
-EAPI="2"
-
-inherit eutils
-
-DESCRIPTION="A milter-based application to provide DKIM signing and verification"
-HOMEPAGE="http://opendkim.org"
-SRC_URI="mirror://sourceforge/opendkim/${P}.tar.gz"
-
-LICENSE="Sendmail-Open-Source BSD-4"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+db asyncdns opendbx unbound"
-
-# FUTURE: diffheaders (libtre error) - bug #296813
-
-DEPEND="dev-libs/openssl
-	db? ( >=sys-libs/db-3.2 )
-	|| ( mail-filter/libmilter mail-mta/sendmail )
-	opendbx? ( >=dev-db/opendbx-1.4.0 )
-	unbound? ( >=net-dns/unbound-1.4.1 )"
-#	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() {
-	sed -i -e 's:/var/db/dkim:/etc/opendkim:g' \
-	       -e 's:/etc/mail:/etc/opendkim:g' \
-		   opendkim/opendkim.conf.sample
-	cd "${S}"/libopendkim
-	epatch "${FILESDIR}"/${P}-repcalc.patch
-}
-
-src_configure() {
-	local conf
-	if use asyncdns ; then
-		if use unbound; then
-			conf=$(use_with unbound)
-		else
-			conf="$(use_enable asyncdns arlib) $(use_enable asyncdns dnsupgrade)"
-		fi
-	else
-		conf="$(use_with unbound) $(use_enable asyncdns arlib) $(use_enable asyncdns dnsupgrade)"
-	fi
-	econf $(use_enable db bodylength_db) \
-		$(use_enable db popauth) \
-		$(use_enable db query_cache) \
-		$(use_enable db report_intervals) \
-		$(use_enable db stats) \
-		$(use_with opendbx odbx) \
-		${conf} \
-		--without-domainkeys \
-		--enable-capture_unknown_errors \
-		--enable-dkim_reputation \
-		--enable-identity_header \
-		--enable-redirect \
-		--enable-resign \
-		--enable-replace_rules \
-		--enable-select_canonicalization \
-		--enable-selector_header \
-		--enable-sender_macro \
-		--enable-vbr \
-		--enable-ztags
-#		$(use_enable diffheaders) \
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	# file collision
-	rm "${D}"/usr/share/man/man3/ar.3
-	mv "${D}"/usr/share/doc/opendkim "${D}"/usr/share/doc/${PF}
-
-	newinitd "${FILESDIR}/opendkim.init" opendkim
-	dodir /etc/opendkim /var/run/opendkim /var/lib/opendkim
-	fowners milter:milter /var/run/opendkim /etc/opendkim /var/lib/opendkim
-
-	# default configuration
-	if [ ! -f /etc/opendkim/opendkim.conf ]; then
-		grep ^[^#] "${S}"/opendkim/opendkim.conf.sample \
-			> "${D}"/etc/opendkim/opendkim.conf
-		echo \# Socket local:/var/run/opendkim/opendkim.sock >> \
-			"${D}"/etc/opendkim/opendkim.conf
-		echo UserID milter >> "${D}"/etc/opendkim/opendkim.conf
-		if use db; then
-			echo Statistics /var/lib/opendkim/stats.db >> \
-				"${D}"/etc/opendkim/opendkim.conf
-		fi
-	fi
-}
-
-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/opendkim/${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
-		opendkim-genkey.sh -b ${keysize} -D "${ROOT}"etc/opendkim/ \
-			-s ${selector} -d '(your domain)' && \
-			chown milter:milter \
-			"${ROOT}"etc/opendkim/"${selector}".private || \
-				{ eerror "Failed to create private and public keys." ; return 1; }
-		chmod go-r "${ROOT}"etc/opendkim/"${selector}".private
-	fi
-
-	# opendkim selector configuration
-	echo
-	einfo "Make sure you have the following settings in your /etc/opendkim/opendkim.conf:"
-	einfo "  Keyfile /etc/opendkim/${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/opendkim/opendkim.sock"
-	einfo "  non_smtpd_milters = unix:/var/run/opendkim/opendkim.sock"
-
-	# DNS configuration
-	einfo "After you configured your MTA, publish your key by adding this TXT record to your domain:"
-	cat "${ROOT}"etc/opendkim/${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 ADSP http://tools.ietf.org/html/rfc5617"
-}
diff --git a/mail-filter/opendkim/opendkim-2.0.0.ebuild b/mail-filter/opendkim/opendkim-2.0.0.ebuild
deleted file mode 100644
index 3f2a922e8870..000000000000
--- a/mail-filter/opendkim/opendkim-2.0.0.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/opendkim-2.0.0.ebuild,v 1.3 2010/03/22 05:39:28 dragonheart Exp $
-
-EAPI="2"
-
-inherit eutils autotools
-
-# for betas
-#MY_P=${P/_b/.B}
-#S=${WORKDIR}/${PN}-2.0.0
-#SRC_URI="mirror://sourceforge/opendkim/${MY_P}.tar.gz"
-
-DESCRIPTION="A milter-based application to provide DKIM signing and verification"
-HOMEPAGE="http://opendkim.org"
-SRC_URI="mirror://sourceforge/opendkim/${P}.tar.gz"
-
-LICENSE="Sendmail-Open-Source BSD-4"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="asyncdns +db opendbx ldap lua sasl unbound"
-
-# FUTURE: diffheaders (libtre error) - bug #296813
-
-DEPEND="dev-libs/openssl
-	db? ( >=sys-libs/db-3.2 )
-	|| ( mail-filter/libmilter mail-mta/sendmail )
-	opendbx? ( >=dev-db/opendbx-1.4.0 )
-	lua? ( dev-lang/lua )
-	ldap? ( net-nds/openldap
-		sasl? ( dev-libs/cyrus-sasl )
-	)
-	unbound? ( >=net-dns/unbound-1.4.1 )"
-#	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() {
-	sed -i -e 's:/var/db/dkim:/etc/opendkim:g' \
-	       -e 's:/etc/mail:/etc/opendkim:g' \
-		   opendkim/opendkim.conf.sample
-	epatch "${FILESDIR}"/${P}-lua-ldap.patch
-	eautoreconf
-}
-
-src_configure() {
-	local conf
-	if use asyncdns ; then
-		if use unbound; then
-			conf=$(use_with unbound)
-		else
-			conf="$(use_enable asyncdns arlib) $(use_enable asyncdns dnsupgrade)"
-		fi
-	else
-		conf="$(use_with unbound) $(use_enable asyncdns arlib) $(use_enable asyncdns dnsupgrade)"
-	fi
-	if use ldap; then
-		conf="${conf} $(use_with sasl)"
-	fi
-	econf $(use_enable db bodylength_db) \
-		$(use_enable db popauth) \
-		$(use_enable db query_cache) \
-		$(use_enable db report_intervals) \
-		$(use_enable db stats) \
-		$(use_with opendbx odbx) \
-		$(use_with lua) \
-		$(use_with ldap openldap) \
-		${conf} \
-		--docdir=/usr/share/doc/${PF} \
-		--without-domainkeys \
-		--enable-capture_unknown_errors \
-		--enable-dkim_reputation \
-		--enable-identity_header \
-		--enable-redirect \
-		--enable-resign \
-		--enable-replace_rules \
-		--enable-select_canonicalization \
-		--enable-selector_header \
-		--enable-sender_macro \
-		--enable-vbr \
-		--enable-ztags
-#		$(use_enable diffheaders) \
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	# file collision
-	rm "${D}"/usr/share/man/man3/ar.3
-	#mv "${D}"/usr/share/doc/opendkim "${D}"/usr/share/doc/${PF}
-
-	newinitd "${FILESDIR}/opendkim.init" opendkim
-	dodir /etc/opendkim /var/run/opendkim /var/lib/opendkim
-	fowners milter:milter /var/run/opendkim /etc/opendkim /var/lib/opendkim
-
-	# default configuration
-	if [ ! -f "${ROOT}"/etc/opendkim/opendkim.conf ]; then
-		grep ^[^#] "${S}"/opendkim/opendkim.conf.sample \
-			> "${D}"/etc/opendkim/opendkim.conf
-		echo \# Socket local:/var/run/opendkim/opendkim.sock >> \
-			"${D}"/etc/opendkim/opendkim.conf
-		echo UserID milter >> "${D}"/etc/opendkim/opendkim.conf.basic
-		if use db; then
-			echo Statistics /var/lib/opendkim/stats.db >> \
-				"${D}"/etc/opendkim/opendkim.conf
-		fi
-	fi
-}
-
-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/opendkim/${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
-		opendkim-genkey.sh -b ${keysize} -D "${ROOT}"etc/opendkim/ \
-			-s ${selector} -d '(your domain)' && \
-			chown milter:milter \
-			"${ROOT}"etc/opendkim/"${selector}".private || \
-				{ eerror "Failed to create private and public keys." ; return 1; }
-		chmod go-r "${ROOT}"etc/opendkim/"${selector}".private
-	fi
-
-	# opendkim selector configuration
-	echo
-	einfo "Make sure you have the following settings in your /etc/opendkim/opendkim.conf:"
-	einfo "  Keyfile /etc/opendkim/${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/opendkim/opendkim.sock"
-	einfo "  non_smtpd_milters = unix:/var/run/opendkim/opendkim.sock"
-
-	# DNS configuration
-	einfo "After you configured your MTA, publish your key by adding this TXT record to your domain:"
-	cat "${ROOT}"etc/opendkim/${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 ADSP http://tools.ietf.org/html/rfc5617"
-}
diff --git a/mail-filter/opendkim/opendkim-2.0.2.ebuild b/mail-filter/opendkim/opendkim-2.0.2.ebuild
deleted file mode 100644
index efba1d8649b8..000000000000
--- a/mail-filter/opendkim/opendkim-2.0.2.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/opendkim-2.0.2.ebuild,v 1.1 2010/04/25 05:39:01 dragonheart Exp $
-
-EAPI="2"
-
-inherit eutils
-
-# for betas
-#MY_P=${P/_b/.B}
-#S=${WORKDIR}/${PN}-2.0.0
-#SRC_URI="mirror://sourceforge/opendkim/${MY_P}.tar.gz"
-
-DESCRIPTION="A milter-based application to provide DKIM signing and verification"
-HOMEPAGE="http://opendkim.org"
-SRC_URI="mirror://sourceforge/opendkim/${P}.tar.gz"
-
-LICENSE="Sendmail-Open-Source BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="asyncdns +db opendbx ldap lua sasl unbound"
-
-# FUTURE: diffheaders (libtre error) - bug #296813
-
-DEPEND="dev-libs/openssl
-	db? ( >=sys-libs/db-3.2 )
-	|| ( mail-filter/libmilter mail-mta/sendmail )
-	opendbx? ( >=dev-db/opendbx-1.4.0 )
-	lua? ( dev-lang/lua )
-	ldap? ( net-nds/openldap
-		sasl? ( dev-libs/cyrus-sasl )
-	)
-	unbound? ( >=net-dns/unbound-1.4.1 )"
-#	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() {
-	sed -i -e 's:/var/db/dkim:/etc/opendkim:g' \
-	       -e 's:/etc/mail:/etc/opendkim:g' \
-		   opendkim/opendkim.conf.sample
-}
-
-src_configure() {
-	local conf
-	if use asyncdns ; then
-		if use unbound; then
-			conf=$(use_with unbound)
-		else
-			conf="$(use_enable asyncdns arlib) $(use_enable asyncdns dnsupgrade)"
-		fi
-	else
-		conf="$(use_with unbound) $(use_enable asyncdns arlib) $(use_enable asyncdns dnsupgrade)"
-	fi
-	if use ldap; then
-		conf="${conf} $(use_with sasl)"
-	fi
-	econf $(use_enable db bodylength_db) \
-		$(use_enable db popauth) \
-		$(use_enable db query_cache) \
-		$(use_enable db report_intervals) \
-		$(use_enable db stats) \
-		$(use_with opendbx odbx) \
-		$(use_with lua) \
-		$(use_with ldap openldap) \
-		${conf} \
-		--docdir=/usr/share/doc/${PF} \
-		--without-domainkeys \
-		--enable-capture_unknown_errors \
-		--enable-dkim_reputation \
-		--enable-identity_header \
-		--enable-redirect \
-		--enable-resign \
-		--enable-replace_rules \
-		--enable-select_canonicalization \
-		--enable-selector_header \
-		--enable-sender_macro \
-		--enable-vbr \
-		--enable-ztags
-#		$(use_enable diffheaders) \
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	# file collision
-	rm "${D}"/usr/share/man/man3/ar.3
-	#mv "${D}"/usr/share/doc/opendkim "${D}"/usr/share/doc/${PF}
-
-	newinitd "${FILESDIR}/opendkim.init" opendkim
-	dodir /etc/opendkim /var/run/opendkim /var/lib/opendkim
-	fowners milter:milter /var/run/opendkim /etc/opendkim /var/lib/opendkim
-
-	# default configuration
-	if [ ! -f "${ROOT}"/etc/opendkim/opendkim.conf ]; then
-		grep ^[^#] "${S}"/opendkim/opendkim.conf.sample \
-			> "${D}"/etc/opendkim/opendkim.conf
-		echo \# Socket local:/var/run/opendkim/opendkim.sock >> \
-			"${D}"/etc/opendkim/opendkim.conf
-		echo UserID milter >> "${D}"/etc/opendkim/opendkim.conf.basic
-		if use db; then
-			echo Statistics /var/lib/opendkim/stats.db >> \
-				"${D}"/etc/opendkim/opendkim.conf
-		fi
-	fi
-}
-
-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/opendkim/${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
-		opendkim-genkey.sh -b ${keysize} -D "${ROOT}"etc/opendkim/ \
-			-s ${selector} -d '(your domain)' && \
-			chown milter:milter \
-			"${ROOT}"etc/opendkim/"${selector}".private || \
-				{ eerror "Failed to create private and public keys." ; return 1; }
-		chmod go-r "${ROOT}"etc/opendkim/"${selector}".private
-	fi
-
-	# opendkim selector configuration
-	echo
-	einfo "Make sure you have the following settings in your /etc/opendkim/opendkim.conf:"
-	einfo "  Keyfile /etc/opendkim/${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/opendkim/opendkim.sock"
-	einfo "  non_smtpd_milters = unix:/var/run/opendkim/opendkim.sock"
-
-	# DNS configuration
-	einfo "After you configured your MTA, publish your key by adding this TXT record to your domain:"
-	cat "${ROOT}"etc/opendkim/${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 ADSP http://tools.ietf.org/html/rfc5617"
-}
diff --git a/mail-filter/opendkim/opendkim-2.0.1.ebuild b/mail-filter/opendkim/opendkim-2.0.4.ebuild
similarity index 98%
rename from mail-filter/opendkim/opendkim-2.0.1.ebuild
rename to mail-filter/opendkim/opendkim-2.0.4.ebuild
index 2649f0cda96b..d220a7ae6b8d 100644
--- a/mail-filter/opendkim/opendkim-2.0.1.ebuild
+++ b/mail-filter/opendkim/opendkim-2.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/opendkim-2.0.1.ebuild,v 1.1 2010/03/22 05:39:28 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/opendkim-2.0.4.ebuild,v 1.1 2010/05/18 08:08:47 dragonheart Exp $
 
 EAPI="2"