www-apps/outreach: Remove old. Fix dependencies, require PHP4, remove dependency on mysql and check for needed php features instead. Quoting, ebuild cleanup.

svn path=/experimental/; revision=372

7 files changed, 54 insertions, 132 deletions

diff --git a/www-apps/outreach/ChangeLog b/www-apps/outreach/ChangeLog
index c4d350e..ec75349 100644
--- a/www-apps/outreach/ChangeLog
+++ b/www-apps/outreach/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for www-apps/outreach
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  07 Sep 2007; Jakub Moc <jakub@gentoo.org> files/postinstall-en.txt,
+  +metadata.xml, -outreach-1.2.6.ebuild, outreach-1.2.7.ebuild:
+  Remove old. Fix dependencies, require PHP4, remove dependency on mysql and
+  check for needed php features instead. Quoting, ebuild cleanup.
+
   04 Dec 2006; Emanuele Gentili <bathym@0x656d67.org>
   +outreach-1.2.7.ebuild:
   Version bump
diff --git a/www-apps/outreach/Manifest b/www-apps/outreach/Manifest
index 25ec3e5..7cb7910 100644
--- a/www-apps/outreach/Manifest
+++ b/www-apps/outreach/Manifest
@@ -6,27 +6,23 @@ AUX gentoo-mysql-4.patch 1563 RMD160 be51770accb5bfa06e40cb57e61505aa8a46600a SH
 MD5 2eab46c9ff2d3a9fe55670e8092fe4c9 files/gentoo-mysql-4.patch 1563
 RMD160 be51770accb5bfa06e40cb57e61505aa8a46600a files/gentoo-mysql-4.patch 1563
 SHA256 0f96e0e275a24f030984d87f5760ee28b3e372d924d602035039388c811ee732 files/gentoo-mysql-4.patch 1563
-AUX postinstall-en.txt 982 RMD160 39eb98c395833b70ed8392d6e2fd5bb264ad14bf SHA1 74c5e3b032f2143288e176f0540ed62c8d3c6e88 SHA256 587f159d4e0e6ea302fa2e8cef8153730df37f662fb378b9a94904f0f842ef48
-MD5 651c6b580aad5067d32dd8202d10cdb4 files/postinstall-en.txt 982
-RMD160 39eb98c395833b70ed8392d6e2fd5bb264ad14bf files/postinstall-en.txt 982
-SHA256 587f159d4e0e6ea302fa2e8cef8153730df37f662fb378b9a94904f0f842ef48 files/postinstall-en.txt 982
-DIST OPT_1-2-6_MAX.tar.gz 3557117 RMD160 42893b0fb7a2eeb45fb1a93541b2ee62cc9201a2 SHA1 f33bf8f4eca7535657f641a626de4b395349fc43 SHA256 ada80eb0597aa171b8fe91f2f2c3d87f5e82225f444d8fc8812ef95a536bcbb6
+AUX postinstall-en.txt 985 RMD160 bcb80f9609261ef4c6c198b238b27551018d709a SHA1 598051bf407976bcb6ec699a66810bed34c22bab SHA256 353cda411814a80e2520a4b280dc3758cfc76e082d4d0eaf8a214e56c6f3cacd
+MD5 82b5f23cc398a062a27845253bc2310b files/postinstall-en.txt 985
+RMD160 bcb80f9609261ef4c6c198b238b27551018d709a files/postinstall-en.txt 985
+SHA256 353cda411814a80e2520a4b280dc3758cfc76e082d4d0eaf8a214e56c6f3cacd files/postinstall-en.txt 985
 DIST OPT_1-2-7_MAX.tar.gz 3551938 RMD160 113f5f4b5dd3816a93e60c6f17186585ac0cf01e SHA1 5320358a1653e406540f6d88984552db21892aad SHA256 3b0b8266ba89be94e200d934f35d454c56c877f5ab990cb2f5d1e2afb068b705
-EBUILD outreach-1.2.6.ebuild 1603 RMD160 f29700ed57b1da34e7e002fafa97799cf0b47290 SHA1 a6e725ee8dd90eb4a724304f61418414dfbb4270 SHA256 63277c8f66547b95804aa551d40d6ceb7c2d6fdf8f62343a06d7d5fcd23d9623
-MD5 514cc0b70f97bfec783344254175281d outreach-1.2.6.ebuild 1603
-RMD160 f29700ed57b1da34e7e002fafa97799cf0b47290 outreach-1.2.6.ebuild 1603
-SHA256 63277c8f66547b95804aa551d40d6ceb7c2d6fdf8f62343a06d7d5fcd23d9623 outreach-1.2.6.ebuild 1603
-EBUILD outreach-1.2.7.ebuild 1603 RMD160 f29700ed57b1da34e7e002fafa97799cf0b47290 SHA1 a6e725ee8dd90eb4a724304f61418414dfbb4270 SHA256 63277c8f66547b95804aa551d40d6ceb7c2d6fdf8f62343a06d7d5fcd23d9623
-MD5 514cc0b70f97bfec783344254175281d outreach-1.2.7.ebuild 1603
-RMD160 f29700ed57b1da34e7e002fafa97799cf0b47290 outreach-1.2.7.ebuild 1603
-SHA256 63277c8f66547b95804aa551d40d6ceb7c2d6fdf8f62343a06d7d5fcd23d9623 outreach-1.2.7.ebuild 1603
-MISC ChangeLog 526 RMD160 86d0258acde03f2840b7b0bfc6e5f4d522887b33 SHA1 c42149e71628383b2d1a4c914d20ee106f1870e6 SHA256 58bf640f3b7ad31e24c50bdb6ca1b9870264f5cac4bd4351cbf57ace0406cff1
-MD5 031264a31d9b4e15975c1767dac4d962 ChangeLog 526
-RMD160 86d0258acde03f2840b7b0bfc6e5f4d522887b33 ChangeLog 526
-SHA256 58bf640f3b7ad31e24c50bdb6ca1b9870264f5cac4bd4351cbf57ace0406cff1 ChangeLog 526
-MD5 4aba0809e10623ea128790f584dacf39 files/digest-outreach-1.2.6 244
-RMD160 53e10c892c9631a5fe3b9c7d986a09e27516253f files/digest-outreach-1.2.6 244
-SHA256 ccc75e6a524072e090b8dd9cd56c48e47bc0aa1d554e436407c6b3fc5fc5e990 files/digest-outreach-1.2.6 244
+EBUILD outreach-1.2.7.ebuild 1585 RMD160 518a6edf67d2a1adc0994931b158f9467e0fcd32 SHA1 4c865715fb774c5eb5bac0bca3922a6fdc724c08 SHA256 2f6dba1cef06bb57697f9d6fa4933b5c9a86442bcde091416aa4f778353bcb77
+MD5 3e01e934ab6784482c1a4db76747d8e2 outreach-1.2.7.ebuild 1585
+RMD160 518a6edf67d2a1adc0994931b158f9467e0fcd32 outreach-1.2.7.ebuild 1585
+SHA256 2f6dba1cef06bb57697f9d6fa4933b5c9a86442bcde091416aa4f778353bcb77 outreach-1.2.7.ebuild 1585
+MISC ChangeLog 804 RMD160 8c19343573ee3cbf19e89d6874f2afecbaf0b824 SHA1 7dd311c9fc66d7d993ebf1042811f1bb3542a879 SHA256 833eae4e570c7875301096b332da2bda8fd652315f1cc685f3c0c656fa86200c
+MD5 e80f3582aa5b8a0abe1f86b280e057f5 ChangeLog 804
+RMD160 8c19343573ee3cbf19e89d6874f2afecbaf0b824 ChangeLog 804
+SHA256 833eae4e570c7875301096b332da2bda8fd652315f1cc685f3c0c656fa86200c ChangeLog 804
+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 dad01b3d7709fe392bd9c21b606a52f9 files/digest-outreach-1.2.7 244
 RMD160 78de5548655fc9cdc5126024df0cb02e9e520850 files/digest-outreach-1.2.7 244
 SHA256 594a956e9389b7332653475936e9ff325cfcb5ac7f227b4046f98d22de779cc2 files/digest-outreach-1.2.7 244
diff --git a/www-apps/outreach/files/digest-outreach-1.2.6 b/www-apps/outreach/files/digest-outreach-1.2.6
deleted file mode 100644
index f96944f..0000000
--- a/www-apps/outreach/files/digest-outreach-1.2.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 188188ccc15a8a2f1bf34353e0ce946e OPT_1-2-6_MAX.tar.gz 3557117
-RMD160 42893b0fb7a2eeb45fb1a93541b2ee62cc9201a2 OPT_1-2-6_MAX.tar.gz 3557117
-SHA256 ada80eb0597aa171b8fe91f2f2c3d87f5e82225f444d8fc8812ef95a536bcbb6 OPT_1-2-6_MAX.tar.gz 3557117
diff --git a/www-apps/outreach/files/postinstall-en.txt b/www-apps/outreach/files/postinstall-en.txt
index eff0666..259ff5c 100644
--- a/www-apps/outreach/files/postinstall-en.txt
+++ b/www-apps/outreach/files/postinstall-en.txt
@@ -23,7 +23,7 @@ corefont package.
 
 Edit the file
 
-        /usr/lib/php/jpgraph/jpg-config.inc
+        /usr/share/php4/jpgraph/jpg-config.inc
 
 and set 
 
diff --git a/www-apps/outreach/metadata.xml b/www-apps/outreach/metadata.xml
new file mode 100644
index 0000000..6632069
--- /dev/null
+++ b/www-apps/outreach/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/outreach/outreach-1.2.6.ebuild b/www-apps/outreach/outreach-1.2.6.ebuild
deleted file mode 100644
index c669fc3..0000000
--- a/www-apps/outreach/outreach-1.2.6.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-# Source: http://bugs.gentoo.org/show_bug.cgi?id=90505
-# Submitted-By: G. Wrobel
-# Reviewed-By: wrobel 2005-12-13
-# $Id$
-
-inherit eutils webapp
-
-MY_PV=${PV//./-}
-
-DESCRIPTION="Outreach Project Tool (OPT) is a PHP general-purpose virtual commonplace for customers and \
-			developers to collaborate in developing projects."
-HOMEPAGE="http://outreach.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/OPT_${MY_PV}_MAX.tar.gz"
-
-LICENSE="GPL-2"
-IUSE=""
-KEYWORDS="~x86"
-
-RDEPEND="virtual/httpd-php
-		dev-php4/jpgraph
-		media-fonts/corefonts
-		dev-db/mysql"
-
-S=${WORKDIR}/OPT_${MY_PV}_MAX
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}/opt
-
-	epatch ${FILESDIR}/gentoo-jpgraph.patch
-	epatch ${FILESDIR}/gentoo-mysql-4.patch
-
-	cd ..
-}
-
-src_install() {
-	webapp_src_preinst
-
-	DOCS="CHANGES INSTALL README docs/*"
-
-	# Do documentation
-	for docfile in ${DOCS}
-	do
-	  dodoc ${docfile}
-	done
-
-	# Copy files to destination
-	cp -R opt/* ${D}/${MY_HTDOCSDIR}
-
-	# Remove documentation
-	for docfile in ${DOCS}
-	do
-	  rm -rf ${D}/${MY_HTDOCSDIR}/${docfile}
-	done
-
-	# Remove libraries
-	rm -rf ${D}/${MY_HTDOCSDIR}/include/jpgraph
-	rm -rf ${D}/${MY_HTDOCSDIR}/include/horde
-
-	# Change permissions for web-based setup
-	for srvown in include/setup_lock include/OPT_lib.php include/mail_retrieve.pl include/cvs_parse.pl
-	do
-	  touch ${D}${MY_HTDOCSDIR}/${srvown}
-	  webapp_serverowned ${MY_HTDOCSDIR}/${srvown}
-	done
-
-	# Post install
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
-
-	webapp_src_install
-}
diff --git a/www-apps/outreach/outreach-1.2.7.ebuild b/www-apps/outreach/outreach-1.2.7.ebuild
index c669fc3..2fcf4ac 100644
--- a/www-apps/outreach/outreach-1.2.7.ebuild
+++ b/www-apps/outreach/outreach-1.2.7.ebuild
@@ -1,18 +1,16 @@
-# 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=90505
 # Submitted-By: G. Wrobel
 # Reviewed-By: wrobel 2005-12-13
-# $Id$
 
-inherit eutils webapp
+inherit eutils webapp depend.php
 
 MY_PV=${PV//./-}
 
-DESCRIPTION="Outreach Project Tool (OPT) is a PHP general-purpose virtual commonplace for customers and \
-			developers to collaborate in developing projects."
+DESCRIPTION="PHP general-purpose virtual commonplace for customers and developers to collaborate in developing projects."
 HOMEPAGE="http://outreach.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/OPT_${MY_PV}_MAX.tar.gz"
 
@@ -20,16 +18,21 @@ LICENSE="GPL-2"
 IUSE=""
 KEYWORDS="~x86"
 
-RDEPEND="virtual/httpd-php
-		dev-php4/jpgraph
-		media-fonts/corefonts
-		dev-db/mysql"
+RDEPEND="dev-php4/jpgraph
+	media-fonts/corefonts"
+
+need_php4_httpd
 
 S=${WORKDIR}/OPT_${MY_PV}_MAX
 
+pkg_setup() {
+	require_php_with_use mysql
+	webapp_pkg_setup
+}
+
 src_unpack() {
 	unpack ${A}
-	cd ${S}/opt
+	cd "${S}"/opt
 
 	epatch ${FILESDIR}/gentoo-jpgraph.patch
 	epatch ${FILESDIR}/gentoo-mysql-4.patch
@@ -40,36 +43,27 @@ src_unpack() {
 src_install() {
 	webapp_src_preinst
 
-	DOCS="CHANGES INSTALL README docs/*"
-
 	# Do documentation
-	for docfile in ${DOCS}
-	do
-	  dodoc ${docfile}
+	local DOCS="CHANGES INSTALL README docs/*"
+	for docfile in ${DOCS} ; do
+		dodoc ${docfile}
 	done
 
-	# Copy files to destination
-	cp -R opt/* ${D}/${MY_HTDOCSDIR}
+	cp -R opt/* "${D}"/${MY_HTDOCSDIR}
 
-	# Remove documentation
-	for docfile in ${DOCS}
-	do
-	  rm -rf ${D}/${MY_HTDOCSDIR}/${docfile}
+	# Remove documentation and bundled php libs
+	for docfile in ${DOCS} ; do
+		rm -rf "${D}"/${MY_HTDOCSDIR}/${docfile}
 	done
-
-	# Remove libraries
-	rm -rf ${D}/${MY_HTDOCSDIR}/include/jpgraph
-	rm -rf ${D}/${MY_HTDOCSDIR}/include/horde
+	rm -rf "${D}"/${MY_HTDOCSDIR}/include/jpgraph
+	rm -rf "${D}"/${MY_HTDOCSDIR}/include/horde
 
 	# Change permissions for web-based setup
-	for srvown in include/setup_lock include/OPT_lib.php include/mail_retrieve.pl include/cvs_parse.pl
-	do
-	  touch ${D}${MY_HTDOCSDIR}/${srvown}
-	  webapp_serverowned ${MY_HTDOCSDIR}/${srvown}
+	for srvown in include/setup_lock include/OPT_lib.php include/mail_retrieve.pl include/cvs_parse.pl ; do
+		touch "${D}"${MY_HTDOCSDIR}/${srvown}
+		webapp_serverowned ${MY_HTDOCSDIR}/${srvown}
 	done
 
-	# Post install
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
-
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
 	webapp_src_install
 }