Remove old

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

11 files changed, 23 insertions, 1754 deletions

diff --git a/mail-filter/opendkim/ChangeLog b/mail-filter/opendkim/ChangeLog
index 6c9a0b37cdf6..07b063bc8dfb 100644
--- a/mail-filter/opendkim/ChangeLog
+++ b/mail-filter/opendkim/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for mail-filter/opendkim
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/ChangeLog,v 1.70 2013/07/16 05:51:37 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/ChangeLog,v 1.71 2013/07/16 06:23:19 eras Exp $
+
+  16 Jul 2013; Eray Aslan <eras@gentoo.org>
+  -files/opendkim-2.7.4-DisableCryptoInit.patch,
+  -files/opendkim-2.7.4-bsd.patch, -files/opendkim-2.8.0-berkeleydb.patch,
+  -files/opendkim-unbreak_upgrade.patch, -opendkim-2.7.4-r1.ebuild,
+  -opendkim-2.8.0-r1.ebuild, -opendkim-2.8.0.ebuild, -opendkim-2.8.1.ebuild,
+  -opendkim-2.8.2.ebuild:
+  Remove old
 
   16 Jul 2013; Eray Aslan <eras@gentoo.org> opendkim-2.8.4.ebuild:
   Fix config file location in opendkim-reportstats - bug #475952
diff --git a/mail-filter/opendkim/Manifest b/mail-filter/opendkim/Manifest
index 832da912351d..ec0fb20f35ea 100644
--- a/mail-filter/opendkim/Manifest
+++ b/mail-filter/opendkim/Manifest
@@ -1,41 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX opendkim-2.7.4-DisableCryptoInit.patch 3747 SHA256 83c0fac5ed1393cdfda695637f337a2a43bcd45476f11ed7db1bc422a080f421 SHA512 c8c352a56150cf0e8a2ce4b0020c03d60da1e8c184e830b325348e1e9272df8634e014a4ae6b62d4c8c596d855ecdf163eb4c09104e31084d1643364bcf093f8 WHIRLPOOL d6ad3a4ea0c2ba7b41d06750beb3fb19dd26f29f44f1ffc6855e93f8a5e8af631c35c9b782d32a7fcb83361e881ea6dffb22d59035d9b3148cf39b37ee62f1db
-AUX opendkim-2.7.4-bsd.patch 18006 SHA256 a4cfb4d26dc7d27134f66f7b1e78b40f6c0c77f3986af787001c094c4734f95f SHA512 9ee24d02d2662b2898dd073b7ec882889fe9568d2afca8751c6ad6c68af60523d77ca79557f540607a68cb159bf0df7266122ed8fe3a3b67ca4e578b325b4892 WHIRLPOOL 8408536bd7fd080eedc99b3b133562d5049a63a61420b5a38759237dce09af8ab257f524152ca870de18c13113b6370bc5c0f8fe06fc43d89101ecbcfbb157e9
-AUX opendkim-2.8.0-berkeleydb.patch 2134 SHA256 3e8152cef5a9f9d158620d8f6d27b266eec86ba3fa0b524a0a4c13b62a71fb68 SHA512 944ef9375ad219f5cb7bcfc415cde13b4bf17f94667f3dc705d0e2fdd641ed65cbffd7b03efd9ee71e15f0a7ff6b37e569d10e0ed951660ccb2a5c5a28579d48 WHIRLPOOL 041768e49bfd078f8228f8dd66a508dce964df579d8ce63701cf74c08559f780b9af4dadd6643b90776c5985b0ec220f444efa7a548f8b08c2f6d46192ffc5d7
 AUX opendkim-2.8.0-unbreak_upgrade.patch 1042 SHA256 5c115fa185bc9a64fe847599e2c0fa8d4d2925f4b2dbdef1e88769195c79046d SHA512 b415fe2f05dd16489ac59038ab15b22c77da23fe1bc3b5fc82883186b4e2b44855f546fbc1128109e84b1c19ed868cffed66c72fd4600c66c27ce4f9363b44a2 WHIRLPOOL 6304af7e66862da3c215455273d486aa4f67ae0777209e92e1c81b9537722850699fdd8c167e95412abfb2143eefcb88ff3c58c4cfc380994e27e9c41deee8e8
-AUX opendkim-unbreak_upgrade.patch 1050 SHA256 6518b34662ca366a4616ca1135d5cc529b62dd6b921d2b0074ba8fabedfbd739 SHA512 01755ba0675d19c6b1d582c502479ae843dccadc712e4af5e66fd63a333241cdd5e29fb1856020967faee5bbe454784745747c54c0994b216b7aaba340bc9107 WHIRLPOOL 6a0b6f9ebdc2a5b06a3a2b1ddd75adfe8e6109cf346ad3387718152e307db107c052b66fab7590a054a0977504f5eb705eca7e7c9d5d62c86f97d216b0d25366
 AUX opendkim.init.r3 1545 SHA256 63f316ef776ad1a9fe87cff7748fac4574c2355b6205e3ef21285ddb84c8cb33 SHA512 c28b93f230b65ba483302dbb0f6cba0d8b2cf29cce0309521e67f6aa0e4c041b0dd69eaca8152d6b0b1b02dbe1ff9634fef0840856c8e192f17a1c24ffac7166 WHIRLPOOL f42cb79de47d2fdac26ef4a45132e996640da824aadaf0c3e66182160e941322ff78a37c18a32ca50efb0bb4fbf11b622a1ce5931146c47a06156c256d568b81
-DIST opendkim-2.7.4.tar.gz 1158496 SHA256 fa66f7ca52dd3fa94cd869e8fe9e8f849ab83d6a32a8d4ed3cf18b06b4584e76 SHA512 f897cea21832355cac5421a96a906f67aaff1bcc0ceb5e027c73845d7c0cd27ec12862a826534b01339571533cba061b86e1a1bad91c405488bada729e2846cb WHIRLPOOL afe329829211cedacc7d27b5a4d03469e1fe8935cabc0b51158a69862ef993d6438499a206628dafc31c7904b9b95d1eeb31edf6583249cf54396793af68bdbc
-DIST opendkim-2.8.0.tar.gz 1175377 SHA256 a7b369b2182031d53257cbbac7ed99d70b00ebc442dfb832dc7d78d5d7b0c31c SHA512 35730e100307e5bdca9fd1c79e13371bd46e73b6a97f7244edaa4fe1bc693a0825ed2bab349155af11d472da7e0635e558f1c755468efdddeef073b3abc0041b WHIRLPOOL a85a69e31eef3eb4e37cc5c6285ef189367d4d4e3ceef6966ccde008d99d897ca862950316cec9e42ad0566fc9814e2cbd6a9f7dbfc2fdc2cf6909bfd83699b8
-DIST opendkim-2.8.1.tar.gz 1176501 SHA256 4fefda01a7fd7ecf37d3cd309c05ba714d97ac61a4eda145b6213bf8e4b536e8 SHA512 c6970ef51a822a6ae2eecca6704f95a307319dd087d9e1b4930f1a7b1f7db49043930f5ef1a62aaf3af0a366094339b2b811b2f585f9f4601c95cb382dc21af3 WHIRLPOOL 5d5ae9e703bbbddf6e0779f9625ed807074affffec03e07e32d41926fe5e1079f6928e4a937f38b7cef3950354fc4a3496dd237917a3e37aa9dd43f95448ea7d
-DIST opendkim-2.8.2.tar.gz 1181815 SHA256 6ccb6a4a8906e18e2c487669bf0a24e7b8e7fd791da38ff45a5ab25264f071bc SHA512 4e3315407092472f06f34af31a440fa2cb4533b73ce19446ed0999251c327610918a6a31fc785aafc4043d01e168b705339e287a758ae655019226f783834776 WHIRLPOOL 82edbb68fa8a4bd8ff3661a8b47b6b05cee5321283d7b9d899719a438a43970b8801d7047478dac5c881a10660ccaa0eb46d9ffb21760efec4b1da5e0a8b3e4f
 DIST opendkim-2.8.3.tar.gz 1182214 SHA256 eb36003b0d2d7514312c65db2b45afd9ce4d02744fbf4b2fe6f8e1e2893ce989 SHA512 bf2b824a4b8c7b32755fefa0d6a5fd608da59f254722d2ad52b6eda4a8710e4d22b95cfe2a85df711e3e9a0b62fd319f88afa7a86d319be4568d0de0f9c6634f WHIRLPOOL 52ad1d85fb4087c8f1a9afb4ec8cc8550016f85b7578954f1ddc02204c3440c742e3d8175560eebb514180c1deb128d500bd4fa6848fe37f3acae628a38307aa
 DIST opendkim-2.8.4.tar.gz 1177118 SHA256 d6ea32f60e750530359841da1e1bd644e6ccb0d228ad5e0633be6dfb8434b30a SHA512 a65e2cbe46878707072aceb5fa60d70d527fda9679aac5c9083b24f1697ba6fe566d9bd7bfca6a23443f639fc27b843e098b5a6b1750347c045f028dd76dc21d WHIRLPOOL b93310e27bfa38326f431ae44ab88d1c6ffddec2d81be1acfce5e3f275ea0e9f8b67eb25715ffb8d5b2c5311766a8ec0236e1e7ee4dc2ee3d0910946654cb550
-EBUILD opendkim-2.7.4-r1.ebuild 6135 SHA256 8254b24c351dd750cad24c36622e0ced17bdf5eff0fc3407f068c28c92c7a816 SHA512 da2633e235431cdf6f496a07bdfde3435878120c7c3e838cf2766920197a54ba62ceb8bb4ed3dc1f936911768ac3c1f10c727bb9e1dfda21a888a3857ecf087f WHIRLPOOL 01df0472e302dda26923157c311ff6aaf90d78e4ca295ead74983ed063cc02868977ea47c918efdd1e8757bfdcb08001864ee4163c85bdee93c6f58fe6f1c5f6
-EBUILD opendkim-2.8.0-r1.ebuild 6198 SHA256 03687582317507bc7ebe711dbcf1262531b7622b8ee856a4beac432d1d8e8b83 SHA512 8707024a6fd283a8aa6278cbbbaf78d4ec4632197ccb4f7a2dad5dc2a2b91282a55e26adc3aea4c02621c203d823f0e24089c2e7d7cf1c7f4d1ed33d76bd165f WHIRLPOOL 5eaeb92acc9884e4f19b15485527452e2d377292ddcbf1cad07a5c408f3ef4e885f35d2805e0c6467a3486c506c4e51e44a5d26ab96f32abfc8042ba089f5403
-EBUILD opendkim-2.8.0.ebuild 6144 SHA256 95556dda451ef7676e445bd75824b28ea52e9aa47b1ab69cf2bb1038053e5ac6 SHA512 d532de8f9f4d595bada1169f139904f7946f22a4fbd4ee37b910af336a338b015d0ad560e73bb2bfd22ad78ca6a78e391f8b71cc9a554a3bbee6c6429f01b43b WHIRLPOOL a2406e9bf001dd0fbd1c10a32ab44e0d071e54baad1e8973ad858f69ca3b28c6f7dc288a6bc3c9fd3726c3296713deb01cc00e77f3341b1e7ace2e42b449b824
-EBUILD opendkim-2.8.1.ebuild 6144 SHA256 975f379bb898affc9147b962c4bc10321480008229d380c6c93c5937660f78b4 SHA512 7ad3b250b70b6af8b96572193af5a5e7267b9947818761d1f1761f5ccb0b0a4dd30f62eb21487d31d698a4ea9d6c0e4bca19d573b2fa6fce0524a2f5cc0e8e97 WHIRLPOOL 3ffb017687e5ad37bab57eeb5f218892b5b71214b32444a0ea5001c1d8d426f73177f8e67908c595575aa9a6d3887b3ae7db11ca5577019ae9f357165e52cb81
-EBUILD opendkim-2.8.2.ebuild 6144 SHA256 e1fe233e1bbb50a6d189882f9a6856966af5dd66ae71cfd302ebf9276701f8b0 SHA512 39fef45003f24e0bbef8a0628b95e7e2009843f70062258b0ebe460b7d56d2839114a200ad37c30f18a77d3fa27f23e7c82aadfbf52999c51b8ef5cb72771f5d WHIRLPOOL 1d2cb3c6a57f7812fd86ced81f50ada2754b7b28a5201a1edf39281c632ca1f461608480aac510f5d50e4bbeabd30c3ad3d20a0f1beff01c6d09408695aab22a
 EBUILD opendkim-2.8.3.ebuild 6132 SHA256 01ed0c2eb238c9214ce406034a93372c01cc956b18a2920b7d786dcab247a35b SHA512 07ad989727a7fb9c8805f3877edf1cf037e8663f5662c244aed414b7b9d7182a4fd4dc65e5b36c52f4e2aa94af07b09348ecde809496d74f631812741f1d7e80 WHIRLPOOL e456e9ee670c60db061ff69ba1d985a8dc9b4bef207e72ce3111de2d942aae78a6cb6048c5c03ec3738a36fb38fb822a253ef1cf748751526c6e0e693978e022
 EBUILD opendkim-2.8.4.ebuild 6118 SHA256 e3bde70f3c9402871274e01c68c2c3c93907e8ecbc82e94066a9de4ad765b4ac SHA512 16fb328bad2a9b9e0c10a11c45b43859a5aaa0240b32339109657ff58b82cc8a5341e5c117df4e371c5eac98a5b99b6bf468ae4413f0cb988f236a4457fac091 WHIRLPOOL 3780506368cde098a36311dd8ba1c305fd4ec00f160cfcaff572bb8b1527387753c43ecc09920aba1ed57129e4dc1fdbba4656a2e6f01547a58577e15a00f863
-MISC ChangeLog 12373 SHA256 ce119b7f70426c11f7c7a5842096ddbc3ec1bfc84d663b5ca560e25cb0552a24 SHA512 ebb24e3f6faa548886bb4e1c77b20fafef08ac957486eeceb06781aae3c8ab308003ea8b46eefc385a85d70ac991d3cd38700704b4308b8e240024c8ae431166 WHIRLPOOL 73a8c3cabea18aac12d8713e54b85f925dcb4c1a538553122567ea449169535f16e4b255b83399bea0a0c8a5d5cbce1378d29e18281b7c66c24c7236385d6309
+MISC ChangeLog 12726 SHA256 85e9e3de0373a5ac861aeb55fde97ba74acf1cf9cd41c607e978cdc1c6e4ddd1 SHA512 c9a0126c22f868c90e29cb3ae963d7deb57a44d60f5f5f168583c11a34e0f41a61a9e8f8c07bbf5770f20adfb371531d784ff3f08d245ee13dff2fc21c562d4a WHIRLPOOL 1e5bfe847208ff30e55fa16b515265cfebb6a65cfbdbf987eeeb6fc6a249b8693a8d0ba8745aa56ae1074857bcc74ae7cb663975d41e95fc8956659beafa20f0
 MISC metadata.xml 1332 SHA256 c1e6b0840b71e1fd07b10d983e414abfce8307095c3ff990362fc571d5b2f01d SHA512 2245a94573171993bb958f2beb6a5dfc738ef9878b7795747e3e0bf689801af756540f561b5d0bd7c93ce02fe66efad7a9b018976a81c7bdaf3849b634f22ec2 WHIRLPOOL a3b25a8495638a9815347ccb297848b8ebde0a9f0cf4093507750784c2732995fc0cd048a051197dc4f6d9acd3115d0c2cbb7fa2321933f8c0ab11158feadfd1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJR5N9qAAoJEHfx8XVYajsf13wP/iRGyN6jU0+KRE30emmqzW9R
-RSHGNBjlC9G0Q8o/UlU352UW2jxmsojFDdRb2XILSC450xB7MqU/dJepn0NNT8l2
-ou0WRAe69tkF5sSi5O/Y29iwWLR4RXe0G+i0ar8PcCcXmyAP0/mv6Qfbt2UkLATn
-X80bOo2+ffWY/41gnpuxKOQgyZ1knzID+3Skl8QuNZtuwckuhR26i3ipXF9PNYPD
-A8yxpx4YW4JWgbZyle+rcqOuywJEAoWgWw0q5R5OXKLJGooqdxhikN1aW4PNLvQm
-JAUeq0SWfFx4e3h8nPGTmbfKfvMdBzxpuBVKwlTaLQb2DSaolppCwKubqf1M947F
-BbHhF7w65meG8B94dq9zqs+ldFkQdAgLAp3Wcdw4YpxvcuWq2PMZFaWY6pYnY3zu
-HNUzKK6VPRdDku2WQj/ow77avMPaZWvsbeK5puo021Q1VTEYFtks7yhNaX/IlBpv
-Vq1jlWebVnSNAoaWl2sZUlsMaE0esTJFr4lfDzPkLV5ElkANSORSSi8+FYMSKFIo
-iNJZSzygDtCn519nD5DLvNT82dg5fG7TFN/c4UzR4zXIw8aAF3nSy04sZh/AVNcW
-TXPBapYYImPEopgvRrkjFCFV+jJE3Iln5PayE7i2wSzINrMVOIM7TKVBKEBroHlf
-lOjpovYjcuQkJ2UPVOlM
-=yheT
+iQIcBAEBCAAGBQJR5ObjAAoJEHfx8XVYajsf1+4P/1hJcuCc3BfGk3GkNlF4kVT6
+jLwlHzMPp64CcNeG2a5Tg7ghS/C1J9MnwUqtrs8SMuifWEz96cCUpSU0vL2Q55jj
+sYe7G5INqFOjWonTO2wslLSdvAOTOGLzAEXHIsnJ0VdvOpQfPLHJ+phCBf+mXZww
+dKNlKb6GYwzhgRob5zpGApldZ6H1Brjbk2TXd9N6TaP80L96L+xxfSLkUHyT1/GT
+eimD5gxgynCxns5mg/VYVoas8jLvrflgIaN+nTeR6Qo+CZAvkG8fV4zfCd8VjS+X
+3y8vxQenkScHNXBW4oUvT9/cY38J+Qny3E9Fi7XUcd39tEms3NRo0jJyTtGdftzs
+fdiQNMfftuwdvfKtKkWqFyDucbh593/eF/xwuypfD3MzEtY9BIGmRonuo0TlE1+7
+jJuUBx+lLd4HdCp/5Xm53LEhkIyONpEicUBl+AsaKWyYFWq2v3UGJKuyliSRyodH
+WZ+KYOsL1ewVCXPeLAJBKrKKYxpXmZF6ZmbuCFv5+9dAONZ46TYEYHM5uk/I8WAi
+QZ9cTd+MPFO/zzqUX96AGNMvvLcGNxvXbEfw61W3cpd3Hxf3HTnPx1ls1zvg4KCY
+zJuWAR3+e1hMTRBS1Oqt4j39QR218aq6k9V3U1+rGy0+lzMJcKwB4AFH1fSbPb9f
+g/dClKKeab2Z04HeqQ8U
+=hO77
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/opendkim/files/opendkim-2.7.4-DisableCryptoInit.patch b/mail-filter/opendkim/files/opendkim-2.7.4-DisableCryptoInit.patch
deleted file mode 100644
index deb9476af2eb..000000000000
--- a/mail-filter/opendkim/files/opendkim-2.7.4-DisableCryptoInit.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From 23548465adccd682ba9ecba58025f852d2353bad Mon Sep 17 00:00:00 2001
-From: Murray S. Kucherawy <msk@trusteddomain.org>
-Date: Thu, 10 Jan 2013 00:49:11 -0800
-Subject: [PATCH] Fix bug #SF3531477: Add (hopefully temporary) configuration option
- "DisableCryptoInit" so that opendkim's initialization of the crypto library
- doesn't conflict with the same work done by other libraries.  Reported by
- Quanah Gibson-Mount.
-
----
- opendkim/opendkim-config.h  |    1 +
- opendkim/opendkim-crypto.c  |    7 +++++--
- opendkim/opendkim.c         |   17 +++++++++++++----
- opendkim/opendkim.conf.5.in |    6 ++++++
- 5 files changed, 29 insertions(+), 6 deletions(-)
-
-diff --git a/opendkim/opendkim-config.h b/opendkim/opendkim-config.h
-index dfc3606..0d40bb9 100644
---- a/opendkim/opendkim-config.h
-+++ b/opendkim/opendkim-config.h
-@@ -56,6 +56,7 @@ struct configdef dkimf_config[] =
- 	{ "Diagnostics",		CONFIG_TYPE_BOOLEAN,	FALSE },
- 	{ "DiagnosticDirectory",	CONFIG_TYPE_STRING,	FALSE },
- 	{ "DisableADSP",		CONFIG_TYPE_BOOLEAN,	FALSE },
-+	{ "DisableCryptoInit",		CONFIG_TYPE_BOOLEAN,	FALSE },
- #ifdef _FFR_DKIM_REPUTATION
- 	{ "DKIMReputationFail",		CONFIG_TYPE_INTEGER,	FALSE },
- 	{ "DKIMReputationPass",		CONFIG_TYPE_INTEGER,	FALSE },
-diff --git a/opendkim/opendkim-crypto.c b/opendkim/opendkim-crypto.c
-index 2ea9b44..fb42fd0 100644
---- a/opendkim/opendkim-crypto.c
-+++ b/opendkim/opendkim-crypto.c
-@@ -121,9 +121,12 @@ dkimf_crypto_init(void)
- void
- dkimf_crypto_free(void)
- {
--	(void) gnutls_global_deinit();
-+	if (crypto_init_done)
-+	{
-+		(void) gnutls_global_deinit();
- 
--	(void) pthread_key_delete(logkey);
-+		(void) pthread_key_delete(logkey);
-+	}
- 
- 	return;
- }
-diff --git a/opendkim/opendkim.c b/opendkim/opendkim.c
-index 9863d30..3fa0a60 100644
---- a/opendkim/opendkim.c
-+++ b/opendkim/opendkim.c
-@@ -209,6 +209,7 @@ struct lua_global
- 
- struct dkimf_config
- {
-+	_Bool		conf_disablecryptoinit;	/* initialize SSL libs? */
- #ifdef USE_LDAP
- 	_Bool		conf_softstart;		/* do LDAP soft starts */
- #endif /* USE_LDAP */
-@@ -6414,6 +6415,10 @@ dkimf_config_load(struct config *data, struct dkimf_config *conf,
- 		                  &conf->conf_noadsp,
- 		                  sizeof conf->conf_noadsp);
- 
-+		(void) config_get(data, "DisableCryptoInit",
-+		                  &conf->conf_disablecryptoinit,
-+		                  sizeof conf->conf_disablecryptoinit);
-+
- 		str = NULL;
- 		(void) config_get(data, "ADSPAction", &str, sizeof str);
- 		if (str != NULL)
-@@ -17503,11 +17508,15 @@ main(int argc, char **argv)
- 	}
- 
- 	/* initialize libcrypto mutexes */
--	status = dkimf_crypto_init();
--	if (status != 0)
-+	if (!curconf->conf_disablecryptoinit)
- 	{
--		fprintf(stderr, "%s: error initializing crypto library: %s\n",
--		        progname, strerror(status));
-+		status = dkimf_crypto_init();
-+		if (status != 0)
-+		{
-+			fprintf(stderr,
-+			        "%s: error initializing crypto library: %s\n",
-+			        progname, strerror(status));
-+		}
- 	}
- 
- 	if ((curconf->conf_mode & DKIMF_MODE_VERIFIER) != 0 &&
-diff --git a/opendkim/opendkim.conf.5.in b/opendkim/opendkim.conf.5.in
-index a963e73..2c20549 100644
---- a/opendkim/opendkim.conf.5.in
-+++ b/opendkim/opendkim.conf.5.in
-@@ -236,6 +236,12 @@ If set, suppresses Author Domain Signing Practices (ADSP) checks, which
- require multiple additional DNS queries.
- 
- .TP
-+.I DisableCryptoInit (Boolean)
-+If set, skips initialization of the SSL library initialization steps, which
-+are normaly required in multi-threaded environments.  This assumes some other
-+library opendkim is using will do the required initialization and shutdown.
-+
-+.TP
- .I DKIMReputationFail (integer)
- If the reputation returned by the DNS reputation service exceeds this
- value then the result "x-dkim-rep" is set to "fail".
--- 
-1.7.4.1
-
diff --git a/mail-filter/opendkim/files/opendkim-2.7.4-bsd.patch b/mail-filter/opendkim/files/opendkim-2.7.4-bsd.patch
deleted file mode 100644
index 594ef4bf4a17..000000000000
--- a/mail-filter/opendkim/files/opendkim-2.7.4-bsd.patch
+++ /dev/null
@@ -1,558 +0,0 @@
-diff -Nru opendkim-2.7.4/configure.ac opendkim-2.7.4/configure.ac
---- opendkim-2.7.4/configure.ac	2013-01-18 06:47:47.000000000 +0000
-+++ opendkim-2.7.4/configure.ac	2013-01-18 06:47:47.000000000 +0000
-@@ -182,6 +182,9 @@
- 
- AC_CHECK_FUNCS([dup2 endpwent getcwd gethostname gethostbyname getaddrinfo gethostbyname2 gettimeofday isascii memchr memmove memset regcomp select socket strcasecmp strchr strdup strerror strncasecmp strrchr strstr strtol strtoul strtoull])
- 
-+bsdstrl_h_found="no"
-+AC_CHECK_HEADERS([bsd/string.h], [bsdstrl_h_found="yes"])
-+
- strl_found="no"
- libstrl_found="no"
- strl_h_found="no"
-@@ -218,11 +221,11 @@
- 		saved_LIBS="$LIBS"
- 		LIBS=""
- 		AC_SEARCH_LIBS([strlcat],
--		               [strl],
-+		               [bsd strl],
- 		               [libstrl_found="yes"],
- 		               [strl_found="no"])
- 		AC_SEARCH_LIBS([strlcpy],
--		               [strl],
-+		               [bsd strl],
- 		               [libstrl_found="yes"],
- 		               [strl_found="no"])
- 		STRL_LIBS="$LIBS"
-@@ -236,13 +239,18 @@
- fi
- # we need to include <strl.h> if:
- # (a) strlcat and strlcpy weren't found, since we'll be rolling our own; OR
--# (b) an installed strl.h was found
--if test x"$strl_h_found" = x"yes" -o \( x"$strl_found" = x"no" -a x"$libstrl_found" = x"no" \)
-+# (b) an installed strl.h was found and no installed bsd/string.h was found
-+if test x"$strl_h_found" = x"yes" -o \( x"$strl_found" = x"no" -a x"$libstrl_found" = x"no" \) -a x"$bsdstrl_h_found" = x"no"
- then
- 	AC_DEFINE([USE_STRL_H], 1,
- 	          [Define to 1 if you need to include <strl.h> to get the `strlcat()' and `strlcpy()' functions.])
- fi
- 
-+if test x"$bsdstrl_h_found" = x"yes"
-+then
-+	AC_DEFINE([USE_BSD_H], 1,
-+	          [Define to 1 if you need to include <bsd/string.h> to get the `strlcat()' and `strlcpy()' functions.])
-+fi
- #
- # Checks for structure members
- #
-diff -Nru opendkim-2.7.4/libopendkim/dkim-cache.c opendkim-2.7.4/libopendkim/dkim-cache.c
---- opendkim-2.7.4/libopendkim/dkim-cache.c	2012-11-30 01:32:17.000000000 +0000
-+++ opendkim-2.7.4/libopendkim/dkim-cache.c	2013-01-18 06:47:47.000000000 +0000
-@@ -27,6 +27,11 @@
- #include "dkim-internal.h"
- #include "dkim-cache.h"
- 
-+/* libbsd if found */
-+#ifdef USE_BSD_H
-+# include <bsd/string.h>
-+#endif /* USE_BSD_H */
-+
- /* libstrl if needed */
- #ifdef USE_STRL_H
- # include <strl.h>
-diff -Nru opendkim-2.7.4/libopendkim/dkim-canon.c opendkim-2.7.4/libopendkim/dkim-canon.c
---- opendkim-2.7.4/libopendkim/dkim-canon.c	2012-11-30 01:32:17.000000000 +0000
-+++ opendkim-2.7.4/libopendkim/dkim-canon.c	2013-01-18 06:47:47.000000000 +0000
-@@ -45,6 +45,11 @@
- #include "dkim-util.h"
- #include "util.h"
- 
-+/* libbsd if found */
-+#ifdef USE_BSD_H
-+# include <bsd/string.h>
-+#endif /* USE_BSD_H */
-+
- /* libstrl if needed */
- #ifdef USE_STRL_H
- # include <strl.h>
-diff -Nru opendkim-2.7.4/libopendkim/dkim-keys.c opendkim-2.7.4/libopendkim/dkim-keys.c
---- opendkim-2.7.4/libopendkim/dkim-keys.c	2012-11-30 01:32:17.000000000 +0000
-+++ opendkim-2.7.4/libopendkim/dkim-keys.c	2013-01-18 06:47:47.000000000 +0000
-@@ -29,6 +29,11 @@
- #include "dkim-test.h"
- #include "util.h"
- 
-+/* libbsd if found */
-+#ifdef USE_BSD_H
-+# include <bsd/string.h>
-+#endif /* USE_BSD_H */
-+
- /* libstrl if needed */
- #ifdef USE_STRL_H
- # include <strl.h>
-diff -Nru opendkim-2.7.4/libopendkim/dkim-policy.c opendkim-2.7.4/libopendkim/dkim-policy.c
---- opendkim-2.7.4/libopendkim/dkim-policy.c	2012-11-30 01:32:17.000000000 +0000
-+++ opendkim-2.7.4/libopendkim/dkim-policy.c	2013-01-18 06:47:47.000000000 +0000
-@@ -34,6 +34,11 @@
- #include "dkim-test.h"
- #include "util.h"
- 
-+/* libbsd if found */
-+#ifdef USE_BSD_H
-+# include <bsd/string.h>
-+#endif /* USE_BSD_H */
-+
- /* libstrl if needed */
- #ifdef USE_STRL_H
- # include <strl.h>
-diff -Nru opendkim-2.7.4/libopendkim/dkim-test.c opendkim-2.7.4/libopendkim/dkim-test.c
---- opendkim-2.7.4/libopendkim/dkim-test.c	2012-11-30 01:32:17.000000000 +0000
-+++ opendkim-2.7.4/libopendkim/dkim-test.c	2013-01-18 06:47:47.000000000 +0000
-@@ -36,6 +36,11 @@
- #include "dkim-util.h"
- #include "dkim-test.h"
- 
-+/* libbsd if found */
-+#ifdef USE_BSD_H
-+# include <bsd/string.h>
-+#endif /* USE_BSD_H */
-+
- /* libstrl if needed */
- #ifdef USE_STRL_H
- # include <strl.h>
-diff -Nru opendkim-2.7.4/libopendkim/dkim.c opendkim-2.7.4/libopendkim/dkim.c
---- opendkim-2.7.4/libopendkim/dkim.c	2012-11-30 01:32:17.000000000 +0000
-+++ opendkim-2.7.4/libopendkim/dkim.c	2013-01-18 06:47:47.000000000 +0000
-@@ -92,6 +92,11 @@
- #include "util.h"
- #include "base64.h"
- 
-+/* libbsd if found */
-+#ifdef USE_BSD_H
-+# include <bsd/string.h>
-+#endif /* USE_BSD_H */
-+
- /* libstrl if needed */
- #ifdef USE_STRL_H
- # include <strl.h>
-diff -Nru opendkim-2.7.4/libopendkim/tests/t-test122.c opendkim-2.7.4/libopendkim/tests/t-test122.c
---- opendkim-2.7.4/libopendkim/tests/t-test122.c	2012-11-30 01:32:17.000000000 +0000
-+++ opendkim-2.7.4/libopendkim/tests/t-test122.c	2013-01-18 06:47:47.000000000 +0000
-@@ -22,6 +22,11 @@
- #include "../dkim.h"
- #include "t-testdata.h"
- 
-+/* libbsd if found */
-+#ifdef USE_BSD_H
-+# include <bsd/string.h>
-+#endif /* USE_BSD_H */
-+
- /* libstrl if needed */
- #ifdef USE_STRL_H
- # include <strl.h>
-diff -Nru opendkim-2.7.4/libopendkim/tests/t-test123.c opendkim-2.7.4/libopendkim/tests/t-test123.c
---- opendkim-2.7.4/libopendkim/tests/t-test123.c	2012-11-30 01:32:17.000000000 +0000
-+++ opendkim-2.7.4/libopendkim/tests/t-test123.c	2013-01-18 06:47:47.000000000 +0000
-@@ -22,6 +22,11 @@
- #include "../dkim.h"
- #include "t-testdata.h"
- 
-+/* libbsd if found */
-+#ifdef USE_BSD_H
-+# include <bsd/string.h>
-+#endif /* USE_BSD_H */
-+
- /* libstrl if needed */
- #ifdef USE_STRL_H
- # include <strl.h>
-diff -Nru opendkim-2.7.4/libopendkim/tests/t-test127.c opendkim-2.7.4/libopendkim/tests/t-test127.c
---- opendkim-2.7.4/libopendkim/tests/t-test127.c	2012-11-30 01:32:17.000000000 +0000
-+++ opendkim-2.7.4/libopendkim/tests/t-test127.c	2013-01-18 06:47:47.000000000 +0000
-@@ -22,6 +22,11 @@
- #include "../dkim.h"
- #include "t-testdata.h"
- 
-+/* libbsd if found */
-+#ifdef USE_BSD_H
-+# include <bsd/string.h>
-+#endif /* USE_BSD_H */
-+
- /* libstrl if needed */
- #ifdef USE_STRL_H
- # include <strl.h>
-diff -Nru opendkim-2.7.4/libopendkim/tests/t-test131.c opendkim-2.7.4/libopendkim/tests/t-test131.c
---- opendkim-2.7.4/libopendkim/tests/t-test131.c	2012-11-30 01:32:17.000000000 +0000
-+++ opendkim-2.7.4/libopendkim/tests/t-test131.c	2013-01-18 06:47:47.000000000 +0000
-@@ -23,6 +23,11 @@
- #include "../dkim.h"
- #include "t-testdata.h"
- 
-+/* libbsd if found */
-+#ifdef USE_BSD_H
-+# include <bsd/string.h>
-+#endif /* USE_BSD_H */
-+
- /* libstrl if needed */
- #ifdef USE_STRL_H
- # include <strl.h>
-diff -Nru opendkim-2.7.4/libopendkim/tests/t-test136.c opendkim-2.7.4/libopendkim/tests/t-test136.c
---- opendkim-2.7.4/libopendkim/tests/t-test136.c	2012-11-30 01:32:17.000000000 +0000
-+++ opendkim-2.7.4/libopendkim/tests/t-test136.c	2013-01-18 06:47:47.000000000 +0000
-@@ -22,6 +22,11 @@
- #include "../dkim.h"
- #include "t-testdata.h"
- 
-+/* libbsd if found */
-+#ifdef USE_BSD_H
-+# include <bsd/string.h>
-+#endif /* USE_BSD_H */
-+
- /* libstrl if needed */
- #ifdef USE_STRL_H
- # include <strl.h>
-diff -Nru opendkim-2.7.4/libopendkim/tests/t-test142.c opendkim-2.7.4/libopendkim/tests/t-test142.c
---- opendkim-2.7.4/libopendkim/tests/t-test142.c	2012-11-30 01:32:17.000000000 +0000
-+++ opendkim-2.7.4/libopendkim/tests/t-test142.c	2013-01-18 06:47:47.000000000 +0000
-@@ -22,6 +22,11 @@
- #include "../dkim.h"
- #include "t-testdata.h"
- 
-+/* libbsd if found */
-+#ifdef USE_BSD_H
-+# include <bsd/string.h>
-+#endif /* USE_BSD_H */
-+
- /* libstrl if needed */
- #ifdef USE_STRL_H
- # include <strl.h>
-diff -Nru opendkim-2.7.4/libopendkim/tests/t-test42.c opendkim-2.7.4/libopendkim/tests/t-test42.c
---- opendkim-2.7.4/libopendkim/tests/t-test42.c	2012-11-30 01:32:17.000000000 +0000
-+++ opendkim-2.7.4/libopendkim/tests/t-test42.c	2013-01-18 06:47:47.000000000 +0000
-@@ -26,6 +26,11 @@
- #include "../dkim.h"
- #include "t-testdata.h"
- 
-+/* libbsd if found */
-+#ifdef USE_BSD_H
-+# include <bsd/string.h>
-+#endif /* USE_BSD_H */
-+
- /* libstrl if needed */
- #ifdef USE_STRL_H
- # include <strl.h>
-diff -Nru opendkim-2.7.4/libopendkim/tests/t-test55.c opendkim-2.7.4/libopendkim/tests/t-test55.c
---- opendkim-2.7.4/libopendkim/tests/t-test55.c	2012-11-30 01:32:17.000000000 +0000
-+++ opendkim-2.7.4/libopendkim/tests/t-test55.c	2013-01-18 06:47:47.000000000 +0000
-@@ -22,6 +22,11 @@
- #include "../dkim.h"
- #include "t-testdata.h"
- 
-+/* libbsd if found */
-+#ifdef USE_BSD_H
-+# include <bsd/string.h>
-+#endif /* USE_BSD_H */
-+
- /* libstrl if needed */
- #ifdef USE_STRL_H
- # include <strl.h>
-diff -Nru opendkim-2.7.4/libopendkim/tests/t-test56.c opendkim-2.7.4/libopendkim/tests/t-test56.c
---- opendkim-2.7.4/libopendkim/tests/t-test56.c	2012-11-30 01:32:17.000000000 +0000
-+++ opendkim-2.7.4/libopendkim/tests/t-test56.c	2013-01-18 06:47:47.000000000 +0000
-@@ -22,6 +22,11 @@
- #include "../dkim.h"
- #include "t-testdata.h"
- 
-+/* libbsd if found */
-+#ifdef USE_BSD_H
-+# include <bsd/string.h>
-+#endif /* USE_BSD_H */
-+
- /* libstrl if needed */
- #ifdef USE_STRL_H
- # include <strl.h>
-diff -Nru opendkim-2.7.4/libopendkim/tests/t-test57.c opendkim-2.7.4/libopendkim/tests/t-test57.c
---- opendkim-2.7.4/libopendkim/tests/t-test57.c	2012-11-30 01:32:17.000000000 +0000
-+++ opendkim-2.7.4/libopendkim/tests/t-test57.c	2013-01-18 06:47:47.000000000 +0000
-@@ -24,6 +24,11 @@
- #include "../dkim.h"
- #include "t-testdata.h"
- 
-+/* libbsd if found */
-+#ifdef USE_BSD_H
-+# include <bsd/string.h>
-+#endif /* USE_BSD_H */
-+
- /* libstrl if needed */
- #ifdef USE_STRL_H
- # include <strl.h>
-diff -Nru opendkim-2.7.4/libopendkim/tests/t-test73.c opendkim-2.7.4/libopendkim/tests/t-test73.c
---- opendkim-2.7.4/libopendkim/tests/t-test73.c	2012-11-30 01:32:17.000000000 +0000
-+++ opendkim-2.7.4/libopendkim/tests/t-test73.c	2013-01-18 06:47:47.000000000 +0000
-@@ -27,6 +27,11 @@
- #include "../dkim.h"
- #include "t-testdata.h"
- 
-+/* libbsd if found */
-+#ifdef USE_BSD_H
-+# include <bsd/string.h>
-+#endif /* USE_BSD_H */
-+
- /* libstrl if needed */
- #ifdef USE_STRL_H
- # include <strl.h>
-diff -Nru opendkim-2.7.4/libopendkim/tests/t-test84.c opendkim-2.7.4/libopendkim/tests/t-test84.c
---- opendkim-2.7.4/libopendkim/tests/t-test84.c	2012-11-30 01:32:17.000000000 +0000
-+++ opendkim-2.7.4/libopendkim/tests/t-test84.c	2013-01-18 06:47:47.000000000 +0000
-@@ -26,6 +26,11 @@
- #include "../dkim.h"
- #include "t-testdata.h"
- 
-+/* libbsd if found */
-+#ifdef USE_BSD_H
-+# include <bsd/string.h>
-+#endif /* USE_BSD_H */
-+
- /* libstrl if needed */
- #ifdef USE_STRL_H
- # include <strl.h>
-diff -Nru opendkim-2.7.4/libopendkim/tests/t-test86.c opendkim-2.7.4/libopendkim/tests/t-test86.c
---- opendkim-2.7.4/libopendkim/tests/t-test86.c	2012-11-30 01:32:17.000000000 +0000
-+++ opendkim-2.7.4/libopendkim/tests/t-test86.c	2013-01-18 06:47:47.000000000 +0000
-@@ -26,6 +26,11 @@
- #include "../dkim.h"
- #include "t-testdata.h"
- 
-+/* libbsd if found */
-+#ifdef USE_BSD_H
-+# include <bsd/string.h>
-+#endif /* USE_BSD_H */
-+
- /* libstrl if needed */
- #ifdef USE_STRL_H
- # include <strl.h>
-diff -Nru opendkim-2.7.4/libopendkim/tests/t-test88.c opendkim-2.7.4/libopendkim/tests/t-test88.c
---- opendkim-2.7.4/libopendkim/tests/t-test88.c	2012-11-30 01:32:17.000000000 +0000
-+++ opendkim-2.7.4/libopendkim/tests/t-test88.c	2013-01-18 06:47:47.000000000 +0000
-@@ -22,6 +22,11 @@
- #include "../dkim.h"
- #include "t-testdata.h"
- 
-+/* libbsd if found */
-+#ifdef USE_BSD_H
-+# include <bsd/string.h>
-+#endif /* USE_BSD_H */
-+
- /* libstrl if needed */
- #ifdef USE_STRL_H
- # include <strl.h>
-diff -Nru opendkim-2.7.4/libopendkim/util.c opendkim-2.7.4/libopendkim/util.c
---- opendkim-2.7.4/libopendkim/util.c	2012-11-30 01:32:17.000000000 +0000
-+++ opendkim-2.7.4/libopendkim/util.c	2013-01-18 06:47:47.000000000 +0000
-@@ -27,6 +27,11 @@
- #include "dkim-internal.h"
- #include "util.h"
- 
-+/* libbsd if found */
-+#ifdef USE_BSD_H
-+# include <bsd/string.h>
-+#endif /* USE_BSD_H */
-+
- /* libstrl if needed */
- #ifdef USE_STRL_H
- # include <strl.h>
-diff -Nru opendkim-2.7.4/miltertest/miltertest.c opendkim-2.7.4/miltertest/miltertest.c
---- opendkim-2.7.4/miltertest/miltertest.c	2013-01-18 06:47:47.000000000 +0000
-+++ opendkim-2.7.4/miltertest/miltertest.c	2013-01-18 06:47:47.000000000 +0000
-@@ -38,6 +38,11 @@
- /* libopendkim includes */
- #include <dkim.h>
- 
-+/* libbsd if found */
-+#ifdef USE_BSD_H
-+# include <bsd/string.h>
-+#endif /* USE_BSD_H */
-+
- /* libstrl if needed */
- #ifdef USE_STRL_H
- # include <strl.h>
-diff -Nru opendkim-2.7.4/opendkim/config.c opendkim-2.7.4/opendkim/config.c
---- opendkim-2.7.4/opendkim/config.c	2013-01-07 01:07:30.000000000 +0000
-+++ opendkim-2.7.4/opendkim/config.c	2013-01-18 06:47:47.000000000 +0000
-@@ -23,6 +23,11 @@
- /* libopendkim includes */
- #include <dkim.h>
- 
-+/* libbsd if found */
-+#ifdef USE_BSD_H
-+# include <bsd/string.h>
-+#endif /* USE_BSD_H */
-+
- /* libstrl if needed */
- #ifdef USE_STRL_H
- # include <strl.h>
-diff -Nru opendkim-2.7.4/opendkim/flowrate.c opendkim-2.7.4/opendkim/flowrate.c
---- opendkim-2.7.4/opendkim/flowrate.c	2012-11-30 01:32:17.000000000 +0000
-+++ opendkim-2.7.4/opendkim/flowrate.c	2013-01-18 06:47:47.000000000 +0000
-@@ -16,6 +16,11 @@
- #include <string.h>
- #include <stdlib.h>
- 
-+/* libbsd if found */
-+#ifdef USE_BSD_H
-+# include <bsd/string.h>
-+#endif /* USE_BSD_H */
-+
- /* libstrl if needed */
- #ifdef USE_STRL_H
- # include <strl.h>
-diff -Nru opendkim-2.7.4/opendkim/opendkim-ar.c opendkim-2.7.4/opendkim/opendkim-ar.c
---- opendkim-2.7.4/opendkim/opendkim-ar.c	2013-01-07 01:07:30.000000000 +0000
-+++ opendkim-2.7.4/opendkim/opendkim-ar.c	2013-01-18 06:47:47.000000000 +0000
-@@ -22,6 +22,11 @@
- # include <sysexits.h>
- #endif /* ARTEST */
- 
-+/* libbsd if found */
-+#ifdef USE_BSD_H
-+# include <bsd/string.h>
-+#endif /* USE_BSD_H */
-+
- /* libstrl if needed */
- #ifdef USE_STRL_H
- # include <strl.h>
-diff -Nru opendkim-2.7.4/opendkim/opendkim-db.c opendkim-2.7.4/opendkim/opendkim-db.c
---- opendkim-2.7.4/opendkim/opendkim-db.c	2012-11-30 01:32:17.000000000 +0000
-+++ opendkim-2.7.4/opendkim/opendkim-db.c	2013-01-18 06:47:47.000000000 +0000
-@@ -37,6 +37,11 @@
- /* libopendkim includes */
- #include <dkim.h>
- 
-+/* libbsd if found */
-+#ifdef USE_BSD_H
-+# include <bsd/string.h>
-+#endif /* USE_BSD_H */
-+
- /* libstrl if needed */
- #ifdef USE_STRL_H
- # include <strl.h>
-diff -Nru opendkim-2.7.4/opendkim/opendkim-spam.c opendkim-2.7.4/opendkim/opendkim-spam.c
---- opendkim-2.7.4/opendkim/opendkim-spam.c	2012-11-30 01:32:17.000000000 +0000
-+++ opendkim-2.7.4/opendkim/opendkim-spam.c	2013-01-18 06:47:47.000000000 +0000
-@@ -24,6 +24,11 @@
- # include <odbx.h>
- #endif /* USE_ODBX */
- 
-+/* libbsd if found */
-+#ifdef USE_BSD_H
-+# include <bsd/string.h>
-+#endif /* USE_BSD_H */
-+
- /* libstrl if needed */
- #ifdef USE_STRL_H
- # include <strl.h>
-diff -Nru opendkim-2.7.4/opendkim/opendkim-testkey.c opendkim-2.7.4/opendkim/opendkim-testkey.c
---- opendkim-2.7.4/opendkim/opendkim-testkey.c	2012-11-30 01:32:17.000000000 +0000
-+++ opendkim-2.7.4/opendkim/opendkim-testkey.c	2013-01-18 06:47:47.000000000 +0000
-@@ -39,6 +39,11 @@
- #include <dkim.h>
- #include <dkim-test.h>
- 
-+/* libbsd if found */
-+#ifdef USE_BSD_H
-+# include <bsd/string.h>
-+#endif /* USE_BSD_H */
-+
- /* libstrl if needed */
- #ifdef USE_STRL_H
- # include <strl.h>
-diff -Nru opendkim-2.7.4/opendkim/opendkim.c opendkim-2.7.4/opendkim/opendkim.c
---- opendkim-2.7.4/opendkim/opendkim.c	2013-01-07 01:07:30.000000000 +0000
-+++ opendkim-2.7.4/opendkim/opendkim.c	2013-01-18 06:47:47.000000000 +0000
-@@ -98,6 +98,11 @@
- # include "vbr.h"
- #endif /* _FFR_VBR */
- 
-+/* libbsd if found */
-+#ifdef USE_BSD_H
-+# include <bsd/string.h>
-+#endif /* USE_BSD_H */
-+
- /* libstrl if needed */
- #ifdef USE_STRL_H
- # include <strl.h>
-diff -Nru opendkim-2.7.4/opendkim/reputation.c opendkim-2.7.4/opendkim/reputation.c
---- opendkim-2.7.4/opendkim/reputation.c	2012-11-30 01:32:17.000000000 +0000
-+++ opendkim-2.7.4/opendkim/reputation.c	2013-01-18 06:47:47.000000000 +0000
-@@ -22,6 +22,11 @@
- /* libopendkim includes */
- #include <dkim.h>
- 
-+/* libbsd if found */
-+#ifdef USE_BSD_H
-+# include <bsd/string.h>
-+#endif /* USE_BSD_H */
-+
- /* libstrl if needed */
- #ifdef USE_STRL_H
- # include <strl.h>
-diff -Nru opendkim-2.7.4/opendkim/stats.c opendkim-2.7.4/opendkim/stats.c
---- opendkim-2.7.4/opendkim/stats.c	2012-11-30 01:32:17.000000000 +0000
-+++ opendkim-2.7.4/opendkim/stats.c	2013-01-18 06:47:47.000000000 +0000
-@@ -41,6 +41,11 @@
- /* libopendkim includes */
- #include <dkim.h>
- 
-+/* libbsd if found */
-+#ifdef USE_BSD_H
-+# include <bsd/string.h>
-+#endif /* USE_BSD_H */
-+
- /* libstrl if needed */
- #ifdef USE_STRL_H
- # include <strl.h>
-diff -Nru opendkim-2.7.4/opendkim/test.c opendkim-2.7.4/opendkim/test.c
---- opendkim-2.7.4/opendkim/test.c	2012-11-30 01:32:17.000000000 +0000
-+++ opendkim-2.7.4/opendkim/test.c	2013-01-18 06:47:47.000000000 +0000
-@@ -22,6 +22,11 @@
- #include "build-config.h"
- #include <dkim.h>
- 
-+/* libbsd if found */
-+#ifdef USE_BSD_H
-+# include <bsd/string.h>
-+#endif /* USE_BSD_H */
-+
- /* libstrl if needed */
- #ifdef USE_STRL_H
- # include <strl.h>
-diff -Nru opendkim-2.7.4/opendkim/util.c opendkim-2.7.4/opendkim/util.c
---- opendkim-2.7.4/opendkim/util.c	2012-11-30 01:32:17.000000000 +0000
-+++ opendkim-2.7.4/opendkim/util.c	2013-01-18 06:47:47.000000000 +0000
-@@ -47,6 +47,11 @@
- # endif /* SOLARIS <= 20600 */
- #endif /* SOLARIS */
- 
-+/* libbsd if found */
-+#ifdef USE_BSD_H
-+# include <bsd/string.h>
-+#endif /* USE_BSD_H */
-+
- /* libstrl if needed */
- #ifdef USE_STRL_H
- # include <strl.h>
-diff -Nru opendkim-2.7.4/stats/opendkim-importstats.c opendkim-2.7.4/stats/opendkim-importstats.c
---- opendkim-2.7.4/stats/opendkim-importstats.c	2012-11-30 01:32:17.000000000 +0000
-+++ opendkim-2.7.4/stats/opendkim-importstats.c	2013-01-18 06:47:47.000000000 +0000
-@@ -23,6 +23,11 @@
- /* OpenDKIM includes */
- #include "stats.h"
- 
-+/* libbsd if found */
-+#ifdef USE_BSD_H
-+# include <bsd/string.h>
-+#endif /* USE_BSD_H */
-+
- /* libstrl if needed */
- #ifdef USE_STRL_H
- # include <strl.h>
diff --git a/mail-filter/opendkim/files/opendkim-2.8.0-berkeleydb.patch b/mail-filter/opendkim/files/opendkim-2.8.0-berkeleydb.patch
deleted file mode 100644
index 6e3eac272500..000000000000
--- a/mail-filter/opendkim/files/opendkim-2.8.0-berkeleydb.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff --git a/RELEASE_NOTES b/RELEASE_NOTES
-index 1233905..2567a63 100644
---- a/RELEASE_NOTES
-+++ b/RELEASE_NOTES
-@@ -3,6 +3,10 @@
- This listing shows the versions of the OpenDKIM package, the date of
- release, and a summary of the changes in that release.
- 
-+2.8.1		2013/0?/??
-+	BUILD: Fix build for versions of libdb between 3.1 and 4.6.
-+		Problem noted by John Wood.
-+
- 2.8.0		2013/02/25
- 	Feature request #SF2964383: Add DKIM_LIBFLAGS_STRICTRESIGN, which
- 		inhibits signing of a handle tagged for resigning when the
-diff --git a/configure.ac b/configure.ac
-index ff018de..64d567a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -14,7 +14,7 @@ AC_PREREQ(2.61)
- #
- m4_define([VERSION_RELEASE], 2)
- m4_define([VERSION_MAJOR_REV], 8)
--m4_define([VERSION_MINOR_REV], 0)
-+m4_define([VERSION_MINOR_REV], 1)
- m4_define([VERSION_PATCH], 0)
- 
- #
-diff --git a/libopendkim/dkim-cache.c b/libopendkim/dkim-cache.c
-index 1bb10e8..c43cc0c 100644
---- a/libopendkim/dkim-cache.c
-+++ b/libopendkim/dkim-cache.c
-@@ -508,7 +508,13 @@ dkim_cache_stats(DB *db, u_int *queries, u_int *hits, u_int *expired,
- #if DB_VERSION_CHECK(2,0,0)
- 		DB_HASH_STAT *sp;
- 
-+# if DB_VERSION_CHECK(4,3,0)
- 		if (db->stat(db, NULL, (void *) &sp, 0) != 0)
-+# elif DB_VERSION_CHECK(4,0,0)
-+		if (db->stat(db, (void *) &sp, 0) != 0)
-+# else /* DB_VERSION_CHECK(4,0,0) */
-+		if (db->stat(db, (void *) &sp, NULL, 0) != 0)
-+# endif /* DB_VERSION_CHECK(4,0,0) */
- 		{
- 			*keys = (u_int) -1;
- 		}
-diff --git a/libopendkim/tests/t-test49.c b/libopendkim/tests/t-test49.c
-index e54cb37..318ad8a 100644
---- a/libopendkim/tests/t-test49.c
-+++ b/libopendkim/tests/t-test49.c
-@@ -53,7 +53,7 @@ main(int argc, char **argv)
- 
- 	int status;
- 	int err;
--	u_int s1, s2, s3;
-+	u_int s1, s2, s3, s4;
- 	size_t buflen;
- 	DB *cache;
- 	char buf[BUFRSZ + 1];
-@@ -99,10 +99,11 @@ main(int argc, char **argv)
- 	assert(status == 1);
- 
- 	printf("--- retrieve cache stats\n");
--	dkim_cache_stats(&s1, &s2, &s3);
-+	dkim_cache_stats(cache, &s1, &s2, &s3, &s4, FALSE);
- 	assert(s1 == 3);
- 	assert(s2 == 1);
- 	assert(s3 == 1);
-+	assert(s4 == 0);
- 
- 	dkim_cache_close(cache);
- #endif /* ! QUERY_CACHE */
diff --git a/mail-filter/opendkim/files/opendkim-unbreak_upgrade.patch b/mail-filter/opendkim/files/opendkim-unbreak_upgrade.patch
deleted file mode 100644
index cc0808070b62..000000000000
--- a/mail-filter/opendkim/files/opendkim-unbreak_upgrade.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- configure.ac	2013-01-22 07:59:36.312240111 +0000
-+++ configure.ac	2013-01-22 07:59:23.694397856 +0000
-@@ -240,11 +240,14 @@
- # we need to include <strl.h> if:
- # (a) strlcat and strlcpy weren't found, since we'll be rolling our own; OR
- # (b) an installed strl.h was found and no installed bsd/string.h was found
--if test x"$strl_h_found" = x"yes" -o \( x"$strl_found" = x"no" -a x"$libstrl_found" = x"no" \) -a x"$bsdstrl_h_found" = x"no"
--then
--	AC_DEFINE([USE_STRL_H], 1,
--	          [Define to 1 if you need to include <strl.h> to get the `strlcat()' and `strlcpy()' functions.])
--fi
-+
-+# Gentoo specific: Don't include strl.h - breaks upgrading from
-+# <=mail-filter/opendkim-2.7.2.  We link against libbsd always.
-+#if test x"$strl_h_found" = x"yes" -o \( x"$strl_found" = x"no" -a x"$libstrl_found" = x"no" \) -a x"$bsdstrl_h_found" = x"no"
-+#then
-+#	AC_DEFINE([USE_STRL_H], 1,
-+#	          [Define to 1 if you need to include <strl.h> to get the `strlcat()' and `strlcpy()' functions.])
-+#fi
- 
- if test x"$bsdstrl_h_found" = x"yes"
- then
diff --git a/mail-filter/opendkim/opendkim-2.7.4-r1.ebuild b/mail-filter/opendkim/opendkim-2.7.4-r1.ebuild
deleted file mode 100644
index 527b6971afef..000000000000
--- a/mail-filter/opendkim/opendkim-2.7.4-r1.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/opendkim-2.7.4-r1.ebuild,v 1.3 2013/02/24 11:30:33 ago 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="+berkdb gnutls ldap lua opendbx poll sasl +ssl static-libs unbound"
-
-DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )
-	dev-libs/libbsd
-	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 )
-	!unbound? ( net-libs/ldns )
-	gnutls? ( >=net-libs/gnutls-2.11.7 )"
-
-RDEPEND="${DEPEND}
-	sys-process/psmisc"
-
-REQUIRED_USE="sasl? ( ldap )"
-
-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
-
-	# don't go over the sock length and fail
-	sed -i -e '/^sock/s/t-sign-ss-macro-value-file.sock/t-s-s-m-v-f.sock/' \
-		opendkim/tests/t-sign-ss-macro-value-file.lua || die
-
-	epatch "${FILESDIR}/${P}-bsd.patch"
-	epatch "${FILESDIR}/${PN}-unbreak_upgrade.patch"
-	epatch "${FILESDIR}/${P}-DisableCryptoInit.patch"
-	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"
-		myconf+=" --enable-stats"
-	fi
-	if use unbound; then
-		myconf+=" --with-unbound"
-	else
-		myconf+=" --with-ldns"
-	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) \
-		$(use_with gnutls) \
-		${myconf} \
-		--docdir=/usr/share/doc/${PF} \
-		--htmldir=/usr/share/doc/${PF}/html \
-		--enable-filter \
-		--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
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dosbin stats/opendkim-reportstats
-	newinitd "${FILESDIR}/opendkim.init.r3" 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
-		keysize=1024
-		# 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.8.0-r1.ebuild b/mail-filter/opendkim/opendkim-2.8.0-r1.ebuild
deleted file mode 100644
index 7f5db05e604d..000000000000
--- a/mail-filter/opendkim/opendkim-2.8.0-r1.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/opendkim-2.8.0-r1.ebuild,v 1.1 2013/03/01 10:58:25 eras Exp $
-
-EAPI=5
-inherit eutils db-use autotools user
-
-# for betas
-#MY_P=${P/_b/.B}
-#S=${WORKDIR}/${PN}-2.8.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="+berkdb gnutls ldap lua opendbx poll sasl +ssl static-libs unbound"
-
-DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )
-	dev-libs/libbsd
-	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 )
-	!unbound? ( net-libs/ldns )
-	gnutls? ( >=net-libs/gnutls-2.11.7 )"
-
-RDEPEND="${DEPEND}
-	sys-process/psmisc"
-
-REQUIRED_USE="sasl? ( ldap )"
-
-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
-
-	# don't go over the sock length and fail
-	sed -i -e '/^sock/s/t-sign-ss-macro-value-file.sock/t-s-s-m-v-f.sock/' \
-		opendkim/tests/t-sign-ss-macro-value-file.lua || die
-
-	epatch "${FILESDIR}/${PN}-2.8.0-unbreak_upgrade.patch"
-	epatch "${FILESDIR}/${PN}-2.8.0-berkeleydb.patch"
-	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"
-		myconf+=" --enable-stats"
-	fi
-	if use unbound; then
-		myconf+=" --with-unbound"
-	else
-		myconf+=" --with-ldns"
-	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) \
-		$(use_with gnutls) \
-		${myconf} \
-		--docdir=/usr/share/doc/${PF} \
-		--htmldir=/usr/share/doc/${PF}/html \
-		--enable-filter \
-		--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 \
-		--with-test-socket=/tmp/opendkim-S
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dosbin stats/opendkim-reportstats
-	newinitd "${FILESDIR}/opendkim.init.r3" 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() {
-	if [[ -z ${REPLACING_VERSION} ]]; then
-		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."
-	fi
-}
-
-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
-		keysize=1024
-		# 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.8.0.ebuild b/mail-filter/opendkim/opendkim-2.8.0.ebuild
deleted file mode 100644
index 71b1cc00d6c5..000000000000
--- a/mail-filter/opendkim/opendkim-2.8.0.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/opendkim-2.8.0.ebuild,v 1.1 2013/02/26 09:04:38 eras Exp $
-
-EAPI=5
-inherit eutils db-use autotools user
-
-# for betas
-#MY_P=${P/_b/.B}
-#S=${WORKDIR}/${PN}-2.8.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="+berkdb gnutls ldap lua opendbx poll sasl +ssl static-libs unbound"
-
-DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )
-	dev-libs/libbsd
-	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 )
-	!unbound? ( net-libs/ldns )
-	gnutls? ( >=net-libs/gnutls-2.11.7 )"
-
-RDEPEND="${DEPEND}
-	sys-process/psmisc"
-
-REQUIRED_USE="sasl? ( ldap )"
-
-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
-
-	# don't go over the sock length and fail
-	sed -i -e '/^sock/s/t-sign-ss-macro-value-file.sock/t-s-s-m-v-f.sock/' \
-		opendkim/tests/t-sign-ss-macro-value-file.lua || die
-
-	epatch "${FILESDIR}/${PN}-2.8.0-unbreak_upgrade.patch"
-	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"
-		myconf+=" --enable-stats"
-	fi
-	if use unbound; then
-		myconf+=" --with-unbound"
-	else
-		myconf+=" --with-ldns"
-	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) \
-		$(use_with gnutls) \
-		${myconf} \
-		--docdir=/usr/share/doc/${PF} \
-		--htmldir=/usr/share/doc/${PF}/html \
-		--enable-filter \
-		--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 \
-		--with-test-socket=/tmp/opendkim-S
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dosbin stats/opendkim-reportstats
-	newinitd "${FILESDIR}/opendkim.init.r3" 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() {
-	if [[ -z ${REPLACING_VERSION} ]]; then
-		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."
-	fi
-}
-
-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
-		keysize=1024
-		# 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.8.1.ebuild b/mail-filter/opendkim/opendkim-2.8.1.ebuild
deleted file mode 100644
index f928e61fa43e..000000000000
--- a/mail-filter/opendkim/opendkim-2.8.1.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/opendkim-2.8.1.ebuild,v 1.1 2013/03/22 10:08:04 eras Exp $
-
-EAPI=5
-inherit eutils db-use autotools user
-
-# for betas
-#MY_P=${P/_b/.B}
-#S=${WORKDIR}/${PN}-2.8.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="+berkdb gnutls ldap lua opendbx poll sasl +ssl static-libs unbound"
-
-DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )
-	dev-libs/libbsd
-	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 )
-	!unbound? ( net-libs/ldns )
-	gnutls? ( >=net-libs/gnutls-2.11.7 )"
-
-RDEPEND="${DEPEND}
-	sys-process/psmisc"
-
-REQUIRED_USE="sasl? ( ldap )"
-
-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
-
-	# don't go over the sock length and fail
-	sed -i -e '/^sock/s/t-sign-ss-macro-value-file.sock/t-s-s-m-v-f.sock/' \
-		opendkim/tests/t-sign-ss-macro-value-file.lua || die
-
-	epatch "${FILESDIR}/${PN}-2.8.0-unbreak_upgrade.patch"
-	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"
-		myconf+=" --enable-stats"
-	fi
-	if use unbound; then
-		myconf+=" --with-unbound"
-	else
-		myconf+=" --with-ldns"
-	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) \
-		$(use_with gnutls) \
-		${myconf} \
-		--docdir=/usr/share/doc/${PF} \
-		--htmldir=/usr/share/doc/${PF}/html \
-		--enable-filter \
-		--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 \
-		--with-test-socket=/tmp/opendkim-S
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dosbin stats/opendkim-reportstats
-	newinitd "${FILESDIR}/opendkim.init.r3" 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() {
-	if [[ -z ${REPLACING_VERSION} ]]; then
-		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."
-	fi
-}
-
-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
-		keysize=1024
-		# 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.8.2.ebuild b/mail-filter/opendkim/opendkim-2.8.2.ebuild
deleted file mode 100644
index 5da7638bf533..000000000000
--- a/mail-filter/opendkim/opendkim-2.8.2.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/opendkim-2.8.2.ebuild,v 1.1 2013/03/29 08:51:01 eras Exp $
-
-EAPI=5
-inherit eutils db-use autotools user
-
-# for betas
-#MY_P=${P/_b/.B}
-#S=${WORKDIR}/${PN}-2.8.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="+berkdb gnutls ldap lua opendbx poll sasl +ssl static-libs unbound"
-
-DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )
-	dev-libs/libbsd
-	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 )
-	!unbound? ( net-libs/ldns )
-	gnutls? ( >=net-libs/gnutls-2.11.7 )"
-
-RDEPEND="${DEPEND}
-	sys-process/psmisc"
-
-REQUIRED_USE="sasl? ( ldap )"
-
-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
-
-	# don't go over the sock length and fail
-	sed -i -e '/^sock/s/t-sign-ss-macro-value-file.sock/t-s-s-m-v-f.sock/' \
-		opendkim/tests/t-sign-ss-macro-value-file.lua || die
-
-	epatch "${FILESDIR}/${PN}-2.8.0-unbreak_upgrade.patch"
-	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"
-		myconf+=" --enable-stats"
-	fi
-	if use unbound; then
-		myconf+=" --with-unbound"
-	else
-		myconf+=" --with-ldns"
-	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) \
-		$(use_with gnutls) \
-		${myconf} \
-		--docdir=/usr/share/doc/${PF} \
-		--htmldir=/usr/share/doc/${PF}/html \
-		--enable-filter \
-		--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 \
-		--with-test-socket=/tmp/opendkim-S
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dosbin stats/opendkim-reportstats
-	newinitd "${FILESDIR}/opendkim.init.r3" 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() {
-	if [[ -z ${REPLACING_VERSION} ]]; then
-		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."
-	fi
-}
-
-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
-		keysize=1024
-		# 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"
-}