Partial cleanup of this mess

svn path=/experimental/; revision=524

3 files changed, 34 insertions, 70 deletions

diff --git a/net-mail/web-cyradm/Manifest b/net-mail/web-cyradm/Manifest
index 0bb685b..3358ea1 100644
--- a/net-mail/web-cyradm/Manifest
+++ b/net-mail/web-cyradm/Manifest
@@ -1,5 +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 4996 RMD160 9f222aa10266b17e55b5ee58b737d7a6f9d531b2 SHA1 e4179ff681210a44e960d17f63308a3adcc2d857 SHA256 84084c52306b8b99bdb995378c1f99417b3c99d3d445a6dd5063d4dbfcaca815
+EBUILD web-cyradm-0.5.4-r2.ebuild 3763 RMD160 f3ba423d7855654d1da2de9117fe5c50bdebeb91 SHA1 6149bcdc39920893e3ae2f780c092598f838e1f6 SHA256 59895a8350c428f9b89d7c8737b1485fb8daf5a43b0cd275b0b48a681abba497
 MISC ChangeLog 446 RMD160 931fc26b0d7a0a232c78ab243b278824f3181ada SHA1 62459a13b970fe109d11377841019b4547078b29 SHA256 3ae595a632a772129e77f37e0da4b1b7009c0193e7f996ac7710c8e73a54ef5f
+MISC metadata.xml 162 RMD160 0b015f5ff17c4d8e7aee826d48b326cc19b1fed4 SHA1 671b30dafbea01228c8bb606af451a0795922840 SHA256 84ff2fc6c9a4af1b9dbe32aa81ab84c2958bc1bd65a9977686df2dcab6e420d0
diff --git a/net-mail/web-cyradm/metadata.xml b/net-mail/web-cyradm/metadata.xml
new file mode 100644
index 0000000..6632069
--- /dev/null
+++ b/net-mail/web-cyradm/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>web-apps</herd>
+</pkgmetadata>
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 cd2a834..02e0660 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
@@ -1,11 +1,10 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 # Source: http://bugs.gentoo.org/show_bug.cgi?id=65318
 # Submitted-By: SteveB
 # Reviewed-By: wrobel 2005-12-19
-# $Id$
 
 inherit eutils webapp
 
@@ -20,16 +19,18 @@ HOMEPAGE="http://www.web-cyradm.org/"
 LICENSE="GPL-2"
 KEYWORDS="~x86"
 
-RDEPEND="mysql?    ( >=dev-db/mysql-4.1.14 )
-		postgres? ( >=dev-db/postgresql-8.0.4 )
-		virtual/httpd-php
-		virtual/mta"
+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
-		>=dev-php/PEAR-DB-1.7.6
-		pam? ( mysql?    ( >=sys-auth/pam_mysql-0.5 )
-			postgres? ( >=sys-auth/libnss-pgsql-1.0.0 ) )"
+	>=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 ) ) )"
 
 S=${WORKDIR}/${PN}-${MY_PV}
 
@@ -42,31 +43,14 @@ pkg_setup() {
 			einfo " ${foo} database support in your USE flags."
 		fi
 	done
-	if [ "${multiple_dbs}" -gt "1" ]; then
+	if [[ "${multiple_dbs}" -gt "1" ]] ; then
 		echo
 		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 -mysql and emerge again."
+		ewarn "Change your USE flag to -mysql and emerge again."
 		echo
-		has_version ">=sys-apps/portage-2.0.50" && (
-		einfo "It would be best practice to add the set of USE flags that you use for this"
-		einfo "package to the file: /etc/portage/package.use. Example:"
-		einfo "\`echo \"${CATEGORY}/${PN} -mysql postgres\" >> /etc/portage/package.use\`"
-		einfo "to build ${PN} with Postgres database as your ${PN} backend."
-		)
-		echo
-		ewarn "Waiting 30 seconds before starting..."
-		ewarn "(Control-C to abort)..."
-		epause 3
-	elif [ "${multiple_dbs}" -eq "0" ]; then
-		echo
-		ewarn "You did not select any SQL based database backend. ${PN} can not"
-		ewarn "run without any SQL based database backend. Please enable one of"
-		ewarn "of the following USE flags:"
-		ewarn "  ${supported_dbs}"
-		echo
-		die "SQL database backend not selected"
+		epause 5
 	fi
 
 	webapp_pkg_setup
@@ -74,45 +58,30 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	# Remove .cvs* files and CVS directories
-	find ${S} -name .cvs\* -or \( -type d -name CVS -prune \) -exec rm -rf "{}" ";"
+	find . -name .cvs\* -or \( -type d -name CVS -prune \) -exec rm -rf "{}" ";"
 
 	# Rename the config file
-	mv -f ${S}/config/conf.php.dist ${S}/config/conf.php
+	mv -f config/conf.php.dist config/conf.php
 
 	# http://www.shaolinux.org/web-cyradm-0.5.4-1.FQUN.20041109.diff
-	if use !pam; then
-		epatch ${FILESDIR}/web-cyradm-0.5.4-1.FQUN.20041109.diff
-	fi
+	use pam || epatch "${FILESDIR}"/web-cyradm-0.5.4-1.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"
-
-	# handle documentation files
-	#
-	# NOTE that doc files go into /usr/share/doc as normal; they do NOT
-	# get installed per vhost!
 	dodoc ${docs}
 	dohtml doc/html/*
 
-	# copy the app's main files
-	#
 	einfo "Installing main files"
-
-	cp ${S}/*.php ${D}${MY_HTDOCSDIR}
-	cp -R ${S}/css ${D}${MY_HTDOCSDIR}
-	cp -R ${S}/images ${D}${MY_HTDOCSDIR}
-	cp -R ${S}/lib ${D}${MY_HTDOCSDIR}
-	cp -R ${S}/locale ${D}${MY_HTDOCSDIR}
-	cp -R ${S}/config ${D}${MY_HTDOCSDIR}
+	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
@@ -121,13 +90,13 @@ src_install() {
 		#  insertuser_mysql.sql
 		#  upgrade-0.5.2-to-0.5.3_mysql.sql
 		#  upgrade-0.5.3-to-0.5.4_mysql.sql
-		cp ${S}/scripts/insertuser_mysql.sql ${T}/merged_mysql.sql
+		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
 		echo >>${T}/merged_mysql.sql
-		cat ${S}/scripts/create_mysql.sql >>${T}/merged_mysql.sql
+		cat scripts/create_mysql.sql >>${T}/merged_mysql.sql
 		webapp_sqlscript mysql ${T}/merged_mysql.sql
-		webapp_sqlscript mysql ${S}/scripts/upgrade-0.5.3-to-0.5.4_mysql.sql 0.5.3
+		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.
@@ -135,29 +104,18 @@ src_install() {
 		#  create_pgsql.sql
 		#  insertuser_pgsql.sql
 		#  upgrade-0.5.3-to-0.5.4_pgsql.sql
-		cp ${S}/scripts/insertuser_pgsql.sql ${T}/merged_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
 		echo >>${T}/merged_pgsql.sql
-		cat ${S}/scripts/create_pgsql.sql >>${T}/merged_pgsql.sql
+		cat scripts/create_pgsql.sql >>${T}/merged_pgsql.sql
 		webapp_sqlscript pgsql ${T}/merged_pgsql.sql
-		webapp_sqlscript pgsql ${S}/scripts/upgrade-0.5.3-to-0.5.4_pgsql.sql 0.5.3
+		webapp_sqlscript pgsql scripts/upgrade-0.5.3-to-0.5.4_pgsql.sql 0.5.3
 	fi
 
-	#
 	webapp_serverowned ${MY_HTDOCSDIR}
-
-	# Identify the configuration files that this app uses
-	#
 	webapp_configfile ${MY_HTDOCSDIR}/config/conf.php
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
 
-	# add the post-installation instructions
-	#
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
-
-	# all done
-	#
-	# now we let the eclass strut its stuff ;-)
-	#
 	webapp_src_install
 }