www-apps/tutos: Version bump, remove old. Do not depend on DBs, check required PHP features for DB backends instead. Add USE=ldap. Fix quoting, clean up ebuild.

svn path=/experimental/; revision=408

9 files changed, 103 insertions, 115 deletions

diff --git a/www-apps/tutos/ChangeLog b/www-apps/tutos/ChangeLog
index 8928e28..256bbf8 100644
--- a/www-apps/tutos/ChangeLog
+++ b/www-apps/tutos/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for www-apps/tutos
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  08 Sep 2007; Jakub Moc <jakub@gentoo.org> +metadata.xml,
+  -tutos-1.3_beta20050904.ebuild, -tutos-1.3.20060914.ebuild,
+  +tutos-1.3.20070317.ebuild:
+  Version bump, remove old. Do not depend on DBs, check required PHP features
+  for DB backends instead. Add USE=ldap. Fix quoting, clean up ebuild.
+
   05 Dec 2006; Emanuele Gentili <bathym@0x656d67.org>
   +tutos-1.3.20060914.ebuild:
   Version bump
diff --git a/www-apps/tutos/Manifest b/www-apps/tutos/Manifest
index b3ee179..efb6600 100644
--- a/www-apps/tutos/Manifest
+++ b/www-apps/tutos/Manifest
@@ -6,23 +6,19 @@ AUX reconfig 219 RMD160 58c7810d4eb9c5f47497bea6073b84cf220ca42a SHA1 e292fb52e9
 MD5 129b84b5e43e9a2fd8ca05f1d3c966cd files/reconfig 219
 RMD160 58c7810d4eb9c5f47497bea6073b84cf220ca42a files/reconfig 219
 SHA256 03d62692af5b753c62016d7770bb843836458f3dbe6b25f96fa1d5116d6ecf97 files/reconfig 219
-DIST TUTOS-php-1.3.20060914.tar.bz2 733277 RMD160 8ec81c1c221f580bf33a8f1ad08daf5531bdf5d4 SHA1 9effc5688bdc66b635c37e6d638d5213240fa628 SHA256 51b3371a0c1a0bd97bcc61b8b104d2e239238835435a94d8fa26b53fd1eb1fd1
-DIST TUTOS-php-1.3beta.20050904.tar.bz2 729249 RMD160 b6c118125f43019c3e35b406b39762e008344f32 SHA1 9c55f155d97f8257c272303d2c069b52cc6843f9 SHA256 97ee8f53c0a184b6ad65c1da69ec6fedf7bbb42cdf33c4d5515c3bd9237fe70d
-EBUILD tutos-1.3.20060914.ebuild 1001 RMD160 36305b642f0226c878039cf1334e57bcfea7b7a5 SHA1 fe35eab5422a219282defc360a0a4879a9878d57 SHA256 f29da29a4b82beacd2ea4956104ab48da0975f5ef34384627402bb3ccc36bfe3
-MD5 818c376a979427305816e09acd0b5c73 tutos-1.3.20060914.ebuild 1001
-RMD160 36305b642f0226c878039cf1334e57bcfea7b7a5 tutos-1.3.20060914.ebuild 1001
-SHA256 f29da29a4b82beacd2ea4956104ab48da0975f5ef34384627402bb3ccc36bfe3 tutos-1.3.20060914.ebuild 1001
-EBUILD tutos-1.3_beta20050904.ebuild 969 RMD160 0c7018989a7b3b6b599aaf47cd7b9521f64fb11a SHA1 a57df509469e3793b58fecd56fa3fe3924e06716 SHA256 cc6fe79200caaab66ec0481683a82fc7e22e87ad949e6f04f1dace6689d542c2
-MD5 1c08c151d516b4b425d1eddfc3c071c4 tutos-1.3_beta20050904.ebuild 969
-RMD160 0c7018989a7b3b6b599aaf47cd7b9521f64fb11a tutos-1.3_beta20050904.ebuild 969
-SHA256 cc6fe79200caaab66ec0481683a82fc7e22e87ad949e6f04f1dace6689d542c2 tutos-1.3_beta20050904.ebuild 969
-MISC ChangeLog 394 RMD160 4d8691cdfcd88010fc56ce5c666822f1b8bbdbe0 SHA1 060ee4ec093beeced69de009b1c884979fc17f49 SHA256 96ea21cdf53a109d7010252d565a3843d33fd623c8e5438d84bed52918270fad
-MD5 9fb23d753d79773d6b8cbe66b4b8f5e8 ChangeLog 394
-RMD160 4d8691cdfcd88010fc56ce5c666822f1b8bbdbe0 ChangeLog 394
-SHA256 96ea21cdf53a109d7010252d565a3843d33fd623c8e5438d84bed52918270fad ChangeLog 394
-MD5 da86672616eba64259d0b71f402b2184 files/digest-tutos-1.3.20060914 271
-RMD160 b6714d7eaad921134b0a2ede87cbfdc2b475cd23 files/digest-tutos-1.3.20060914 271
-SHA256 74ff2caa1e6adc07edac786149ed75764127830fba3541a7a7437c612800fc53 files/digest-tutos-1.3.20060914 271
-MD5 6f92c086f683dae0f79d897f4fc7ddb1 files/digest-tutos-1.3_beta20050904 283
-RMD160 5e1cab5409d1ec5accce64d6ca28cfb28287d51f files/digest-tutos-1.3_beta20050904 283
-SHA256 c8fd2b410a6c1a484b31c07f3148360e172410625dd68fd03451e8eb37491af5 files/digest-tutos-1.3_beta20050904 283
+DIST TUTOS-php-1.3.20070317.tar.bz2 736804 RMD160 ced814df0f542e048ba11aec5ca038147f3e9e6d SHA1 df25a99c342e3e863959d09f0756504231960077 SHA256 9e97b469b54cb2a133be980513d1b5f9d52e0824094f0ef6f60a676821fb33bd
+EBUILD tutos-1.3.20070317.ebuild 1654 RMD160 b1f34337bd7edf88a8962af30cabb37fa5e39154 SHA1 5f4c28967a0855a208a0f15d16840a653d8bc45b SHA256 a81deadfa2d2503f9339de1dfbe49397c2a19dbd54df380ce21a6685b82db28c
+MD5 0047dcc59ac11e6216bd2c8a5fc19713 tutos-1.3.20070317.ebuild 1654
+RMD160 b1f34337bd7edf88a8962af30cabb37fa5e39154 tutos-1.3.20070317.ebuild 1654
+SHA256 a81deadfa2d2503f9339de1dfbe49397c2a19dbd54df380ce21a6685b82db28c tutos-1.3.20070317.ebuild 1654
+MISC ChangeLog 695 RMD160 f613e9ce988959620b10ad2f145d94e4c9beb043 SHA1 be89480727a06142d1adab5a6cab721939f1883e SHA256 36ec1c68f910ab3d581526e38cbc5cb471cf43f55efa529de97d56ced41120d4
+MD5 8be09a93f16cb6d993a395a82d969670 ChangeLog 695
+RMD160 f613e9ce988959620b10ad2f145d94e4c9beb043 ChangeLog 695
+SHA256 36ec1c68f910ab3d581526e38cbc5cb471cf43f55efa529de97d56ced41120d4 ChangeLog 695
+MISC metadata.xml 162 RMD160 0b015f5ff17c4d8e7aee826d48b326cc19b1fed4 SHA1 671b30dafbea01228c8bb606af451a0795922840 SHA256 84ff2fc6c9a4af1b9dbe32aa81ab84c2958bc1bd65a9977686df2dcab6e420d0
+MD5 7b6e6cf3eaafa0480ab619fadfb37e2e metadata.xml 162
+RMD160 0b015f5ff17c4d8e7aee826d48b326cc19b1fed4 metadata.xml 162
+SHA256 84ff2fc6c9a4af1b9dbe32aa81ab84c2958bc1bd65a9977686df2dcab6e420d0 metadata.xml 162
+MD5 d3e1dba962e330e120389ebc5109382f files/digest-tutos-1.3.20070317 271
+RMD160 259b13a5b1ec0fb95898f4a64fade9b98d96c00c files/digest-tutos-1.3.20070317 271
+SHA256 71f0ca91d1dc4fa12239e49bdab617a08fcaadb047df674dd064b99a5e3b0ec1 files/digest-tutos-1.3.20070317 271
diff --git a/www-apps/tutos/files/digest-tutos-1.3.20060914 b/www-apps/tutos/files/digest-tutos-1.3.20060914
deleted file mode 100644
index 0e49bc8..0000000
--- a/www-apps/tutos/files/digest-tutos-1.3.20060914
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c89d6ca1afef9191aa8b2dff3af79be1 TUTOS-php-1.3.20060914.tar.bz2 733277
-RMD160 8ec81c1c221f580bf33a8f1ad08daf5531bdf5d4 TUTOS-php-1.3.20060914.tar.bz2 733277
-SHA256 51b3371a0c1a0bd97bcc61b8b104d2e239238835435a94d8fa26b53fd1eb1fd1 TUTOS-php-1.3.20060914.tar.bz2 733277
diff --git a/www-apps/tutos/files/digest-tutos-1.3.20070317 b/www-apps/tutos/files/digest-tutos-1.3.20070317
new file mode 100644
index 0000000..ee61928
--- /dev/null
+++ b/www-apps/tutos/files/digest-tutos-1.3.20070317
@@ -0,0 +1,3 @@
+MD5 175eefbb13cbe05fb2ba4b1f9e0c6d1d TUTOS-php-1.3.20070317.tar.bz2 736804
+RMD160 ced814df0f542e048ba11aec5ca038147f3e9e6d TUTOS-php-1.3.20070317.tar.bz2 736804
+SHA256 9e97b469b54cb2a133be980513d1b5f9d52e0824094f0ef6f60a676821fb33bd TUTOS-php-1.3.20070317.tar.bz2 736804
diff --git a/www-apps/tutos/files/digest-tutos-1.3_beta20050904 b/www-apps/tutos/files/digest-tutos-1.3_beta20050904
deleted file mode 100644
index 8fb92ac..0000000
--- a/www-apps/tutos/files/digest-tutos-1.3_beta20050904
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5ca765112d7e8a23cea8f024c4010542 TUTOS-php-1.3beta.20050904.tar.bz2 729249
-RMD160 b6c118125f43019c3e35b406b39762e008344f32 TUTOS-php-1.3beta.20050904.tar.bz2 729249
-SHA256 97ee8f53c0a184b6ad65c1da69ec6fedf7bbb42cdf33c4d5515c3bd9237fe70d TUTOS-php-1.3beta.20050904.tar.bz2 729249
diff --git a/www-apps/tutos/metadata.xml b/www-apps/tutos/metadata.xml
new file mode 100644
index 0000000..6632069
--- /dev/null
+++ b/www-apps/tutos/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/www-apps/tutos/tutos-1.3.20060914.ebuild b/www-apps/tutos/tutos-1.3.20060914.ebuild
deleted file mode 100644
index 230ce2e..0000000
--- a/www-apps/tutos/tutos-1.3.20060914.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-# Reviewed-By: bathym 2006-05-12
-
-inherit webapp
-
-#MY_PV=${PV/_beta/beta.}
-
-DESCRIPTION="TUTOS is a tool to manage the organizational needs of small groups, teams, departments"
-HOMEPAGE="http://www.tutos.org"
-SRC_URI="mirror://sourceforge/${PN}/TUTOS-php-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-S=${WORKDIR}/${PN}
-
-IUSE="mysql postgres"
-
-RDEPEND="mysql? ( dev-db/mysql )
-	postgres? ( dev-db/postgresql )
-	virtual/php
-	net-www/apache"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	cp php/config_default.pinc php/config.php
-}
-
-src_install () {
-	webapp_src_preinst
-	dodoc ChangeLog INSTALL README*
-
-	cp -R . ${D}/${MY_HTDOCSDIR}
-
-	keepdir ${MY_HTDOCSDIR}/repository
-	webapp_serverowned ${MY_HTDOCSDIR}/repository
-	webapp_configfile ${MY_HTDOCSDIR}/php/config.php
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
-	webapp_hook_script ${FILESDIR}/reconfig
-
-	webapp_src_install
-}
diff --git a/www-apps/tutos/tutos-1.3.20070317.ebuild b/www-apps/tutos/tutos-1.3.20070317.ebuild
new file mode 100644
index 0000000..a955ae9
--- /dev/null
+++ b/www-apps/tutos/tutos-1.3.20070317.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+# Reviewed-By: bathym 2006-05-12
+
+inherit webapp depend.php depend.apache
+
+#MY_PV=${PV/_beta/beta.}
+
+DESCRIPTION="TUTOS is a tool to manage the organizational needs of small groups, teams, departments"
+HOMEPAGE="http://www.tutos.org"
+SRC_URI="mirror://sourceforge/${PN}/TUTOS-php-${PV}.tar.bz2"
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+
+DB_BACKENDS="firebird interbase mysql oci8 postgres"
+IUSE="${DB_BACKENDS} ldap"
+
+DEPEND=""
+RDEPEND=""
+
+need_php_httpd
+need_apache
+
+S=${WORKDIR}/${PN}
+
+pkg_setup() {
+	local dbflags
+	for db in ${DB_BACKENDS} ; do
+		use ${db} && dbflags="${dbflags} ${db}"
+	done
+	if use ldap ; then
+		local ldapmsg="and also ldap"
+		local flags="ldap"
+	fi
+
+	if [[ -z ${dbflags} ]] ; then
+		if ! PHPCHECKNODIE="yes" require_php_with_any_use ${DB_BACKENDS} || \
+			( use ldap && ! PHPCHECKNODIE="yes" require_php_with_use ldap ) ; then
+				die "Re-install ${PHP_PKG} with at least one of ${DB_BACKENDS} ${ldapmsg} USE flags enabled."
+		fi
+	else
+		require_php_with_use ${dbflags} ${flags}
+	fi
+	
+	webapp_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	cp php/config_default.pinc php/config.php
+	rm -f tutos.{spec*,lsm}
+}
+
+src_install () {
+	webapp_src_preinst
+	local docs="ChangeLog INSTALL README* ToDo"
+	dodoc ${docs}
+	rm -f ${docs}
+
+	cp -R . "${D}"/${MY_HTDOCSDIR}
+
+	keepdir ${MY_HTDOCSDIR}/repository
+	webapp_serverowned ${MY_HTDOCSDIR}/repository
+	webapp_configfile ${MY_HTDOCSDIR}/php/config.php
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	webapp_hook_script "${FILESDIR}"/reconfig
+
+	webapp_src_install
+}
diff --git a/www-apps/tutos/tutos-1.3_beta20050904.ebuild b/www-apps/tutos/tutos-1.3_beta20050904.ebuild
deleted file mode 100644
index 1ff08c3..0000000
--- a/www-apps/tutos/tutos-1.3_beta20050904.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit webapp
-
-MY_PV=${PV/_beta/beta.}
-
-DESCRIPTION="TUTOS is a tool to manage the organizational needs of small groups, teams, departments"
-HOMEPAGE="http://www.tutos.org"
-SRC_URI="mirror://sourceforge/${PN}/TUTOS-php-${MY_PV}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-S=${WORKDIR}/${PN}
-
-IUSE="mysql postgres"
-
-RDEPEND="mysql? ( dev-db/mysql )
-	postgres? ( dev-db/postgresql )
-	virtual/php
-	net-www/apache"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	cp php/config_default.pinc php/config.php
-}
-
-src_install () {
-	webapp_src_preinst
-	dodoc ChangeLog INSTALL README*
-
-	cp -R . ${D}/${MY_HTDOCSDIR}
-
-	keepdir ${MY_HTDOCSDIR}/repository
-	webapp_serverowned ${MY_HTDOCSDIR}/repository
-	webapp_configfile ${MY_HTDOCSDIR}/php/config.php
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
-	webapp_hook_script ${FILESDIR}/reconfig
-
-	webapp_src_install
-}