adding webapps-apache. Closes #35183

3 files changed, 29 insertions, 29 deletions

diff --git a/net-www/horde-chora/ChangeLog b/net-www/horde-chora/ChangeLog
index 9cc660cfcd35..2549eb3479cf 100644
--- a/net-www/horde-chora/ChangeLog
+++ b/net-www/horde-chora/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-www/horde-chora
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/horde-chora/ChangeLog,v 1.9 2003/10/18 18:54:59 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/horde-chora/ChangeLog,v 1.10 2003/12/08 01:56:15 mholzer Exp $
+
+  08 Dec 2003; Martin Holzer <mholzer@gentoo.org> horde-chora-1.2-r1.ebuild:
+  adding webapps-apache. Closes #35183
 
   19 Oct 2003; Martin Holzer <mholzer@gentoo.org> horde-chora-1.2-r1.ebuild:
   marked x86 stable.
diff --git a/net-www/horde-chora/Manifest b/net-www/horde-chora/Manifest
index cdee9fd6945c..0f37bdaaa97c 100644
--- a/net-www/horde-chora/Manifest
+++ b/net-www/horde-chora/Manifest
@@ -1,7 +1,7 @@
-MD5 97190cceb380414e49c20d39aba2d15e ChangeLog 1085
-MD5 94cd6f2248ab1c81a12fe9281f83c5bb horde-chora-1.1.ebuild 2077
-MD5 b52089382fb112a9fe186e84ac512661 horde-chora-1.2-r1.ebuild 1581
 MD5 4b47e4c7d98695babfc786af50c63c45 horde-chora-1.2.ebuild 2081
-MD5 033bd6c3aab6f738bb6b542b65c86133 files/digest-horde-chora-1.1 62
+MD5 94cd6f2248ab1c81a12fe9281f83c5bb horde-chora-1.1.ebuild 2077
+MD5 0be51d372b22af78f13a7dcb5c97a0e5 ChangeLog 1203
+MD5 8217237732be934074cd7b08c60a20cf horde-chora-1.2-r1.ebuild 1393
 MD5 4e7d3aeb55f6a66a360f0c4571a7804b files/digest-horde-chora-1.2 61
+MD5 033bd6c3aab6f738bb6b542b65c86133 files/digest-horde-chora-1.1 62
 MD5 4e7d3aeb55f6a66a360f0c4571a7804b files/digest-horde-chora-1.2-r1 61
diff --git a/net-www/horde-chora/horde-chora-1.2-r1.ebuild b/net-www/horde-chora/horde-chora-1.2-r1.ebuild
index 893e9bf06c31..0bce42ab08e2 100644
--- a/net-www/horde-chora/horde-chora-1.2-r1.ebuild
+++ b/net-www/horde-chora/horde-chora-1.2-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/horde-chora/horde-chora-1.2-r1.ebuild,v 1.5 2003/10/18 19:00:23 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/horde-chora/horde-chora-1.2-r1.ebuild,v 1.6 2003/12/08 01:56:15 mholzer Exp $
+
+inherit webapp-apache
 
 DESCRIPTION="Chora ${PV} is the Horde CVS viewer."
 HOMEPAGE="http://www.horde.org"
@@ -10,45 +12,40 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ~ppc ~sparc ~alpha"
 DEPEND=""
-RDEPEND=">=net-www/horde-2.2.1
+RDEPEND=">=net-www/horde-2.2.4
 	>=app-text/rcs-5.7-r1
 	>=dev-util/cvs-1.11.2"
 IUSE=""
 S=${WORKDIR}/${MY_P}
 
-find_http_root() {
-	HTTPD_ROOT=`grep apache /etc/passwd | cut -d: -f6`/htdocs
-	if [ -z "${HTTPD_ROOT}" ]; then
-		eerror "HTTPD_ROOT is null! Using defaults."
-		eerror "You probably want to check /etc/passwd"
-		HTTPD_ROOT="/home/httpd/htdocs"
-	fi
+webapp-detect || NO_WEBSERVER=1
+
+pkg_setup() {
+	webapp-pkg_setup "${NO_WEBSERVER}"
+	einfo "Installing into ${ROOT}${HTTPD_ROOT}."
 
-	REGISTRY=${HTTPD_ROOT}/horde/config/registry.php
+	export REGISTRY=${HTTPD_ROOT}/horde/config/registry.php
 	[ -f ${REGISTRY} ] || REGISTRY=${HTTPD_ROOT}/horde/config/registry.php.dist
+	[ -f ${REGISTRY} ] || die "${REGISTRY} not found"
 }
 
 src_install () {
-	find_http_root
-
-	# detecting apache usergroup
-	GID=`grep apache /etc/group |cut -d: -f3`
-	if [ -z "${GID}" ]; then
-		einfo "Using default GID of 81 for Apache"
-		GID=81
-	fi
+	local DocumentRoot=${HTTPD_ROOT}
+	local destdir=${DocumentRoot}/horde/chora
 
 	dodoc COPYING README docs/*
 	rm -rf COPYING README docs
-	dodir ${HTTPD_ROOT}/horde/chora
-	cp -r . ${D}/${HTTPD_ROOT}/horde/chora
+
+	dodir ${destdir}
+	cp -r . ${D}${destdir}
+	cd ${D}/${HTTPD_ROOT}/horde
 
 	# protecting files
-	chown -R root.${GID} ${D}/${HTTPD_ROOT}/horde/chora
-	find ${D}/${HTTPD_ROOT}/horde/chora/ -type f -exec chmod 0640 {} \;
-	find ${D}/${HTTPD_ROOT}/horde/chora/ -type d -exec chmod 0750 {} \;
+	chown -R ${HTTPD_USER}:${HTTPD_GROUP} chora
+	find ${D}/${destdir} -type f -exec chmod 0640 {} \;
+	find ${D}/${destdir} -type d -exec chmod 0750 {} \;
 }
+
 pkg_postinst() {
-	find_http_root
 	einfo "Please read /usr/share/doc/${PF}/INSTALL.gz"
 }