Version bump

Package-Manager: portage-2.1_rc2-r2

6 files changed, 307 insertions, 25 deletions

diff --git a/mail-filter/spamassassin/ChangeLog b/mail-filter/spamassassin/ChangeLog
index d60ecb41dc45..93bd2aa3cbc4 100644
--- a/mail-filter/spamassassin/ChangeLog
+++ b/mail-filter/spamassassin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-filter/spamassassin
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/ChangeLog,v 1.100 2006/04/21 19:08:33 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/ChangeLog,v 1.101 2006/05/26 02:03:11 mcummings Exp $
+
+*spamassassin-3.1.2 (26 May 2006)
+
+  26 May 2006; <mcummings@gentoo.org> +spamassassin-3.1.2.ebuild:
+  Version bump
 
   21 Apr 2006; Hanno Boeck <hanno@gentoo.org>
   +files/spamassassin-3.1.1-lint-de.diff, spamassassin-3.1.1.ebuild:
diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest
index 4dae21450f53..8b70e6eaae75 100644
--- a/mail-filter/spamassassin/Manifest
+++ b/mail-filter/spamassassin/Manifest
@@ -1,64 +1,88 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 eceafd81db440f2746ab62e85ef0229b ChangeLog 24719
-RMD160 cdf2347adc2ec8216ad2af237fb9626f0ab5477a ChangeLog 24719
-SHA256 0b1407ecec2a6bc279bdfce09df66b9357e4275be8fa4b24aa3af229214ca33f ChangeLog 24719
+AUX 3.0.0-spamd.conf 1528 RMD160 92bbeb8d14ada234e9001cae914055b2d2cb69aa SHA1 e4918b986630043b01fd739ecd090fa23453fc2a SHA256 bf6dfce0e63813da4b900987826780d4bede9a1f5cc8324e3b96bce30dfe5158
 MD5 cde41d7639fa7e7077f1c74fef8a4ed2 files/3.0.0-spamd.conf 1528
 RMD160 92bbeb8d14ada234e9001cae914055b2d2cb69aa files/3.0.0-spamd.conf 1528
 SHA256 bf6dfce0e63813da4b900987826780d4bede9a1f5cc8324e3b96bce30dfe5158 files/3.0.0-spamd.conf 1528
+AUX 3.0.0-spamd.init 738 RMD160 bcc78fcfcf783411790f8b9f62a58a45a91c126d SHA1 e87bb817c9b2c6aa97e785a11e7d399f21275748 SHA256 15d8d35f4d4043f31b4db1de40183a375d789918cd7bb645edc5b65f5c5ebf37
 MD5 13c538208e1f991a44a30a8bce130fa8 files/3.0.0-spamd.init 738
 RMD160 bcc78fcfcf783411790f8b9f62a58a45a91c126d files/3.0.0-spamd.init 738
 SHA256 15d8d35f4d4043f31b4db1de40183a375d789918cd7bb645edc5b65f5c5ebf37 files/3.0.0-spamd.init 738
-MD5 4783482f6c574067f3c8fa48e3202fae files/digest-spamassassin-3.0.4 76
-RMD160 b7b5e479085c42b5b0a30bd5df858ad10f88b541 files/digest-spamassassin-3.0.4 76
-SHA256 6a52b28213070af05b519aaea3f9c8e5bd711c9e209535ce12c4d9c665201497 files/digest-spamassassin-3.0.4 76
-MD5 9d87182bab72ef8b6ae97fe0ab22f5d1 files/digest-spamassassin-3.1.0 77
-RMD160 07c03d38776ded5214aeca7e878438aeb3bd265f files/digest-spamassassin-3.1.0 77
-SHA256 305c4f8214445e20b3bbd8f4a21c45673da5461470c21f98c51b98b77d442258 files/digest-spamassassin-3.1.0 77
-MD5 9d87182bab72ef8b6ae97fe0ab22f5d1 files/digest-spamassassin-3.1.0-r1 77
-RMD160 07c03d38776ded5214aeca7e878438aeb3bd265f files/digest-spamassassin-3.1.0-r1 77
-SHA256 305c4f8214445e20b3bbd8f4a21c45673da5461470c21f98c51b98b77d442258 files/digest-spamassassin-3.1.0-r1 77
-MD5 d6f2ad1930ee7a36de0443fa6656ec88 files/digest-spamassassin-3.1.0-r2 277
-RMD160 005ad7ec092992819f493d1743a3be5dfb4ed782 files/digest-spamassassin-3.1.0-r2 277
-SHA256 265d522d398492e085649c9af06ab47b0d8dbb099e7684889f285a68bc79c2d4 files/digest-spamassassin-3.1.0-r2 277
-MD5 415094f6195c81f5c47aaee049ff7227 files/digest-spamassassin-3.1.1 274
-RMD160 d824ef6e600dd68cef91d6040369c8cf86f8df2f files/digest-spamassassin-3.1.1 274
-SHA256 27b1a488f7058c7bdbef88fb4db129bf01b41a2be392fb7afa3a151bb7b3fba6 files/digest-spamassassin-3.1.1 274
+AUX secrets.cf 664 RMD160 afb1212a464bd7053c1301c1a1e670b73216528a SHA1 a742beddf850e55bc4454a7548dc43c36f8e9760 SHA256 9f134c7b857b21689f612fc6d131f719e5a65e2ba341b282e7aa57402c854139
 MD5 d3b6df49d772fdf4425d4c2376bc7173 files/secrets.cf 664
 RMD160 afb1212a464bd7053c1301c1a1e670b73216528a files/secrets.cf 664
 SHA256 9f134c7b857b21689f612fc6d131f719e5a65e2ba341b282e7aa57402c854139 files/secrets.cf 664
+AUX spamassassin-3.1.1-lint-de.diff 3779 RMD160 a28f308380634e607d307763b51b381bd254b173 SHA1 4e17202f9090e0b0f18cf37307463a3f1e21a669 SHA256 b5c405e8fd698a3360d4255ad0533ee8e0f2a8be587e4936d1e3d30c7369e907
 MD5 3b1ec9cd3b71b0c0fbd4db9a0a9715e5 files/spamassassin-3.1.1-lint-de.diff 3779
 RMD160 a28f308380634e607d307763b51b381bd254b173 files/spamassassin-3.1.1-lint-de.diff 3779
 SHA256 b5c405e8fd698a3360d4255ad0533ee8e0f2a8be587e4936d1e3d30c7369e907 files/spamassassin-3.1.1-lint-de.diff 3779
+AUX spamd.conf 604 RMD160 b93b367d735801e0d6c30ba41daa749555238e00 SHA1 43c719187a6d9be1e19f1da668a381db1f7b6e29 SHA256 2d91fde46ccc70fc157824e9fca564f398ddf8e7d75526bc26d390df02b389cc
 MD5 66f6531ea3b0a382b4d97bd1234c43a1 files/spamd.conf 604
 RMD160 b93b367d735801e0d6c30ba41daa749555238e00 files/spamd.conf 604
 SHA256 2d91fde46ccc70fc157824e9fca564f398ddf8e7d75526bc26d390df02b389cc files/spamd.conf 604
+AUX spamd.init 617 RMD160 4624c79222ba863dc68e88a13f3de6bb0d579f89 SHA1 dc90ac2f561e33bf50740888e5e962325d911808 SHA256 8b5abf70f7aac3ddcf7b258ce693f01dd4691048bb4f40a19c25a92e985321a8
 MD5 9ab5a9bd40752148b4cb0982dd1a5581 files/spamd.init 617
 RMD160 4624c79222ba863dc68e88a13f3de6bb0d579f89 files/spamd.init 617
 SHA256 8b5abf70f7aac3ddcf7b258ce693f01dd4691048bb4f40a19c25a92e985321a8 files/spamd.init 617
-MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
-RMD160 647980838c590f54441a053916ea629e53e551c0 metadata.xml 305
-SHA256 f05dbef15061919972882cab07057e102760a542beba17d131194091401cd7ca metadata.xml 305
+DIST Mail-SpamAssassin-3.0.4.tar.bz2 847365
+DIST Mail-SpamAssassin-3.1.0.tar.bz2 1012946 RMD160 976d18f76bf804472b24f70a695551c7f1b71d43 SHA256 5470943fd57d42feef998ed0eeb59a5eb4bbddd9ad956b4f864fcf47b6a911c4
+DIST Mail-SpamAssassin-3.1.1.tar.bz2 974527 RMD160 811a00bd79bb4d6c35cf107f3a67f60f488795fd SHA1 7723663486b013f738eb8e805a7503f52f50e347 SHA256 edcb4adca3e28914bb59b44c320e1139f133535928cd6dfaaa50d128ecce812f
+DIST Mail-SpamAssassin-3.1.2.tar.bz2 975060 RMD160 cde5ee2e9d0e2b4efdbd8b68367ca9508254a4c8 SHA1 aad32b73f2870182fe8f2dd5277e94d0da91b196 SHA256 43b932797494b4d2a299228b5c793181fb335dac6f78c099bd6ae3cda64f85d3
+EBUILD spamassassin-3.0.4.ebuild 6561 RMD160 bc0e1a76c93306949b7b235cc2d8713b089857b0 SHA1 c1df899603985d82f8d01ee54f4a363e2168e5ab SHA256 959c26395036031dfe29ad0411ea537a221137d68939be91477274a96ff8aaa5
 MD5 d054996d958c54cab0a2f99acc44ce9e spamassassin-3.0.4.ebuild 6561
 RMD160 bc0e1a76c93306949b7b235cc2d8713b089857b0 spamassassin-3.0.4.ebuild 6561
 SHA256 959c26395036031dfe29ad0411ea537a221137d68939be91477274a96ff8aaa5 spamassassin-3.0.4.ebuild 6561
+EBUILD spamassassin-3.1.0-r1.ebuild 6737 RMD160 9192f1c8facf0f4d87d271f5cacfeaa55ad5e905 SHA1 e45c9a076bc20c09e4a729daeef54ff759a78d63 SHA256 66d6b428675c6bfefc4a053d34156d0b6ed115f6a2cf3986be3e61b8e78a941f
 MD5 5a1429650c999fd901d0bd156f522797 spamassassin-3.1.0-r1.ebuild 6737
 RMD160 9192f1c8facf0f4d87d271f5cacfeaa55ad5e905 spamassassin-3.1.0-r1.ebuild 6737
 SHA256 66d6b428675c6bfefc4a053d34156d0b6ed115f6a2cf3986be3e61b8e78a941f spamassassin-3.1.0-r1.ebuild 6737
+EBUILD spamassassin-3.1.0-r2.ebuild 6836 RMD160 dfc676c21f12460df64fefedf2b01ada83742a6a SHA1 d028f41f3d46cb9b79161565a9519119adf4e6a0 SHA256 a4ee5488f45cc1fd47d5a21d7874e71c5e8fdb784a3d4bda372757267030b4ec
 MD5 c415f6600f4680f9fa0a07d8b30f9444 spamassassin-3.1.0-r2.ebuild 6836
 RMD160 dfc676c21f12460df64fefedf2b01ada83742a6a spamassassin-3.1.0-r2.ebuild 6836
 SHA256 a4ee5488f45cc1fd47d5a21d7874e71c5e8fdb784a3d4bda372757267030b4ec spamassassin-3.1.0-r2.ebuild 6836
+EBUILD spamassassin-3.1.0.ebuild 6548 RMD160 801803b399ce703eaa5b3a34c91c4f6558e85b6d SHA1 4ed09269d2dfae78a2d93a7dbc48cc6cc70f1cfc SHA256 347b9f65d79dcebf5b1703c833d5de47f737746bfc22fa8e2aad477678bc6af3
 MD5 91b5e033bc40ed39ff378042862c2d58 spamassassin-3.1.0.ebuild 6548
 RMD160 801803b399ce703eaa5b3a34c91c4f6558e85b6d spamassassin-3.1.0.ebuild 6548
 SHA256 347b9f65d79dcebf5b1703c833d5de47f737746bfc22fa8e2aad477678bc6af3 spamassassin-3.1.0.ebuild 6548
+EBUILD spamassassin-3.1.1.ebuild 7910 RMD160 69cca26480802821b24a59faa53c10adb1f83734 SHA1 7daf85f99eb5e858a21222225faf0f8b20173184 SHA256 a798f0ea81b3d07dd864795da7741d950d26ddbd458814b1f09b08731430de5a
 MD5 7f0c87bd783f395b6c87c479edcba6b3 spamassassin-3.1.1.ebuild 7910
 RMD160 69cca26480802821b24a59faa53c10adb1f83734 spamassassin-3.1.1.ebuild 7910
 SHA256 a798f0ea81b3d07dd864795da7741d950d26ddbd458814b1f09b08731430de5a spamassassin-3.1.1.ebuild 7910
+EBUILD spamassassin-3.1.2.ebuild 7845 RMD160 d667ae17f5062da42686b4a5c49dd5a2a2e38bbc SHA1 b0af5a5b1d2391fc3631ce60ed3ca1a8fa558a95 SHA256 59b95fe9ad574db0818426eb80a341fc218b8359beb819638a4c61e579f76b99
+MD5 7dc45eaca25f274ff9267ffa1318abc1 spamassassin-3.1.2.ebuild 7845
+RMD160 d667ae17f5062da42686b4a5c49dd5a2a2e38bbc spamassassin-3.1.2.ebuild 7845
+SHA256 59b95fe9ad574db0818426eb80a341fc218b8359beb819638a4c61e579f76b99 spamassassin-3.1.2.ebuild 7845
+MISC ChangeLog 24840 RMD160 104e58900a25976167dbdf1331f542bd2bbeb8b6 SHA1 b6d03f2fd1f9d815e5831686960c892530b65d50 SHA256 6b3a243833281fa84c2329aa234a78ef4e36812fdac862df0b802f1d772df803
+MD5 d4cbd1130714156f1478539313d140d2 ChangeLog 24840
+RMD160 104e58900a25976167dbdf1331f542bd2bbeb8b6 ChangeLog 24840
+SHA256 6b3a243833281fa84c2329aa234a78ef4e36812fdac862df0b802f1d772df803 ChangeLog 24840
+MISC metadata.xml 305 RMD160 647980838c590f54441a053916ea629e53e551c0 SHA1 99ef1deeae9a934fb6e46cf5fc4a5fcb8379a74a SHA256 f05dbef15061919972882cab07057e102760a542beba17d131194091401cd7ca
+MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
+RMD160 647980838c590f54441a053916ea629e53e551c0 metadata.xml 305
+SHA256 f05dbef15061919972882cab07057e102760a542beba17d131194091401cd7ca metadata.xml 305
+MD5 4783482f6c574067f3c8fa48e3202fae files/digest-spamassassin-3.0.4 76
+RMD160 b7b5e479085c42b5b0a30bd5df858ad10f88b541 files/digest-spamassassin-3.0.4 76
+SHA256 6a52b28213070af05b519aaea3f9c8e5bd711c9e209535ce12c4d9c665201497 files/digest-spamassassin-3.0.4 76
+MD5 adfd3091f64ba62fc9f715b6022cc2b9 files/digest-spamassassin-3.1.0 277
+RMD160 2771e3b35b854a26b9a9a3476fb7bc1f7b1378eb files/digest-spamassassin-3.1.0 277
+SHA256 9f18bff4b76ba225ef01a49a7d0c1686cf0c5f037ee6f8296d820af5c9cd60d3 files/digest-spamassassin-3.1.0 277
+MD5 adfd3091f64ba62fc9f715b6022cc2b9 files/digest-spamassassin-3.1.0-r1 277
+RMD160 2771e3b35b854a26b9a9a3476fb7bc1f7b1378eb files/digest-spamassassin-3.1.0-r1 277
+SHA256 9f18bff4b76ba225ef01a49a7d0c1686cf0c5f037ee6f8296d820af5c9cd60d3 files/digest-spamassassin-3.1.0-r1 277
+MD5 d6f2ad1930ee7a36de0443fa6656ec88 files/digest-spamassassin-3.1.0-r2 277
+RMD160 005ad7ec092992819f493d1743a3be5dfb4ed782 files/digest-spamassassin-3.1.0-r2 277
+SHA256 265d522d398492e085649c9af06ab47b0d8dbb099e7684889f285a68bc79c2d4 files/digest-spamassassin-3.1.0-r2 277
+MD5 415094f6195c81f5c47aaee049ff7227 files/digest-spamassassin-3.1.1 274
+RMD160 d824ef6e600dd68cef91d6040369c8cf86f8df2f files/digest-spamassassin-3.1.1 274
+SHA256 27b1a488f7058c7bdbef88fb4db129bf01b41a2be392fb7afa3a151bb7b3fba6 files/digest-spamassassin-3.1.1 274
+MD5 a51abf22e224b87bef9ba74c14af8eba files/digest-spamassassin-3.1.2 274
+RMD160 c29c6fdf772adc8feb7e848e7afe272633da73c4 files/digest-spamassassin-3.1.2 274
+SHA256 968443cdc2caad4550af4a0d9b6066d7e1ad6a7241ebc7f3a9adf90416cdc763 files/digest-spamassassin-3.1.2 274
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFESS6Er2QksT29OyARAjThAJ43aHRkz9tllWz92oFpsv6ItE9mnwCgiw5s
-4/QS7Ss1h6K4yujCeX9kkhU=
-=YPhu
+iD8DBQFEdmHmtG5z4I8BtQoRApEwAJ9nBkkr5fOp+V3iAd6bUWo0aEnczgCfUUJb
+e2BLa6P3zWZMnUnxjLvRgd4=
+=AetJ
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/spamassassin/files/digest-spamassassin-3.1.0 b/mail-filter/spamassassin/files/digest-spamassassin-3.1.0
index 261f2ae1e3e2..6b0220b00c9f 100644
--- a/mail-filter/spamassassin/files/digest-spamassassin-3.1.0
+++ b/mail-filter/spamassassin/files/digest-spamassassin-3.1.0
@@ -1 +1,3 @@
 MD5 d28bd7e83d01b234144e336bbfde0caa Mail-SpamAssassin-3.1.0.tar.bz2 1012946
+RMD160 976d18f76bf804472b24f70a695551c7f1b71d43 Mail-SpamAssassin-3.1.0.tar.bz2 1012946
+SHA256 5470943fd57d42feef998ed0eeb59a5eb4bbddd9ad956b4f864fcf47b6a911c4 Mail-SpamAssassin-3.1.0.tar.bz2 1012946
diff --git a/mail-filter/spamassassin/files/digest-spamassassin-3.1.0-r1 b/mail-filter/spamassassin/files/digest-spamassassin-3.1.0-r1
index 261f2ae1e3e2..6b0220b00c9f 100644
--- a/mail-filter/spamassassin/files/digest-spamassassin-3.1.0-r1
+++ b/mail-filter/spamassassin/files/digest-spamassassin-3.1.0-r1
@@ -1 +1,3 @@
 MD5 d28bd7e83d01b234144e336bbfde0caa Mail-SpamAssassin-3.1.0.tar.bz2 1012946
+RMD160 976d18f76bf804472b24f70a695551c7f1b71d43 Mail-SpamAssassin-3.1.0.tar.bz2 1012946
+SHA256 5470943fd57d42feef998ed0eeb59a5eb4bbddd9ad956b4f864fcf47b6a911c4 Mail-SpamAssassin-3.1.0.tar.bz2 1012946
diff --git a/mail-filter/spamassassin/files/digest-spamassassin-3.1.2 b/mail-filter/spamassassin/files/digest-spamassassin-3.1.2
new file mode 100644
index 000000000000..0d933f48a2da
--- /dev/null
+++ b/mail-filter/spamassassin/files/digest-spamassassin-3.1.2
@@ -0,0 +1,3 @@
+MD5 e1fb14def1265d6d7351ba27b5940da2 Mail-SpamAssassin-3.1.2.tar.bz2 975060
+RMD160 cde5ee2e9d0e2b4efdbd8b68367ca9508254a4c8 Mail-SpamAssassin-3.1.2.tar.bz2 975060
+SHA256 43b932797494b4d2a299228b5c793181fb335dac6f78c099bd6ae3cda64f85d3 Mail-SpamAssassin-3.1.2.tar.bz2 975060
diff --git a/mail-filter/spamassassin/spamassassin-3.1.2.ebuild b/mail-filter/spamassassin/spamassassin-3.1.2.ebuild
new file mode 100644
index 000000000000..a84591d342f0
--- /dev/null
+++ b/mail-filter/spamassassin/spamassassin-3.1.2.ebuild
@@ -0,0 +1,246 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.1.2.ebuild,v 1.1 2006/05/26 02:03:11 mcummings Exp $
+
+inherit perl-module eutils
+
+MY_P=Mail-SpamAssassin-${PV//_/-}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="SpamAssassin is an extensible email filter which is used to identify spam."
+HOMEPAGE="http://spamassassin.apache.org/"
+SRC_URI="mirror://apache/spamassassin/source/${MY_P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="berkdb qmail ssl doc ldap mysql postgres sqlite tools ipv6"
+
+DEPEND=">=dev-lang/perl-5.8.2-r1
+	virtual/perl-MIME-Base64
+	>=virtual/perl-PodParser-1.32
+	virtual/perl-Storable
+	virtual/perl-Time-HiRes
+	>=dev-perl/HTML-Parser-3.31
+	>=dev-perl/Net-DNS-0.53
+	dev-perl/Digest-SHA1
+	dev-perl/libwww-perl
+	>=dev-perl/Archive-Tar-1.26
+	app-crypt/gnupg
+	dev-perl/IO-Zlib
+	ssl? (
+		dev-perl/IO-Socket-SSL
+		dev-libs/openssl
+	)
+	berkdb? (
+		virtual/perl-DB_File
+	)
+	ldap? ( dev-perl/perl-ldap )
+	mysql? (
+		dev-perl/DBI
+		dev-perl/DBD-mysql
+	)
+	postgres? (
+		dev-perl/DBI
+		dev-perl/DBD-Pg
+	)
+	sqlite? (
+		dev-perl/DBI
+		dev-perl/DBD-SQLite
+	)
+
+	ipv6? (
+		dev-perl/IO-Socket-INET6
+	)"
+
+src_compile() {
+	# - Set SYSCONFDIR explicitly so we can't get bitten by bug 48205 again
+	#   (just to be sure, nobody knows how it could happen in the first place).
+	myconf="SYSCONFDIR=/etc DATADIR=/usr/share/spamassassin"
+
+	# If ssl is enabled, spamc can be built with ssl support
+	if use ssl; then
+		myconf="${myconf} ENABLE_SSL=yes"
+	else
+		myconf="${myconf} ENABLE_SSL=no"
+	fi
+
+	# Set the path to the Perl executable explictly.  This will be used to
+	# create the initial sharpbang line in the scripts and might cause
+	# a versioned app name end in there, see
+	# <http://bugs.gentoo.org/show_bug.cgi?id=62276>
+	myconf="${myconf} PERL_BIN=/usr/bin/perl"
+
+	# If you are going to enable taint mode, make sure that the bug where
+	# spamd doesn't start when the PATH contains . is addressed, and make
+	# sure you deal with versions of razor <2.36-r1 not being taint-safe.
+	# <http://bugzilla.spamassassin.org/show_bug.cgi?id=2511> and
+	# <http://spamassassin.org/released/Razor2.patch>.
+	myconf="${myconf} PERL_TAINT=no"
+
+	# No settings needed for 'make all'.
+	mymake=""
+
+	# Neither for 'make install'.
+	myinst=""
+
+	# Add Gentoo tag to make it easier for the upstream devs to spot
+	# possible modifications or patches.
+	version_tag="g${PV:6}${PR}"
+	version_str="${PV//_/-}-${version_tag}"
+
+	# Create the Gentoo config file before Makefile.PL is called so it
+	# is copied later on.
+	echo "version_tag ${version_tag}" > rules/11_gentoo.cf
+
+	# Setting the following env var ensures that no questions are asked.
+	export PERL_MM_USE_DEFAULT=1
+	perl-module_src_prep
+	# Run the autoconf stuff now, just to make the build sequence look more
+	# familiar to the user :)  Plus feeding the VERSION_STRING skips some
+	# calls to Perl.
+	make spamc/Makefile VERSION_STRING="${version_str}"
+
+	# Now compile all the stuff selected.
+	perl-module_src_compile
+	if use qmail; then
+		make spamc/qmail-spamc || die building qmail-spamc failed
+	fi
+
+	# Remove the MANIFEST files as they aren't docu files
+	rm -f MANIFEST*
+
+	use doc && make text_html_doc
+}
+
+src_install () {
+	perl-module_src_install
+
+	# Create the stub dir used by sa-update and friends
+	dodir /var/lib/spamassassin
+
+	# Move spamd to sbin where it belongs.
+	dodir /usr/sbin
+	mv "${D}"/usr/bin/spamd "${D}"/usr/sbin/spamd  || die
+
+	use qmail && dobin spamc/qmail-spamc
+
+	dosym /etc/mail/spamassassin /etc/spamassassin
+
+	# Disable plugin by default
+	sed -i -e 's/^loadplugin/\#loadplugin/g' ${D}/etc/mail/spamassassin/init.pre
+
+	# Add the init and config scripts.
+	newinitd "${FILESDIR}"/3.0.0-spamd.init spamd
+	newconfd "${FILESDIR}"/3.0.0-spamd.conf spamd
+
+	if use doc; then
+		dodoc NOTICE TRADEMARK CREDITS INSTALL UPGRADE BUGS USAGE \
+		sql/README.bayes sql/README.awl README.ldap procmailrc.example \
+		sample-nonspam.txt sample-spam.txt rules/STATISTICS-set0.txt \
+		STATISTICS-set1.txt STATISTICS-set2.txt STATISTICS-set3.txt \
+		spamd/PROTOCOL
+
+		# Rename some docu files so they don't clash with others
+		newdoc spamd/README README.spamd
+		newdoc sql/README README.sql
+		newdoc ldap/README README.ldap
+		use qmail && newdoc spamc/README.qmail README.qmail
+
+		dohtml doc/*.html
+		docinto sql
+		dodoc sql/*.sql
+	fi
+
+	# Install provided tools. See bug 108168
+	if use tools; then
+		docinto tools
+		dodoc tools/*
+	fi
+
+	cp ${FILESDIR}/secrets.cf ${D}/etc/mail/spamassassin/secrets.cf.example
+	fperms 0400 /etc/mail/spamassassin/secrets.cf.example
+	echo "">>${D}/etc/mail/spamassassin/local.cf.example
+	echo "# Sensitive data, such as database connection info, should">>${D}/etc/mail/spamassassin/local.cf.example
+	echo "# be stored in /etc/mail/spamassassin/secrets.cf with">>${D}/etc/mail/spamassassin/local.cf.example
+	echo "# appropriate permissions">>${D}/etc/mail/spamassassin/local.cf.example
+}
+
+pkg_postinst() {
+	perl-module_pkg_postinst
+
+	if ! has_version "perl-core/DB_File"; then
+		einfo "The Bayes backend requires the Berkeley DB to store its data. You"
+		einfo "need to emerge perl-core/DB_File or USE=berkdb to make it available."
+	fi
+
+	if has_version "mail-filter/razor"; then
+		if ! has_version ">=mail-filter/razor-2.61"; then
+				ewarn "You have $(best_version mail-filter/razor) installed but SpamAssassin"
+				if has_version "<mail-filter/razor-2.40"; then
+					ewarn "requires at least version 2.40, version 2.61 or later is recommended."
+				else
+					ewarn "recommends at least version 2.61."
+				fi
+		fi
+	fi
+
+	if use doc; then
+		einfo
+		einfo "Please read the file"
+		einfo "  /usr/share/doc/${PF}/INSTALL.gz"
+		einfo "to find out which optional modules you need to install to enable"
+		einfo "additional features which depend on them."
+		einfo
+		einfo "If upgraded from 2.x, please read the file"
+		einfo "  /usr/share/doc/${PF}/UPGRADE.gz"
+		einfo
+	fi
+
+	ewarn
+	ewarn "spamd is not designed to listen to an untrusted network"
+	ewarn "and is vulnerable to DoS attacks (and eternal doom) if"
+	ewarn "configured to do so"
+	ewarn
+	ewarn "If you plan on using the -u flag to spamd, please read the notes"
+	ewarn "in /etc/conf.d/spamd regarding the location of the pid file."
+
+	einfo
+	einfo "If you build ${PN} with optional dependancy support,"
+	einfo "you can enable them in /etc/mail/spamassassin/init.pre"
+
+	if has_version '>=dev-lang/perl-5.8.8'; then
+		ewarn "Perl 5.8 now uses Unicode internally by default, which causes trouble for"
+		ewarn "SpamAssassin (and almost all other reasonably complex pieces of perl"
+		ewarn "code!)."
+		echo ""
+		ewarn "We've worked around this in most places, as far as we know, but there may"
+		ewarn "still be some issues.  In addition, there is a speed hit, which it would"
+		ewarn "be nice to avoid."
+		echo ""
+		ewarn "Setting the LANG environment variable before any invocation of"
+		ewarn "SpamAssassin sometimes seems to help fix it, like so:"
+		echo ""
+		ewarn "  export LANG=en_US"
+		echo ""
+		ewarn "Notably, the LANG setting must not include \"utf8\".   However, some folks"
+		ewarn "have reported that this makes no difference. ;)"
+	fi
+	einfo
+	if ! has_version 'dev-perl/Mail-SPF-Query'; then
+		einfo "For spf support, please emerge dev-perl/Mail-SPF-Query"
+	fi
+	if ! has_version 'mail-filter/dcc'; then
+		einfo "For dcc support, please emerge mail-filter/dcc"
+	fi
+	if ! has_version 'dev-python/pyzor'; then
+		einfo "For pyzor support, please emerge dev-python/pyzor"
+	fi
+	if ! has_version 'mail-filter/razor'; then
+		einfo "For razor support, please emerge mail-filter/razor"
+	fi
+	einfo
+	einfo "For addtional functionality, you may wish to emerge:"
+	einfo "dev-perl/IP-Country       dev-perl/Net-Ident "
+	einfo "dev-perl/Mail-DomainKeys"
+
+}