Version bump and cleanup

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.25-gentoo-r7 x86_64
RepoMan-Options: --force

4 files changed, 17 insertions, 24 deletions

diff --git a/mail-mta/postfix/ChangeLog b/mail-mta/postfix/ChangeLog
index dc1dec9ee3b0..c3bf71baf621 100644
--- a/mail-mta/postfix/ChangeLog
+++ b/mail-mta/postfix/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for mail-mta/postfix
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.167 2008/08/18 14:18:39 falco Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.168 2008/08/19 12:00:04 dertobi123 Exp $
+
+*postfix-2.5.4 (19 Aug 2008)
+*postfix-2.4.8 (19 Aug 2008)
+
+  19 Aug 2008; Tobias Scherbaum <dertobi123@gentoo.org>
+  -postfix-2.4.7.ebuild, +postfix-2.4.8.ebuild, -postfix-2.5.3.ebuild,
+  +postfix-2.5.4.ebuild:
+  Version bump and cleanup
 
   18 Aug 2008; Raphael Marichez <falco@gentoo.org> files/postfix.rc6.2.5:
   Fix bashisms in the init.d script, fix bug #234838 thanks to Martin Vath
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 649fefad3f50..15e1ee7583e7 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX mailer.conf 438 RMD160 b9efd9921c9e6295d8791e621e4e08510b526ac4 SHA1 fad8603d181a0d1ba104f09719e5620bae421288 SHA256 4ea1fb59653bd12841501f30781bda51a66aae56a5560623f7d41709dc97c839
 AUX postfix-2.0.9-get-FQDN.patch 1057 RMD160 492e9de53c0a16e71940ab4f4ed99bc4f76061fa SHA1 38f0322792822612a836ded1845368b23d3c1120 SHA256 6e5f5a1f9bc60e04d6decc8491c5955c625396f23698d961c412b50ec793e878
 AUX postfix-2.4.7-CVE-2008-2936.patch 1879 RMD160 948efbfaff66fdb933ee3056353f4836c706c93d SHA1 2b5e97cc6210a0659af5183293ce8acfc538bbe0 SHA256 a2d4b352340789dc566ed2f54f3d323afbdcb85ff4566353d981a1cfe347e321
@@ -18,25 +15,16 @@ DIST postfix-2.3.8.tar.gz 2787761 RMD160 2984ca8e81375a3124801c999d23637e745de54
 DIST postfix-2.4.6-vda-ng-r2.patch.gz 12397 RMD160 a03f29df52eb5c2974206cd3ee32305c24d4be73 SHA1 71c9b71a238093f944865fbc90704a25710d3f3f SHA256 d8186d4c0f19b0a989d98305d9bd1c8e27223c3a4fb549d5581f279e567fadf5
 DIST postfix-2.4.6.tar.gz 2935249 RMD160 115b3a4eb982701e29db2e52e294ec8ee69bdae5 SHA1 226222707fd8d963d3173070cac96370c453ffa7 SHA256 00d079d6354bb3979b186da6bbe281b42eea2716620da781bcdb36dd558edcca
 DIST postfix-2.4.7.tar.gz 2937251 RMD160 aea8314d39e2ee3802a814c9efd2b0c5f1b8474d SHA1 9957b6ee0abdc15749655b1f00a3d0c084c28712 SHA256 1d3fcb784d21cd93567e94e8cb244445465b9a1d0e6c2589bb1ed4ab90d536dc
+DIST postfix-2.4.8.tar.gz 2937491 RMD160 2b8490078ac10951fdd743ea8ae9da551251e2f2 SHA1 751b604c2ee9fe369f27c643e9e9b5794466b75a SHA256 5c7cf5db497e707e57c04392bb67ecc87d8c27db941d30041675327509988a6d
 DIST postfix-2.5.3-vda-ng.patch.gz 12809 RMD160 4543db88a244eae7edaf7250449eb6d2e78d0156 SHA1 f3fc798f6eede1d600531877dd069c20b0a1e626 SHA256 5690c734072e6231b151449a7ef1da25e9ac091f51b279c4670219751b984799
 DIST postfix-2.5.3.tar.gz 3156942 RMD160 3966af29024c587da3eebe56446f059a6cd1a8e4 SHA1 95d511c003ef89cc334c90b73396c4d366c74923 SHA256 4f8f933dd437fd9c29b2b53795cb16a20d6ca73bccf445101aeb5e05068a3a43
+DIST postfix-2.5.4.tar.gz 3157713 RMD160 83d59f949eb13656b60226fc43b7ab24b227c873 SHA1 995f5873c464ac9427b543d25c4325e2fbbb7bf5 SHA256 c455de2efd03a38e6b7507521dc0141c526105b8bdf231732f7cd7a9129b4a63
 EBUILD postfix-2.2.11-r1.ebuild 10482 RMD160 38a30850a1d3be0327aaf61eaf3ec085a65c75ed SHA1 e86c048743816eb80cf4a86ce9f7aef977efaab4 SHA256 886a8fa626c202b9eda143aa1d76c052abfdf8722da39072bd4f7abc63ac8f46
 EBUILD postfix-2.3.8-r1.ebuild 11815 RMD160 1ff0b58312bbe3daaa2972b25c8a1f86815a5b4a SHA1 45a577bb284e99e48905b7f3e39496002e85c08a SHA256 720e3c5f359cccc9655c48340b0d7383c3e836ecd7c8b71eba264c99bc03b117
 EBUILD postfix-2.4.6-r2.ebuild 11865 RMD160 7055177b96401e61a89f3fe1440d2489dc2389df SHA1 3e9fa6bbc787d9989d95ec9a2ae1c90556c35053 SHA256 1c3fc1a9c1dc3207794217748055ecefabb149c9ad3ec19dd071444f6669444d
 EBUILD postfix-2.4.7-r1.ebuild 11924 RMD160 b5530383f9785785faaeb069265edde44ba75d7a SHA1 418dbb93c48d9ecc49021a3a4c48b83343784d30 SHA256 702afb595dfa10fc1c36fe04291aa75f9dc560364506877dd36f6f5d137c1e64
-EBUILD postfix-2.4.7.ebuild 11869 RMD160 bb93f5800f18174d6a8f45ea1e4c386280bf8f1f SHA1 49aee93b67215ef973de6be54a18d16299f9bbb2 SHA256 14e9d1d6e61fd999d5b00a56a0b7d530ab8529757d8127b885218a81cda88f1e
+EBUILD postfix-2.4.8.ebuild 11839 RMD160 c0654e250aece573b3020d1baad3173d0a563d49 SHA1 48027b7d844b461dd083ac02b886bfac0ea8f6c9 SHA256 b63adc9ab941277d5bbcb6093f33b27139306cacdc6114881c2ba3f08833dbde
 EBUILD postfix-2.5.3-r1.ebuild 12029 RMD160 1ee106d262fd7ac7477cc96fbcc88b33ac7ab2c1 SHA1 c1a944f00f0dc0a8d49350acb40e2a2cff3462a4 SHA256 734a94429fbb3fb5a10b787287862b4499fbb9bcb25b77a756b7746e294d8f1e
-EBUILD postfix-2.5.3.ebuild 11977 RMD160 71dc5db5827c0ecfe9312d7e8b0d51127078afea SHA1 6424d8256b8d14869a77e9214e87b6b77d5bf167 SHA256 a5105982726aaf66df67ba1b002eff8192422a296a2a9cb78bbbba564d4b2cd8
-MISC ChangeLog 50536 RMD160 4a3b6ceceac14f48f10bd49bab8a50e3af2d924d SHA1 e3d217b9b032ba63c742e3a17499477133cc4858 SHA256 051717d3e5906270135d3e4a1fc0ad8c52ff478a9c6681a459261ce89df44367
+EBUILD postfix-2.5.4.ebuild 11977 RMD160 1aa9db9975a0aa7f337b109bd1b761475288b47e SHA1 28eb4eaf0679ae7078591292cd9172ba8d774177 SHA256 b547aaa77c7668bc83e0e3a4ecff25338134357b4cbea49c314480fdddb96d3e
+MISC ChangeLog 50780 RMD160 af4fd7c082791e104ebf96a945ffceac05d0aaca SHA1 df58f207231ea83d04314dff09322a7dcb43a1e3 SHA256 0ffba9dea3ecf6dd234b86e921b2d78bcdc0d827fb173e04649b989c1161c3dc
 MISC metadata.xml 162 RMD160 fd38b82541901b3c6df18b630d79fe7883ae3f01 SHA1 e6aecefcc2137d6047cedfe447686775ab59cb48 SHA256 569031668e39895fb20829fb17a49a91a83e8f41b2195b0f04825c4340d2af6b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iQEcBAEBAgAGBQJIqYUAAAoJEDvRww8BFPxF9QcH/i46kQgUA8w1UeT9XdU5v4CK
-oRuGWXNMbGtkzENiab5RjxgF8ClwU18lO2C6qgdYRAXwkS51ZJKwu/7IQNu34zc+
-a8JM0zk0W80h0Ol+Kd413dpFFGfhCHXGcoipqeGnxPKj8fLP6zBWhxQ+wSQ4oFKV
-LR4IoAeO4OY8614z/LA6IP1VpfiuTiQMXP3qw/NuehSAmqWUPSJlAIZTcXmU90Mf
-TSJamVFhNoR565ipZykTidjpmm2AYrLLUzTOh1XcG+6AehHs3YcKzHaa4SQhWuPq
-flO/Bd625MjqZK2VkhehZql0Q/uWLtWBESkQfJD8NuNTSQrq41KrkYDfZGuWbvk=
-=8kbo
------END PGP SIGNATURE-----
diff --git a/mail-mta/postfix/postfix-2.4.7.ebuild b/mail-mta/postfix/postfix-2.4.8.ebuild
index e6dc55b8e8f0..9e5cc1c63314 100644
--- a/mail-mta/postfix/postfix-2.4.7.ebuild
+++ b/mail-mta/postfix/postfix-2.4.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.4.7.ebuild,v 1.4 2008/07/22 17:44:21 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.4.8.ebuild,v 1.1 2008/08/19 12:00:04 dertobi123 Exp $
 
 # NOTE: this ebuild is a regular ebuild without mailer-config support!
 # Comment lines below "regular ebuild" and uncomment lines below "mailer-config support"
@@ -50,10 +50,7 @@ DEPEND=">=sys-libs/db-3.2
 # regular ebuild
 RDEPEND="${DEPEND}
 		>=net-mail/mailbase-0.00
-		!mailwrapper? (
-			!virtual/mta
-			!net-mail/mailwrapper
-		)
+		!mailwrapper? ( !virtual/mta )
 		mailwrapper? ( >=net-mail/mailwrapper-0.2 )
 		selinux? ( sec-policy/selinux-postfix )"
 
diff --git a/mail-mta/postfix/postfix-2.5.3.ebuild b/mail-mta/postfix/postfix-2.5.4.ebuild
index ef882745583d..d686db402e91 100644
--- a/mail-mta/postfix/postfix-2.5.3.ebuild
+++ b/mail-mta/postfix/postfix-2.5.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.5.3.ebuild,v 1.1 2008/08/03 14:29:58 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.5.4.ebuild,v 1.1 2008/08/19 12:00:04 dertobi123 Exp $
 
 # NOTE: this ebuild is a regular ebuild without mailer-config support!
 # Comment lines below "regular ebuild" and uncomment lines below "mailer-config support"