Version bump. bug# 63686 Thanks Jacob Smullyan <smulloni@smullyan.org>

5 files changed, 96 insertions, 22 deletions

diff --git a/dev-python/skunkweb/ChangeLog b/dev-python/skunkweb/ChangeLog
index 916b0cf540bb..d0067c6c0944 100644
--- a/dev-python/skunkweb/ChangeLog
+++ b/dev-python/skunkweb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/skunkweb
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/skunkweb/ChangeLog,v 1.10 2004/09/28 00:41:37 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/skunkweb/ChangeLog,v 1.11 2004/10/08 16:43:09 pythonhead Exp $
+
+*skunkweb-3.4.0 (08 Oct 2004)
+
+  08 Oct 2004; Rob Cakebread <pythonhead@gentoo.org> files/skunkweb-init,
+  +skunkweb-3.4.0.ebuild:
+  Version bump. bug# 63686 Thanks Jacob Smullyan <smulloni@smullyan.org>
 
   28 Sep 2004; Sven Wegener <swegener@gentoo.org> files/skunkweb-init:
   Gentoo Technologies, Inc. -> Gentoo Foundation
@@ -15,10 +21,6 @@
   +files/skunkweb-init, skunkweb-3.4_beta5.ebuild:
   initscript added
 
-  02 Sep 2004; Seemant Kulleen <seemant@gentoo.org> skunkweb-3.4_beta5.ebuild:
-  remove sed from version calculation, it's
-  sooooooooooooooooooooooooooooooooooooo not necessary
-
   28 Jul 2004; Alastair Tse <liquidx@gentoo.org> skunkweb-3.4_beta5.ebuild:
   fix enewuser enewgroup issues (#58526)
 
diff --git a/dev-python/skunkweb/Manifest b/dev-python/skunkweb/Manifest
index cb67bda34523..7de570305027 100644
--- a/dev-python/skunkweb/Manifest
+++ b/dev-python/skunkweb/Manifest
@@ -1,17 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 5d2ad4204e4ae66c74064ca6501b8efb ChangeLog 1474
+MD5 3141342a70515d8f068ccda2ec3f4309 ChangeLog 1502
 MD5 ce3f2bc35dd35ff24c757ab6f807ddae metadata.xml 488
 MD5 545fd5a4bbb9939e5c9100b9e8797163 skunkweb-3.4_beta5.ebuild 2232
 MD5 b71c1146c21ffe63a6f7c4cf9a48e338 skunkweb-3.4_beta5-r1.ebuild 2611
+MD5 eeded26c9431b624f0e2d2dcaf7531a6 skunkweb-3.4.0.ebuild 2510
 MD5 33defac2f69099260dac7f1a043b2643 files/digest-skunkweb-3.4_beta5 67
-MD5 682c6c89005793875f61f753eb584bd7 files/skunkweb-init 642
+MD5 f733b69dfffa2d83db3841b2a94a6f49 files/skunkweb-init 617
 MD5 33defac2f69099260dac7f1a043b2643 files/digest-skunkweb-3.4_beta5-r1 67
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBWLNKI1lqEGTUzyQRArIpAJwNuAtokfMQxKNmf0lV3DPBSgbIOACgprtt
-+O2Py3sCxf0UynU6PkvSFTA=
-=Xmko
------END PGP SIGNATURE-----
+MD5 f649daf3fb435a3f6edc0307de265e57 files/digest-skunkweb-3.4.0 67
diff --git a/dev-python/skunkweb/files/digest-skunkweb-3.4.0 b/dev-python/skunkweb/files/digest-skunkweb-3.4.0
new file mode 100644
index 000000000000..1bbb13e13a26
--- /dev/null
+++ b/dev-python/skunkweb/files/digest-skunkweb-3.4.0
@@ -0,0 +1 @@
+MD5 77a6493b6b2a56df946e1c536ab1e0b0 skunkweb-3.4.0.tar.gz 1944962
diff --git a/dev-python/skunkweb/files/skunkweb-init b/dev-python/skunkweb/files/skunkweb-init
index de1c94494961..2c4d653d2291 100644
--- a/dev-python/skunkweb/files/skunkweb-init
+++ b/dev-python/skunkweb/files/skunkweb-init
@@ -1,15 +1,11 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-python/skunkweb/files/skunkweb-init,v 1.2 2004/09/28 00:41:37 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/skunkweb/files/skunkweb-init,v 1.3 2004/10/08 16:43:09 pythonhead Exp $
 
 DAEMON_CMD=/usr/bin/swmgr
 opts="${opts} configtest"
 
-depend() {
-	use apache2
-}
-
 configtest() {
 	${DAEMON_CMD} configtest
 }
diff --git a/dev-python/skunkweb/skunkweb-3.4.0.ebuild b/dev-python/skunkweb/skunkweb-3.4.0.ebuild
new file mode 100644
index 000000000000..af6b2110ffd8
--- /dev/null
+++ b/dev-python/skunkweb/skunkweb-3.4.0.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/skunkweb/skunkweb-3.4.0.ebuild,v 1.1 2004/10/08 16:43:09 pythonhead Exp $
+
+inherit eutils
+
+DESCRIPTION="robust Python web application server"
+HOMEPAGE="http://skunkweb.sourceforge.net/"
+MY_P=${P/_beta/b}
+S=${WORKDIR}/${MY_P}
+SRC_URI="mirror://sourceforge/skunkweb/${MY_P}.tar.gz"
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE="apache1 apache2 doc"
+DEPEND=">=dev-lang/python-2.2
+		>=dev-python/egenix-mx-base-2.0.4
+		apache2? ( >=net-www/apache-2.0.47 )
+		!apache2? ( apache1? ( <=net-www/apache-2 ) )"
+
+pkg_setup() {
+	enewgroup skunkweb
+	enewuser skunkweb -1 /bin/false /usr/share/skunkweb skunkweb
+}
+
+src_compile() {
+	local myconf
+	if use apache2; then
+		myconf="${myconf} --with-apxs=/usr/sbin/apxs2"
+	else
+		if use apache1; then
+			myconf="${myconf} --with-apxs=/usr/sbin/apxs"
+		else
+			myconf="${myconf} --without-mod_skunkweb"
+		fi
+	fi
+	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 \
+		${myconf} || die "configure failed"
+
+	emake || die
+}
+
+src_install() {
+	INSTALLING="yes"
+	make DESTDIR=${D} APXSFLAGS="-c" install || die
+	if use apache2; then
+		exeinto /usr/lib/apache2-extramodules
+		doexe SkunkWeb/mod_skunkweb/.libs/mod_skunkweb.so
+		insinto /etc/apache2/conf/modules.d
+		newins SkunkWeb/mod_skunkweb/httpd_conf.stub mod_skunkweb.conf
+	else
+		if use apache1; then
+			exeinto /usr/lib/apache-extramodules
+			doexe SkunkWeb/mod_skunkweb/mod_skunkweb.so
+			insinto /etc/apache/conf/addon-modules
+			newins SkunkWeb/mod_skunkweb/httpd_conf.stub mod_skunkweb.conf
+		fi
+	fi
+	# dirs --------------------------------------------------------------
+	mkdir -p ${D}/var/{lib,log}/${PN}
+	chown skunkweb:skunkweb ${D}/var/{lib,log}/${PN}
+	mkdir -p ${D}/var/lib/${PN}/run
+	# init --------------------------------------------------------------
+	exeinto /etc/init.d; newexe ${FILESDIR}/skunkweb-init skunkweb
+	# 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}
+
+	fi
+}