Bump versions and remove some old versions.

10 files changed, 110 insertions, 89 deletions

diff --git a/dev-python/mod_python/ChangeLog b/dev-python/mod_python/ChangeLog
index 48319e607fd8..ddfa9c669904 100644
--- a/dev-python/mod_python/ChangeLog
+++ b/dev-python/mod_python/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-python/mod_python
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mod_python/ChangeLog,v 1.9 2003/10/27 23:57:30 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mod_python/ChangeLog,v 1.10 2003/12/12 02:44:23 kloeri Exp $
+
+*mod_python-2.7.9 (12 Dec 2003)
+
+  12 Dec 2003; Bryan Østergaard,,, <kloeri@gentoo.org>
+  mod_python-2.7.9.ebuild, mod_python-3.0.0_beta4.ebuild,
+  mod_python-3.0.1.ebuild, mod_python-3.0.4.ebuild,
+  files/mod_python-3.0.0_beta4-destdir.diff:
+  Bump versions and remove some old versions.
 
   28 Oct 2003; Bryan Østergaard <kloeri@gentoo.org>
   mod_python-3.0.3.ebuild:
diff --git a/dev-python/mod_python/Manifest b/dev-python/mod_python/Manifest
index 1848877a17e3..f1f5049134d9 100644
--- a/dev-python/mod_python/Manifest
+++ b/dev-python/mod_python/Manifest
@@ -1,8 +1,8 @@
-MD5 02d366923474967885982ce47cb121fb mod_python-3.0.4.ebuild 1679
+MD5 a180d5294738800bf9e8553fea94fe3a mod_python-3.0.4.ebuild 1679
 MD5 e1b86e5574bcdb91f2574b467320fd89 mod_python-2.7.8.ebuild 2482
 MD5 1f8667cc283448c799ca483f659e487f mod_python-3.0.3.ebuild 1658
-MD5 8adc55136e381293806630520d26d90a mod_python-2.7.9.ebuild 2567
-MD5 001ec247084f2976db970717fb6bd78a ChangeLog 1429
+MD5 8d354ec671cfdc297b13dd29a7d0e2c4 mod_python-2.7.9.ebuild 2564
+MD5 c190e983c1428e90c242f849e1322a95 ChangeLog 1720
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
 MD5 ff854e7ccb21572faafdc9bc82795c11 files/mod_python-3.0.3-dest1.diff 376
 MD5 155cbbec64eef8aba0304289113190f4 files/mod_python-3.0.3-dest2.diff 438
diff --git a/dev-python/mod_python/files/digest-mod_python-2.7.9 b/dev-python/mod_python/files/digest-mod_python-2.7.9
new file mode 100644
index 000000000000..7dfa49a5e755
--- /dev/null
+++ b/dev-python/mod_python/files/digest-mod_python-2.7.9
@@ -0,0 +1 @@
+MD5 fc8c83b310d22a75491de3c2647a0f71 mod_python-2.7.9.tgz 176181
diff --git a/dev-python/mod_python/files/digest-mod_python-3.0.0_beta4 b/dev-python/mod_python/files/digest-mod_python-3.0.0_beta4
deleted file mode 100644
index 8b7911290d67..000000000000
--- a/dev-python/mod_python/files/digest-mod_python-3.0.0_beta4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3846e3dc817cb8aca702e9d66ff2ce73 mod_python-3.0.0-BETA4.tgz 211306
diff --git a/dev-python/mod_python/files/digest-mod_python-3.0.1 b/dev-python/mod_python/files/digest-mod_python-3.0.1
deleted file mode 100644
index b20daef4acbf..000000000000
--- a/dev-python/mod_python/files/digest-mod_python-3.0.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 41e587e2347449d60ed4ea02ffbc8a14 mod_python-3.0.1.tgz 213491
diff --git a/dev-python/mod_python/files/digest-mod_python-3.0.4 b/dev-python/mod_python/files/digest-mod_python-3.0.4
new file mode 100644
index 000000000000..3eefc4f3ee99
--- /dev/null
+++ b/dev-python/mod_python/files/digest-mod_python-3.0.4
@@ -0,0 +1 @@
+MD5 d4a51a049f84c5150878625911d8f1d5 mod_python-3.0.4.tgz 218692
diff --git a/dev-python/mod_python/files/mod_python-3.0.0_beta4-destdir.diff b/dev-python/mod_python/files/mod_python-3.0.0_beta4-destdir.diff
deleted file mode 100644
index 1b040ca9962f..000000000000
--- a/dev-python/mod_python/files/mod_python-3.0.0_beta4-destdir.diff
+++ /dev/null
@@ -1,29 +0,0 @@
---- Makefile.in.orig	2002-11-27 10:51:39.000000000 -0500
-+++ Makefile.in	2002-11-27 10:52:16.000000000 -0500
-@@ -92,7 +92,7 @@
- 	@echo
- 	@echo "Performing DSO installation."
- 	@echo
--	$(INSTALL) src/mod_python.so $(LIBEXECDIR)
-+	$(INSTALL) src/mod_python.so $(DESTDIR)$(LIBEXECDIR)
- 	@$(MAKE) install_py_lib
- 	@echo
- 	@echo "Now don't forget to edit your main config and add"
-@@ -102,13 +102,13 @@
- 	@echo
- 
- install_py_lib:
--	$(INSTALL) -d $(PY_STD_LIB)/site-packages/mod_python
-+	$(INSTALL) -d $(DESTDIR)$(PY_STD_LIB)/site-packages/mod_python
- 	@for f in `ls lib/python/mod_python/*.py`; \
- 	do \
--		$(INSTALL) $$f $(PY_STD_LIB)/site-packages/mod_python; \
-+		$(INSTALL) $$f $(DESTDIR)$(PY_STD_LIB)/site-packages/mod_python; \
- 	done
--	${PYTHON_BIN} $(PY_STD_LIB)/compileall.py $(PY_STD_LIB)/site-packages/mod_python
--	${PYTHON_BIN} -O $(PY_STD_LIB)/compileall.py $(PY_STD_LIB)/site-packages/mod_python
-+	${PYTHON_BIN} $(PY_STD_LIB)/compileall.py $(DESTDIR)$(PY_STD_LIB)/site-packages/mod_python
-+	${PYTHON_BIN} -O $(PY_STD_LIB)/compileall.py $(DESTDIR)$(PY_STD_LIB)/site-packages/mod_python
- 
- clean:
- 	cd src && $(MAKE) clean
diff --git a/dev-python/mod_python/mod_python-2.7.9.ebuild b/dev-python/mod_python/mod_python-2.7.9.ebuild
new file mode 100644
index 000000000000..f055b9a2ae55
--- /dev/null
+++ b/dev-python/mod_python/mod_python-2.7.9.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mod_python/mod_python-2.7.9.ebuild,v 1.1 2003/12/12 02:44:23 kloeri Exp $
+
+DESCRIPTION="Python module for Apache 1.x, not for Apache 2.x"
+SRC_URI="http://www.apache.org/dist/httpd/modpython/${P}.tgz"
+HOMEPAGE="http://www.modpython.org/"
+
+LICENSE="as-is"
+KEYWORDS="~x86"
+SLOT="0"
+
+DEPEND="=net-www/apache-1* dev-lang/python"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	# This patch from SuSE fixes the missing CFLAGS.
+	# If you remove it, your apache will most likely
+	# fail (lots of dieing pids in error_log).
+	sed -i -e 's:OPT=:OPT=$(OPTFLAGS):' src/Makefile.in
+}
+
+src_compile() {
+	# If we dont add that, ./configure breaks this ebuild
+	# because the last task (make depend) is somehow borked
+	echo 'echo "configure done"' >> configure
+
+	export OPTFLAGS="`/usr/sbin/apxs -q CFLAGS`"
+	econf --with-apxs=/usr/sbin/apxs
+
+	cp Makefile Makefile.orig
+	sed -e 's/LIBEXECDIR=\/usr\/lib\/apache/LIBEXECDIR=${D}\/usr\/lib\/apache-extramodules/' \
+		-e 's/PY_STD_LIB=/PY_STD_LIB=${D}/' \
+		Makefile.orig > Makefile
+
+	cd src
+	cp Makefile Makefile.orig
+	sed -e 's/CFLAGS=$(OPT) $(INCLUDES)/CFLAGS=$(OPT) $(INCLUDES) -DEAPI -O0/' \
+		Makefile.orig > Makefile
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	PY_LIBPATH="/usr/lib/python$(python -c 'import sys; print sys.version[0:3]')"
+
+	dodir /usr/lib/apache-extramodules
+	dodir ${PY_LIBPATH}
+	dodir /etc/apache/conf/addon-modules
+
+	# compileall.py is needed or make install will fail
+	cp ${PY_LIBPATH}/compileall.py ${D}${PY_LIBPATH}
+	emake D=${D} install || die
+	rm ${D}${PY_LIBPATH}/compileall.py
+
+	insinto /etc/apache/conf/addon-modules
+	doins ${FILESDIR}/mod_python.conf
+	dodoc COPYRIGHT CREDITS NEWS README
+	insinto /usr/share/doc/${P}/html
+	doins doc-html/*
+	insinto /usr/share/doc/${P}/html/icons
+	doins doc-html/icons/*
+}
+
+pkg_postinst() {
+	einfo
+	einfo "To have Apache run python programs, please do the following:"
+	einfo "1. Execute the command:"
+	einfo " \"ebuild /var/db/pkg/dev-python/${PF}/${PF}.ebuild config\""
+	einfo "2. Edit /etc/conf.d/apache and add \"-D PYTHON\""
+	einfo
+	einfo "That will include the ${PN} mime types in your configuration"
+	einfo "automagically and setup Apache to load ${PN} when it starts."
+	einfo
+}
+
+pkg_config() {
+	${ROOT}/usr/sbin/apacheaddmod \
+		${ROOT}/etc/apache/conf/apache.conf \
+		extramodules/mod_python.so mod_python.c python_module \
+		before=perl define=PYTHON addconf=conf/addon-modules/mod_python.conf
+	:;
+}
diff --git a/dev-python/mod_python/mod_python-3.0.0_beta4.ebuild b/dev-python/mod_python/mod_python-3.0.0_beta4.ebuild
deleted file mode 100644
index ed4bcbf63681..000000000000
--- a/dev-python/mod_python/mod_python-3.0.0_beta4.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mod_python/mod_python-3.0.0_beta4.ebuild,v 1.6 2003/11/14 11:43:07 seemant Exp $
-
-DESCRIPTION="An Apache2 DSO providing an embedded Python interpreter"
-HOMEPAGE="http://www.modpython.org/"
-
-NEWP="`echo ${P} | sed -e 's|_beta|-BETA|'`"
-S=${WORKDIR}/${NEWP}
-SRC_URI="http://www.apache.org/dist/httpd/modpython/dev/${NEWP}.tgz"
-DEPEND="dev-lang/python =net-www/apache-2*"
-LICENSE="Apache-1.1"
-KEYWORDS="~x86"
-IUSE=""
-SLOT="0"
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S} || die
-	patch -p0 <${FILESDIR}/mod_python-3.0.0_beta4-destdir.diff || die
-}
-
-src_compile() {
-	./configure --with-apxs=/usr/sbin/apxs2 || die
-	make OPT="`apxs2 -q CFLAGS` -fPIC" || die
-}
-
-src_install() {
-	dodir /usr/lib/{apache2,apache2-extramodules}
-	make install DESTDIR=${D} || die
-	mv ${D}/usr/lib/apache2/${PN}.so ${D}/usr/lib/apache2-extramodules
-	rm -rf ${D}/usr/lib/apache2
-	insinto /etc/apache2/conf/modules.d
-	doins ${FILESDIR}/16_mod_python.conf
-	dodoc ${FILESDIR}/16_mod_python.conf README NEWS CREDITS COPYRIGHT
-	dohtml doc-html/*
-}
-
-pkg_postinst() {
-	einfo "To have Apache run python programs, please do the following:"
-	einfo "Edit /etc/conf.d/apache2 (/etc/conf.d/apache if you're using"
-	einfo "apache 1.x) and add \"-D PYTHON\""
-	einfo "That will setup Apache to load python when it starts."
-	einfo
-	einfo "If you're new to mod_python there's a manual and tutorial"
-	einfo "installed in /usr/share/doc/${P}/html/index.html."
-}
diff --git a/dev-python/mod_python/mod_python-3.0.1.ebuild b/dev-python/mod_python/mod_python-3.0.4.ebuild
index f2e8c5f03ee2..f965ecd02f7d 100644
--- a/dev-python/mod_python/mod_python-3.0.1.ebuild
+++ b/dev-python/mod_python/mod_python-3.0.4.ebuild
@@ -1,21 +1,27 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mod_python/mod_python-3.0.1.ebuild,v 1.6 2003/10/06 06:48:36 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mod_python/mod_python-3.0.4.ebuild,v 1.1 2003/12/12 02:44:23 kloeri Exp $
+
 
 DESCRIPTION="An Apache2 DSO providing an embedded Python interpreter"
 HOMEPAGE="http://www.modpython.org/"
-
 SRC_URI="http://www.apache.org/dist/httpd/modpython/${P}.tgz"
-DEPEND="dev-lang/python >=net-www/apache-2.0"
 LICENSE="Apache-1.1"
+SLOT="0"
 KEYWORDS="~x86"
 IUSE=""
-SLOT="0"
+DEPEND="dev-lang/python >=net-www/apache-2.0"
 
 src_unpack() {
 	unpack ${A} || die
 	cd ${S} || die
-	patch -p0 <${FILESDIR}/mod_python-3.0.0_beta4-destdir.diff || die
+	sed -i -e 's:mod_python.so :mod_python.so $(DESTDIR):' Makefile.in
+	sed -i -e 's:--optimize 2:--prefix=${DESTDIR}/usr --optimize 2:' dist/Makefile.in
+
+	# Fix compilation when using Python-2.3
+	has_version ">=dev-lang/python-2.3" && \
+		sed -i -e 's:LONG_LONG:PY_LONG_LONG:g' \
+		"${S}/src/requestobject.c"
 }
 
 src_compile() {
@@ -36,8 +42,7 @@ src_install() {
 
 pkg_postinst() {
 	einfo "To have Apache run python programs, please do the following:"
-	einfo "Edit /etc/conf.d/apache2 (/etc/conf.d/apache if you're using"
-	einfo "apache 1.x) and add \"-D PYTHON\""
+	einfo "Edit /etc/conf.d/apache2 and add \"-D PYTHON\""
 	einfo "That will setup Apache to load python when it starts."
 	einfo
 	einfo "If you're new to mod_python there's a manual and tutorial"