fix #278410; remove old ebuilds

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

8 files changed, 10 insertions, 301 deletions

diff --git a/www-apps/postfixadmin/ChangeLog b/www-apps/postfixadmin/ChangeLog
index a72dd08da669..f9207dc2f86a 100644
--- a/www-apps/postfixadmin/ChangeLog
+++ b/www-apps/postfixadmin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-apps/postfixadmin
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/postfixadmin/ChangeLog,v 1.14 2009/06/08 17:21:48 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/postfixadmin/ChangeLog,v 1.15 2009/10/11 08:39:31 hollow Exp $
+
+  11 Oct 2009; Benedikt Böhm <hollow@gentoo.org>
+  -postfixadmin-2.1.0-r1.ebuild, -postfixadmin-2.2.0.ebuild,
+  postfixadmin-2.2.1.1.ebuild, -files/config-hook.sh,
+  -files/postinstall-en.txt, -files/postinstall-en-mysql.txt,
+  -files/postinstall-en-postgres.txt:
+  fix #278410; remove old ebuilds
 
   08 Jun 2009; Tobias Scherbaum <dertobi123@gentoo.org>
   postfixadmin-2.1.0-r1.ebuild, postfixadmin-2.2.0.ebuild,
diff --git a/www-apps/postfixadmin/files/config-hook.sh b/www-apps/postfixadmin/files/config-hook.sh
deleted file mode 100644
index bc2222716509..000000000000
--- a/www-apps/postfixadmin/files/config-hook.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-case "$1" in
-    install)
-	sed -i "s:^\(AuthUserFile \).*$:\1${MY_INSTALLDIR}/admin/.htpasswd:gI" ${MY_INSTALLDIR}/admin/.htaccess || exit
-	;;
-    *)
-	# Nothing to do for clean up
-	;;
-esac
diff --git a/www-apps/postfixadmin/files/postinstall-en-mysql.txt b/www-apps/postfixadmin/files/postinstall-en-mysql.txt
deleted file mode 100644
index c2a85aa696b9..000000000000
--- a/www-apps/postfixadmin/files/postinstall-en-mysql.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-To complete installation, you must:
-  1. Create the needed MySQL database and tables and user:
-     mysql -u root -p < ${MY_SQLSCRIPTSDIR}/mysql/${PVR}_create.sql
-  2. Reload MySQL:
-     /etc/init.d/mysql restart
-  3. Change the password for the admin user! Inital password is
-     "admin" (without the quotes).
-
-
-Updating from older version of Postfix Admin:
-  * When you are upgrading from an older Postfix Admin version, make sure you
-  * backup your database before you run the update script on your database.
-  *   mysqldump -a -u root -p > /tmp/postfixadmin-backup.sql
-
-  For update from 2.0.x version of Postfix Admin:
-    1. Please read the BACKUP_MX.TXT
-    2. Update the needed MySQL database and tables:
-       mysql -u root -p < ${MY_SQLSCRIPTSDIR}/mysql/2.0.x_to_${PVR}.sql
-    3. Reload MySQL:
-       /etc/init.d/mysql restart
-
-  For update from 1.5x (or older) version of Postfix Admin:
-    1. Please read the UPGRADE.TXT
-    2. Update the needed MySQL database and tables:
-       mysql -u root -p < ${MY_SQLSCRIPTSDIR}/mysql/1.5x_to_${PVR}.sql
-    3. Reload MySQL:
-       /etc/init.d/mysql restart
-
-
-To use Virtual Vacation, please read VIRTUAL_VACATION_INSTALL.
-
-Check the config.inc.php file. There you can specify settings that are
-relevant to your setup.
-
-Postfix Admin contains 3 views of administration:
-  1. Site Admin view, located at http://${VHOST_HOSTNAME}${VHOST_APPDIR}/admin/.
-  2. Domain Admin view, located at http://${VHOST_HOSTNAME}${VHOST_APPDIR}/.
-  3. User Admin View, located at http://${VHOST_HOSTNAME}${VHOST_APPDIR}/users/.
-
-In order to do the initial configuration you have to go to the Site Admin view.
-
-The default password for the Site Admin view of Postfix Admin is admin/admin.
-
-This is specified in the .htpasswd file in the /admin directory. Make sure
-that the location of the .htpasswd file matches your path.
diff --git a/www-apps/postfixadmin/files/postinstall-en-postgres.txt b/www-apps/postfixadmin/files/postinstall-en-postgres.txt
deleted file mode 100644
index 66f303eff672..000000000000
--- a/www-apps/postfixadmin/files/postinstall-en-postgres.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-To complete installation, you must:
-  1. Create the needed PostgreSQL database and tables and user:
-     creatuser -P postfix
-     creatuser -P postfixadmin
-     createdb -U postgres postfix
-     psql -U postgres -p < ${MY_SQLSCRIPTSDIR}/postgresql/${PVR}_create.sql
-  2. Reload PostgreSQL:
-     /etc/init.d/postgresql restart
-  3. Change the password for the admin user! Inital password is
-     "admin" (without the qotes).
-
-Check the config.inc.php file. There you can specify settings that are
-relevant to your setup.
-
-Postfix Admin contains 3 views of administration:
-  1. Site Admin view, located at http://${VHOST_HOSTNAME}${VHOST_APPDIR}/admin/.
-  2. Domain Admin view, located at http://${VHOST_HOSTNAME}${VHOST_APPDIR}/.
-  3. User Admin View, located at http://${VHOST_HOSTNAME}${VHOST_APPDIR}/users/.
-
-In order to do the initial configuration you have to go to the Site Admin view.
-
-The default password for the Site Admin view of Postfix Admin is admin/admin.
-
-This is specified in the .htpasswd file in the /admin directory. Make sure
-that the location of the .htpasswd file matches your path.
diff --git a/www-apps/postfixadmin/files/postinstall-en.txt b/www-apps/postfixadmin/files/postinstall-en.txt
deleted file mode 100644
index c28ec3092ea3..000000000000
--- a/www-apps/postfixadmin/files/postinstall-en.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-To complete installation, you must:
-  1. Create the needed MySQL database and tables and user:
-     mysql -u root -p < ${MY_SQLSCRIPTSDIR}/mysql/${PVR}_create.sql
-  2. Reload MySQL:
-     /etc/init.d/mysql restart
-  3. Change the password for the admin user! Inital password is
-     "admin" (without the qotes).
-
-
-Updating from older version of Postfix Admin:
-  * When you are upgrading from an older Postfix Admin version, make sure you
-  * backup your database before you run the update script on your database.
-  *   mysqldump -a -u root -p > /tmp/postfixadmin-backup.sql
-
-  For update from 2.0.x version of Postfix Admin:
-    1. Please read the BACKUP_MX.TXT
-    2. Update the needed MySQL database and tables:
-       mysql -u root -p < ${MY_SQLSCRIPTSDIR}/mysql/2.0.x_to_${PVR}.sql
-    3. Reload MySQL:
-       /etc/init.d/mysql restart
-
-  For update from 1.5x (or older) version of Postfix Admin:
-    1. Please read the UPGRADE.TXT
-    2. Update the needed MySQL database and tables:
-       mysql -u root -p < ${MY_SQLSCRIPTSDIR}/mysql/1.5x_to_${PVR}.sql
-    3. Reload MySQL:
-       /etc/init.d/mysql restart
-
-
-To use Virtual Vacation, please read VIRTUAL_VACATION_INSTALL.
-
-Check the config.inc.php file. There you can specify settings that are
-relevant to your setup.
-
-Postfix Admin contains 3 views of administration:
-  1. Site Admin view, located at http://${VHOST_HOSTNAME}${VHOST_APPDIR}/admin/.
-  2. Domain Admin view, located at http://${VHOST_HOSTNAME}${VHOST_APPDIR}/.
-  3. User Admin View, located at http://${VHOST_HOSTNAME}${VHOST_APPDIR}/users/.
-
-In order to do the initial configuration you have to go to the Site Admin view.
-
-The default password for the Site Admin view of Postfix Admin is admin/admin.
-
-This is specified in the .htpasswd file in the /admin directory. Make sure
-that the location of the .htpasswd file matches your path.
diff --git a/www-apps/postfixadmin/postfixadmin-2.1.0-r1.ebuild b/www-apps/postfixadmin/postfixadmin-2.1.0-r1.ebuild
deleted file mode 100644
index 3686df7f4e17..000000000000
--- a/www-apps/postfixadmin/postfixadmin-2.1.0-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/postfixadmin/postfixadmin-2.1.0-r1.ebuild,v 1.4 2009/06/08 17:21:48 dertobi123 Exp $
-
-inherit eutils webapp depend.php confutils
-
-DESCRIPTION="Web Based Management tool for Postfix style virtual domains and users."
-HOMEPAGE="http://high5.net/postfixadmin/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-
-LICENSE="MPL-1.1"
-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
-	confutils_use_depend_built_with_all mysql mail-mta/postfix mysql
-	confutils_use_depend_built_with_all postgres mail-mta/postfix 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
-
-	mv DATABASE_MYSQL.TXT "${T}"/mysql-setup.sql
-	mv TABLE_CHANGES.TXT  "${T}"/mysql-update.sql
-	mv DATABASE_PGSQL.TXT "${T}"/postgres-setup.sql
-
-	mv config.inc.php{.sample,}
-}
-
-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="BACKUP_MX.TXT CHANGELOG.TXT INSTALL.TXT LANGUAGE.TXT
-		TABLE_BACKUP_MX.TXT UPGRADE.TXT VIRTUAL_VACATION_INSTALL.TXT"
-	dodoc ${docs}
-	rm -rf ${docs} LICENSE.TXT ADDITIONS/
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	if use mysql; then
-		webapp_sqlscript mysql "${T}"/mysql-setup.sql
-		webapp_sqlscript mysql "${T}"/mysql-update.sql 2.0.x
-		webapp_sqlscript mysql "${T}"/mysql-update.sql 1.5x
-		webapp_postinst_txt en "${FILESDIR}"/postinstall-en-mysql.txt
-	fi
-	if use postgres; then
-		webapp_sqlscript postgresql "${T}"/postgres-setup.sql
-		webapp_postinst_txt en "${FILESDIR}"/postinstall-en-postgres.txt
-	fi
-
-	webapp_configfile "${MY_HTDOCSDIR}"/config.inc.php
-	webapp_configfile "${MY_HTDOCSDIR}"/admin/.htpasswd
-
-	webapp_hook_script "${FILESDIR}"/config-hook.sh
-
-	webapp_src_install
-}
diff --git a/www-apps/postfixadmin/postfixadmin-2.2.0.ebuild b/www-apps/postfixadmin/postfixadmin-2.2.0.ebuild
deleted file mode 100644
index 259c0714b9d0..000000000000
--- a/www-apps/postfixadmin/postfixadmin-2.2.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/postfixadmin/postfixadmin-2.2.0.ebuild,v 1.2 2009/06/08 17:21:48 dertobi123 Exp $
-
-inherit eutils webapp depend.php confutils
-
-DESCRIPTION="Web Based Management tool for Postfix style virtual domains and users."
-HOMEPAGE="http://high5.net/postfixadmin/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.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
-	confutils_use_depend_built_with_all mysql mail-mta/postfix mysql
-	confutils_use_depend_built_with_all postgres mail-mta/postfix 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.2.1.1.ebuild b/www-apps/postfixadmin/postfixadmin-2.2.1.1.ebuild
index 6cb572e5d06c..a94d52aec8ed 100644
--- a/www-apps/postfixadmin/postfixadmin-2.2.1.1.ebuild
+++ b/www-apps/postfixadmin/postfixadmin-2.2.1.1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2009 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.2 2009/06/08 17:21:48 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/postfixadmin/postfixadmin-2.2.1.1.ebuild,v 1.3 2009/10/11 08:39:31 hollow Exp $
 
 inherit eutils webapp depend.php confutils
 
 DESCRIPTION="Web Based Management tool for Postfix style virtual domains and users."
 HOMEPAGE="http://high5.net/postfixadmin/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-${PV}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 RESTRICT="mirror"
 
 LICENSE="GPL-2"
@@ -26,8 +26,6 @@ pkg_setup() {
 	webapp_pkg_setup
 
 	confutils_require_any mysql postgres
-	confutils_use_depend_built_with_all mysql mail-mta/postfix mysql
-	confutils_use_depend_built_with_all postgres mail-mta/postfix postgres
 
 	if use mysql; then
 		enewgroup vacation