Version bump(s) and cleanup

(Portage version: 2.2_rc40/cvs/Linux x86_64)

3 files changed, 31 insertions, 17 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/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"