Version bump and remove old

Package-Manager: portage-2.1.11.5/cvs/Linux x86_64

5 files changed, 44 insertions, 431 deletions

diff --git a/mail-filter/opendkim/ChangeLog b/mail-filter/opendkim/ChangeLog
index ffe00bf09ed1..3bf0ec11f619 100644
--- a/mail-filter/opendkim/ChangeLog
+++ b/mail-filter/opendkim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-filter/opendkim
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/ChangeLog,v 1.40 2012/07/04 07:34:21 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/ChangeLog,v 1.41 2012/07/12 17:14:04 eras Exp $
+
+*opendkim-2.6.3 (12 Jul 2012)
+
+  12 Jul 2012; Eray Aslan <eras@gentoo.org> -opendkim-2.4.2.ebuild,
+  -opendkim-2.5.1.ebuild, -opendkim-2.5.2.ebuild, +opendkim-2.6.3.ebuild:
+  Version bump and remove old
 
   04 Jul 2012; Jeff Horelick <jdhore@gentoo.org> opendkim-2.5.2-r1.ebuild:
   marked x86 per bug 420663
diff --git a/mail-filter/opendkim/Manifest b/mail-filter/opendkim/Manifest
index 9d8313ace539..425780ea9eee 100644
--- a/mail-filter/opendkim/Manifest
+++ b/mail-filter/opendkim/Manifest
@@ -1,17 +1,34 @@
-AUX opendkim-2.4.0-ipv6.patch 765 RMD160 607f7d55c6bf6d4453651f899927e36682ec2673 SHA1 bc7a1fcae1aff97366e60612e2052ef7b03be14d SHA256 ab04590e0ca8543e0bff17f243134e265f36095a4a23d044521c9a07701b897d
-AUX opendkim.init.r2 1533 RMD160 11dc7939f7f7c2890504cd06295f598f45f35ae1 SHA1 b68137fb885ae39170dfcebc78cce699813286d0 SHA256 0e8fab90020c109f602d8367a6501bfb3b397a50f020b6fade5024e2facf593c
-DIST opendkim-2.4.2.tar.gz 1374662 RMD160 b19cc3522b2f4d2a63d9088ea611e687453e82a5 SHA1 6946d3d805e2c73256a97b1cdc9af3251fd89c6f SHA256 930a9ef845822ba310666dfc918d306d1ffa44cc0a8d9f56d7c0b0426d668f3f
-DIST opendkim-2.4.3.tar.gz 1381956 RMD160 73908fb7cf8f7c99b1d98499249d0283d0d59542 SHA1 cde87adf1236c9a9f25277935c26020fb13b1153 SHA256 c3ef73c5aa2bf8a6626b822cea08b72c954376ae892d596346973d11003c0906
-DIST opendkim-2.5.1.tar.gz 1468303 RMD160 76a716307bfd30bc2f81c3545f1d4f7ceca99332 SHA1 fd257d2e52673c73e1e15c5254c9db864a53fbb0 SHA256 afd6a762859ff6616103df03757e59c7a1053a241dd28ab21e5e38d44152a8fa
-DIST opendkim-2.5.2.tar.gz 1475225 RMD160 1fe0ea26cd00728226d1788e72f48366b3fafb03 SHA1 778f27162501879dec6ac3c957055d5bc9a1ac42 SHA256 fb6994ea4bbd7e93772517cd3ee0b4ec338ed502a920fa2fa98b34869db167a9
-DIST opendkim-2.6.0.tar.gz 1127009 RMD160 e8cf31b9c8112731e8c295a9cdb76e8490bca7fa SHA1 7b3aaf0c7ceb303fd60476af2034cfc76eb3c1df SHA256 1fd20a436af5005fb9870ec112315b9866642271250f0439cf0f0ac061051e41
-DIST opendkim-2.6.1.tar.gz 1125780 RMD160 318cda12538c59abc2f12b1ebea21871ae7dc778 SHA1 9d89f5d3fe9d79dac68a80b6c28f05b8e8506251 SHA256 a6cb55b1ae51cc6b37bfe09325c6e4c2309aabca0a447ea0baddbe8a159b25b6
-EBUILD opendkim-2.4.2.ebuild 6333 RMD160 34908883b4fb9eaa26ae38aee7c78af8be9302af SHA1 1275401d7a326783bb9d0fb164c2109bad395625 SHA256 829a5515d98166fc63c07ffa4f962bff6fede1d4e395bf8a00ea40a28fc60eef
-EBUILD opendkim-2.4.3.ebuild 6386 RMD160 272990ea203845dce688b448167373bd8d8d2438 SHA1 286b504e28be8aef5448c8e44e45713441b23615 SHA256 5a997081adfa28ba728b2b1a9afc1b548094eef3265aaa5b5efb225b936fde67
-EBUILD opendkim-2.5.1.ebuild 6417 RMD160 2de1862824b8f0077b308a00a8358f5856a2eec9 SHA1 96dd7814340db7adfbd8c7d5f40b3496c387f25a SHA256 ed7d3943d30ab25c860936471b8648e7de5cdd7e35f25fd6590448af7d59eb07
-EBUILD opendkim-2.5.2-r1.ebuild 6381 RMD160 c7a0c6c7b5f1b6f1d52cac974f7a47a230054ec1 SHA1 1dd3957cd7f1eeabc5cc5b9cf4aa58c0aba65489 SHA256 fb66509fcc160db3cb5add3386e5d0ff40ed21e3d28d1405f330575c34f36a72
-EBUILD opendkim-2.5.2.ebuild 6417 RMD160 4ea2a19ce134742b96ad7a7e8715e01b6b79fc0c SHA1 2349165879263f07ebfc272a5a696db302e6819b SHA256 be1714a3256996a41cdf787d92e0aaf394c7631f410a924694e89b4442d606f4
-EBUILD opendkim-2.6.0.ebuild 6348 RMD160 fc22e99bbd26b043b7d4ec068debed563e46c94e SHA1 2a572b29e5932926b2a106605ef0a1a5ec4f0106 SHA256 16414fae7170e523be6a92cf2118a48296456f325ed57b0eefd164ae9d5a3444
-EBUILD opendkim-2.6.1.ebuild 6332 RMD160 0193e5d91b66c5984123a5ef94394e49a897994c SHA1 21984e23f9a67cead50c1384c89e58bbdda4c1a2 SHA256 2960caca3efcbfd1e791576aea7fbe591b32c1b518f6ea1a72f1cb69a60cec57
-MISC ChangeLog 7436 RMD160 5a7bd853c625fdfa67b36fad2e91892a1f38321d SHA1 5631a2001f1beac47b7744ff4244701b4fd0e73d SHA256 ea51814270e19afd3b9bc7c502c75ae009be5b722abdaf5c2b29cda87766c5d8
-MISC metadata.xml 1325 RMD160 ff2a0c1e342165fc1bb643bf9712047549e0cfc6 SHA1 69c0c291ac7e94c65a86e27f401b9520346f43f9 SHA256 5c79e487583ffa41f2823235e61232f84c1ac18ef41b1b71150f8d32f76b82eb
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX opendkim-2.4.0-ipv6.patch 765 SHA256 ab04590e0ca8543e0bff17f243134e265f36095a4a23d044521c9a07701b897d SHA512 92fa7ebd2a33a80da0f35f30b2a032a9910c245db987ac4391e6e3876359ffaa85e386bebc2ae6ab7e315d008ee5969cc7a48a640e35a42fb9b5b0e40d332f06 WHIRLPOOL dfa19d812048d58372842c417a2b32a5b29a699a1f6affe5d47b0c61d0e4a6c5ea701179316489920c1abb2f12a2bd972cd199226de72fd31cf3e0131adab7db
+AUX opendkim.init.r2 1533 SHA256 0e8fab90020c109f602d8367a6501bfb3b397a50f020b6fade5024e2facf593c SHA512 8c7aef32c67e1ec4bf3afb0df48d861b6f1399c8a825161d00ca1400d87b084ad16de68401f9cece4cc9c07b06377641cc664d7e79750a0fc106f1088fb2dff7 WHIRLPOOL 00783d779d904118eb172f859c289d8b2b1832f1de1f17ab30a5a9f0af6ffa324395f2777b82fbde2e46d26f064d4ffec368b6734ce9cfe09173f24a7053de50
+DIST opendkim-2.4.3.tar.gz 1381956 SHA256 c3ef73c5aa2bf8a6626b822cea08b72c954376ae892d596346973d11003c0906
+DIST opendkim-2.5.2.tar.gz 1475225 SHA256 fb6994ea4bbd7e93772517cd3ee0b4ec338ed502a920fa2fa98b34869db167a9
+DIST opendkim-2.6.0.tar.gz 1127009 SHA256 1fd20a436af5005fb9870ec112315b9866642271250f0439cf0f0ac061051e41
+DIST opendkim-2.6.1.tar.gz 1125780 SHA256 a6cb55b1ae51cc6b37bfe09325c6e4c2309aabca0a447ea0baddbe8a159b25b6
+DIST opendkim-2.6.3.tar.gz 1127456 SHA256 6208d1bdf3e754cd26e3c9dd95ed68f00f9236e471242c176f2a6a61ede37216 SHA512 a9cbbac94cf23b613adb19e2fb38bda406d1874dd53be7ab0bae44860c284403ee33a1ca8b5aebe7964d0ea832169efa4c41c3ae93c37b8586904a0ecb431e19 WHIRLPOOL c12be4edbd42347d2e5e54d8073d948dbcbf84a15a3869ded14299baef08cd321487f2ea17f8d8e995e63fd0954a195c887046aca4e164f0a438417dabdc56ba
+EBUILD opendkim-2.4.3.ebuild 6386 SHA256 5a997081adfa28ba728b2b1a9afc1b548094eef3265aaa5b5efb225b936fde67 SHA512 34b99a31e2b5a448f266cdab7fbf6f4f771b6441f49aacf13fe3b9ffce4e80b95bacab09d2f51bf2c91eb821f5f2cd8bd6a68bbef326fa91ad627632390862f4 WHIRLPOOL 1f6f918adf564bc3866ea7197be28c8be2c757b2b699c9c93a49b2bb7ed22d4c91d35e842a335a764025cba12698b72fb8dd7d1e516dcf8c47ed677e6109cf94
+EBUILD opendkim-2.5.2-r1.ebuild 6381 SHA256 fb66509fcc160db3cb5add3386e5d0ff40ed21e3d28d1405f330575c34f36a72 SHA512 6275ecedda76b28ab20de3ab9ec010f4529a9b0545a62c5298aa8c1f4759583c51a6ee64f8a624fd3aca8395a274ac153ec682d2c2ab6519427c401d4ece34ba WHIRLPOOL cd3ed8b5e46bb1e2073d9918cfbda16bdf92f98615607e9bcc80335b60bfd6dead5e3e7c4ec1473446d900b9845db6989e4c2c420427fa1c5741121b257cd594
+EBUILD opendkim-2.6.0.ebuild 6348 SHA256 16414fae7170e523be6a92cf2118a48296456f325ed57b0eefd164ae9d5a3444 SHA512 88f6393b58901d6b0f1acc4065ec67c264115c97e85628c6264831a929e3138a90d63eef0952cda4d950a8b51dd8f78b57517bdbd568440d5bf7ffb1dd7d5781 WHIRLPOOL 9ab00561df7c118c75b77a07bdf21c4ad85bf2a3d150fcda71a9ef50c9fbe92eac0a69ff51afae37676109e037b21cbcdcca6de077069b9ee7aadb6e26502172
+EBUILD opendkim-2.6.1.ebuild 6332 SHA256 2960caca3efcbfd1e791576aea7fbe591b32c1b518f6ea1a72f1cb69a60cec57 SHA512 6a89efc29d092682233f2079da9806b7ca2247bdaac9e37107d0c604b0131b6c63aaaff0090e7fd82fe7a071ffbb56667f43e535c3d25e9186912d3652615799 WHIRLPOOL 6a63ca377ead189d8f222c1d6c9c7bf79c5c586033d6a722231a7f8b9bbf8aa1aee01926fd234cba7741729bbca93388729a54e4847b6addb40679e79882d576
+EBUILD opendkim-2.6.3.ebuild 6332 SHA256 ec74fb29947fed50cf835bf848d184f6f902ef81741c00891ed598338523b837 SHA512 278a57502a8343948bd4a118fbe8092ab8cf703b7b28f0989105d2125273c3e1747301ace318de54e96a9ce1026085c7945fc760bde3f631e141bbf7a698faf6 WHIRLPOOL 6f9156e644207a540340e51fa72235eb20c5603b070c946c2d785393fe46aaffc1bb1498278a8f01fd5c6cebc2ae8fe9f9f2afcba862c3a6ce4dc879a0c373c7
+MISC ChangeLog 7638 SHA256 ecdc9fbc07b18f16be65d4ee92196da7f1a87c433cf90b3df49b025ea227930a SHA512 cdf782cd4a20a0e98fc3ff146e6e559087446260dc063b43322ba6bc71d264e55c74e2a87047af0782e98e7075da8981df3f296370e0999b14b910adf85de89d WHIRLPOOL 97b233729ec9159813df45e9cb18d5ec94a1157511d8ee826c8e5222d73b353c97e41611bd328de259c665e902c252ad10003fadcf0440ba4f2935b96a576211
+MISC metadata.xml 1325 SHA256 5c79e487583ffa41f2823235e61232f84c1ac18ef41b1b71150f8d32f76b82eb SHA512 ae25f27a0c0cc5c3460b150f3eb6369e34b3051984b58da6a81847b5e90edc62e91fdd8f0d428576ef73614db095dc3a415237cccc1cc3cc806f9d99ff588df5 WHIRLPOOL d8b1221d484e12c31d76a20e8a7e6e0d033e16884e7dd14f657d4383f24f8f9294bc51dea4f512896a4183f9299c2faef31e7540d95c418000245090a3a0cdfe
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJP/wXpAAoJEHfx8XVYajsfQsEP/A6uCfMH4jMkxwrEb+SpwoB5
+1s07ROCT2GyRBeiOXv3TsYQisSPd43MbpJm3ncIoxz3WTkLxBKrDqb46fFq7cOBF
+JXWq0YRnvKNrGRbhIsKBdC9YmI6DcIa9c3rhwN0fWiSNYAxYdyU5zFNdvyqaPILc
+KZzaap+vJseQA5+W+EvheFEGOtR1BfvUgPyqRdyIBt/WOTcvsnoQx6pYrH9kujPK
+HELV+vZcGdkSWvM6B1GYwfvTmJeFNP+PkdE4zPYSsC5FSBYo6YfF7l05NNKB4WTW
+PM5Z5ndzzBoGOrMllXxzVzVUuT84anDAU9Nf7KEoftxrgBJmKayt0S6qHAZ6pAAP
+54TSKcj5Y5qqwM/4IWB6nsnEAFCTtGK1PQGG1aQnwwBpMJTaoMLjX+kamgLMzqO6
+T//6s8NC/g69UPw1eBkluokjoB+GTEMFvCABO4WzRym2M31igpSYfSiOdJk55o3Q
+a2S4BxxDhUFrwQQKxIvkgKhG95NaumKP9NlMnCg71Q3CiqDJtnS+8d9xMPM+WI73
+lhPbKSd+kca6b7c4gyDpEsa5cULoFW7L9SJjrwjFFeykUsxEjt9qxUhvXBsT/g5X
+uO1gxZvofjqwsL7iPJGIYHA8LjM2MbQ7gO4U2ALF7S2mw0nVBouzodokAX1XdBbD
+bOdFwNfIP0cGhzLjeZt8
+=HWR/
+-----END PGP SIGNATURE-----
diff --git a/mail-filter/opendkim/opendkim-2.4.2.ebuild b/mail-filter/opendkim/opendkim-2.4.2.ebuild
deleted file mode 100644
index d2743afaa77b..000000000000
--- a/mail-filter/opendkim/opendkim-2.4.2.ebuild
+++ /dev/null
@@ -1,202 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/opendkim-2.4.2.ebuild,v 1.4 2012/06/04 23:58:02 zmedico Exp $
-
-EAPI=4
-
-inherit eutils db-use user
-
-# 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 +berkdb ldap lua opendbx poll sasl +ssl unbound"
-
-# FUTURE: diffheaders (libtre error) - bug #296813
-
-DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )
-	ssl? ( >=dev-libs/openssl-0.9.8 )
-	berkdb? ( >=sys-libs/db-3.2 )
-	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 net-dns/dnssec-root )"
-	#diffheaders? ( dev-libs/tre )
-	#gnutls? ( >=net-libs/gnutls-2.11.7 )
-
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="sasl? ( ldap )
-	lua? ( berkdb )"
-
-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:/var/db/opendkim:/var/lib/opendkim:g' \
-	       -e 's:/etc/mail:/etc/opendkim:g' \
-	       -e 's:mailnull:milter:g' \
-	       -e 's:^#[[:space:]]*PidFile.*:PidFile /var/run/opendkim/opendkim.pid:' \
-		   opendkim/opendkim.conf.sample opendkim/opendkim.conf.simple.in \
-		   contrib/stats/opendkim-reportstats || die
-
-		   epatch "${FILESDIR}/${PN}-2.4.0-ipv6.patch"
-}
-
-src_configure() {
-	local myconf
-	if use berkdb ; then
-		myconf=$(db_includedir)
-		myconf="--with-db-incdir=${myconf#-I}"
-		myconf+=" --enable-popauth"
-		myconf+=" --enable-query_cache"
-		myconf+=" --enable-report_intervals"
-		myconf+=" --enable-stats"
-	fi
-	if use asyncdns ; then
-		if use unbound; then
-			myconf+=" --with-unbound"
-		else
-			myconf+=" --enable-arlib"
-		fi
-	else
-		myconf+=" $(use_with unbound) --disable-arlib"
-	fi
-	if use ldap; then
-		myconf+=" $(use_with sasl)"
-	fi
-	econf \
-		$(use_with berkdb db) \
-		$(use_with opendbx odbx) \
-		$(use_with lua) \
-		$(use_enable lua statsext) \
-		$(use_enable lua rbl) \
-		$(use_with ldap openldap) \
-		$(use_enable ldap ldap_caching) \
-		$(use_enable poll) \
-		${myconf} \
-		--docdir=/usr/share/doc/${PF} \
-		--enable-filter \
-		--without-domainkeys \
-		--enable-oversign \
-		--enable-adsp_lists \
-		--enable-dkim_reputation \
-		--enable-identity_header \
-		--enable-rate_limit \
-		--enable-redirect \
-		--enable-resign \
-		--enable-replace_rules \
-		--enable-selector_header \
-		--enable-default_sender \
-		--enable-sender_macro \
-		--enable-vbr \
-		--disable-rpath \
-		--disable-live-testing
-		#$(use_enable diffheaders)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	# file collision
-	rm -f "${D}"/usr/share/man/man3/ar.3
-
-	dosbin contrib/stats/opendkim-reportstats
-	newinitd "${FILESDIR}/opendkim.init.r2" opendkim
-	dodir /etc/opendkim /var/lib/opendkim
-	fowners milter:milter /var/lib/opendkim
-
-	# default configuration
-	if [ ! -f "${ROOT}"/etc/opendkim/opendkim.conf ]; then
-		grep ^[^#] "${S}"/opendkim/opendkim.conf.simple \
-			> "${D}"/etc/opendkim/opendkim.conf
-		if use unbound; then
-			echo TrustedAnchorFile /etc/dnssec/root-anchors.txt >> "${D}"/etc/opendkim/opendkim.conf
-		fi
-		echo UserID milter >> "${D}"/etc/opendkim/opendkim.conf
-		if use berkdb; then
-			echo Statistics /var/lib/opendkim/stats.dat >> \
-				"${D}"/etc/opendkim/opendkim.conf
-		fi
-	fi
-}
-
-pkg_postinst() {
-	elog "If you want to sign your mail messages and need some help"
-	elog "please 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 -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"
-	einfo "  and read http://www.postfix.org/MILTER_README.html"
-
-	# 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.5.2.ebuild b/mail-filter/opendkim/opendkim-2.5.2.ebuild
deleted file mode 100644
index c5c58173a1b2..000000000000
--- a/mail-filter/opendkim/opendkim-2.5.2.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/opendkim-2.5.2.ebuild,v 1.2 2012/06/04 23:58:02 zmedico Exp $
-
-EAPI=4
-
-inherit eutils db-use autotools user
-
-# 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 +berkdb ldap lua opendbx poll sasl +ssl static-libs unbound"
-
-# FUTURE: diffheaders (libtre error) - bug #296813
-
-DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )
-	ssl? ( >=dev-libs/openssl-0.9.8 )
-	berkdb? ( >=sys-libs/db-3.2 )
-	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 net-dns/dnssec-root )"
-	#diffheaders? ( dev-libs/tre )
-	#gnutls? ( >=net-libs/gnutls-2.11.7 )
-
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="sasl? ( ldap )"
-	#lua? ( berkdb )"
-
-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:/var/db/opendkim:/var/lib/opendkim:g' \
-	       -e 's:/etc/mail:/etc/opendkim:g' \
-	       -e 's:mailnull:milter:g' \
-	       -e 's:^#[[:space:]]*PidFile.*:PidFile /var/run/opendkim/opendkim.pid:' \
-		   opendkim/opendkim.conf.sample opendkim/opendkim.conf.simple.in \
-		   contrib/stats/opendkim-reportstats || die
-
-	sed -i -e 's:dist_doc_DATA:dist_html_DATA:' libopendkim/docs/Makefile.am \
-		|| die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	if use berkdb ; then
-		myconf=$(db_includedir)
-		myconf="--with-db-incdir=${myconf#-I}"
-		myconf+=" --enable-popauth"
-		myconf+=" --enable-query_cache"
-	fi
-	if use asyncdns ; then
-		if use unbound; then
-			myconf+=" --with-unbound"
-		else
-			myconf+=" --enable-arlib"
-		fi
-	else
-		myconf+=" $(use_with unbound) --disable-arlib"
-	fi
-	if use ldap; then
-		myconf+=" $(use_with sasl)"
-	fi
-	econf \
-		$(use_with berkdb db) \
-		$(use_with opendbx odbx) \
-		$(use_with lua) \
-		$(use_enable lua rbl) \
-		$(use_with ldap openldap) \
-		$(use_enable ldap ldap_caching) \
-		$(use_enable poll) \
-		$(use_enable static-libs static) \
-		${myconf} \
-		--docdir=/usr/share/doc/${PF} \
-		--htmldir=/usr/share/doc/${PF}/html \
-		--enable-filter \
-		--enable-oversign \
-		--enable-adsp_lists \
-		--enable-dkim_reputation \
-		--enable-identity_header \
-		--enable-rate_limit \
-		--enable-redirect \
-		--enable-resign \
-		--enable-replace_rules \
-		--enable-selector_header \
-		--enable-default_sender \
-		--enable-sender_macro \
-		--enable-vbr \
-		--disable-rpath \
-		--disable-live-testing
-		#$(use_enable diffheaders)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	# file collision
-	rm -f "${D}"/usr/share/man/man3/ar.3
-
-	dosbin contrib/stats/opendkim-reportstats
-	newinitd "${FILESDIR}/opendkim.init.r2" opendkim
-	dodir /etc/opendkim /var/lib/opendkim
-	fowners milter:milter /var/lib/opendkim
-
-	# default configuration
-	if [ ! -f "${ROOT}"/etc/opendkim/opendkim.conf ]; then
-		grep ^[^#] "${S}"/opendkim/opendkim.conf.simple \
-			> "${D}"/etc/opendkim/opendkim.conf
-		if use unbound; then
-			echo TrustedAnchorFile /etc/dnssec/root-anchors.txt >> "${D}"/etc/opendkim/opendkim.conf
-		fi
-		echo UserID milter >> "${D}"/etc/opendkim/opendkim.conf
-		if use berkdb; then
-			echo Statistics /var/lib/opendkim/stats.dat >> \
-				"${D}"/etc/opendkim/opendkim.conf
-		fi
-	fi
-
-	use static-libs || find "${D}" -name "*.la" -delete
-}
-
-pkg_postinst() {
-	elog "If you want to sign your mail messages and need some help"
-	elog "please 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 -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"
-	einfo "  and read http://www.postfix.org/MILTER_README.html"
-
-	# 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.5.1.ebuild b/mail-filter/opendkim/opendkim-2.6.3.ebuild
index e15db99497ab..2b9b3bda3afe 100644
--- a/mail-filter/opendkim/opendkim-2.5.1.ebuild
+++ b/mail-filter/opendkim/opendkim-2.6.3.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/opendkim-2.5.1.ebuild,v 1.2 2012/06/04 23:58:02 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/opendkim-2.6.3.ebuild,v 1.1 2012/07/12 17:14:04 eras Exp $
 
 EAPI=4
-
 inherit eutils db-use autotools user
 
 # for betas
@@ -53,7 +52,7 @@ src_prepare() {
 	       -e 's:mailnull:milter:g' \
 	       -e 's:^#[[:space:]]*PidFile.*:PidFile /var/run/opendkim/opendkim.pid:' \
 		   opendkim/opendkim.conf.sample opendkim/opendkim.conf.simple.in \
-		   contrib/stats/opendkim-reportstats || die
+		   stats/opendkim-reportstats || die
 
 	sed -i -e 's:dist_doc_DATA:dist_html_DATA:' libopendkim/docs/Makefile.am \
 		|| die
@@ -87,7 +86,6 @@ src_configure() {
 		$(use_with lua) \
 		$(use_enable lua rbl) \
 		$(use_with ldap openldap) \
-		$(use_enable ldap ldap_caching) \
 		$(use_enable poll) \
 		$(use_enable static-libs static) \
 		${myconf} \
@@ -102,7 +100,6 @@ src_configure() {
 		--enable-redirect \
 		--enable-resign \
 		--enable-replace_rules \
-		--enable-selector_header \
 		--enable-default_sender \
 		--enable-sender_macro \
 		--enable-vbr \
@@ -116,7 +113,7 @@ src_install() {
 	# file collision
 	rm -f "${D}"/usr/share/man/man3/ar.3
 
-	dosbin contrib/stats/opendkim-reportstats
+	dosbin stats/opendkim-reportstats
 	newinitd "${FILESDIR}/opendkim.init.r2" opendkim
 	dodir /etc/opendkim /var/lib/opendkim
 	fowners milter:milter /var/lib/opendkim