Fix dependencies; do not depend on detabases and check for required php features instead. Default to mysql if no DB backend is selected. Require PHP4 for now, PHP5 only supported in SVN. Sanitize the ebuild.

svn path=/experimental/; revision=525

3 files changed, 51 insertions, 40 deletions

diff --git a/net-mail/web-cyradm/ChangeLog b/net-mail/web-cyradm/ChangeLog
index 9796df1..d898145 100644
--- a/net-mail/web-cyradm/ChangeLog
+++ b/net-mail/web-cyradm/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for net-mail/web-cyradm
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  12 Sep 2007; Jakub Moc <jakub@gentoo.org> web-cyradm-0.5.4-r2.ebuild:
+  Fix dependencies; do not depend on databases and check for required php
+  features instead. Default to mysql if no DB backend is selected. Require
+  PHP4 for now, PHP5 only supported in SVN. Sanitize the ebuild.
+
   03 Jan 2006; <wrobel@gentoo.org> ChangeLog:
   Repoman fixes.
 
diff --git a/net-mail/web-cyradm/Manifest b/net-mail/web-cyradm/Manifest
index 3358ea1..5bff781 100644
--- a/net-mail/web-cyradm/Manifest
+++ b/net-mail/web-cyradm/Manifest
@@ -1,6 +1,6 @@
 AUX postinstall-en.txt 1621 RMD160 03a426d474f69869c3bd7a8ea41766fe70f99921 SHA1 a044b7518ddeb29194e208f28aa4b29b792cbc8f SHA256 4007b12ef6d562b16e3d5e348bd544eb8a1789e34753b72a71adef0c5b9deee6
 AUX web-cyradm-0.5.4-1.FQUN.20041109.diff 8514 RMD160 3570eb4da03a5484a63ab794084ee6cd63562755 SHA1 ebb2a18ac149ff10a9c7927dc318eb9445bb6ffa SHA256 47f32c3190ed1a6e9ff79ab1cca2a2062971ca4f7f102f92b201180adb9fa2e3
 DIST web-cyradm-0.5.4-1.tar.gz 455900 RMD160 1a9aaeb42d91af6ea236d100bd4e643193a463c0 SHA1 c7a7ad87c6a5a50f71ebbe63b34e5f5b1423b748 SHA256 f42cca48eeeb4ef2eb02a1594e44ff31fbcfc9d75eb2314b239ed497f08c4e58
-EBUILD web-cyradm-0.5.4-r2.ebuild 3763 RMD160 f3ba423d7855654d1da2de9117fe5c50bdebeb91 SHA1 6149bcdc39920893e3ae2f780c092598f838e1f6 SHA256 59895a8350c428f9b89d7c8737b1485fb8daf5a43b0cd275b0b48a681abba497
-MISC ChangeLog 446 RMD160 931fc26b0d7a0a232c78ab243b278824f3181ada SHA1 62459a13b970fe109d11377841019b4547078b29 SHA256 3ae595a632a772129e77f37e0da4b1b7009c0193e7f996ac7710c8e73a54ef5f
+EBUILD web-cyradm-0.5.4-r2.ebuild 3935 RMD160 2e952b3cacc0387099df140e2af879bff6c9d829 SHA1 5e5e9890e2f9a12467174a0a42d7e1338dfa53c5 SHA256 6a025e08cf0abe2aa81aecc7862587fb3ae1c75437c09bdcd3a608ce81ad3b02
+MISC ChangeLog 733 RMD160 564d030ed2d92bfff7d11db72bd9fb6a61914b36 SHA1 03635165554612cc2fbcd80f9232fecd0eabb993 SHA256 e114d716f4f3a99894238d33d013b9ce8b60815bfaf46b03818c6d3a36c27bc9
 MISC metadata.xml 162 RMD160 0b015f5ff17c4d8e7aee826d48b326cc19b1fed4 SHA1 671b30dafbea01228c8bb606af451a0795922840 SHA256 84ff2fc6c9a4af1b9dbe32aa81ab84c2958bc1bd65a9977686df2dcab6e420d0
diff --git a/net-mail/web-cyradm/web-cyradm-0.5.4-r2.ebuild b/net-mail/web-cyradm/web-cyradm-0.5.4-r2.ebuild
index 02e0660..b71bb5f 100644
--- a/net-mail/web-cyradm/web-cyradm-0.5.4-r2.ebuild
+++ b/net-mail/web-cyradm/web-cyradm-0.5.4-r2.ebuild
@@ -6,52 +6,68 @@
 # Submitted-By: SteveB
 # Reviewed-By: wrobel 2005-12-19
 
-inherit eutils webapp
-
-IUSE="mysql postgres pam"
+inherit eutils webapp depend.php
 
 MY_PV="${PV}-1"
 
-DESCRIPTION="Web-based that glues topnotch mailing technologies like cyrus-imap and postfix together."
+DESCRIPTION="Web-based application that glues topnotch mailing technologies like cyrus-imap and postfix together."
 SRC_URI="http://www.web-cyradm.org/${PN}-${MY_PV}.tar.gz"
 HOMEPAGE="http://www.web-cyradm.org/"
 
 LICENSE="GPL-2"
 KEYWORDS="~x86"
+IUSE="mysql postgres pam"
 
-RDEPEND="mysql? ( >=virtual/mysql-4.1 )
-	!mysql? ( postgres? ( >=dev-db/postgresql-8.0.4 ) )
-	!mysql? ( !postgres? ( >=virtual/mysql-4.1 ) )
-	virtual/httpd-php
-	virtual/mta"
-
-DEPEND="${RDEPEND}
-	>=net-mail/cyrus-imapd-2.2.12
+DEPEND=">=net-mail/cyrus-imapd-2.2.12
 	>=dev-php/PEAR-DB-1.7.6
 	pam? ( mysql? ( >=sys-auth/pam_mysql-0.5 )
 		!mysql? ( postgres? ( >=sys-auth/libnss-pgsql-1.0.0 ) )
-		!mysql? ( !postgres? ( >=sys-auth/pam_mysql-0.5 ) ) )"
+		!mysql? ( !postgres? ( >=sys-auth/pam_mysql-0.5 ) ) )
+	virtual/mta"
+
+# PHP5 only supported in SVN snapshots
+need_php4_httpd
 
 S=${WORKDIR}/${PN}-${MY_PV}
 
 pkg_setup() {
 	local multiple_dbs="0"
 	local supported_dbs="mysql postgres"
+	local foo
 	for foo in ${supported_dbs}; do
 		if use ${foo}; then
 			let multiple_dbs="((multiple_dbs + 1 ))"
 			einfo " ${foo} database support in your USE flags."
 		fi
 	done
-	if [[ "${multiple_dbs}" -gt "1" ]] ; then
-		echo
+	if [[ "${multiple_dbs}" -eq "0" ]] ; then
+		ewarn
+		ewarn "You have no database backend active in your USE flags."
+		ewarn "Will default to MySQL as your ${PN} database backend."
+		ewarn "If you want to use PostgreSQL database backend; hit Control-C now,"
+		ewarn "add postgres to your USE flags and emerge again."
+		ewarn
+		epause 5
+	elif [[ "${multiple_dbs}" -gt "1" ]] ; then
+		ewarn
 		ewarn "You have multiple database backends active in your USE flags."
 		ewarn "Will default to MySQL as your ${PN} database backend."
-		ewarn "If you want to build with another database backend; hit Control-C now."
-		ewarn "Change your USE flag to -mysql and emerge again."
-		echo
+		ewarn "If you want to use another database backend; hit Control-C now,"
+		ewarn "disable mysql in your USE flags and emerge again."
+		ewarn
 		epause 5
+	else
+		einfo "Using ${foo} as the database backend."
+	fi
+
+	if use mysql  ; then
+		local phpflags="mysql"
+	elif use postgres ; then
+		local phpflags="postgres"
+	else
+		local phpflags="mysql"
 	fi
+	require_php_with_use ${phpflags}
 
 	webapp_pkg_setup
 }
@@ -67,46 +83,36 @@ src_unpack() {
 	mv -f config/conf.php.dist config/conf.php
 
 	# http://www.shaolinux.org/web-cyradm-0.5.4-1.FQUN.20041109.diff
-	use pam || epatch "${FILESDIR}"/web-cyradm-0.5.4-1.FQUN.20041109.diff
+	use pam || epatch "${FILESDIR}"/${PN}-${MY_PV}.FQUN.20041109.diff
 }
 
 src_install() {
 	webapp_src_preinst
 
-	local docs="COPYRIGHT ChangeLog README README.translations TO-BE-DONE doc/Postfix-Cyrus-Web-cyradm-HOWTO.txt"
+	local docs="ChangeLog README README.translations TO-BE-DONE doc/Postfix-Cyrus-Web-cyradm-HOWTO.txt"
 	dodoc ${docs}
-	dohtml doc/html/*
+	dohtml -r doc/html/*
+	rm -rf ${docs} COPYRIGHT INSTALL doc/
 
 	einfo "Installing main files"
 	cp *.php "${D}"/${MY_HTDOCSDIR}
 	cp -R css images lib locale config "${D}"/${MY_HTDOCSDIR}
 
 	# install the SQL scripts available to us
-	if use mysql; then
-		# Because of limitations in the webapp ECLASS we need to merge the
-		# insertuser SQL scripts into one file
-		# SQL Scripts:
-		#  create_mysql.sql
-		#  insertuser_mysql.sql
-		#  upgrade-0.5.2-to-0.5.3_mysql.sql
-		#  upgrade-0.5.3-to-0.5.4_mysql.sql
+	# Because of limitations in the webapp ECLASS we need to merge the
+	# insertuser SQL scripts into one file
+	if use mysql || ( ! use mysql && ! use postgres ) ; then
 		cp scripts/insertuser_mysql.sql ${T}/merged_mysql.sql
 		echo >>${T}/merged_mysql.sql
-		sed -n "s:^create database:USE:gIp" ${S}/scripts/insertuser_mysql.sql >>${T}/merged_mysql.sql
+		sed -n "s:^create database:USE:gIp" scripts/insertuser_mysql.sql >>${T}/merged_mysql.sql
 		echo >>${T}/merged_mysql.sql
 		cat scripts/create_mysql.sql >>${T}/merged_mysql.sql
 		webapp_sqlscript mysql ${T}/merged_mysql.sql
 		webapp_sqlscript mysql scripts/upgrade-0.5.3-to-0.5.4_mysql.sql 0.5.3
 	elif use postgres; then
-		# Because of limitations in the webapp ECLASS we need to merge the
-		# insertuser SQL scripts into one file.
-		# SQL Scripts:
-		#  create_pgsql.sql
-		#  insertuser_pgsql.sql
-		#  upgrade-0.5.3-to-0.5.4_pgsql.sql
 		cp scripts/insertuser_pgsql.sql ${T}/merged_pgsql.sql
 		echo >>${T}/merged_pgsql.sql
-		sed -n "s:^create database:USE:gIp" ${S}/scripts/insertuser_pgsql.sql >>${T}/merged_pgsql.sql
+		sed -n "s:^create database:USE:gIp" scripts/insertuser_pgsql.sql >>${T}/merged_pgsql.sql
 		echo >>${T}/merged_pgsql.sql
 		cat scripts/create_pgsql.sql >>${T}/merged_pgsql.sql
 		webapp_sqlscript pgsql ${T}/merged_pgsql.sql