Version bump. Reported in bug #175816 by Janne Pikkarainen <jaba at mikrobitti.fi>. Update dependency list. Do not install generic LICENSE file.

Package-Manager: portage-2.1.2.3

11 files changed, 256 insertions, 50 deletions

diff --git a/mail-filter/amavisd-new/ChangeLog b/mail-filter/amavisd-new/ChangeLog
index 91af608015bc..069fd54f54dc 100644
--- a/mail-filter/amavisd-new/ChangeLog
+++ b/mail-filter/amavisd-new/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for mail-filter/amavisd-new
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.107 2007/04/13 08:59:53 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.108 2007/04/24 16:38:00 ticho Exp $
+
+*amavisd-new-2.5.0 (24 Apr 2007)
+
+  24 Apr 2007; Andrej Kacian <ticho@gentoo.org> amavisd-new-2.3.3-r2.ebuild,
+  amavisd-new-2.4.1.ebuild, amavisd-new-2.4.2.ebuild,
+  amavisd-new-2.4.2-r1.ebuild, amavisd-new-2.4.3.ebuild,
+  amavisd-new-2.4.4.ebuild, amavisd-new-2.4.5-r1.ebuild,
+  +amavisd-new-2.5.0.ebuild:
+  Version bump. Reported in bug #175816 by Janne Pikkarainen <jaba at
+  mikrobitti.fi>. Update dependency list. Do not install generic LICENSE file.
 
   13 Apr 2007; Andrej Kacian <ticho@gentoo.org> files/amavisd.rc6:
   Add --name to start-stop-daemon when starting amavisd-new, so baselayout2
diff --git a/mail-filter/amavisd-new/Manifest b/mail-filter/amavisd-new/Manifest
index 975c3d5baab1..e97df7a7d8da 100644
--- a/mail-filter/amavisd-new/Manifest
+++ b/mail-filter/amavisd-new/Manifest
@@ -43,38 +43,43 @@ DIST amavisd-new-2.4.2.tar.gz 854326 RMD160 fd82a0f3a1166d7f70846651b7b91af147b3
 DIST amavisd-new-2.4.3.tar.gz 876615 RMD160 9301d2ea30bd6a620d827384facc5a1bbace86db SHA1 d3b8b1a3c1707b120e9230821ba4ede449eed646 SHA256 ff71af590a0dc62bda558a037daceaea3b776d1ef7d0689ab0bfb582d436cf15
 DIST amavisd-new-2.4.4.tar.gz 887625 RMD160 3d6ac62f57b68440a7ca3766ff374f4763db6bbf SHA1 20943dd3787c33a1f39c9e486bc00e8f670e3f7e SHA256 b3a11ff3813e8b6c7cdf48c852c7bc672b2c0c6115d1b1dba896cd6358b67889
 DIST amavisd-new-2.4.5.tar.gz 895870 RMD160 3167b7660c84e33b59b87f8b437814c074c0e89c SHA1 2a99083b72d08cad7bf6fa6cc2eb8bd55e44f22b SHA256 cfd9150878ebaf51b021935ebc19f57be1a39f55194ef5e82f589cf80823ac53
-EBUILD amavisd-new-2.3.3-r2.ebuild 5198 RMD160 bb22a4a257eaddff6692b6aae9fb85c52e0dc849 SHA1 db79d28bb9c5263d96196387713a3ea593f9bb6e SHA256 231f479c9b433f38b63082c35d12aff82d34e7912a70634e79386d9509efda8c
-MD5 3f258731099a081b36afdf718f62dfd9 amavisd-new-2.3.3-r2.ebuild 5198
-RMD160 bb22a4a257eaddff6692b6aae9fb85c52e0dc849 amavisd-new-2.3.3-r2.ebuild 5198
-SHA256 231f479c9b433f38b63082c35d12aff82d34e7912a70634e79386d9509efda8c amavisd-new-2.3.3-r2.ebuild 5198
-EBUILD amavisd-new-2.4.1.ebuild 5086 RMD160 c65422b3b7d41a8c9bb6a3e0ee7a1c4ebd7c2341 SHA1 f9976dd3596202c02ff6a5429ebd1efbc8d7bace SHA256 94d3351d5cc338dee630fe5d418abb0a67db035b2b084565597e60432c2baef7
-MD5 8c35c60fae0bce0641240aa96d48271d amavisd-new-2.4.1.ebuild 5086
-RMD160 c65422b3b7d41a8c9bb6a3e0ee7a1c4ebd7c2341 amavisd-new-2.4.1.ebuild 5086
-SHA256 94d3351d5cc338dee630fe5d418abb0a67db035b2b084565597e60432c2baef7 amavisd-new-2.4.1.ebuild 5086
-EBUILD amavisd-new-2.4.2-r1.ebuild 5119 RMD160 c58da451e5ffc505ba0285acd01690956e74217c SHA1 f97e88ef269ac4f674e6b3f62da88c3d8fbe58aa SHA256 42fc87c2a95f2244a4dd2be5442f87627d2c78286376a484bd1ef97b474e42b5
-MD5 3c4c1e9facec808794d34ba93033f932 amavisd-new-2.4.2-r1.ebuild 5119
-RMD160 c58da451e5ffc505ba0285acd01690956e74217c amavisd-new-2.4.2-r1.ebuild 5119
-SHA256 42fc87c2a95f2244a4dd2be5442f87627d2c78286376a484bd1ef97b474e42b5 amavisd-new-2.4.2-r1.ebuild 5119
-EBUILD amavisd-new-2.4.2.ebuild 5092 RMD160 0c9cc8a9dca5aa165507c3aa250695340d95a87a SHA1 0396d43e373146d5cad7ed87b680b27063baf5b0 SHA256 759a47c6bbfa9cb64f2891123d1fc7e0ddc07c30c76d97bab497746889f563a1
-MD5 7d1f92e8c56a2a9737088536c8c7e246 amavisd-new-2.4.2.ebuild 5092
-RMD160 0c9cc8a9dca5aa165507c3aa250695340d95a87a amavisd-new-2.4.2.ebuild 5092
-SHA256 759a47c6bbfa9cb64f2891123d1fc7e0ddc07c30c76d97bab497746889f563a1 amavisd-new-2.4.2.ebuild 5092
-EBUILD amavisd-new-2.4.3.ebuild 5123 RMD160 6e3ac2e79df3bbe76ee495c048df1871e0307c14 SHA1 0b530e057fbbceb476133313d46403c1d3f98c36 SHA256 2cf8b8111a15d7b6a9d5fd674dc8c2f3ce821b7375d5a10e1c7d5127bb1e6a66
-MD5 a0291715a0234ada80613b57f549d05a amavisd-new-2.4.3.ebuild 5123
-RMD160 6e3ac2e79df3bbe76ee495c048df1871e0307c14 amavisd-new-2.4.3.ebuild 5123
-SHA256 2cf8b8111a15d7b6a9d5fd674dc8c2f3ce821b7375d5a10e1c7d5127bb1e6a66 amavisd-new-2.4.3.ebuild 5123
-EBUILD amavisd-new-2.4.4.ebuild 5116 RMD160 e52b5be0f9b26fb35f828672dd3d36510dc459e1 SHA1 3953c933fea501afea205e025d0bb54eb3f3dd9e SHA256 4921a7b7d172b092db217d54930dec10de987ab0aa5d567622ab2764737b2af1
-MD5 3c838deff7f95a6915466638a0c4cfb8 amavisd-new-2.4.4.ebuild 5116
-RMD160 e52b5be0f9b26fb35f828672dd3d36510dc459e1 amavisd-new-2.4.4.ebuild 5116
-SHA256 4921a7b7d172b092db217d54930dec10de987ab0aa5d567622ab2764737b2af1 amavisd-new-2.4.4.ebuild 5116
-EBUILD amavisd-new-2.4.5-r1.ebuild 4911 RMD160 16e35be1a251850dd1b50009a8861d11a27f6c0e SHA1 e619e34d6aa87a34fa720e272c4b7f0b39b62033 SHA256 e14820af41cf4172f7d532863ad38716e660e990da0957ce4ac0f6ed08a6d052
-MD5 cf8e659a89e000241eb1e8ee34b2b334 amavisd-new-2.4.5-r1.ebuild 4911
-RMD160 16e35be1a251850dd1b50009a8861d11a27f6c0e amavisd-new-2.4.5-r1.ebuild 4911
-SHA256 e14820af41cf4172f7d532863ad38716e660e990da0957ce4ac0f6ed08a6d052 amavisd-new-2.4.5-r1.ebuild 4911
-MISC ChangeLog 22515 RMD160 e8f0affce24074f9aaa745b97950bd45f441f919 SHA1 86973ec9e43a6ebc3702afcd6857769fa6d218f9 SHA256 bcde8e1ab2474bedcfff07eb8a6668b41a61940f2b1347db8a1b88e1a083df28
-MD5 180940a41f3750a6bc06285662b7d380 ChangeLog 22515
-RMD160 e8f0affce24074f9aaa745b97950bd45f441f919 ChangeLog 22515
-SHA256 bcde8e1ab2474bedcfff07eb8a6668b41a61940f2b1347db8a1b88e1a083df28 ChangeLog 22515
+DIST amavisd-new-2.5.0.tar.gz 780990 RMD160 b84a75b57489c6fc3ce4340b420e7fd1339e5f19 SHA1 b520c2bb5a5fd93d894466de10a89573de336da5 SHA256 d5f5238a565868b5150c2591cd06780556d2aa093355475874e6b539e7eb1116
+EBUILD amavisd-new-2.3.3-r2.ebuild 5189 RMD160 0b37256c4ef5f9aa93922ebab4ad424af646c547 SHA1 115f0b2d9db6d5481bc2d46590164fcebbb8294e SHA256 7d47d9191d743bd65908923ab4c2218c5631d2c4066f27c78c38373b10f596c2
+MD5 eebbf398cb623144c70bc1ca388bced7 amavisd-new-2.3.3-r2.ebuild 5189
+RMD160 0b37256c4ef5f9aa93922ebab4ad424af646c547 amavisd-new-2.3.3-r2.ebuild 5189
+SHA256 7d47d9191d743bd65908923ab4c2218c5631d2c4066f27c78c38373b10f596c2 amavisd-new-2.3.3-r2.ebuild 5189
+EBUILD amavisd-new-2.4.1.ebuild 5078 RMD160 28b81711e24d34f4eab34e16817a734cc695ffd7 SHA1 94a67117acc74739e1fbd621d305f137f54cd5ed SHA256 3ce9c9208986c067d0c21f27dd19efa542e400c99ed5a620f5a1a6a500c38519
+MD5 a116beb966c579ee63bf5becfed58760 amavisd-new-2.4.1.ebuild 5078
+RMD160 28b81711e24d34f4eab34e16817a734cc695ffd7 amavisd-new-2.4.1.ebuild 5078
+SHA256 3ce9c9208986c067d0c21f27dd19efa542e400c99ed5a620f5a1a6a500c38519 amavisd-new-2.4.1.ebuild 5078
+EBUILD amavisd-new-2.4.2-r1.ebuild 5110 RMD160 c1942fe06fff73c019ab693b3be93be326fbbf81 SHA1 91d3694bd20dc63825a11f0604ac11f9cc88ef62 SHA256 b0bc470b429b8e43e973dc4c6392426b9492d163b45492fff7b256692dbcbf22
+MD5 50f5f3c00b86561a1961f6e6d1660f16 amavisd-new-2.4.2-r1.ebuild 5110
+RMD160 c1942fe06fff73c019ab693b3be93be326fbbf81 amavisd-new-2.4.2-r1.ebuild 5110
+SHA256 b0bc470b429b8e43e973dc4c6392426b9492d163b45492fff7b256692dbcbf22 amavisd-new-2.4.2-r1.ebuild 5110
+EBUILD amavisd-new-2.4.2.ebuild 5083 RMD160 56d11d25e27223295cfc37a9037b29e62a7cfc45 SHA1 82da131800462ce0fc4c62fe9cfbaeb0dcc40540 SHA256 aff8f64bb2a78027c08952a831bbe5e26cdd14c09b18fd1f49eec336dc797ff2
+MD5 90704451a578b39ed0bb33540adec7ab amavisd-new-2.4.2.ebuild 5083
+RMD160 56d11d25e27223295cfc37a9037b29e62a7cfc45 amavisd-new-2.4.2.ebuild 5083
+SHA256 aff8f64bb2a78027c08952a831bbe5e26cdd14c09b18fd1f49eec336dc797ff2 amavisd-new-2.4.2.ebuild 5083
+EBUILD amavisd-new-2.4.3.ebuild 5114 RMD160 442848423e731785be5707ba37918add1bb272de SHA1 c408cc99fcd14328d74b27d8dc44175d890f112d SHA256 5bb48e987f50bed8a471fd373fc3ea39a2f2d15d8255bd069c2f065cfc891e48
+MD5 dbc77025d4a8ce5c1a49e00742d4a0a1 amavisd-new-2.4.3.ebuild 5114
+RMD160 442848423e731785be5707ba37918add1bb272de amavisd-new-2.4.3.ebuild 5114
+SHA256 5bb48e987f50bed8a471fd373fc3ea39a2f2d15d8255bd069c2f065cfc891e48 amavisd-new-2.4.3.ebuild 5114
+EBUILD amavisd-new-2.4.4.ebuild 5107 RMD160 50e0c34ac15b0ba1abcce1b6349c771bfdc396c0 SHA1 a5b6a0ad92c491756476cc4e8534f047259d5bad SHA256 9ab62c3631ff85f94a4e01679b471534c4b087cf37b9260923523d1023570b98
+MD5 d109074aeb9e2f8b2929c6ced567b229 amavisd-new-2.4.4.ebuild 5107
+RMD160 50e0c34ac15b0ba1abcce1b6349c771bfdc396c0 amavisd-new-2.4.4.ebuild 5107
+SHA256 9ab62c3631ff85f94a4e01679b471534c4b087cf37b9260923523d1023570b98 amavisd-new-2.4.4.ebuild 5107
+EBUILD amavisd-new-2.4.5-r1.ebuild 4903 RMD160 cf05f4b52479cc62ed2c40fdce9e59f5fbdfee1c SHA1 a63514de3819ef5455f60042b17e87b11fce9a79 SHA256 cdf53caf37e4bce533a421a1f022353a729ac152ae176038496a04ed7269bceb
+MD5 ef61fbdc6fc524f7222c160f06848fb8 amavisd-new-2.4.5-r1.ebuild 4903
+RMD160 cf05f4b52479cc62ed2c40fdce9e59f5fbdfee1c amavisd-new-2.4.5-r1.ebuild 4903
+SHA256 cdf53caf37e4bce533a421a1f022353a729ac152ae176038496a04ed7269bceb amavisd-new-2.4.5-r1.ebuild 4903
+EBUILD amavisd-new-2.5.0.ebuild 5119 RMD160 2b115e496c85d7e6846d2c50a9b7c594b50afcef SHA1 b8d91e4b00a58c1a85e17473d170e8c835f05d7f SHA256 f2ccc41f3a0850c5b1605d3026de8d9d2ed67478198eaae6583ef185f996bd93
+MD5 911d9f5ae0849b2378faebe5b01f39b3 amavisd-new-2.5.0.ebuild 5119
+RMD160 2b115e496c85d7e6846d2c50a9b7c594b50afcef amavisd-new-2.5.0.ebuild 5119
+SHA256 f2ccc41f3a0850c5b1605d3026de8d9d2ed67478198eaae6583ef185f996bd93 amavisd-new-2.5.0.ebuild 5119
+MISC ChangeLog 22973 RMD160 1e32f39c02e4828cd847c02c8cd00e27199cf55a SHA1 e3fa9fa14e4c9f50fb522eb530c6baf3183a0f01 SHA256 1269b78a81078c115791698a8b431275dab90cd70f445393988faaec7a3f9796
+MD5 a020172ee7b7e9a1ffef69f926385e91 ChangeLog 22973
+RMD160 1e32f39c02e4828cd847c02c8cd00e27199cf55a ChangeLog 22973
+SHA256 1269b78a81078c115791698a8b431275dab90cd70f445393988faaec7a3f9796 ChangeLog 22973
 MISC metadata.xml 184 RMD160 c37bff1fc1cd7139c91dae9b0fa5082e1d81f153 SHA1 cc0a188d9ad2411e78747326c62dd046bd5413c8 SHA256 d51011aa837db802ef539a1321a4af0a4a00879d475b92fd58f3c01df7320b58
 MD5 7e32edfd72887a57b16ecd73f0f7a1a0 metadata.xml 184
 RMD160 c37bff1fc1cd7139c91dae9b0fa5082e1d81f153 metadata.xml 184
@@ -100,10 +105,13 @@ SHA256 3efe36b42ef294cc88b43fd99e066f1599af37a38b5764681067bb76b601a091 files/di
 MD5 8a753a8cbf16255eed1625def44bdfa5 files/digest-amavisd-new-2.4.5-r1 253
 RMD160 e972ad004ce2186c1dde42911606a16645c1df95 files/digest-amavisd-new-2.4.5-r1 253
 SHA256 c53492eedc474159bc50f0ee9f20bd171ad2f0b460f564203bdbaaceeec00ca6 files/digest-amavisd-new-2.4.5-r1 253
+MD5 705879c4b6ecad0f9009be76f10bde19 files/digest-amavisd-new-2.5.0 253
+RMD160 951e4cb27d78fd4528a1d1003fe4cd5a4876c01e files/digest-amavisd-new-2.5.0 253
+SHA256 424077e1b845d0c0a4c5877ddca7fac4f9b4749e91ba6de744e74b6b54667632 files/digest-amavisd-new-2.5.0 253
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGH0aOQlM6RnzZP+IRApO3AJ99kCdPtWeHlgodTR1917YDrj8yYgCeOzVT
-RVeHuuIWDlwa+Z8+mfF/cKg=
-=hsA3
+iD8DBQFGLjJyQlM6RnzZP+IRAoqAAJ4p91JUxMoZ1PpLbaaZ86V+wp8cGACeMEtI
+LSzIXhNYnc9oZrmoomivMNU=
+=7gW3
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/amavisd-new/amavisd-new-2.3.3-r2.ebuild b/mail-filter/amavisd-new/amavisd-new-2.3.3-r2.ebuild
index dd93903386dd..78a1fad1ff98 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.3.3-r2.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.3.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.3.3-r2.ebuild,v 1.15 2007/03/18 02:44:50 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.3.3-r2.ebuild,v 1.16 2007/04/24 16:38:00 ticho Exp $
 
 inherit eutils
 
@@ -130,7 +130,7 @@ src_install() {
 	fi
 
 	newdoc test-messages/README README.samples
-	dodoc AAAREADME.first INSTALL LICENSE MANIFEST RELEASE_NOTES \
+	dodoc AAAREADME.first INSTALL MANIFEST RELEASE_NOTES \
 		README_FILES/* test-messages/sample-* amavisd.conf-default amavisd-agent
 
 	if use milter ; then
diff --git a/mail-filter/amavisd-new/amavisd-new-2.4.1.ebuild b/mail-filter/amavisd-new/amavisd-new-2.4.1.ebuild
index 8b2b028d08fc..5bc3311e587a 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.4.1.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.4.1.ebuild,v 1.9 2007/03/18 02:44:50 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.4.1.ebuild,v 1.10 2007/04/24 16:38:00 ticho Exp $
 
 inherit eutils
 
@@ -128,7 +128,7 @@ src_install() {
 	fi
 
 	newdoc test-messages/README README.samples
-	dodoc AAAREADME.first INSTALL LICENSE MANIFEST RELEASE_NOTES \
+	dodoc AAAREADME.first INSTALL MANIFEST RELEASE_NOTES \
 		README_FILES/* test-messages/sample* amavisd.conf-default amavisd-agent
 
 	if use milter ; then
diff --git a/mail-filter/amavisd-new/amavisd-new-2.4.2-r1.ebuild b/mail-filter/amavisd-new/amavisd-new-2.4.2-r1.ebuild
index fbfa8c8f4c97..46b6de79207d 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.4.2-r1.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.4.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.4.2-r1.ebuild,v 1.3 2007/03/18 02:44:50 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.4.2-r1.ebuild,v 1.4 2007/04/24 16:38:00 ticho Exp $
 
 inherit eutils
 
@@ -130,7 +130,7 @@ src_install() {
 	fi
 
 	newdoc test-messages/README README.samples
-	dodoc AAAREADME.first INSTALL LICENSE MANIFEST RELEASE_NOTES \
+	dodoc AAAREADME.first INSTALL MANIFEST RELEASE_NOTES \
 		README_FILES/* test-messages/sample* amavisd.conf-default amavisd-agent
 
 	if use milter ; then
diff --git a/mail-filter/amavisd-new/amavisd-new-2.4.2.ebuild b/mail-filter/amavisd-new/amavisd-new-2.4.2.ebuild
index a9d65c5f808c..6dab88e1d9be 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.4.2.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.4.2.ebuild,v 1.3 2007/03/18 02:44:50 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.4.2.ebuild,v 1.4 2007/04/24 16:38:00 ticho Exp $
 
 inherit eutils
 
@@ -128,7 +128,7 @@ src_install() {
 	fi
 
 	newdoc test-messages/README README.samples
-	dodoc AAAREADME.first INSTALL LICENSE MANIFEST RELEASE_NOTES \
+	dodoc AAAREADME.first INSTALL MANIFEST RELEASE_NOTES \
 		README_FILES/* test-messages/sample* amavisd.conf-default amavisd-agent
 
 	if use milter ; then
diff --git a/mail-filter/amavisd-new/amavisd-new-2.4.3.ebuild b/mail-filter/amavisd-new/amavisd-new-2.4.3.ebuild
index 346f85acae64..d6379b831e93 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.4.3.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.4.3.ebuild,v 1.3 2007/03/18 02:44:50 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.4.3.ebuild,v 1.4 2007/04/24 16:38:00 ticho Exp $
 
 inherit eutils
 
@@ -130,7 +130,7 @@ src_install() {
 	fi
 
 	newdoc test-messages/README README.samples
-	dodoc AAAREADME.first INSTALL LICENSE MANIFEST RELEASE_NOTES \
+	dodoc AAAREADME.first INSTALL MANIFEST RELEASE_NOTES \
 		README_FILES/* test-messages/sample* amavisd.conf-default amavisd-agent
 
 	if use milter ; then
diff --git a/mail-filter/amavisd-new/amavisd-new-2.4.4.ebuild b/mail-filter/amavisd-new/amavisd-new-2.4.4.ebuild
index 608abe22d40e..fde8016d0553 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.4.4.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.4.4.ebuild,v 1.5 2007/03/18 02:44:50 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.4.4.ebuild,v 1.6 2007/04/24 16:38:00 ticho Exp $
 
 inherit eutils
 
@@ -132,7 +132,7 @@ src_install() {
 	fi
 
 	newdoc test-messages/README README.samples
-	dodoc AAAREADME.first INSTALL LICENSE MANIFEST RELEASE_NOTES \
+	dodoc AAAREADME.first INSTALL MANIFEST RELEASE_NOTES \
 		README_FILES/* test-messages/sample* amavisd.conf-default amavisd-agent
 
 	if use milter ; then
diff --git a/mail-filter/amavisd-new/amavisd-new-2.4.5-r1.ebuild b/mail-filter/amavisd-new/amavisd-new-2.4.5-r1.ebuild
index 82a9b62d4860..8abd8132af39 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.4.5-r1.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.4.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.4.5-r1.ebuild,v 1.2 2007/03/27 17:43:22 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.4.5-r1.ebuild,v 1.3 2007/04/24 16:38:00 ticho Exp $
 
 inherit eutils
 
@@ -105,7 +105,7 @@ src_install() {
 	keepdir ${AMAVIS_ROOT}/tmp
 
 	newdoc test-messages/README README.samples
-	dodoc AAAREADME.first INSTALL LICENSE MANIFEST RELEASE_NOTES \
+	dodoc AAAREADME.first INSTALL MANIFEST RELEASE_NOTES \
 		README_FILES/* test-messages/sample* amavisd.conf-default amavisd-agent
 
 	if use milter ; then
diff --git a/mail-filter/amavisd-new/amavisd-new-2.5.0.ebuild b/mail-filter/amavisd-new/amavisd-new-2.5.0.ebuild
new file mode 100644
index 000000000000..437cd7b450b9
--- /dev/null
+++ b/mail-filter/amavisd-new/amavisd-new-2.5.0.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.5.0.ebuild,v 1.1 2007/04/24 16:38:00 ticho Exp $
+
+inherit eutils
+
+DESCRIPTION="High-performance interface between the MTA and content checkers."
+HOMEPAGE="http://www.ijs.si/software/amavisd/"
+SRC_URI="http://www.ijs.si/software/amavisd/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="courier ldap milter mysql postgres qmail"
+
+DEPEND=">=sys-apps/sed-4
+	>=dev-lang/perl-5.8.2"
+
+RDEPEND="${DEPEND}
+	>=sys-apps/coreutils-5.0-r3
+	app-arch/gzip
+	app-arch/bzip2
+	app-arch/arc
+	app-arch/cabextract
+	app-arch/freeze
+	app-arch/lha
+	app-arch/unarj
+	app-arch/unrar
+	app-arch/zoo
+	>=dev-perl/Archive-Zip-1.14
+	>=dev-perl/Compress-Zlib-1.35
+	dev-perl/Convert-TNEF
+	>=dev-perl/Convert-UUlib-1.08
+	virtual/perl-MIME-Base64
+	>=dev-perl/MIME-tools-5.415
+	>=dev-perl/MailTools-1.58
+	>=dev-perl/net-server-0.91
+	virtual/perl-Digest-MD5
+	dev-perl/IO-stringy
+	>=virtual/perl-Time-HiRes-1.49
+	dev-perl/Unix-Syslog
+	>=sys-libs/db-3.2
+	dev-perl/BerkeleyDB
+	virtual/mta
+	ldap? ( >=dev-perl/perl-ldap-0.33 )
+	mysql? ( dev-perl/DBD-mysql )
+	postgres? ( dev-perl/DBD-Pg )
+	milter? ( || ( >=mail-mta/sendmail-8.12 mail-filter/libmilter ) )"
+
+AMAVIS_ROOT="/var/amavis"
+
+pkg_preinst() {
+	enewgroup amavis
+	enewuser amavis -1 -1 ${AMAVIS_ROOT} amavis
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	if use courier ; then
+		elog "Patching with courier support."
+		epatch amavisd-new-courier.patch
+	fi
+
+	if use qmail ; then
+		elog "Patching with qmail qmqp support."
+		epatch amavisd-new-qmqpqq.patch
+	fi
+
+	epatch "${FILESDIR}/${PN}-2.4.4-amavisd.conf-gentoo.patch"
+}
+
+src_compile() {
+	if use milter ; then
+		cd "${S}/helper-progs"
+
+		econf --with-runtime-dir=${AMAVIS_ROOT} \
+			--with-sockname=${AMAVIS_ROOT}/amavisd.sock \
+			--with-user=amavis || die "helper-progs econf failed"
+		emake || die "helper-progs compile problem"
+
+		cd "${S}"
+	fi
+}
+
+src_install() {
+	dosbin amavisd amavisd-agent amavisd-nanny amavisd-release
+	dobin p0f-analyzer.pl
+
+	insinto /etc
+	insopts -m0640
+	newins amavisd.conf-sample amavisd.conf
+
+	dosed "s:^#\\?\\\$MYHOME[^;]*;:\$MYHOME = '$AMAVIS_ROOT';:" \
+		/etc/amavisd.conf
+
+	newinitd "${FILESDIR}/amavisd.rc6" amavisd
+	dosed "s:/var/run/amavis/:$AMAVIS_ROOT/:g" /etc/init.d/amavisd
+
+	keepdir ${AMAVIS_ROOT}
+	keepdir ${AMAVIS_ROOT}/db
+	keepdir ${AMAVIS_ROOT}/quarantine
+	keepdir ${AMAVIS_ROOT}/tmp
+
+	newdoc test-messages/README README.samples
+	dodoc AAAREADME.first INSTALL MANIFEST RELEASE_NOTES README_FILES/README.* \
+		test-messages/sample* amavisd.conf-default amavisd-agent \
+		amavisd-custom.conf
+
+	dodir /usr/share/doc/${PF}/html
+	insinto /usr/share/doc/${PF}/html
+	doins README_FILES/*.{html,css}
+	dodir /usr/share/doc/${PF}/html/images
+	insinto /usr/share/doc/${PF}/html/images
+	doins README_FILES/images/*
+
+	if use milter ; then
+		cd "${S}/helper-progs"
+		einstall
+		cd "${S}"
+	fi
+
+	for i in whitelist blacklist spam_lovers; do
+		if [ -f ${AMAVIS_ROOT}/${i} ]; then
+			cp "${AMAVIS_ROOT}/${i}" "${D}/${AMAVIS_ROOT}"
+		else
+			touch ${D}/${AMAVIS_ROOT}/${i}
+		fi
+	done
+
+	if use ldap ; then
+		elog "Adding ${P} schema to openldap schema dir."
+		dodir /etc/openldap/schema
+		insinto /etc/openldap/schema
+		insopts -o root -g root -m 644
+		newins LDAP.schema ${PN}.schema || die
+		newins LDAP.schema ${PN}.schema.default || die
+	fi
+
+	find ${D}/${AMAVIS_ROOT} -name "*" -type d -exec chmod 0750 \{\} \;
+	find ${D}/${AMAVIS_ROOT} -name "*" -type f -exec chmod 0640 \{\} \;
+}
+
+pkg_preinst() {
+	if [ -z "$(dnsdomainname)" ] ; then
+		dosed "s:^#\\?\\\$mydomain[^;]*;:\$mydomain = '$(hostname)';:" \
+			/etc/amavisd.conf
+	else
+		dosed "s:^#\\?\\\$mydomain[^;]*;:\$mydomain = '$(dnsdomainname)';:" \
+			/etc/amavisd.conf
+	fi
+
+	if has_version mail-filter/razor ; then
+		if [ ! -d ${AMAVIS_ROOT}/.razor ] ; then
+			elog "Setting up initial razor config files..."
+
+			razor-admin -create -home=${D}/${AMAVIS_ROOT}/.razor
+			sed -i -e "s:debuglevel\([ ]*\)= .:debuglevel\1= 0:g" \
+				${D}/${AMAVIS_ROOT}/.razor/razor-agent.conf
+		fi
+	fi
+}
+
+pkg_postinst() {
+	if ! has_version mail-filter/spamassassin ; then
+		echo
+		elog "Amavisd-new no longer requires SpamAssassin, but no anti-spam checking"
+		elog "will be performed without it. Since you do not have SpamAssassin installed,"
+		elog "all spam checks have been disabled. To enable them, install SpamAssassin"
+		elog "and comment out the line containing: "
+		elog "@bypass_spam_checks_maps = (1); in /etc/amavisd.conf."
+	fi
+	echo
+	ewarn "As of amavisd-new-2.4.5 p0f-analyzer.pl only binds to the loopback interface"
+	ewarn "by default instead of to all interfaces. You will need to change $bind_addr"
+	ewarn "in p0f-analyzer.pl to '0.0.0.0' if p0f-analyzer.pl is running on a different"
+	ewarn "host from amavisd or from other querying clients."
+	echo
+	ewarn "Adjusting permissions for /etc/amavisd.conf (0 for world, owner root:amavis)"
+	echo
+	chmod o-rwx /etc/amavisd.conf
+	chown root:amavis /etc/amavisd.conf
+	chown -R amavis:amavis ${AMAVIS_ROOT}
+}
diff --git a/mail-filter/amavisd-new/files/digest-amavisd-new-2.5.0 b/mail-filter/amavisd-new/files/digest-amavisd-new-2.5.0
new file mode 100644
index 000000000000..66cb5c929f91
--- /dev/null
+++ b/mail-filter/amavisd-new/files/digest-amavisd-new-2.5.0
@@ -0,0 +1,3 @@
+MD5 990a8c78911e208afca8c43a1f7c018d amavisd-new-2.5.0.tar.gz 780990
+RMD160 b84a75b57489c6fc3ce4340b420e7fd1339e5f19 amavisd-new-2.5.0.tar.gz 780990
+SHA256 d5f5238a565868b5150c2591cd06780556d2aa093355475874e6b539e7eb1116 amavisd-new-2.5.0.tar.gz 780990