Remove old

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0x77F1F175586A3B1F

17 files changed, 79 insertions, 1446 deletions

diff --git a/mail-filter/gld/ChangeLog b/mail-filter/gld/ChangeLog
index 7487d8011955..b6a6f3fc74a0 100644
--- a/mail-filter/gld/ChangeLog
+++ b/mail-filter/gld/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for mail-filter/gld
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/gld/ChangeLog,v 1.52 2012/11/20 19:53:05 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/gld/ChangeLog,v 1.53 2012/11/27 20:24:00 eras Exp $
+
+  27 Nov 2012; Eray Aslan <eras@gentoo.org> -gld-1.7-r1.ebuild:
+  Remove old
 
   20 Nov 2012; Agostino Sarubbo <ago@gentoo.org> gld-1.7-r2.ebuild:
   Stable for x86, wrt bug #441348
diff --git a/mail-filter/gld/Manifest b/mail-filter/gld/Manifest
index 12a8c7e9e95b..e94d6ca214f7 100644
--- a/mail-filter/gld/Manifest
+++ b/mail-filter/gld/Manifest
@@ -1,7 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX gld.rc 544 SHA256 040837f1a16f8f6cf72f9f051322e46b4cacad8cc0a97de217e64a42efda03dc SHA512 a853391b46f26a12e1d20e71fc410ce070d0faa3d45c2307ed790333a98400b1856357b5159b648e9720f91cd6b1c12410216615fe29670cfb50132e1e5ee066 WHIRLPOOL cbfb22c155b8875b6860ea6cbac55a94a11691077f3ded9a2547e9ff660282a768fb51b5d254a8662d8c20708b00c99494d34d193c0b90844eb97d8274723e43
 AUX tables.sql 1141 SHA256 1432a8b52c55299b17cd0aeaa94076aef65f04db66f02554e83a862c298bfc5d SHA512 4501ffb273f7064f1bbb56dd6d3f433532924da52c9007d089c57a27aff9cfda2f4b0a59844d0c8e5ff8ce9218f66316914a5af2c801eacba489d003806bb56a WHIRLPOOL d2278b837ecfe255681bafd5b7ff6693218046be2433f48fb143612d18a4b8df8b0f933cadd0ff67d1c6279f04033c030dca3abddd15ecbe4f3be3c82001c365
 DIST gld-1.7.tgz 40241 SHA256 c0776f6841afa73b6579e355522d79fd15467de2936f1a4464265e6415cae14b SHA512 68bbfd03295c2895608f8404ca1a0942c53003af66d70fda0e2515717ab8e6836f2b609942633b6d70a15b49338a887b5b1082ed1d9bc7c2c0aa3a7735abb13e WHIRLPOOL 815bbf2dc565695ca14eeee5821477e35c5d804c00f33c5e988462b3e6f8f3550c24f56cf6bc77ec9378d7a0cbdc1ba76cd47ae27a40e1cdcc2b3e6ffdd06785
-EBUILD gld-1.7-r1.ebuild 1670 SHA256 c1945825453b13ae2057756736c3652b2a558f3d899a1c93f43248f897aac00a SHA512 ead26d299409350a2cbd06b8bb61d2983894fbd9a1da1c645c495c5bd44207eddb8ce5c2eed3cb390ebe17697fd9935978cd9b7ba7c4d550b85250b918461f84 WHIRLPOOL d02e0b40b13a3d8ae4ea926ee20e3ffcca7cd48cefdb5e0df42fef2e50e0762ce750eecf1771134cde9013151414ad1938e8addcf0c3fd892966cdd24c4aa268
 EBUILD gld-1.7-r2.ebuild 1979 SHA256 94c6beebb9a76a261a03ff5fdac50c1d542879d617dc21ff60054dbde5f8e6a4 SHA512 1c80300d87cdb6b498b2796cb93a45958e88f3490c482d7a909b7396491cf5819fe5ca4952186750b55daa30db94bc738e4c9e38c937e800e93826ad6c9c2e5a WHIRLPOOL 7637acf944a74f132f25ea453ea85d97ec94f7f1b1ecf19c4d5ec2707bdf7e87b1df70b5c8e85a8124c14deb6e8ea9dc4c7f4d69e1a3fdfd3f88f8b830cf63b4
-MISC ChangeLog 7535 SHA256 a5db1fedeb68c5e6b20e3cb544ba0cf295d06769db150e697dfc1fb6cb65a619 SHA512 03266315be03abee80bf5d62dc24275ce8bfad26ac33541720ef37e16a5a817ca7332c644cd668fe9b41b00900ce6de43f77f154e826a95cb510d1aa24bf6783 WHIRLPOOL d2c65bf4a5f00a0d6d3a4087cdbaa5a28a711c64c6b43ff46d022ae8ee3d3e1980cd773dc5aaf914738cba523c905892e0ebb940c6d96e3110c1a0522304cdc6
+MISC ChangeLog 7614 SHA256 4d1c392ef14bfa7fa5661c8ac77c7f0b7a77aa7251f67463d6f95df2c9b30dc7 SHA512 53c5debc63d2e8a5d291165c187149dff056f2a593302818827355beb00bf7ae4b185745199be36ce7b783354898aab26196b36545891c88d11f7efc3b12361f WHIRLPOOL 86152ae52d5575fb02136ef5f450f3d04348db8324c2a9fd48cd71d1bddbcf9190d671fcb5c211b157218a142fd51317774fef9cb25dbd085ef73c78a9cbdc4b
 MISC metadata.xml 161 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32 SHA512 77001eed8032a3b919c30d8dd9314951d3471528e770ef5ad840060e217037f5e1f0eb2cf4c5f90cb2d58e9598c8a38619a1301f890d6dd734900ab6273fb6ec WHIRLPOOL 0d251627fdbf63b5c090313d5bbf3e45acf630331742dc930a0136cc382b7720fe4099c64fd439fd31fe0eed48a4199d6e31692dbdedd34f803f9e2567d46975
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJQtSFgAAoJEHfx8XVYajsfbZQP/1H1P/p4f5sHJgCURDyBtO5d
+dDJwGl1h8MsIzSbuYP0KOQr1TCutqe9M1xbm6zW3vxL45IV+PQdqp8UU/M/we6PH
+dh5J/ySFvcLb+5SSbLk2Ki+G2bacmomqWnLpDC1iUJKUS1jDVI4GdGgpgIRIkxzw
+QNBeizXgGm8iH6SJWG6p3Htx6yMQBoi+Jcvp+k6AZBDDH7VxKVU2RcOtinoX8rWx
+gmxgvcP8g0zDUn76Cq3ZOLwQJ5sMGaIM/nk59X2z3iZdwU+4LfdhfThhB0JL0NLl
+2dVJ1uTo3mY2U2dDns0MbsDqeh9m90HM8EyYCQ+TMPX7K0Vy7/3kcuxyKVhINl69
+acWK7caSpI/f/0XRVW9OjByt3lR1wCw6qHG17ITdzlYEi77Zqmfgrjnscsxsohcn
++VXL1BphCdes1VpBJpXia59YeXlT1bgyPULewYRzcryX2R3JclJQgxaDNuSoClc4
+rGKmmjxRVrrynOJFKPxoU+KxvlJsOE0e0y6O+oV0aObA+Ll2a4/gjxNiPWdeEeOC
+QYWIF0ME2o7A0drU/TVlt0n9tPP2Nf+d3xqkk1pMINXgDsaGZQsLxSGG4pwjPkzp
+iZHox9k/YCDkAuf5FtnKHDnYG6pZCNVm8X9vVpMeKvnw3EyfsT3kQ7+B7h0h0nel
+kNH/BS48ziq7mYw1vfje
+=8hHs
+-----END PGP SIGNATURE-----
diff --git a/mail-filter/gld/gld-1.7-r1.ebuild b/mail-filter/gld/gld-1.7-r1.ebuild
deleted file mode 100644
index c2653cb0c533..000000000000
--- a/mail-filter/gld/gld-1.7-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/gld/gld-1.7-r1.ebuild,v 1.4 2011/06/22 21:35:10 ranger Exp $
-
-EAPI="2"
-
-inherit toolchain-funcs
-
-DESCRIPTION="A standalone anti-spam greylisting algorithm on top of Postfix"
-HOMEPAGE="http://www.gasmi.net/gld.html"
-SRC_URI="http://www.gasmi.net/down/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="postgres"
-# Not adding a mysql USE flag. The package defaults to it, so we will too.
-DEPEND="sys-libs/zlib
-	>=dev-libs/openssl-0.9.6
-	postgres? ( dev-db/postgresql-server )
-	!postgres? ( virtual/mysql )"
-
-src_prepare() {
-	sed -i gld.conf \
-		-e 's:^LOOPBACKONLY=.*:LOOPBACKONLY=1:' \
-		-e 's:^#USER=.*:USER=nobody:' \
-		-e 's:^#GROUP=.*:GROUP=nobody:' \
-		|| die "sed gld.conf failed"
-
-	sed -i Makefile.in \
-		-e '/ -c /{s|-O2|$(CFLAGS)|g}' \
-		-e '/ -o /{s|-O2|$(CFLAGS) $(LDFLAGS)|g}' \
-		-e '/strip/d' \
-		|| die "sed Makefile.in failed"
-}
-
-src_configure() {
-	tc-export CC
-	# It's kind of weird. $(use_with postgres pgsql) won't work if you don't
-	# use it...
-	if use postgres ; then
-		myconf="${myconf} --with-pgsql"
-	fi
-
-	econf ${myconf} || die "econf failed"
-}
-
-src_install() {
-	dobin gld
-
-	insinto /etc
-	newins gld.conf gld.conf.example
-
-	dodoc HISTORY README*
-
-	insinto /usr/share/${PN}/sql
-	doins *.pgsql *-whitelist.sql "${FILESDIR}"/tables.sql
-
-	newinitd "${FILESDIR}"/gld.rc gld
-}
-
-pkg_postinst() {
-	elog
-	elog "Please read the README file in /usr/share/doc/${PF} for"
-	elog "details on how to setup gld."
-	elog
-	elog "The sql files have been installed to /usr/share/${PN}/sql."
-	elog
-}
diff --git a/mail-filter/opendkim/ChangeLog b/mail-filter/opendkim/ChangeLog
index bc73236cf6e4..4cd832884178 100644
--- a/mail-filter/opendkim/ChangeLog
+++ b/mail-filter/opendkim/ChangeLog
@@ -1,6 +1,11 @@
 # 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.53 2012/11/21 11:03:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/ChangeLog,v 1.54 2012/11/27 20:17:19 eras Exp $
+
+  27 Nov 2012; Eray Aslan <eras@gentoo.org> -files/opendkim-2.4.0-ipv6.patch,
+  -opendkim-2.4.3.ebuild, -opendkim-2.5.2-r1.ebuild, -opendkim-2.6.3.ebuild,
+  -opendkim-2.6.4.ebuild, -opendkim-2.6.7.ebuild:
+  Remove old
 
   21 Nov 2012; Agostino Sarubbo <ago@gentoo.org> opendkim-2.6.7-r1.ebuild:
   Stable for x86, wrt bug #438968
diff --git a/mail-filter/opendkim/Manifest b/mail-filter/opendkim/Manifest
index 559412351f6c..933241330f06 100644
--- a/mail-filter/opendkim/Manifest
+++ b/mail-filter/opendkim/Manifest
@@ -1,24 +1,34 @@
-AUX opendkim-2.4.0-ipv6.patch 765 SHA256 ab04590e0ca8543e0bff17f243134e265f36095a4a23d044521c9a07701b897d SHA512 92fa7ebd2a33a80da0f35f30b2a032a9910c245db987ac4391e6e3876359ffaa85e386bebc2ae6ab7e315d008ee5969cc7a48a640e35a42fb9b5b0e40d332f06 WHIRLPOOL dfa19d812048d58372842c417a2b32a5b29a699a1f6affe5d47b0c61d0e4a6c5ea701179316489920c1abb2f12a2bd972cd199226de72fd31cf3e0131adab7db
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX opendkim-2.7.2-strl.patch 1158 SHA256 23d06779d843aecd8a8540d40effa90f7d3fa854eccbee22672731438be7c88f SHA512 57dae887354a164d6146c55d258b8b41cdfbf9df887d228ab6ae9f2868b2096b44d738897880e1ad39c2d1d2ccade655cdb2658a171499cb470e6aafc0ca72bc WHIRLPOOL 760706018224941090b82b65b613bb90f51c6cfdba4f87bd640e6f301719c137592fd54f0bc383e0fa384f4f8e4ecd3699906ad70b86ffdf85f5fb9c12842ae0
 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 SHA512 cb82163f36ad2a8de35174214729f4dd13c408cfded82e3d1b20d1a05ea3c55ffaba34908d81801b0fc13f59f3a71fce984ecdf3f1fe654fb80b5b3536830b49 WHIRLPOOL c52d5afbfb8708c2e1af7f6e709ef1db3b0a7d753f8c96dcd4530d2210b654e2bc1be2a254e4ddf77c5cc0f80d5bffe637e727a1dd230d5999765dccdaa68a40
-DIST opendkim-2.6.3.tar.gz 1127456 SHA256 6208d1bdf3e754cd26e3c9dd95ed68f00f9236e471242c176f2a6a61ede37216 SHA512 a9cbbac94cf23b613adb19e2fb38bda406d1874dd53be7ab0bae44860c284403ee33a1ca8b5aebe7964d0ea832169efa4c41c3ae93c37b8586904a0ecb431e19 WHIRLPOOL c12be4edbd42347d2e5e54d8073d948dbcbf84a15a3869ded14299baef08cd321487f2ea17f8d8e995e63fd0954a195c887046aca4e164f0a438417dabdc56ba
-DIST opendkim-2.6.4.tar.gz 1127508 SHA256 ff0c53eb93f21bca88f803668d32e127d884c83f850c159eb291898656dc622f SHA512 3706a75b259c96b9bd9efa7a79cb470bb5d3276d9080378ffe7dce771ae9e90797e5c6f5a24b89a1a23ff15cd379d6203938b2145ac0fc6a090e3a3fa708524f WHIRLPOOL 8a8ba93acfb82c676a528af35f2b70c05edb1a8f508ed9e5e855e8ab78941e8e757425610a3536a78c740a964893a79862252a83536989ff720b402e25c81318
 DIST opendkim-2.6.7.tar.gz 1129124 SHA256 45da209ccddfb6f6888ac2366b6e38a6460b36ff0da527aed910217cead6fc84 SHA512 f47f4c4805b96a2c57774dd69a7770751649397866b29392aa756c4b143579d93951166c817342fde12b8994251a8b44d2de61e6059fd04686e04aa6e668cdd3 WHIRLPOOL df662ca97ac937720038b16fb8b5e8f3f1d6a9d5b73102082a889abddaa003ca8ddf8fcba670fb16f7d00e4fd8b07fc0ddaff97f070e795822350751b0cb0608
 DIST opendkim-2.6.8.tar.gz 1141247 SHA256 1b2e9033842634a1dc891afa10a94ba58c0e7663670e2faf117b27bead541edc SHA512 0f1a48741194d9d47b9e301bb1d1a32f0396f12ed93eeafcaea74783e5ca9fb1f0a7cc6bb384df687d30026105e65c33c6b9cee86aa836906d959b4d2315946e WHIRLPOOL 00c841fc5d73ab7b0fe26a4612e8a319087a8a15a3a7fb5bcd61ad98cb9b5cf860fb54c98077ad99792d1e5c626bd2ce69eabb1da560f45725d23170e9100293
 DIST opendkim-2.7.0.tar.gz 1143836 SHA256 f5c2319ec23fa20a6bd4bb1b4abc005f6a7dbb77852c13091a3f2a042f82fee2 SHA512 17c53cfb7198162446c5db72d6bb234d41fcb6f167e12ee04609e36fd78916a2133f9f401800dd24e29ed811e4e123090296f24611b5fef6525711377642e320 WHIRLPOOL 52c8a0e20e2e2e3ba6364b0e14bd6122fcf3566c59029464fa5d9a1d5cf697dd89a1ce99b970987bf62c83768a64fe0be1caf02941f6153538368fd2428a9fd1
 DIST opendkim-2.7.1.tar.gz 1153665 SHA256 782c030ce3b09d9ef536d2b98910d5a9289ba2128e8392e6ff568b2ade0282ed SHA512 76074ba23f4a4e142f6c41cc2474ac8e4281a770695a615b51ddcb0cb1b195ac295ce2be3f433e2213fc2c7b3355fa470e19d6a3421d4f0af4acb065eb498dd0 WHIRLPOOL 69a61297d1d79c2a296b99453f5b24c4c9b109b8fab9d114d627c788e1ea2b5e836b99d7c11312214794157f3a48dd8ea6cb79d8bdbc6156c3e019743df57e37
 DIST opendkim-2.7.2.tar.gz 1156510 SHA256 cf72a26506ef48a2c6b231947226ab460cdb6e05b18176ee42a94b3b6d521b42 SHA512 be1cf2329f9a871df560bcdb60f9f2277ac5220ed9f94c112410994b1dc1f1ee7274bea76b8ce7c118695f73831fb3459007b728a151ece966a1021d6774e425 WHIRLPOOL 2e07e87bf274a3644bec6c42ccc7ca0575206fa67eba8009f52f24213a74c4985b2e78eb9e6b4b0938cb513c186b0c858f2d80330019a20eee18188d39f68677
-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.3.ebuild 6332 SHA256 ec74fb29947fed50cf835bf848d184f6f902ef81741c00891ed598338523b837 SHA512 278a57502a8343948bd4a118fbe8092ab8cf703b7b28f0989105d2125273c3e1747301ace318de54e96a9ce1026085c7945fc760bde3f631e141bbf7a698faf6 WHIRLPOOL 6f9156e644207a540340e51fa72235eb20c5603b070c946c2d785393fe46aaffc1bb1498278a8f01fd5c6cebc2ae8fe9f9f2afcba862c3a6ce4dc879a0c373c7
-EBUILD opendkim-2.6.4.ebuild 6332 SHA256 6a789a58b78532698c1ac6351e9bd0404e000049a19ca330225dcd3aa79a5732 SHA512 7adb77946102c310aeb48f3a592b57ae165ee36c4793e3f0757e230160cba17569548bc39601ddc4273e8a86ae1919ae2f22230e105770f075ce33f7eee2d299 WHIRLPOOL ece4f43bc716d8768da704c19b293e8530a74111af9641ade1e6c1202b711ec76711a8b57396a60a0885203b312a7331d8f8ef8b623cf8285cc1c8e297068c2f
 EBUILD opendkim-2.6.7-r1.ebuild 6380 SHA256 1fdfd5a87069115fea59cd641a554561b89666eb05283355c19429e36ef42fdb SHA512 3923604c1fa2f53ded36ee08fca144b9683f322b5f40342a46dd25085a8af18856c7b9238020f22f4f054a31d79d22d6bec85627e0aa616956b26b1821762d05 WHIRLPOOL e07276482ec7107e5b7af5bc57581bf6e04761ae9801ceb4f649b43a30467ed6d5be22fbcaa506acbb113f675f98f5100e09b0a45d4304c5b66d1642d2a8ece6
-EBUILD opendkim-2.6.7.ebuild 6332 SHA256 67455b4fca44a560cf226ef3a2814967e14cc210d2d15a378b48e842bf6172e0 SHA512 6134a4837b4b963425dc93403680e2022555fc158aac368b3de3753a367b299774b08c78ec373194d7fa86d5de5bde1c6d294f3735fc784df63038310a96b3dc WHIRLPOOL faa605f7bed9d139c78fed158c6e246a7450c9c7eba07d93929cabe4009ac6334adc42d4c6d93e7abc1c6300a04f037569416849543df5c2d0a4b656e5f49cfd
 EBUILD opendkim-2.6.8.ebuild 6380 SHA256 1251c1d8ced6ad6b0c2c51fe20699623fc5d10c41bd0b3cd73eca9b31fbd8f2a SHA512 68914959f5e82083e36e41731a2121f08e3dabd97c46849e611a09cd757017dd1f853ccaa95216ee988010634e9933767f4caae34e46cb161847d5be245ab221 WHIRLPOOL 3a3bca5c1a51066bcd91dd7e6bc29a0c364a7fdfff9c027268a11f847dcab07300e09d2d88bdd04b3fd696f4abc06275e2408f5e7535d01a5b2b6e23bd76cb63
 EBUILD opendkim-2.7.0.ebuild 5980 SHA256 bba11f3060774c3e665b8c9e0a91483a817d34f6c40268214ed2f66591059c6f SHA512 bbae17c344d99a982e549feeaeb85c9fefa3739c6b35e0e05ffc26c65b92befb4e44284c24dcd17a645e61545805fbb75b57192e8afea639a6595543bd30e87d WHIRLPOOL b256873263f8b861c8c67c453c6f737eccb526cb96ff04306bea949d002c06232f792d1a26945b943cee0db5b8b014f8557a7f54897e5854ff90f67239dcda6c
 EBUILD opendkim-2.7.1.ebuild 5980 SHA256 1b0ab9e9a9c3ad9ee31c7a55102c0e8eab149f56dce0c1348f9a981d09044379 SHA512 3b240ae0f2e2f2716a2f206fb668d4e01eea2c0ec04dbf638c78cb5ebaaf98c15ae45540a14a8433832222fcba2b25ac12e1c3bf4e35bc73b1a858f22f5b9c7a WHIRLPOOL ce2318ef0e7104ad756cd2f6d03114a653c0763f14ecbf8d001e52a01ac6f6dfe22fc0cd02e8c305b322d1aba8cddd8644b05c8a9633aefbb2ff9c9c439bf8ad
 EBUILD opendkim-2.7.2.ebuild 6018 SHA256 bf833332cc51619ef502df419bd1ea00f4cfac9580c0d769ee27d03e6d9be51e SHA512 46dd38590bc4683244bf57f65bf0d796cacded1a6c8507dddd7337e4b147169e7a21428b495863de52651af89020911651dc6b9d6b891fc761a61c0f886a9de1 WHIRLPOOL 4bafda1b64e90f60ead18947ec051fa55e4b7edf1be3be0208c6d365ebc5fa040253987e4b9a965e4b053f6450d41b3708d49db0f3a570a1cf397b28846f89e2
-MISC ChangeLog 9185 SHA256 d586c92815d104059cc7d279cb46b9954fc9b9b4142423d423edcdc40e80aec9 SHA512 5132dd6eb230b37f533847ec42c4f55976f74d3cd43655814dceb233a5b0848de58042ced9524f409ae21d71605d217b04772511aed1b5ae2e0ccae23481cba1 WHIRLPOOL 7cc9f4b464a61fc6fce907d26a5e94f48db784ef961d097822e596d27bbf8257da5654b789156a96a9cfde6e384b1ac0e174c6ecaaac56eb07df75f6a2125396
+MISC ChangeLog 9405 SHA256 6d5ca965066dfe140364f04987bf493835114a85b7f5f0756910d984ff92df78 SHA512 03509563d0a773cccf4849c6f665a245cbc6a5c4d39717f1b149f19ff84649667928100858c1ccf06535f36f77bb5a188934697c20b8426329bb857e4ac6c253 WHIRLPOOL 40d4a742fd13bcb64f15149b4d52d67a15e230d4ef9f37cece4d65791c217824cb457fe40a9c7c44dd76836d652a2ddc2fd786dc2c59dc6ffb992c2daea06a9a
 MISC metadata.xml 1325 SHA256 5c79e487583ffa41f2823235e61232f84c1ac18ef41b1b71150f8d32f76b82eb SHA512 ae25f27a0c0cc5c3460b150f3eb6369e34b3051984b58da6a81847b5e90edc62e91fdd8f0d428576ef73614db095dc3a415237cccc1cc3cc806f9d99ff588df5 WHIRLPOOL d8b1221d484e12c31d76a20e8a7e6e0d033e16884e7dd14f657d4383f24f8f9294bc51dea4f512896a4183f9299c2faef31e7540d95c418000245090a3a0cdfe
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJQtR/XAAoJEHfx8XVYajsfYY4QAIDsyyiqcw4SxWhWJ1TbD6GA
+s9mbWcaD2WITpYShOC8PCxNVQBT6UcA08H8wfqT3HUwr7ARzp8P4Uhhqb3eAlItq
+ricaKwczGEemk/lXU7MPtryxiIdhRmAO2TP35Pokzz8fVy5IsAUXR6kcedf5Lxfn
+imdxuptL9Q5k7fgdAPsqiYfBND+MFRvOc7Es0EcR2zm3tr/KcFt2WElyIBpvudZI
+6VHlAUuYYMIWjqQJozg4ts8cMVsCnc4+U2p5FFiF8yeDw93FVsEHgpU6lGkbxY+J
+mO9F+ZKSG0aevDHWdc+bYZIaY5x94K85h2M7gwzInDD3uRA/CREEBbSCVMIobrRm
+I1xSayzUVcqIzkvGQmQO2kRdRy771KlnhEwqEurJvn/GVScKPFcGSiJw6x/PsDqA
+Z4zUhrKPa6LEEsuVFgaXYV0H/FArK8XZTslQHelzFDFINJVOys5J9tLH5n2I2Nay
+wLcK9kbWWVj4bEcu5i5fUiAN+x9tUkQpTzn0eQvgHEDv90afv7CTyJSPiaiZnAf6
+quuXhqJI0Jzw4MTeIexF2X6hkxxWSdWhxruaDGcnsRsl0XIdMgNXiKm73v/QGUEq
+R6W6vrjACEJUMvM94AflhwNzZCk9bhitSK6vwMrSRVWE92BcPC8LpWYFf/W/yNT8
+WlUpeQrAeGcPTVSoXQjc
+=E4iv
+-----END PGP SIGNATURE-----
diff --git a/mail-filter/opendkim/files/opendkim-2.4.0-ipv6.patch b/mail-filter/opendkim/files/opendkim-2.4.0-ipv6.patch
deleted file mode 100644
index 334087d9de71..000000000000
--- a/mail-filter/opendkim/files/opendkim-2.4.0-ipv6.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Don't assume ipv6 is available
---- opendkim/tests/t-peer.lua	2011-03-19 06:11:53.000000000 +0200
-+++ opendkim/tests/t-peer.lua	2011-06-27 09:42:25.342413931 +0300
-@@ -37,14 +37,6 @@
- 	{ "localhost", "192.168.1.130", SMFIR_CONTINUE },
- 	{ "localhost", "192.168.1.131", SMFIR_CONTINUE },
- 	{ "localhost", "192.168.1.132", SMFIR_ACCEPT },
---- ipv6 tests
--	{ "localhost", "9001:db8::8:800:200c:417a", SMFIR_CONTINUE },
--	{ "localhost", "2001:db8::91", SMFIR_ACCEPT },
--	{ "localhost", "2001:db8::fff0", SMFIR_CONTINUE },
--	{ "localhost", "2001:db8::fff1", SMFIR_CONTINUE },
--	{ "localhost", "2001:db8::fff2", SMFIR_CONTINUE },
--	{ "localhost", "2001:db8::fff3", SMFIR_CONTINUE },
--	{ "localhost", "2001:db8::fff4", SMFIR_ACCEPT }
- 	}
- 
- for index = 1, table.getn(test)
diff --git a/mail-filter/opendkim/opendkim-2.4.3.ebuild b/mail-filter/opendkim/opendkim-2.4.3.ebuild
deleted file mode 100644
index da9c08ccee2f..000000000000
--- a/mail-filter/opendkim/opendkim-2.4.3.ebuild
+++ /dev/null
@@ -1,203 +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.3.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 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
-}
-
-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) \
-		$(use_enable static-libs static) \
-		${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
-
-	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.2-r1.ebuild b/mail-filter/opendkim/opendkim-2.5.2-r1.ebuild
deleted file mode 100644
index b8586f649f66..000000000000
--- a/mail-filter/opendkim/opendkim-2.5.2-r1.ebuild
+++ /dev/null
@@ -1,204 +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-r1.ebuild,v 1.4 2012/07/04 07:34:21 jdhore 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 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.6.3.ebuild b/mail-filter/opendkim/opendkim-2.6.3.ebuild
deleted file mode 100644
index 2b9b3bda3afe..000000000000
--- a/mail-filter/opendkim/opendkim-2.6.3.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.6.3.ebuild,v 1.1 2012/07/12 17:14:04 eras 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 \
-		   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 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-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 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.6.4.ebuild b/mail-filter/opendkim/opendkim-2.6.4.ebuild
deleted file mode 100644
index 7b0f97347467..000000000000
--- a/mail-filter/opendkim/opendkim-2.6.4.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.6.4.ebuild,v 1.1 2012/07/13 06:17:44 eras 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 \
-		   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 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-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 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.6.7.ebuild b/mail-filter/opendkim/opendkim-2.6.7.ebuild
deleted file mode 100644
index 091c7a824e18..000000000000
--- a/mail-filter/opendkim/opendkim-2.6.7.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.6.7.ebuild,v 1.1 2012/07/24 09:06:04 eras 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 \
-		   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 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-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 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/spamass-milter/ChangeLog b/mail-filter/spamass-milter/ChangeLog
index e4587b471b62..72b6968059f1 100644
--- a/mail-filter/spamass-milter/ChangeLog
+++ b/mail-filter/spamass-milter/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-filter/spamass-milter
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamass-milter/ChangeLog,v 1.34 2012/11/21 11:00:56 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamass-milter/ChangeLog,v 1.35 2012/11/27 20:20:19 eras Exp $
+
+  27 Nov 2012; Eray Aslan <eras@gentoo.org> -files/spamass-milter-header.patch,
+  -files/spamass-milter-popen-r1.patch, -files/spamass-milter.rc3,
+  -spamass-milter-0.3.1-r5.ebuild:
+  Remove old
 
   21 Nov 2012; Agostino Sarubbo <ago@gentoo.org> spamass-milter-0.3.2.ebuild:
   Stable for x86, wrt bug #441638
diff --git a/mail-filter/spamass-milter/Manifest b/mail-filter/spamass-milter/Manifest
index e5f841d5bcdf..13df0fd24c72 100644
--- a/mail-filter/spamass-milter/Manifest
+++ b/mail-filter/spamass-milter/Manifest
@@ -1,13 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX README.gentoo 1680 SHA256 3ae980f0f8f6c82e2ae8a0677751275e0467e9c1f33b1a835a964a2ee3e80bbf SHA512 03e2c067fff97c0aabdca1c47011df72ca0671969980df95d34fb7a519fe16755359bbb72ce33d64430dbdb986a6d2e719451b38288df717ac8378a89cb16b2b WHIRLPOOL e8fede7062bf5d9d54ebcc690155d58ee15354ca5f002295994f0b2796f3dd0f3fb9dba909a802abf0fae37b3ac8dfbf925856f73185f1bac408930b667edc9a
 AUX spamass-milter-auth_users.patch 3570 SHA256 7838552434d4da78bf33d3ce1f21243adcf1df5b1bd39f9550d2453c832049b9 SHA512 d941af831410142de5d445aa188f3736f29ddad1e722c71c66578c7f01e55617729aefc1d50f09ecadf6a71a1f16f7530456da8b0f1c484bb50ada12702bb130 WHIRLPOOL 7a62317194cec9277d4d8ddefd874e6357a46d00189aa96431ae22496dd0b4518617a41276aa6ddd7c0f82d2180b1959154007ec0ce0bda6dff4ebdecd3960f6
-AUX spamass-milter-header.patch 631 SHA256 8286c2b6c6ea5fb760ffa4f2f1815b2ef7aa596fa5e160a78cb778e887a3ffad SHA512 901d153acc6b3b24fa933d545ef651f64e497b7f9f76cdd89bb1ca0d0434d4a919e6a9e1c895e9e88b50cdff6e088f7403ed48b2a5fb8cad29031e7086172f90 WHIRLPOOL 5f9a9c33e190b40ccd77a70e9c391dbb804431b60c976d855e1d864c9d9097f3e56e72f1f409a8776427fb80081eb80a8d40ba3d763fb86706dbc1d5eb4e930e
-AUX spamass-milter-popen-r1.patch 6642 SHA256 2f6e4a8700d0d838901b2cd62fc428bb077f87580f098b66f72b3d6dfae54d86 SHA512 2a316c18864361a55658d3003341de407221593b57a3b8e5f5e1d6635aa03f6f500622aef8346aaae6cb66fe1eae41dddd12e1acfd3367b58bcafd3330e93c46 WHIRLPOOL a280e403dc070c194dc4389cdd1dcf15d2f6e05e3decf814f14e75efe2b931039480c7aaafcf05fe3a64fe9781c335581b8030895ead88fb64d8e5b364d94e8f
 AUX spamass-milter.conf3 903 SHA256 f1969e8d1dcba108c379469a5e88e4286624c994bb8e22fd563d1f5cc4063617 SHA512 d8629227faacf5c8e86ecf5d456a13d775a70025c3e666c9d2952ddb43f93d6e460ee56f41f01bb02bc823da5463a37e3c444d4785e88b3b68283b1bc43cae8a WHIRLPOOL aadbe9ee06bfe7b8089b17f6341d98b18fa4ecee168c8b6a3202bb690668e21bc83c498e11f3bcb0f729ca8057f2570cd00f323ca748495ce0fc18b96ae98042
-AUX spamass-milter.rc3 1039 SHA256 e8acb8f341d7f5d4cfd9b77da7ef75407c543020546fcf52556f3b07e0781665 SHA512 ef61f3352afdf51b2ee395bef3638fd62c6714126d892d40e209cee8235bd22d4b84078b3224cc009942b98a7cdfc5c339586937bdd65fc9f6554c8b2022dd3c WHIRLPOOL e955a9c590978ba61e0a696a54523f8cdf6fa207a03fb8e20a2e6b1747b5ddb40f575108f7cb8af476edb904a726a7a7a6c7a8f64b42a836f0eda0365e213574
 AUX spamass-milter.rc4 1446 SHA256 6b2bfe9a5fbc59092b478f2d460f73abe3d43902ae83e637ff543bd06f3a4584 SHA512 de2c6baf59100688f6e53148ff9fcd46da3bb162abf3ec65541a53a9453890fed7f2d28e0a57f714ae11079b998581f5fb1748c45e89cbeb21de64c9fd5807f9 WHIRLPOOL aacfd2a24bb6e5c255671b297856d97a5124e001383acd49fa71b36e96c5239d164bdc8b01a48b9cc567acac6e9fcbf527c1be80fa8e1db79361c018dd197253
-DIST spamass-milter-0.3.1.tar.bz2 116591 SHA256 d7423835af7bb9cdf97bba7f31c5bea197dc86a600133d354aa6083bf1bbd24c
 DIST spamass-milter-0.3.2.tar.bz2 125350 SHA256 ba2eb8c9e4c50307ffae38bb06444b9830695e742e9fd8c9da40953e7e1d830b SHA512 19279c53c8af738fbdd796e3aa382754474fc8c2ed17a3f857906d61740aefbd30f4759952fc1aaeff31af492fa8782363cbaac8ea1f389b4e2c1237226086d8 WHIRLPOOL e7e9df528b12a1b9b29f1ace8c2d0e7398806aac0ca148ee74f68fa0c2a86240578e36e8d20a21279159ccbef3f651ec27eb2286351f0396014ad4fce5fb6c87
-EBUILD spamass-milter-0.3.1-r5.ebuild 1331 SHA256 03c8fce916cc12849087a156304d039d629cd2b3c8e7f83fe5729e5c5f66b6c6 SHA512 f9547211ea72823189cb94732a14be5be6f9b1c15c4589b9454e29049cc540f2dd7df4906a987b982cac7d7b5b77d4871d1f91d8fbc51cfc2e6f311e8d76c93c WHIRLPOOL 66f6f458e86e98485c4dac20a733355a9ba594fec40b060e0c4c631f45f75b6f515de1e8ba457062875fa2337e1a6ca68fe8f6041d3fd5588c21c672113d2047
 EBUILD spamass-milter-0.3.2.ebuild 1074 SHA256 f3676fd3a6e39bdd1770a778e6400d23fc7a5c457bcc02c7c2b1caf6ee721af1 SHA512 5880744a60e6d9aa27e8af8aa0b99e6560d943900e48547d26d302a76ce89fe2cd9dfe01b8f38f1a730f242876891faadd8a0bfe803ba929c10ac95dc4868c30 WHIRLPOOL 3725e23335725746814f8e3e41e9b9b5ef1930b9f033f70ee29032f256872da8468ba6e0d8b8501dc67f141fafee1ec5a90f0f613440159ce1a3872cacdf949e
-MISC ChangeLog 5953 SHA256 03313614dd9e58585c7c247afecfd2d0555a3c81e8b17afbdb1ebac477992de7 SHA512 1f0fe69db02e2c84218d0d372e402cfbb67bd36b3ecd7fda13cd5ba130401c7936f644de7a556a7ec58dd5a7794cf539695548028e7c0a0367a2887b2f768a9a WHIRLPOOL 682737e3b4c374328345ef27c1f379213d71047ecd25e8cee68748717ae683c920bfed6d90fa5e04bc3b20ec796c3fa3f9b067817f60c729eddeaba1f8737df9
+MISC ChangeLog 6150 SHA256 997e480da62074e66f37eb8465610bb87f5df99080bf49e2b38837adbeb7bfd1 SHA512 2576bcc883b73ffd44243356aa57421368c0636123c43bdcdd8d0a6d75135ceb27ed65c5cc42eb518629745fb89b9652c340a2b2b772b56d094128a32a005ae8 WHIRLPOOL 84bcd0383c87eff683eb2f8665e10a5a97a86f5a2ffa22584c0a21888377271917f7053ae8aad3e1f990f29d8e9f4e51925c0d45ad711c14a80c2e986341805c
 MISC metadata.xml 162 SHA256 569031668e39895fb20829fb17a49a91a83e8f41b2195b0f04825c4340d2af6b SHA512 b706438a0eda682ad16d8e2217bd54d5fa9f8b305efc6e009d0bf523df159162afee0fae9107c5887e12bb64951bbee4c36c8f4744d008ba8fc2db4c01504fa2 WHIRLPOOL d1196dde03902f1b7eee5c0ad8e30243470e014ec8b6d56fe556125f636872345f0dec41e45f39fa14993db3db78a782efdcf26c3d50cdccd88f4f7c8b7dc67a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJQtSCDAAoJEHfx8XVYajsf0NsP/1uSyYrbXgA8KTqiTH26s1QX
+BQp8krwZU3SsRRC2adjoxC1EnLgTKkykmKxKGviEod8mHkmUwi7uz2XN/pLOi7P+
+bCimrbGZDAYnTbDmgtxKvvpFOEoCiV+RXIepQIwSsx++3tMVmZJgVoIc03SklXT4
+tJ39znCEg/LEgLdGyp+a1TAx442CsGfbVvsEFUieiIc05dDptWou36rTK/QhEeVh
+bmQRIjCVH1R/ibuliT4JRWyV1ZP2K+WdNsxszLGM1ozttwK39YvoJyXDPJ7Iupqw
+If7gWoQqmQ4toeglrrPx6OegvuOCae8yqQRcn4Ny/srw2CqS0h85kCQHF6gRhq3T
+Yv2rx+R1VdfkYey1V1/6KMJyYtYCiB6BDXx8LWHLMGH+4AWdnP5QVDG8JGcRMuqn
++8P9U0pILoqwJuP3Eozk2Jm+fATqjPjIN9fNRDvPSUMwSnlwcWeL0J9EcmdDTnf3
+1+tcJKMQiY2gmUm9FLQ5T+dNiX5mGzzjFwcSDoesoYbP+Hk1Wh2LKplzJ2IC6wtg
+SxGCYQaDBHshzMYD2eYJLHaFQNcGhH3hyg+21nUjYbcUG1HppGEnnfawLSgt8DvE
+uJihzkcq/QK2njh1YSEepR3uRujVJHVFmKPNJhgvoTlJlMQusEZ8lk7nXkcGpPr9
+BtVYDCvxkqo9pzad2t4B
+=NHq4
+-----END PGP SIGNATURE-----
diff --git a/mail-filter/spamass-milter/files/spamass-milter-header.patch b/mail-filter/spamass-milter/files/spamass-milter-header.patch
deleted file mode 100644
index 450b08cd89a8..000000000000
--- a/mail-filter/spamass-milter/files/spamass-milter-header.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Do not mangle headers - bug #264304
---- spamass-milter.cppi~	2011-06-08 11:33:25.000000000 +0000
-+++ spamass-milter.cpp		2011-06-08 11:34:31.000000000 +0000
-@@ -1002,9 +1002,9 @@
- 
- 		assassin->output((string)
- 			"Received: from "+macro_s+" ("+macro__+")\r\n\t"+
--			"by "+macro_j+"("+macro_v+"/"+macro_Z+") with "+macro_r+" id "+macro_i+"\r\n\t"+
-+			"by "+macro_j+" ("+macro_v+"/"+macro_Z+") with "+macro_r+" id "+macro_i+"\r\n\t"+
- 			macro_b+"\r\n\t"+
--			"(envelope-from "+assassin->from()+"\r\n");
-+			"(envelope-from "+assassin->from()+")\r\n");
- 
- 	} else
- 		assassin->output((string)"X-Envelope-To: "+envrcpt[0]+"\r\n");
diff --git a/mail-filter/spamass-milter/files/spamass-milter-popen-r1.patch b/mail-filter/spamass-milter/files/spamass-milter-popen-r1.patch
deleted file mode 100644
index b6cc9e3f3c32..000000000000
--- a/mail-filter/spamass-milter/files/spamass-milter-popen-r1.patch
+++ /dev/null
@@ -1,220 +0,0 @@
---- spamass-milter.cpp	2011-07-09 11:26:20.000000000 +0000
-+++ spamass-milter.cpp	2011-07-09 11:53:53.000000000 +0000
-@@ -172,10 +172,6 @@
- bool warnedmacro = false;	/* have we logged that we couldn't fetch a macro? */
- bool ignore_authenticated_senders = false;
- 
--#if defined(__FreeBSD__) /* popen bug - see PR bin/50770 */
--static pthread_mutex_t popen_mutex = PTHREAD_MUTEX_INITIALIZER;
--#endif
--
- // {{{ main()
- 
- int
-@@ -467,59 +463,23 @@
- 			   send another copy.  The milter API will not let you send the
- 			   message AND return a failure code to the sender, so this is
- 			   the only way to do it. */
--#if defined(__FreeBSD__)
--			int rv;
--#endif
--			
--#if defined(HAVE_ASPRINTF)
--			char *buf;
--#else
--			char buf[1024];
--#endif
--			char *fmt="%s \"%s\"";
-+			char sendmail_prog[] = SENDMAIL;
-+			char *const popen_argv[] = { sendmail_prog, spambucket, NULL };
- 			FILE *p;
-+			pid_t pid;
- 
--#if defined(HAVE_ASPRINTF)
--			asprintf(&buf, fmt, SENDMAIL, spambucket);
--#else
--#if defined(HAVE_SNPRINTF)
--			snprintf(buf, sizeof(buf)-1, fmt, SENDMAIL, spambucket);
--#else
--			/* XXX possible buffer overflow here */
--			sprintf(buf, fmt, SENDMAIL, spambucket);
--#endif
--#endif
--
--			debug(D_COPY, "calling %s", buf);
--#if defined(__FreeBSD__) /* popen bug - see PR bin/50770 */
--			rv = pthread_mutex_lock(&popen_mutex);
--			if (rv)
--			{
--				debug(D_ALWAYS, "Could not lock popen mutex: %s", strerror(rv));
--				abort();
--			}		
--#endif
--			p = popen(buf, "w");
-+			debug(D_COPY, "calling %s %s", SENDMAIL, spambucket);
-+			p = popenv(popen_argv, "w", &pid);
- 			if (!p)
- 			{
--				debug(D_COPY, "popen failed(%s).  Will not send a copy to spambucket", strerror(errno));
-+				debug(D_COPY, "popenv failed(%s).  Will not send a copy to spambucket", strerror(errno));
- 			} else
- 			{
- 				// Send message provided by SpamAssassin
- 				fwrite(assassin->d().c_str(), assassin->d().size(), 1, p);
--				pclose(p); p = NULL;
-+				fclose(p); p = NULL;
-+				waitpid(pid, NULL, 0);
- 			}
--#if defined(__FreeBSD__)
--			rv = pthread_mutex_unlock(&popen_mutex);
--			if (rv)
--			{
--				debug(D_ALWAYS, "Could not unlock popen mutex: %s", strerror(rv));
--				abort();
--			}		
--#endif
--#if defined(HAVE_ASPRINTF)
--			free(buf);
--#endif 
- 		}
- 		return SMFIS_REJECT;
- 	}
-@@ -864,30 +824,17 @@
- 		/* open a pipe to sendmail so we can do address expansion */
- 
- 		char buf[1024];
--		char *fmt="%s -bv \"%s\" 2>&1";
--
--#if defined(HAVE_SNPRINTF)
--		snprintf(buf, sizeof(buf)-1, fmt, SENDMAIL, envrcpt[0]);
--#else
--		/* XXX possible buffer overflow here */
--		sprintf(buf, fmt, SENDMAIL, envrcpt[0]);
--#endif
--
--		debug(D_RCPT, "calling %s", buf);
-+		char sendmail_prog[] = SENDMAIL;
-+		char sendmail_mode[] = "-bv";
-+		char * const popen_argv[] = { sendmail_prog, sendmail_mode, envrcpt[0], NULL };
-+		pid_t pid;
- 
--#if defined(__FreeBSD__) /* popen bug - see PR bin/50770 */
--		rv = pthread_mutex_lock(&popen_mutex);
--		if (rv)
--		{
--			debug(D_ALWAYS, "Could not lock popen mutex: %s", strerror(rv));
--			abort();
--		}		
--#endif
-+		debug(D_RCPT, "calling %s -bv %s", SENDMAIL, envrcpt[0]);
- 
--		p = popen(buf, "r");
-+		p = popenv(popen_argv, "r", &pid);
- 		if (!p)
- 		{
--			debug(D_RCPT, "popen failed(%s).  Will not expand aliases", strerror(errno));
-+			debug(D_RCPT, "popenv failed(%s).  Will not expand aliases", strerror(errno));
- 			assassin->expandedrcpt.push_back(envrcpt[0]);
- 		} else
- 		{
-@@ -912,16 +859,9 @@
- 					assassin->expandedrcpt.push_back(p+7);
- 				}
- 			}
--			pclose(p); p = NULL;
-+			fclose(p); p = NULL;
-+			waitpid(pid, NULL, 0);
- 		}
--#if defined(__FreeBSD__)
--		rv = pthread_mutex_unlock(&popen_mutex);
--		if (rv)
--		{
--			debug(D_ALWAYS, "Could not unlock popen mutex: %s", strerror(rv));
--			abort();
--		}		
--#endif
- 	} else
- 	{
- 		assassin->expandedrcpt.push_back(envrcpt[0]);
-@@ -2179,5 +2119,72 @@
- 	warnedmacro = true;
- }
- 
-+/*
-+   untrusted-argument-safe popen function - only supports "r" and "w" modes
-+   for simplicity, and always reads stdout and stderr in "r" mode.  Call
-+   fclose to close the FILE, and waitpid to reap the child process (pid).
-+*/
-+FILE *popenv(char *const argv[], const char *type, pid_t *pid)
-+{
-+       FILE *iop;
-+       int pdes[2];
-+       int save_errno;
-+
-+       if ((*type != 'r' && *type != 'w') || type[1])
-+       {
-+               errno = EINVAL;
-+               return (NULL);
-+       }
-+       if (pipe(pdes) < 0)
-+               return (NULL);
-+       switch (*pid = fork()) {
-+       
-+       case -1:                        /* Error. */
-+               save_errno = errno;
-+               (void)close(pdes[0]);
-+               (void)close(pdes[1]);
-+               errno = save_errno;
-+               return (NULL);
-+               /* NOTREACHED */
-+       case 0:                         /* Child. */
-+               if (*type == 'r') {
-+                       /*
-+                        * The dup2() to STDIN_FILENO is repeated to avoid
-+                        * writing to pdes[1], which might corrupt the
-+                        * parent's copy.  This isn't good enough in
-+                        * general, since the exit() is no return, so
-+                        * the compiler is free to corrupt all the local
-+                        * variables.
-+                        */
-+                       (void)close(pdes[0]);
-+                       (void)dup2(pdes[1], STDOUT_FILENO);
-+                       (void)dup2(pdes[1], STDERR_FILENO);
-+                       if (pdes[1] != STDOUT_FILENO && pdes[1] != STDERR_FILENO) {
-+                               (void)close(pdes[1]);
-+                       } 
-+               } else {
-+                       if (pdes[0] != STDIN_FILENO) {
-+                               (void)dup2(pdes[0], STDIN_FILENO);
-+                               (void)close(pdes[0]);
-+                       }
-+                       (void)close(pdes[1]);
-+               }
-+               execv(argv[0], argv);
-+               exit(127);
-+               /* NOTREACHED */
-+       }
-+
-+       /* Parent; assume fdopen can't fail. */
-+       if (*type == 'r') {
-+               iop = fdopen(pdes[0], type);
-+               (void)close(pdes[1]);
-+       } else {
-+               iop = fdopen(pdes[1], type);
-+               (void)close(pdes[0]);
-+       }
-+
-+       return (iop);
-+}
-+
- // }}}
- // vim6:ai:noexpandtab
---- spamass-milter.h	2011-07-09 11:55:14.000000000 +0000
-+++ spamass-milter.h	2011-07-09 11:56:02.000000000 +0000
-@@ -186,5 +186,6 @@
- void parse_debuglevel(char* string);
- char *strlwr(char *str);
- void warnmacro(char *macro, char *scope);
-+FILE *popenv(char *const argv[], const char *type, pid_t *pid);
- 
- #endif
diff --git a/mail-filter/spamass-milter/files/spamass-milter.rc3 b/mail-filter/spamass-milter/files/spamass-milter.rc3
deleted file mode 100644
index 20e5dd1af4cb..000000000000
--- a/mail-filter/spamass-milter/files/spamass-milter.rc3
+++ /dev/null
@@ -1,38 +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/spamass-milter/files/spamass-milter.rc3,v 1.1 2008/06/15 09:28:02 dertobi123 Exp $
-
-depend() {
-	need net spamd
-	use logger
-	before mta
-}
-
-start() {
-	ebegin "Starting spamass-milter"
-	start-stop-daemon --start --quiet --pidfile ${PIDFILE} -c ${SOCKET_USER:-milter}:${SOCKET_GROUP:-milter} \
-		--exec ${DAEMON} -- -P ${PIDFILE} -p ${SOCKET} -f ${OPTIONS}
-	eend $? "Failed to start ${DAEMON}"
-	for ((spamass_timeout=0 ; spamass_timeout <= 20 ; spamass_timeout++))
-	do
-		if [ ! -S "${SOCKET}" -o ! -r "${SOCKET}" ]
-		then
-			sleep 1
-		else
-			break
-		fi
-	done
-	chown ${SOCKET_USER:-milter}:${SOCKET_GROUP:-milter} ${SOCKET} 1>/dev/null 2>&1
-	chmod ${SOCKET_MODE:-664} ${SOCKET} 1>/dev/null 2>&1
-}
-
-stop() {
-	ebegin "Stopping spamass-milter"
-	start-stop-daemon --stop --quiet --pidfile ${PIDFILE} &&
-	{
-		sleep 5
-		rm -f ${SOCKET}
-	}
-	eend $? "Failed to stop ${DAEMON}"
-}
diff --git a/mail-filter/spamass-milter/spamass-milter-0.3.1-r5.ebuild b/mail-filter/spamass-milter/spamass-milter-0.3.1-r5.ebuild
deleted file mode 100644
index d33221b7c67c..000000000000
--- a/mail-filter/spamass-milter/spamass-milter-0.3.1-r5.ebuild
+++ /dev/null
@@ -1,51 +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/spamass-milter/spamass-milter-0.3.1-r5.ebuild,v 1.3 2012/06/05 00:06:47 zmedico Exp $
-
-EAPI=4
-
-inherit eutils user
-
-IUSE=""
-
-DESCRIPTION="A milter for SpamAssassin"
-HOMEPAGE="http://savannah.nongnu.org/projects/spamass-milt/"
-SRC_URI="http://savannah.nongnu.org/download/spamass-milt/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-
-DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )
-	>=mail-filter/spamassassin-3.1.0"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup milter
-	enewuser milter -1 -1 /var/lib/milter milter
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-header.patch
-	epatch "${FILESDIR}"/${PN}-auth_users.patch
-	epatch "${FILESDIR}"/${PN}-popen-r1.patch
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	newinitd "${FILESDIR}"/spamass-milter.rc3 spamass-milter
-	newconfd "${FILESDIR}"/spamass-milter.conf3 spamass-milter
-	dodir /var/run/milter
-	keepdir /var/run/milter
-	fowners milter:milter /var/run/milter
-	dodir /var/lib/milter
-	keepdir /var/lib/milter
-	fowners milter:milter /var/lib/milter
-
-	dodoc AUTHORS NEWS README ChangeLog "${FILESDIR}/README.gentoo"
-}
-
-pkg_postinst() {
-	elog "Documentation is installed in /usr/share/doc/${P}"
-}