version bump. this is a security release (bug #400971). also take advantage of EAPI4. remove older ebuilds. commit with approval from sec-team.

(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)

7 files changed, 25 insertions, 290 deletions

diff --git a/www-apps/postfixadmin/ChangeLog b/www-apps/postfixadmin/ChangeLog
index 752a650875cc..1a6f47e34d13 100644
--- a/www-apps/postfixadmin/ChangeLog
+++ b/www-apps/postfixadmin/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for www-apps/postfixadmin
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/postfixadmin/ChangeLog,v 1.23 2011/10/19 10:53:57 pva Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/postfixadmin/ChangeLog,v 1.24 2012/06/26 12:12:11 mabi Exp $
+
+*postfixadmin-2.3.5 (26 Jun 2012)
+
+  26 Jun 2012; Matti Bickel <mabi@gentoo.org> +postfixadmin-2.3.5.ebuild,
+  -postfixadmin-2.2.1.1.ebuild, -postfixadmin-2.3.3.ebuild,
+  -postfixadmin-2.3.4.ebuild, -postfixadmin-2.3.ebuild, metadata.xml,
+  postfixadmin-2.3.2.ebuild:
+  version bump. this is a security release (bug #400971). also take advantage of
+  EAPI4. remove older ebuilds. commit with approval from sec-team.
 
 *postfixadmin-2.3.4 (19 Oct 2011)
 
diff --git a/www-apps/postfixadmin/metadata.xml b/www-apps/postfixadmin/metadata.xml
index 1d01289ac0ef..e995d08521dc 100644
--- a/www-apps/postfixadmin/metadata.xml
+++ b/www-apps/postfixadmin/metadata.xml
@@ -7,8 +7,6 @@
 		<name>Peter Volkov</name>
 	</maintainer>
 	<use>
-		<flag name='tests'>Install model unit tests</flag>
-		<flag name='extras'>Install contributed scripts and plugins</flag>
 		<flag name='vacation'>Install vacation.pl script and dependencies</flag>
 	</use>
 </pkgmetadata>
diff --git a/www-apps/postfixadmin/postfixadmin-2.2.1.1.ebuild b/www-apps/postfixadmin/postfixadmin-2.2.1.1.ebuild
deleted file mode 100644
index 3aad93bcb4cc..000000000000
--- a/www-apps/postfixadmin/postfixadmin-2.2.1.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/postfixadmin/postfixadmin-2.2.1.1.ebuild,v 1.4 2010/03/22 20:56:39 jlec Exp $
-
-inherit eutils webapp depend.php confutils
-
-DESCRIPTION="Web Based Management tool for Postfix style virtual domains and users."
-HOMEPAGE="http://postfixadmin.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-RESTRICT="mirror"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="mysql postgres"
-
-DEPEND=">=dev-lang/perl-5.0
-	dev-perl/DBI
-	mysql? ( dev-perl/DBD-mysql )
-	postgres? ( dev-perl/DBD-Pg )"
-RDEPEND="${DEPEND}"
-
-need_httpd_cgi
-need_php_httpd
-
-pkg_setup() {
-	webapp_pkg_setup
-
-	confutils_require_any mysql postgres
-
-	if use mysql; then
-		enewgroup vacation
-		enewuser vacation -1 -1 -1 vacation
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	ecvs_clean
-
-	mv VIRTUAL_VACATION/INSTALL.TXT VIRTUAL_VACATION_INSTALL.TXT
-}
-
-src_install() {
-	webapp_src_preinst
-
-	# virtual vacation only works with MySQL
-	if use mysql; then
-		diropts -m0770 -o vacation -g vacation
-		dodir /var/spool/vacation
-		keepdir /var/spool/vacation
-		insinto /var/spool/vacation
-		insopts -m770 -o vacation -g vacation
-		doins "${S}"/VIRTUAL_VACATION/vacation.pl
-
-		diropts -m775 -o root -g root
-		insopts -m644 -o root -g root
-	fi
-
-	local docs="DOCUMENTS/BACKUP_MX.txt CHANGELOG.TXT INSTALL.TXT
-		DOCUMENTS/LANGUAGE.txt DOCUMENTS/UPGRADE.txt
-		VIRTUAL_VACATION_INSTALL.TXT"
-	dodoc ${docs}
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	for FILE in ${docs} GPL-LICENSE.TXT LICENSE.TXT ADDITIONS/ debian/
-	do
-	  rm -rf ${FILE}
-	done
-
-	webapp_configfile "${MY_HTDOCSDIR}"/config.inc.php
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-2.2.0.txt
-	webapp_src_install
-}
diff --git a/www-apps/postfixadmin/postfixadmin-2.3.2.ebuild b/www-apps/postfixadmin/postfixadmin-2.3.2.ebuild
index 0520fcd1230d..6b0531de6320 100644
--- a/www-apps/postfixadmin/postfixadmin-2.3.2.ebuild
+++ b/www-apps/postfixadmin/postfixadmin-2.3.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/postfixadmin/postfixadmin-2.3.2.ebuild,v 1.4 2011/03/03 20:58:14 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/postfixadmin/postfixadmin-2.3.2.ebuild,v 1.5 2012/06/26 12:12:11 mabi Exp $
 
 EAPI="2"
 
-inherit eutils webapp depend.php confutils
+inherit eutils user webapp depend.php confutils
 
 DESCRIPTION="Web Based Management tool for Postfix style virtual domains and users."
 HOMEPAGE="http://postfixadmin.sourceforge.net"
diff --git a/www-apps/postfixadmin/postfixadmin-2.3.4.ebuild b/www-apps/postfixadmin/postfixadmin-2.3.4.ebuild
deleted file mode 100644
index 127fd1b4cc34..000000000000
--- a/www-apps/postfixadmin/postfixadmin-2.3.4.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/postfixadmin/postfixadmin-2.3.4.ebuild,v 1.1 2011/10/19 10:53:57 pva Exp $
-
-EAPI="2"
-
-inherit eutils webapp depend.php confutils
-
-DESCRIPTION="Web Based Management tool for Postfix style virtual domains and users."
-HOMEPAGE="http://postfixadmin.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${PN}/${P}/${PN}_${PV}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="mysql postgres +vacation xmlrpc"
-
-DEPEND="vacation? ( dev-perl/DBI
-		virtual/perl-MIME-Base64
-		dev-perl/MIME-EncWords
-		dev-perl/Email-Valid
-		dev-perl/Mail-Sender
-		dev-perl/log-dispatch
-		dev-perl/Log-Log4perl
-		dev-perl/MIME-Charset
-		mysql? ( dev-perl/DBD-mysql )
-		postgres? ( dev-perl/DBD-Pg ) )
-	xmlrpc? ( dev-php/ZendFramework[-minimal] )
-	dev-lang/php[session,unicode,imap,postgres?,xmlrpc?]"
-
-RDEPEND="${DEPEND}"
-
-need_httpd_cgi
-need_php_httpd
-
-pkg_setup() {
-	webapp_pkg_setup
-
-	confutils_require_any mysql postgres
-
-	if use mysql && ! PHPCHECKNODIE="yes" require_php_with_any_use mysql mysqli; then
-		die "Re-install ${PHP_PKG} with either mysql or mysqli"
-	fi
-
-	if use vacation; then
-		enewgroup vacation
-		enewuser vacation -1 -1 -1 vacation
-	fi
-}
-
-src_install() {
-	webapp_src_preinst
-
-	if use vacation; then
-		insinto /var/spool/vacation
-		newins VIRTUAL_VACATION/vacation.pl vacation.pl-${SLOT}
-		fowners vacation:vacation /var/spool/vacation/vacation.pl-${SLOT}
-		fperms 770 /var/spool/vacation/vacation.pl-${SLOT}
-		dodoc VIRTUAL_VACATION/FILTER_README
-		newdoc VIRTUAL_VACATION/INSTALL.TXT VIRTUAL_VACATION_INSTALL.TXT
-		rm -r VIRTUAL_VACATION/{vacation.pl,INSTALL.TXT,tests,FILTER_README}
-	fi
-
-	insinto /usr/share/doc/${PF}/
-	doins -r ADDITIONS
-
-	local docs="DOCUMENTS/*.txt INSTALL.TXT CHANGELOG.TXT"
-	dodoc ${docs}
-
-	rm -rf ${docs} DOCUMENTS/ GPL-LICENSE.TXT LICENSE.TXT debian/ tests/ ADDITIONS/
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	webapp_configfile "${MY_HTDOCSDIR}"/config.inc.php
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-2.3.txt
-	webapp_src_install
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-	if use vacation; then
-		# portage does not update owners of directories (feature :)
-		chown vacation:vacation "${ROOT}"/var/spool/vacation/
-		einfo "/var/spool/vacation/vacation.pl symlink was updated to:"
-		einfo "/var/spool/vacation/vacation.pl-${SLOT}"
-		ln -sf "${ROOT}"/var/spool/vacation/vacation.pl{-${SLOT},}
-	fi
-}
-
-pkg_postrm() {
-	# Make sure we don't leave broken vacation.pl symlink
-	find -L "${ROOT}"/var/spool/vacation/ -type l -delete
-	if [[ ! -e "${ROOT}"/var/spool/vacation/vacation.pl ]] &&
-		path_exists "${ROOT}"/var/spool/vacation/vacation.pl-*; then
-		ln -s $(LC_ALL=C ls -1 /var/spool/vacation/vacation.pl-* | tail -n1) \
-			"${ROOT}"/var/spool/vacation/vacation.pl
-		ewarn "/var/spool/vacation/vacation.pl was updated to point on most"
-		ewarn "recent verion, but please, do your own checks"
-	fi
-}
diff --git a/www-apps/postfixadmin/postfixadmin-2.3.3.ebuild b/www-apps/postfixadmin/postfixadmin-2.3.5.ebuild
index ae9b1254d164..5aee14ce704d 100644
--- a/www-apps/postfixadmin/postfixadmin-2.3.3.ebuild
+++ b/www-apps/postfixadmin/postfixadmin-2.3.5.ebuild
@@ -1,18 +1,19 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/postfixadmin/postfixadmin-2.3.3.ebuild,v 1.1 2011/04/30 19:17:21 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/postfixadmin/postfixadmin-2.3.5.ebuild,v 1.1 2012/06/26 12:12:11 mabi Exp $
 
-EAPI="2"
+EAPI="4"
 
-inherit eutils webapp depend.php confutils
+inherit user webapp
 
 DESCRIPTION="Web Based Management tool for Postfix style virtual domains and users."
 HOMEPAGE="http://postfixadmin.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
-IUSE="mysql postgres +vacation xmlrpc"
+IUSE="+mysql postgres +vacation xmlrpc"
+REQUIRED_USE="|| ( mysql postgres )"
 
 DEPEND="vacation? ( dev-perl/DBI
 		virtual/perl-MIME-Base64
@@ -25,22 +26,17 @@ DEPEND="vacation? ( dev-perl/DBI
 		mysql? ( dev-perl/DBD-mysql )
 		postgres? ( dev-perl/DBD-Pg ) )
 	xmlrpc? ( dev-php/ZendFramework[-minimal] )
-	dev-lang/php[session,unicode,imap,postgres?,xmlrpc?]"
+	dev-lang/php[unicode,imap,postgres?,xmlrpc?]"
 
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	virtual/httpd-php
+	mysql? ( || ( dev-lang/php[mysqli] dev-lang/php[mysql] ) )"
 
 need_httpd_cgi
-need_php_httpd
 
 pkg_setup() {
 	webapp_pkg_setup
 
-	confutils_require_any mysql postgres
-
-	if use mysql && ! PHPCHECKNODIE="yes" require_php_with_any_use mysql mysqli; then
-		die "Re-install ${PHP_PKG} with either mysql or mysqli"
-	fi
-
 	if use vacation; then
 		enewgroup vacation
 		enewuser vacation -1 -1 -1 vacation
diff --git a/www-apps/postfixadmin/postfixadmin-2.3.ebuild b/www-apps/postfixadmin/postfixadmin-2.3.ebuild
deleted file mode 100644
index abea4351ff56..000000000000
--- a/www-apps/postfixadmin/postfixadmin-2.3.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/postfixadmin/postfixadmin-2.3.ebuild,v 1.2 2010/03/22 20:56:39 jlec Exp $
-
-inherit eutils webapp depend.php confutils
-
-DESCRIPTION="Web Based Management tool for Postfix style virtual domains and users."
-HOMEPAGE="http://postfixadmin.sourceforge.net"
-MY_P="${PN}_${PV}"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-RESTRICT="mirror"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="extras mysql postgres tests"
-
-DEPEND="dev-perl/DBI
-	virtual/perl-MIME-Base64
-	dev-perl/Email-Valid
-	dev-perl/Mail-Sender
-	dev-perl/log-dispatch
-	dev-perl/Log-Log4perl
-	mysql? ( dev-perl/DBD-mysql )
-	postgres? ( dev-perl/DBD-Pg )"
-RDEPEND="${DEPEND}"
-
-need_httpd_cgi
-need_php_httpd
-
-pkg_setup() {
-	webapp_pkg_setup
-
-	confutils_require_any mysql postgres
-
-	if use mysql; then
-		enewgroup vacation
-		enewuser vacation -1 -1 -1 vacation
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	ecvs_clean
-}
-
-src_install() {
-	webapp_src_preinst
-
-	# virtual vacation only works with MySQL
-	if use mysql; then
-		diropts -m0770 -o vacation -g vacation
-		dodir /var/spool/vacation
-		keepdir /var/spool/vacation
-		insinto /var/spool/vacation
-		insopts -m770 -o vacation -g vacation
-		doins "${S}"/VIRTUAL_VACATION/vacation.pl
-
-		diropts -m775 -o root -g root
-		insopts -m644 -o root -g root
-
-		mv VIRTUAL_VACATION/INSTALL.TXT VIRTUAL_VACATION_INSTALL.TXT
-		dodoc VIRTUAL_VACATION_INSTALL.TXT
-		rm VIRTUAL_VACATION_INSTALL.TXT
-	fi
-
-	local docs="DOCUMENTS/*.txt CHANGELOG.TXT INSTALL.TXT"
-	dodoc ${docs}
-
-	if ! use extras; then
-		rm -rf ADDITIONS/
-	fi
-
-	if ! use tests; then
-		rm -rf tests
-	fi
-
-	for FILE in DOCUMENTS/ GPL-LICENSE.TXT LICENSE.TXT debian/
-	do
-	  rm -rf ${FILE}
-	done
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	webapp_configfile "${MY_HTDOCSDIR}"/config.inc.php
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-2.3.txt
-	webapp_src_install
-}