added webapps-apache.eclass. Closes #33319

3 files changed, 28 insertions, 19 deletions

diff --git a/net-www/moinmoin/ChangeLog b/net-www/moinmoin/ChangeLog
index bb0e087ddb99..c19feac5398f 100644
--- a/net-www/moinmoin/ChangeLog
+++ b/net-www/moinmoin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-www/moinmoin
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/moinmoin/ChangeLog,v 1.5 2003/02/12 08:51:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/moinmoin/ChangeLog,v 1.6 2003/11/16 21:51:16 mholzer Exp $
+
+  16 Nov 2003; Martin Holzer <mholzer@gentoo.org> moinmoin-1.0.ebuild:
+  added webapps-apache.eclass. Closes #33319
 
   06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
  
diff --git a/net-www/moinmoin/Manifest b/net-www/moinmoin/Manifest
index 1e34b0ad1819..d024166dee90 100644
--- a/net-www/moinmoin/Manifest
+++ b/net-www/moinmoin/Manifest
@@ -1,3 +1,3 @@
-MD5 acb45d566792eaaa922295fbc08b4af1 ChangeLog 523
-MD5 68009fd7f3c63e28cdf72d40129bf865 moinmoin-1.0.ebuild 1279
+MD5 643beb18bbd2e6add2469b5a5af8e7aa ChangeLog 641
+MD5 09f9255cdd5a6f972d0ce9671bb63b4e moinmoin-1.0.ebuild 1334
 MD5 147a676c8160b5ab61a8ca43e32fe971 files/digest-moinmoin-1.0 60
diff --git a/net-www/moinmoin/moinmoin-1.0.ebuild b/net-www/moinmoin/moinmoin-1.0.ebuild
index b05bdbaba3eb..a7c1cc0fdb57 100644
--- a/net-www/moinmoin/moinmoin-1.0.ebuild
+++ b/net-www/moinmoin/moinmoin-1.0.ebuild
@@ -1,43 +1,49 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/moinmoin/moinmoin-1.0.ebuild,v 1.7 2003/02/13 15:39:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/moinmoin/moinmoin-1.0.ebuild,v 1.8 2003/11/16 21:51:16 mholzer Exp $
+
+inherit webapp-apache
 
 PN0="moin"
 S=${WORKDIR}/${PN0}-${PV}
-HTTPD_ROOT="/home/httpd/htdocs"
-HTTPD_USER="apache"
 
 DESCRIPTION="Python WikiClone"
-
 SRC_URI="http://download.sourceforge.net/${PN0}/${PN0}-${PV}.tar.gz"
 HOMEPAGE="http://moin.sourceforge.net"
-KEYWORDS="x86 sparc "
+KEYWORDS="x86 sparc"
 SLOT="0"
 LICENSE="GPL-2"
 
 DEPEND=">=dev-lang/python-2.2"
 
-RDEPEND="net-www/apache"
+webapp-detect || NO_WEBSERVER=1
+HTTPD_USER="apache"
+HTTPD_GROUP="apache"
+
+pkg_setup() {
+	webapp-pkg_setup "${NO_WEBSERVER}"
+	einfo "Installing into ${ROOT}${HTTPD_ROOT}."
+}
 
 src_compile() {
 	python setup.py build || die "python build failed"
 }
 
 src_install () {
+	local DocumentRoot=${HTTPD_ROOT}
+	local destdir=${DocumentRoot}/${PN}
+	dodir ${destdir}
+
 	python setup.py install --root=${D} --prefix=/usr install || die "python install failed"
-	dodir ${HTTPD_ROOT}/${P}
-	dosym ${HTTPD_ROOT}/${P} ${HTTPD_ROOT}/${PN}
+
 	cd ${D}/usr/share/moin
-	cp -r data htdocs/* ${D}/${HTTPD_ROOT}/${P}
-	cp cgi-bin/* ${D}/${HTTPD_ROOT}/${P}
+	cp -r data htdocs/* ${D}/${HTTPD_ROOT}/${PN}
+	cp cgi-bin/* ${D}/${HTTPD_ROOT}/${PN}
 	cd ${D}/${HTTPD_ROOT}
-	chown -R ${HTTPD_USER}.${HTTPD_USER} ${P}
-	cd ${D}/${HTTPD_ROOT}/${P}
+	chown -R ${HTTPD_USER}.${HTTPD_USER} ${PN}
+	cd ${D}/${HTTPD_ROOT}/${PN}
 	chmod  a+x moin.cgi
-	mv moin_config.py moin_config.py.orig
-	sed -e "s/\/wiki/\/moinmoin/" moin_config.py.orig \
-		> moin_config.py
-	rm moin_config.py.orig
+	sed -i -e "s/\/wiki/\/moinmoin/" moin_config.py
 }
 
 pkg_postinst() {