alpha1-r2 in stable, add alpha2.

5 files changed, 124 insertions, 10 deletions

diff --git a/net-www/mod_scgi/ChangeLog b/net-www/mod_scgi/ChangeLog
index 026e7662af24..764df4a55200 100644
--- a/net-www/mod_scgi/ChangeLog
+++ b/net-www/mod_scgi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-www/mod_scgi
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_scgi/ChangeLog,v 1.6 2003/12/03 23:51:18 robbat2 Exp $
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_scgi/ChangeLog,v 1.7 2004/05/22 01:12:44 robbat2 Exp $
+
+*mod_scgi-1.2_alpha2 (21 May 2004)
+
+  21 May 2004; Robin H. Johnson <robbat2@gentoo.org>
+  mod_scgi-1.2_alpha1-r2.ebuild, mod_scgi-1.2_alpha2.ebuild:
+  alpha1-r2 in stable, add alpha2.
 
 *mod_scgi-1.2_alpha1-r2 (03 Dec 2003)
 
diff --git a/net-www/mod_scgi/Manifest b/net-www/mod_scgi/Manifest
index 084783ca4c6e..01303905bdfb 100644
--- a/net-www/mod_scgi/Manifest
+++ b/net-www/mod_scgi/Manifest
@@ -1,9 +1,11 @@
-MD5 8b8752b59b25941f5ce99358b11518e4 mod_scgi-1.2_alpha1-r2.ebuild 3021
+MD5 e9cc8f2cc1a21957eec9f910c6765c01 mod_scgi-1.2_alpha1-r2.ebuild 3020
+MD5 e9cc8f2cc1a21957eec9f910c6765c01 mod_scgi-1.2_alpha2.ebuild 3020
+MD5 e9c1c8e78bd64b25cefdb098c53684c1 mod_scgi-1.2_alpha1-r1.ebuild 2777
+MD5 96a06fc8afc0b592744d7ae08865e5c9 mod_scgi-1.2_alpha1.ebuild 1131
+MD5 18ac5c2cf42fdb6accfeb4817c742a4d ChangeLog 1084
+MD5 0c1ffc3eff281366ee07df94a66166e6 metadata.xml 160
 MD5 fe6e3027503038b59f1e9b4ee2cb3baa files/digest-mod_scgi-1.2_alpha1 61
+MD5 7ec590d1ee6da7b63a722808c6758ee7 files/digest-mod_scgi-1.2_alpha2 61
 MD5 98c270edf79608cb914cbc7d6ffea7b0 files/20_mod_scgi.conf 1243
 MD5 fe6e3027503038b59f1e9b4ee2cb3baa files/digest-mod_scgi-1.2_alpha1-r1 61
 MD5 fe6e3027503038b59f1e9b4ee2cb3baa files/digest-mod_scgi-1.2_alpha1-r2 61
-MD5 b83ff860aace9cb95a366277128ee705 mod_scgi-1.2_alpha1-r1.ebuild 2778
-MD5 38a813bcc97f0df0ee19ce308acff3fd mod_scgi-1.2_alpha1.ebuild 1132
-MD5 0ad5aea6605610c618a4cf29af593e88 ChangeLog 1085
-MD5 0c1ffc3eff281366ee07df94a66166e6 metadata.xml 160
diff --git a/net-www/mod_scgi/files/digest-mod_scgi-1.2_alpha2 b/net-www/mod_scgi/files/digest-mod_scgi-1.2_alpha2
new file mode 100644
index 000000000000..a7f1d9545edd
--- /dev/null
+++ b/net-www/mod_scgi/files/digest-mod_scgi-1.2_alpha2
@@ -0,0 +1 @@
+MD5 7ed218368a2dadaf8773cef944faa0bf scgi-1.2a2.tar.gz 17713
diff --git a/net-www/mod_scgi/mod_scgi-1.2_alpha1-r2.ebuild b/net-www/mod_scgi/mod_scgi-1.2_alpha1-r2.ebuild
index df8a6bc685fc..56e1c796333b 100644
--- a/net-www/mod_scgi/mod_scgi-1.2_alpha1-r2.ebuild
+++ b/net-www/mod_scgi/mod_scgi-1.2_alpha1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_scgi/mod_scgi-1.2_alpha1-r2.ebuild,v 1.1 2003/12/03 23:51:18 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_scgi/mod_scgi-1.2_alpha1-r2.ebuild,v 1.2 2004/05/22 01:12:44 robbat2 Exp $
 
 detectapache() {
 	local domsg=
@@ -45,7 +45,7 @@ URI_BASE="http://www.mems-exchange.org/software"
 HOMEPAGE="${URI_BASE}/scgi/"
 SRC_URI="${URI_BASE}/files/${MY_PN}/${MY_P}.tar.gz"
 LICENSE="CNRI"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE="apache2"
 DEPEND="${DEPEND}
 		net-www/scgi
diff --git a/net-www/mod_scgi/mod_scgi-1.2_alpha2.ebuild b/net-www/mod_scgi/mod_scgi-1.2_alpha2.ebuild
new file mode 100644
index 000000000000..c74132c7bb47
--- /dev/null
+++ b/net-www/mod_scgi/mod_scgi-1.2_alpha2.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_scgi/mod_scgi-1.2_alpha2.ebuild,v 1.1 2004/05/22 01:12:44 robbat2 Exp $
+
+detectapache() {
+	local domsg=
+	[ -n "$1" ] && domsg=1
+	HAVE_APACHE1=
+	HAVE_APACHE2=
+	has_version '=net-www/apache-1*' && HAVE_APACHE1=1
+	has_version '=net-www/apache-2*' && HAVE_APACHE2=1
+
+	[ -n "${HAVE_APACHE1}" ] && APACHEVER=1
+	[ -n "${HAVE_APACHE2}" ] && APACHEVER=2
+	[ -n "${HAVE_APACHE1}" ] && [ -n "${HAVE_APACHE2}" ] && APACHEVER='both'
+
+	case "${APACHEVER}" in
+	1) [ -n "${domsg}" ] && einfo 'Apache1 only detected' ;;
+	2) [ -n "${domsg}" ] && einfo 'Apache2 only detected';;
+	both)
+		if [ "`use apache2`" ]; then
+			[ -n "${domsg}" ] && einfo "Multiple Apache versions detected, using Apache2 (USE=apache2)"
+			APACHEVER=2
+		else
+			[ -n "${domsg}" ] && einfo 'Multiple Apache versions detected, using Apache1 (USE=-apache2)'
+			APACHEVER=1
+		fi ;;
+	*) if [ -n "${domsg}" ]; then
+			MSG="Unknown Apache version!"; eerror $MSG ; die $MSG
+	   else
+			APACHEVER=0
+	   fi; ;;
+	esac
+}
+detectapache
+SLOT="${APACHEVER}"
+[ "${APACHEVER}" -eq '2' ] && USE_APACHE2='2' || USE_APACHE2=''
+
+MY_PN=${PN/mod_}
+MY_PV=${PV/_alpha/a}
+MY_P=${MY_PN}-${MY_PV}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="Apache module for a Replacement for the CGI protocol that is similar to FastCGI"
+URI_BASE="http://www.mems-exchange.org/software"
+HOMEPAGE="${URI_BASE}/scgi/"
+SRC_URI="${URI_BASE}/files/${MY_PN}/${MY_P}.tar.gz"
+LICENSE="CNRI"
+KEYWORDS="~x86"
+IUSE="apache2"
+DEPEND="${DEPEND}
+		net-www/scgi
+		net-www/apache
+		apache2? ( >=net-www/apache-2 )"
+
+src_unpack() {
+	unpack ${A}
+	einfo "Fixing module name"
+	for f in ${S}/apache[12]/Makefile; do
+		sed -e 's/\(apxs[2]*\)/\1 -n mod_scgi/g' -i ${f}
+	done
+	for f in ${S}/apache[12]/mod_scgi.c; do
+		sed -e 's/scgi_module/mod_scgi/g' -i ${f}
+	done
+}
+
+src_compile() {
+	detectapache true
+	cd apache${APACHEVER}
+	make || die "apache${APACHEVER} mod_scgi make failed"
+}
+
+src_install() {
+	detectapache
+	newdoc apache1/README README.apache1
+	newdoc apache2/README README.apache2
+	dodoc README PKG-INFO LICENSE.txt CHANGES
+	exeinto /usr/lib/apache${APACHEVER}-extramodules
+	doexe apache${APACHEVER}/.libs/${PN}.so
+	insinto /etc/apache${APACHEVER}/conf/modules.d
+	doins ${FILESDIR}/20_mod_scgi.conf
+}
+
+pkg_postinst() {
+	detectapache
+	if [ -n "${USE_APACHE2}" ] ; then
+		einfo "Add '-D SCGI' to your APACHE2_OPTS in /etc/conf.d/apache2"
+	else
+		einfo "1. Execute the command:"
+		einfo " \"ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config\""
+		einfo "2. Edit /etc/conf.d/apache and add \"-D SCGI\" to APACHE_OPTS"
+	fi
+}
+
+pkg_config() {
+	detectapache
+	if [ -n "${USE_APACHE2}" ] ; then
+		einfo "Add '-D SCGI' to your APACHE2_OPTS in /etc/conf.d/apache2"
+	else
+		${ROOT}/usr/sbin/apacheaddmod \
+		${ROOT}/etc/apache/conf/apache.conf \
+		extramodules/mod_scgi.so mod_scgi.c scgi_module \
+		before=perl define=SCGI addconf=conf/modules.d/20_mod_scgi.conf
+		:;
+	fi
+}