net-mail/postfixadmin: Use ecvs_clean from eutils eclass, fix deps, quoting

svn path=/experimental/; revision=831

3 files changed, 20 insertions, 21 deletions

diff --git a/net-mail/postfixadmin/ChangeLog b/net-mail/postfixadmin/ChangeLog
index b09061b..bbc9dcd 100644
--- a/net-mail/postfixadmin/ChangeLog
+++ b/net-mail/postfixadmin/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for net-mail/postfixadmin
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/www-apps/postfixadmin/ChangeLog,v 1.1 2006/02/02 19:35:13 wrobel Exp $
 
+  23 Feb 2008; Jakub Moc <jakub@gentoo.org> postfixadmin-2.1.0-r2.ebuild:
+  Use ecvs_clean from eutils eclass, fix deps, quoting
+
   14 Sep 2007; Jakub Moc <jakub@gentoo.org> postfixadmin-2.1.0-r2.ebuild:
   Block www-apps/postfixadmin
 
diff --git a/net-mail/postfixadmin/Manifest b/net-mail/postfixadmin/Manifest
index 2fafcd3..30eb6de 100644
--- a/net-mail/postfixadmin/Manifest
+++ b/net-mail/postfixadmin/Manifest
@@ -4,6 +4,6 @@ AUX postfixadmin-2.1.0-postgres-2.patch 8555 RMD160 79ae220fa85442aa85c3618cf833
 AUX postfixadmin-2.1.0-postgres-3.patch 1623 RMD160 efbe95eda2cfa1ca465cda8574b76240b02594fc SHA1 d34ac67e3dcc208ebb56739b9903c2e5f67f12ef SHA256 95a5ffbf48a8efce7aeaba264caeac4757063ac1863661f7b4f285babf6fc712
 AUX postinstall-en.txt 1859 RMD160 8ba29b5fae66503e38b822fe0f483a688935b6a3 SHA1 214df1f8404bcdfc97712798d4d8e60569512861 SHA256 a8d58a82e734ce28acf3cc5730805c7db7ebb54cbb6eeff67dd379cb8a6f234e
 DIST postfixadmin-2.1.0.tgz 160525 RMD160 a90773bcfd9caa0a197fb11a39ac1350a053ebc2 SHA1 9c87962a543df7639a547a021d192998e5c96ca2 SHA256 8c34f17b91c1f82923b8fc3f0fb73716e853f874b2015998a975bd9909029a44
-EBUILD postfixadmin-2.1.0-r2.ebuild 3599 RMD160 24e683cc7d7f8ce7847c13f26bb1c1daecb6e90d SHA1 c4a7079578c71cd6cd99bdf0ad84ecd556dd322b SHA256 1f722ab6e501837e0123db02eff6d81638b7e5738c76beb880fa6ab847b0c008
-MISC ChangeLog 1199 RMD160 7caf7a073f91cf7b7db26dcb5e6a7b9dd517c1af SHA1 7230ccc86d6fef8c80349b3f90b773b4469cc836 SHA256 1b701a7d3546f5e03b8f56bfadd0d3cc6d3a8044ccb784693032560676bdd7ba
+EBUILD postfixadmin-2.1.0-r2.ebuild 3419 RMD160 ba1e1a5a2460f72bac3774718bf9d1a9166269d8 SHA1 8c24beb68f72697e2080890d0056d7f89efdb88e SHA256 c1a4b8d978e4179c451bef8a37b44d106206990e49eb184eeff54d7027b5ef3f
+MISC ChangeLog 1329 RMD160 1e8b2799e4827336db4e44542d137e508000a8bb SHA1 fa27111488208c93952ec6872d84b80f5665ec49 SHA256 1edabc78b451bfed2989eb4ae42844ba1e77ea30df1876ce9d7a4d9a11d281ec
 MISC metadata.xml 300 RMD160 bf586296c9109dde24954321b649d4209515a655 SHA1 4d51a604920a4063599ce594e66c89bade642e2b SHA256 ede26e0fd846cfff8f6fbe5207a5f62606d3fdd8b7dd36fbc7eca81f5059c9e9
diff --git a/net-mail/postfixadmin/postfixadmin-2.1.0-r2.ebuild b/net-mail/postfixadmin/postfixadmin-2.1.0-r2.ebuild
index 52a4373..fb79f9f 100644
--- a/net-mail/postfixadmin/postfixadmin-2.1.0-r2.ebuild
+++ b/net-mail/postfixadmin/postfixadmin-2.1.0-r2.ebuild
@@ -1,11 +1,7 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-# Source: http://bugs.gentoo.org/show_bug.cgi?id=50035
-# Submitted-By: SteveB <tp22a@softhome.net>
-# Reviewed-By: wrobel 2005-12-14
-
 inherit eutils webapp depend.php depend.apache
 
 DESCRIPTION="Web Based Management tool for Postfix for dealing with Postfix Style Virtual Domains
@@ -17,11 +13,11 @@ LICENSE="MPL-1.1"
 KEYWORDS="~x86 ~amd64"
 IUSE="mysql postgres"
 
-RDEPEND="virtual/httpd-php
-	>=mail-mta/postfix-2.0.0
+RDEPEND=">=mail-mta/postfix-2.0.0
 	mysql? ( dev-perl/DBI dev-perl/DBD-mysql )
 	!www-apps/postfixadmin"
 
+need_php_httpd
 need_apache
 
 pkg_setup() {
@@ -42,23 +38,23 @@ src_unpack() {
 	cd "${S}"
 
 	# Remove .cvs* files and CVS directories
-	find ${S} -name .cvs\* -or \( -type d -name CVS -prune \) -exec rm -rf {} \;
+	ecvs_clean
 
 	# Database support (we don't care wich one is used. Allow both of them!)
 	if use mysql; then
-		cp ./DATABASE_MYSQL.TXT ${T}/mysql-setup.sql || die "Creating MySQL setup script failed!"
-		cp ./TABLE_CHANGES.TXT ${T}/mysql-update.sql || die "Creating MySQL update script failed!"
-		cp ./VIRTUAL_VACATION/INSTALL.TXT ${T}/VIRTUAL_VACATION_INSTALL.TXT
+		cp ./DATABASE_MYSQL.TXT "${T}"/mysql-setup.sql || die "Creating MySQL setup script failed!"
+		cp ./TABLE_CHANGES.TXT "${T}"/mysql-update.sql || die "Creating MySQL update script failed!"
+		cp ./VIRTUAL_VACATION/INSTALL.TXT "${T}"/VIRTUAL_VACATION_INSTALL.TXT
 	fi
 	if use postgres ; then
-		cp ./DATABASE_PGSQL.TXT ${T}/pgsql-setup.sql || die "Creating PostgreSQL setup script failed!"
+		cp ./DATABASE_PGSQL.TXT "${T}"/pgsql-setup.sql || die "Creating PostgreSQL setup script failed!"
 		epatch "${FILESDIR}"/${P}-postgres-1.patch || die "Patching for postgres failed."
 		epatch "${FILESDIR}"/${P}-postgres-2.patch || die "Patching for postgres failed."
 		epatch "${FILESDIR}"/${P}-postgres-3.patch || die "Patching for postgres failed."
 	fi
 
 	# Rename config.inc.php
-	cp ./config.inc.php.sample ${T}/config.inc.php || die "Creating config file failed!"
+	cp ./config.inc.php.sample "${T}"/config.inc.php || die "Creating config file failed!"
 }
 
 src_install() {
@@ -78,19 +74,19 @@ src_install() {
 	# these are things we need to add at a later date
 	#
 	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_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
 	fi
 	if use postgres ; then
-		webapp_sqlscript pgsql ${T}/pgsql-setup.sql
+		webapp_sqlscript postgres "${T}"/pgsql-setup.sql
 	fi
 
 
 	einfo "Installing main files"
 	dodir ${MY_HTDOCSDIR}
 	cp -r . "${D}"${MY_HTDOCSDIR} || die "cp failed"
-	cp ${T}/config.inc.php "${D}"${MY_HTDOCSDIR} || die "cp failed"
+	cp "${T}"/config.inc.php "${D}"${MY_HTDOCSDIR} || die "cp failed"
 
 	# handle documentation files
 	local docs="{BACKUP_MX,CHANGELOG,INSTALL,LANGUAGE,LICENSE.TXT,TABLE_BACKUP_MX,TABLE_CHANGES,UPGRADE}.TXT"