Uses new apache-module eclass: bug #79434 (thanks to Elfyn McBratney)

(Portage version: 2.0.51.19)

8 files changed, 149 insertions, 14 deletions

diff --git a/www-servers/skunkweb/ChangeLog b/www-servers/skunkweb/ChangeLog
index 4754d1188f49..4eab0b571b23 100644
--- a/www-servers/skunkweb/ChangeLog
+++ b/www-servers/skunkweb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-servers/skunkweb
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/skunkweb/ChangeLog,v 1.5 2004/12/29 01:56:18 ciaranm Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/skunkweb/ChangeLog,v 1.6 2005/03/12 15:50:32 satya Exp $
+
+*skunkweb-3.4.0-r1 (12 Mar 2005)
+
+  12 Mar 2005; Christian Andreetta <satya@gentoo.org>
+  +files/100_mod_skunkweb.conf, +skunkweb-3.4.0-r1.ebuild:
+  Uses new apache-module eclass: bug #79434 (thanks to Elfyn McBratney)
 
   29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/www-servers/skunkweb/Manifest b/www-servers/skunkweb/Manifest
index 5da6d5dddf13..84743162962f 100644
--- a/www-servers/skunkweb/Manifest
+++ b/www-servers/skunkweb/Manifest
@@ -1,10 +1,13 @@
-MD5 ec86d300c3ad032e0f6106e3bf130f66 skunkweb-3.4_beta5.ebuild 2233
-MD5 cc014bf4febf2ee039531626faf94db2 ChangeLog 2184
-MD5 08ff0fbd128af0e0777cf68774e13ccc skunkweb-3.4.0.ebuild 2671
+MD5 d18d77d6928480c06f5c87e9d054c6e8 skunkweb-3.4_beta5-r1.ebuild 2612
+MD5 cb48711ab34fd2c4b69fc4a327861337 skunkweb-3.4.0.ebuild 2671
+MD5 106adbbdb4e1ddb45407f8d3556297bf skunkweb-3.4.0-r1.ebuild 2263
+MD5 682036dd30dd1bead261ff814ab96971 ChangeLog 2404
 MD5 8ed4fe3b3e2b2cde0b1eb44f5767d209 metadata.xml 536
-MD5 67df3a6fb7b14011a6787552c9acfc93 skunkweb-3.4_beta5-r1.ebuild 2612
-MD5 33defac2f69099260dac7f1a043b2643 files/digest-skunkweb-3.4_beta5 67
+MD5 c21ba1e9b7fca9116a53dbad2a377bf7 skunkweb-3.4_beta5.ebuild 2233
+MD5 f649daf3fb435a3f6edc0307de265e57 files/digest-skunkweb-3.4.0 67
 MD5 2b9e491bd99ee6babcfc6eb3f824e646 files/skunkweb-init 518
+MD5 33defac2f69099260dac7f1a043b2643 files/digest-skunkweb-3.4_beta5 67
 MD5 595ca4b94aee6033c092990fdaed80e2 files/skunkweb-cron-cache_cleaner 108
 MD5 33defac2f69099260dac7f1a043b2643 files/digest-skunkweb-3.4_beta5-r1 67
-MD5 f649daf3fb435a3f6edc0307de265e57 files/digest-skunkweb-3.4.0 67
+MD5 2843ae875786bb890bad903d0f005381 files/100_mod_skunkweb.conf 1727
+MD5 f649daf3fb435a3f6edc0307de265e57 files/digest-skunkweb-3.4.0-r1 67
diff --git a/www-servers/skunkweb/files/100_mod_skunkweb.conf b/www-servers/skunkweb/files/100_mod_skunkweb.conf
new file mode 100644
index 000000000000..099993285e38
--- /dev/null
+++ b/www-servers/skunkweb/files/100_mod_skunkweb.conf
@@ -0,0 +1,50 @@
+<IfDefine SKUNKWEB>
+
+	<IfModule !mod_skunkweb.c>
+		LoadModule skunkweb_module modules/mod_skunkweb.so
+	</IfModule>
+
+	# This tells apache to call our module for EVERY request
+	<Location /> 
+		SetHandler skunkweb-handler
+	</Location>
+
+	# Socket address of SkunkWeb.  Either a path to a unix domain socket or
+	# a host:port pair for a TCP socket
+	SkunkWebSocketAddress localhost:9888
+
+	# Number of times to retry accessing the SkunkWeb
+	SkunkWebRetries	3	
+
+	# The location of the error page which gets displayed when SkunkWeb is
+	# not accessible
+	SkunkWebErrorDoc /usr/share/skunkweb/share/skunk/modskunkweb_error.html
+
+	# The list of users to receive critical error emails. Should be a list
+	# of space separated entries
+	SkunkWebErrorEmails	root@localhost
+
+	# List of uri prefixes for which should be handled in the normal way by
+	# apache and *not* by SkunkWeb.
+	#
+	# THIS OPTION IS NO LONGER SUPPORTED UNDER APACHE 2 AND MAY GO AWAY FOR
+	# APACHE 1.x AS YOU CAN DO THE SAME THING VIA <Location> directives
+	#
+	# SkunkWebExclude /foo/ /bar/
+
+	# In the event that we cannot reach a server running on SkunkWebSocketAddress,
+	# randomly pick socketaddresses from the following list and try to connect to
+	# them instead until we run out of retries (set by SkunkWebRetries).  
+	#
+	# SkunkWebFailoverHosts unixsocketaddr otherhost2:port
+
+	# The number of milliseconds we should wait attempting to connect before 
+	# bailing out retrying, since otherwise, we'd wait the default amount for TCP
+	# which is 2 minutes -- BLEAH!  (default is 1 second = 1000 milliseconds)
+	#
+	# SkunkWebConnectTimeout 1000
+
+	# Whether or not to include SkunkWeb/<version> in the Server header of Apache
+	# Default is On
+	# SkunkWebExpose On
+</IfDefine>
diff --git a/www-servers/skunkweb/files/digest-skunkweb-3.4.0-r1 b/www-servers/skunkweb/files/digest-skunkweb-3.4.0-r1
new file mode 100644
index 000000000000..1bbb13e13a26
--- /dev/null
+++ b/www-servers/skunkweb/files/digest-skunkweb-3.4.0-r1
@@ -0,0 +1 @@
+MD5 77a6493b6b2a56df946e1c536ab1e0b0 skunkweb-3.4.0.tar.gz 1944962
diff --git a/www-servers/skunkweb/skunkweb-3.4.0-r1.ebuild b/www-servers/skunkweb/skunkweb-3.4.0-r1.ebuild
new file mode 100644
index 000000000000..8afa579b9597
--- /dev/null
+++ b/www-servers/skunkweb/skunkweb-3.4.0-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/skunkweb/skunkweb-3.4.0-r1.ebuild,v 1.1 2005/03/12 15:50:32 satya Exp $
+
+inherit eutils apache-module
+
+DESCRIPTION="robust Python web application server"
+HOMEPAGE="http://skunkweb.sourceforge.net/"
+SRC_URI="mirror://sourceforge/skunkweb/${P}.tar.gz"
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE="doc"
+DEPEND=">=dev-lang/python-2.2
+		>=dev-python/egenix-mx-base-2.0.4"
+
+APACHE1_MOD_FILE="${S}/SkunkWeb/mod_skunkweb/mod_skunkweb.so"
+APACHE2_MOD_FILE="${S}/SkunkWeb/mod_skunkweb/.libs/mod_skunkweb.so"
+
+APACHE1_MOD_DEFINE="SKUNKWEB"
+APACHE2_MOD_DEFINE="SKUNKWEB"
+
+APACHE1_MOD_CONF="100_mod_skunkweb"
+APACHE2_MOD_CONF="100_mod_skunkweb"
+
+need_apache
+
+pkg_setup() {
+	enewgroup skunkweb
+	enewuser skunkweb -1 /bin/false /usr/share/skunkweb skunkweb
+}
+
+src_compile() {
+	local apxs
+	use apache2 && apxs="${APXS2}"
+	use apache2 || apxs="${APXS1}"
+
+	econf \
+		--with-user=skunkweb \
+		--with-group=skunkweb \
+		--localstatedir=/var/lib/skunkweb \
+		--bindir=/usr/bin \
+		--libdir=/usr/lib/skunkweb \
+		--sysconfdir=/etc/skunkweb \
+		--prefix=/usr/share/skunkweb \
+		--with-cache=/var/lib/skunkweb/cache \
+		--with-docdir=/usr/share/doc/${P} \
+		--with-logdir=/var/log/skunkweb \
+		--with-python=/usr/bin/python \
+		--with-apxs=${apxs} || die "configure failed"
+
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} APXSFLAGS="-c" install || die "make install failed"
+	apache-module_src_install
+
+	# dirs --------------------------------------------------------------
+	keepdir ${D}/var/{lib,log}/${PN}
+	keepdir ${D}/var/lib/${PN}/run
+	chown -R skunkweb:skunkweb ${D}/var/{lib,log}/${PN}
+	# scripts------------------------------------------------------------
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/skunkweb-init skunkweb
+	exeinto /etc/cron.daily
+	newexe ${FILESDIR}/skunkweb-cron-cache_cleaner skunkweb-cache_cleaner
+	# docs --------------------------------------------------------------
+	dodoc README ChangeLog NEWS HACKING ACKS INSTALL
+	if use doc; then
+		dodir /usr/share/doc/${PF}
+		cp docs/paper-letter/*.pdf ${D}/usr/share/doc/${PF}
+		ewarn "Some docs are still in upstream cvs (i.e.: formlib, pydo2)"
+	fi
+}
diff --git a/www-servers/skunkweb/skunkweb-3.4.0.ebuild b/www-servers/skunkweb/skunkweb-3.4.0.ebuild
index 7c33b9ab6641..ca8010161651 100644
--- a/www-servers/skunkweb/skunkweb-3.4.0.ebuild
+++ b/www-servers/skunkweb/skunkweb-3.4.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/skunkweb/skunkweb-3.4.0.ebuild,v 1.3 2004/11/19 11:00:56 satya Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/skunkweb/skunkweb-3.4.0.ebuild,v 1.4 2005/03/12 15:50:32 satya Exp $
 
 inherit eutils
 
diff --git a/www-servers/skunkweb/skunkweb-3.4_beta5-r1.ebuild b/www-servers/skunkweb/skunkweb-3.4_beta5-r1.ebuild
index 0d62b710c898..f19ef7b1e529 100644
--- a/www-servers/skunkweb/skunkweb-3.4_beta5-r1.ebuild
+++ b/www-servers/skunkweb/skunkweb-3.4_beta5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/skunkweb/skunkweb-3.4_beta5-r1.ebuild,v 1.1 2004/11/06 12:35:34 satya Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/skunkweb/skunkweb-3.4_beta5-r1.ebuild,v 1.2 2005/03/12 15:50:32 satya Exp $
 
 inherit eutils
 
diff --git a/www-servers/skunkweb/skunkweb-3.4_beta5.ebuild b/www-servers/skunkweb/skunkweb-3.4_beta5.ebuild
index 732d0341d3b2..3beb8a65e930 100644
--- a/www-servers/skunkweb/skunkweb-3.4_beta5.ebuild
+++ b/www-servers/skunkweb/skunkweb-3.4_beta5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/skunkweb/skunkweb-3.4_beta5.ebuild,v 1.1 2004/11/06 12:35:34 satya Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/skunkweb/skunkweb-3.4_beta5.ebuild,v 1.2 2005/03/12 15:50:32 satya Exp $
 
 inherit eutils