Version bump(s) and cleanup

Package-Manager: portage-2.2_rc40/cvs/Linux x86_64

4 files changed, 36 insertions, 33 deletions

diff --git a/mail-mta/postfix/ChangeLog b/mail-mta/postfix/ChangeLog
index 2ff0c3b1fd61..998faad7db00 100644
--- a/mail-mta/postfix/ChangeLog
+++ b/mail-mta/postfix/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for mail-mta/postfix
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.193 2009/08/26 15:17:16 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.194 2009/08/30 06:13:53 dertobi123 Exp $
+
+*postfix-2.6.5 (30 Aug 2009)
+*postfix-2.5.9 (30 Aug 2009)
+
+  30 Aug 2009; Tobias Scherbaum <dertobi123@gentoo.org>
+  -postfix-2.4.11.ebuild, +postfix-2.5.9.ebuild, -postfix-2.6.2-r1.ebuild,
+  +postfix-2.6.5.ebuild:
+  Version bump(s) and cleanup
 
   26 Aug 2009; Torsten Veller <tove@gentoo.org> metadata.xml:
   Fix dovecot category (#281143)
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 15a8e528d93b..bcf9231673ce 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -1,28 +1,17 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX mailer.conf 438 RMD160 b9efd9921c9e6295d8791e621e4e08510b526ac4 SHA1 fad8603d181a0d1ba104f09719e5620bae421288 SHA256 4ea1fb59653bd12841501f30781bda51a66aae56a5560623f7d41709dc97c839
 AUX postfix.rc6.2.5 1415 RMD160 9d9b7240b1bfb7bcf53d6914dfc5aea2b150572e SHA1 ba08faaa70311605d2b869519ce876c71ce47a5d SHA256 11f79d4a84acfe0c34ebba11b6d1afde9c6dffcf44e8aba8dc895d4fcd0adcac
 AUX smtp.pass 141 RMD160 799433a4ee9e9e32f20aa2d31f85f33faa2bc7e6 SHA1 e1d75aa259fa07b257a617e056662aecfd19957f SHA256 c9b3b56a8df2367cc15bc43a70304fac7ebdd7697e1d450d1bcb4bfdd3e078e9
 AUX smtp.sasl 131 RMD160 6831f9bbfd76be0d39fdda4270120824ebb9f52f SHA1 613dff95ac21bd306c2917e5360430772efbb146 SHA256 954ba1e80537ca01b935b856e31ec4e3e41c138f04b7cf99ccb969876b8b78e7
-DIST postfix-2.4.11.tar.gz 2938201 RMD160 8461d89b108e5275d0cd0ee38f2914ab340c9ef6 SHA1 656e806ed11f670db587df078a94c6e6e72e645c SHA256 d574e291c7f776383529d4c33320e672ef9cdfdb529675cee945fe83819acb09
-DIST postfix-2.4.6-vda-ng-r2.patch.gz 12397 RMD160 a03f29df52eb5c2974206cd3ee32305c24d4be73 SHA1 71c9b71a238093f944865fbc90704a25710d3f3f SHA256 d8186d4c0f19b0a989d98305d9bd1c8e27223c3a4fb549d5581f279e567fadf5
 DIST postfix-2.5.3-vda-ng.patch.gz 12809 RMD160 4543db88a244eae7edaf7250449eb6d2e78d0156 SHA1 f3fc798f6eede1d600531877dd069c20b0a1e626 SHA256 5690c734072e6231b151449a7ef1da25e9ac091f51b279c4670219751b984799
 DIST postfix-2.5.5-vda-ng.patch.gz 12537 RMD160 992a20b897f7c62707f08bb19788b2c0110b254d SHA1 84b3dabc26236121fdc666da4f0fa98cc0cfbe8b SHA256 f4d2410a96c77644ba5978c8dc70c85c7978d42567ade52f35b68a31ddbe6e26
 DIST postfix-2.5.5.tar.gz 3157877 RMD160 2118fa61710bdb266d4fb8b7a0f60cf0f633c801 SHA1 7240be9e362b991bacfcf7e3771ab611e872ac12 SHA256 8c12c4d539818433d2a65019d44c802c06d0d18667cd069a5b313db06f4bc832
 DIST postfix-2.5.7.tar.gz 3159263 RMD160 5fa24140e4888fa32f4e01d4021ae37a60b523dd SHA1 1a7620b703a24cd7eef56daddff605cace184a60 SHA256 b758684dadbf01fcfe964400151788cf54cb1f4b90d2e8ede87f81f9fbc635c4
+DIST postfix-2.5.9.tar.gz 3160370 RMD160 1eac2a7512c605e666f38ad3c4ae4f868d5ef0dd SHA1 19a7a6712d59b79b818b839faf6aa4b72a5cd9e4 SHA256 afabcd385d0505a772b7ea72d1087e83b84ebcb554c08f130771c0e761a84f99
 DIST postfix-2.6.2-vda-ng.patch.gz 12661 RMD160 e5e1ad8447cc4d8476e8826b4784069ff0b6e6fe SHA1 3274de41ffc64c1b20028793b4b37383f1847b99 SHA256 2e49d9320a38d5d7ca246320127186cfacc3aced9a47aeced61151ee6eb620a4
-DIST postfix-2.6.2.tar.gz 3323255 RMD160 a86c829c3c17746986a0ea013674b6bec49d74ea SHA1 a3b349df60bca947f3b94ff484b699d176777b4a SHA256 025acf080bbe279cbc6e8e6806ecd0f99af41c8ca384fcb2f7631988f73d5f7c
-EBUILD postfix-2.4.11.ebuild 11849 RMD160 381980f7ae2ac7af4c5bb1d95eef7c7bc16e01ab SHA1 b0593f77b78647da2d1eddf2671fb76ddf904892 SHA256 6268651bede416c9c8ecee780cdb5d8601efb323857785ec7afdfb3ab584fc37
+DIST postfix-2.6.5.tar.gz 3325444 RMD160 f9b308457b9d3dcc05eb30c47b8267450a552a23 SHA1 98b04c719869b4bd61bec8749e2d57a219eb69a7 SHA256 5b5c8d3c98d7dffece1d30ed4dc1cfbd3220842fd626a324ce038d7d795e4102
 EBUILD postfix-2.5.5.ebuild 12000 RMD160 b399d7402ff12f2c6de655cd07069b95399dea83 SHA1 3894dbd43ced3a6e35db528c7fff115900f9d1a1 SHA256 693fa1d2b263b2d0264f1e2d9b38a2e4a4815e332f0328d84a424e443a844ce4
 EBUILD postfix-2.5.7.ebuild 11998 RMD160 99df4c7bdd58e9e65f4099b072d7f12fbccc9a90 SHA1 5b2cd1b3ca03f0d5a5e16deadc78509ef9e85add SHA256 bf728402c5960d3bacb2e8779af67de440421ef79dfdb2d60845ba43c81a6e9c
-EBUILD postfix-2.6.2-r1.ebuild 11143 RMD160 c712ff226cc923dd1aa40c0ee1602cc19e21c119 SHA1 9c059f77eb5ee50567e4f4f7fd5d8415b17113ad SHA256 7451ca5f8e59789dd9e1d7ccdf8479fe0972064a280a7dc5686ce8556cf2dee2
-MISC ChangeLog 55145 RMD160 87a7a73e5e239b954bbf301e7279fed150415a03 SHA1 70d149914950c91351d86be40aa008adcc16dee4 SHA256 fa4c501fe4ef79c32d80d24db716c989682c832021f3faba393223f1d52c511c
+EBUILD postfix-2.5.9.ebuild 12015 RMD160 13c4b078d9bd6b787db54533243bb9a4cd70e850 SHA1 fdce2e70902352c9826b4bea6c83e0c01ec93edf SHA256 74b30b1541b6f3715e59f9898269bf8d6407ce8d1885dab8f62f547dbe324d4b
+EBUILD postfix-2.6.5.ebuild 11144 RMD160 0943759ceebffc348b7c76b8486021f745a0266a SHA1 ca952e21867b677ce3df95e1c87f03280c984a7a SHA256 762f3001c6170ce5bca6e453d41a9a4107a76b01d2b10e89673661316ab73b46
+MISC ChangeLog 55397 RMD160 b9ac947eebb2e97f87956fcfa721f01c0f7f13ed SHA1 3adfe47bd99f7625d95cc24f86afab77739e22e6 SHA256 0623c113459396c443ab19748c75073d4ab88659fd458c87ef2cc91c1edbabaa
 MISC metadata.xml 388 RMD160 2a199814dde538c1a3b770310a5ee151488b3e2e SHA1 5b247853d93835655d9713d1f90350035d29e307 SHA256 4a27cb38992ea5bc17952c35aa5af32f77f994e69cb8580014ab267a996d79a1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkqVUgUACgkQV3J2n04EauwriACeL9e653pt7keh6TF92fQuuLml
-HnkAoNIlxuS8WTnblCZh6ZOeRb2gNTkr
-=SqwI
------END PGP SIGNATURE-----
diff --git a/mail-mta/postfix/postfix-2.4.11.ebuild b/mail-mta/postfix/postfix-2.5.9.ebuild
index 6343b3580802..02e44cc753fd 100644
--- a/mail-mta/postfix/postfix-2.4.11.ebuild
+++ b/mail-mta/postfix/postfix-2.5.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.4.11.ebuild,v 1.2 2009/07/05 20:57:15 gengor Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.5.9.ebuild,v 1.1 2009/08/30 06:13:53 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"
@@ -11,7 +11,7 @@ inherit eutils multilib ssl-cert toolchain-funcs flag-o-matic pam
 # mailer-config support
 #inherit eutils multilib ssl-cert toolchain-funcs flag-o-matic mailer pam
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 
 # regular ebuild
 IUSE="cdb dovecot-sasl hardened ipv6 ldap mailwrapper mbox mysql nis pam postgres sasl selinux ssl vda"
@@ -21,13 +21,14 @@ IUSE="cdb dovecot-sasl hardened ipv6 ldap mailwrapper mbox mysql nis pam postgre
 MY_PV="${PV/_rc/-RC}"
 MY_SRC="${PN}-${MY_PV}"
 MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
-VDA_P="${PN}-2.4.6-vda-ng-r2"
+VDA_PV="2.5.5"
+VDA_P="${PN}-${VDA_PV}-vda-ng"
 RC_VER="2.5"
 
 DESCRIPTION="A fast and secure drop-in replacement for sendmail."
 HOMEPAGE="http://www.postfix.org/"
 SRC_URI="${MY_URI}/${MY_SRC}.tar.gz
-	vda? ( http://gentoo.longitekk.com/${VDA_P}.patch.gz ) "
+	vda? ( http://vda.sourceforge.net/VDA/${VDA_P}.patch.gz ) "
 
 LICENSE="IPL-1"
 SLOT="0"
@@ -50,7 +51,10 @@ DEPEND=">=sys-libs/db-3.2
 # regular ebuild
 RDEPEND="${DEPEND}
 		>=net-mail/mailbase-0.00
-		!mailwrapper? ( !virtual/mta )
+		!mailwrapper? (
+			!virtual/mta
+			!net-mail/mailwrapper
+		)
 		mailwrapper? ( >=net-mail/mailwrapper-0.2 )
 		selinux? ( sec-policy/selinux-postfix )"
 
@@ -71,9 +75,9 @@ group_user_check() {
 }
 
 pkg_setup() {
-	# Do not upgrade live from Postfix <2.4
+	# Do not upgrade live from Postfix <2.5
 	if [[ -f /var/lib/init.d/started/postfix ]] ; then
-		if has_version '<mail-mta/postfix-2.4.0' ; then
+		if has_version '<mail-mta/postfix-2.5.0' ; then
 			if [[ "${FORCE_UPGRADE}" ]] ; then
 				echo
 				ewarn "You are upgrading from an incompatible version and you have"
@@ -153,8 +157,8 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
-	cd "${S}"
 
+	cd "${S}"
 	if use vda ; then
 		epatch "${WORKDIR}/${VDA_P}.patch"
 	fi
@@ -183,17 +187,13 @@ src_compile() {
 	fi
 
 	if use mysql ; then
-		mycc="${mycc} -DHAS_MYSQL -I/usr/include/mysql"
+		mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)"
 		mylibs="${mylibs} -lmysqlclient -lm -lz"
 	fi
 
 	if use postgres ; then
-		if best_version '=virtual/postgresql-base-7.3*' ; then
-			mycc="${mycc} -DHAS_PGSQL -I/usr/include/postgresql"
-		else
-			mycc="${mycc} -DHAS_PGSQL -I/usr/include/postgresql/pgsql"
-		fi
-		mylibs="${mylibs} -lpq"
+		mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
+		mylibs="${mylibs} -lpq -L$(pg_config --libdir)"
 	fi
 
 	if use ssl ; then
@@ -303,12 +303,18 @@ src_install () {
 
 	# Install qshape tool
 	dobin auxiliary/qshape/qshape.pl
+	doman man/man1/qshape.1
 
 	# Performance tuning tools and their manuals
 	dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
 	doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
 
 	# Set proper permissions on required files/directories
+	dodir /var/lib/postfix
+	keepdir /var/lib/postfix
+	fowners postfix:postfix /var/lib/postfix
+	fowners postfix:postfix /var/lib/postfix/.keep_${CATEGORY}_${PN}-${SLOT}
+	fperms 0750 /var/lib/postfix
 	fowners root:postdrop /usr/sbin/post{drop,queue}
 	fperms 02711 /usr/sbin/post{drop,queue}
 
diff --git a/mail-mta/postfix/postfix-2.6.2-r1.ebuild b/mail-mta/postfix/postfix-2.6.5.ebuild
index f1e721b62c9a..d8edee9350b7 100644
--- a/mail-mta/postfix/postfix-2.6.2-r1.ebuild
+++ b/mail-mta/postfix/postfix-2.6.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.6.2-r1.ebuild,v 1.2 2009/07/14 07:23:51 gengor Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.6.5.ebuild,v 1.1 2009/08/30 06:13:53 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"