Version bump + uses new apache-module eclass. All changes by Benedikt Boehm <hollow@gentoo.org>.

Package-Manager: portage-2.0.51-r15

6 files changed, 135 insertions, 16 deletions

diff --git a/dev-python/mod_python/ChangeLog b/dev-python/mod_python/ChangeLog
index a700c1e428fb..02d39a527c0d 100644
--- a/dev-python/mod_python/ChangeLog
+++ b/dev-python/mod_python/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/mod_python
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mod_python/ChangeLog,v 1.28 2005/02/11 19:45:40 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mod_python/ChangeLog,v 1.29 2005/02/26 12:27:02 kloeri Exp $
+
+*mod_python-2.7.11 (26 Feb 2005)
+
+  26 Feb 2005; Bryan Østergaard <kloeri@gentoo.org>
+  +mod_python-2.7.11.ebuild, +mod_python-3.1.4.ebuild:
+  Version bump + uses new apache-module eclass. All changes by Benedikt Boehm
+  <hollow@gentoo.org>.
 
   11 Feb 2005; Rob Cakebread <pythonhead@gentoo.org>
   +files/publisher-2.diff, mod_python-3.1.3.ebuild:
diff --git a/dev-python/mod_python/Manifest b/dev-python/mod_python/Manifest
index 948051455924..d722aef8bb03 100644
--- a/dev-python/mod_python/Manifest
+++ b/dev-python/mod_python/Manifest
@@ -1,23 +1,17 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 12c3fe9490e1bfb49d7085703b7ceefb ChangeLog 4354
 MD5 19c5d014ef01ffef8f4e55360e14b8ad metadata.xml 546
+MD5 c2bbe7ffe039697fc1245c3b8cfc0ff4 mod_python-2.7.11.ebuild 1500
 MD5 67997ffb188bf18507f6a2ac093227a6 mod_python-2.7.10.ebuild 2466
 MD5 56e0e23014de3fcd64cd488154dc0c14 mod_python-2.7.10-r1.ebuild 2670
-MD5 eeb4d18110c623dfed18a9c097b39a97 mod_python-3.1.3.ebuild 1879
 MD5 7a9f8809160500edcc3f6adfee451a0a mod_python-3.1.3-r1.ebuild 1881
+MD5 12c3fe9490e1bfb49d7085703b7ceefb ChangeLog 4354
+MD5 d9ed9529a769dc24ff5c9c8054f608a1 mod_python-3.1.4.ebuild 1556
+MD5 eeb4d18110c623dfed18a9c097b39a97 mod_python-3.1.3.ebuild 1879
+MD5 01ce560a5062d990e685e78b756fa5ba files/mod_python.conf 70
+MD5 eedde8a8dd90829d24fdb18cc86054f6 files/digest-mod_python-2.7.10-r1 66
+MD5 c4619f17df8352dc648c0f89b61e17b6 files/digest-mod_python-3.1.4 65
+MD5 67e42121ddce856c5d7021b3eca7abdb files/digest-mod_python-3.1.3 65
 MD5 0779383c65d90a5161e7a11ab5bbbbec files/publisher-2.diff 1383
 MD5 05bbbfafd26dcf70f83fcc2b015751dc files/16_mod_python.conf 1106
 MD5 eedde8a8dd90829d24fdb18cc86054f6 files/digest-mod_python-2.7.10 66
-MD5 eedde8a8dd90829d24fdb18cc86054f6 files/digest-mod_python-2.7.10-r1 66
 MD5 67e42121ddce856c5d7021b3eca7abdb files/digest-mod_python-3.1.3-r1 65
-MD5 67e42121ddce856c5d7021b3eca7abdb files/digest-mod_python-3.1.3 65
-MD5 01ce560a5062d990e685e78b756fa5ba files/mod_python.conf 70
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCDQucz2gxt1z4IGYRAvYcAKCZInvT5msBBpzbmXEpgLV9NaQNLQCgsvOa
-5q5i7ahR1JHWv/UEAHnBUGw=
-=wDqr
------END PGP SIGNATURE-----
+MD5 f9aea2b5454c22f2e134e3698099f890 files/digest-mod_python-2.7.11 66
diff --git a/dev-python/mod_python/files/digest-mod_python-2.7.11 b/dev-python/mod_python/files/digest-mod_python-2.7.11
new file mode 100644
index 000000000000..964923f843cb
--- /dev/null
+++ b/dev-python/mod_python/files/digest-mod_python-2.7.11
@@ -0,0 +1 @@
+MD5 edea9de6c6273c1e0df8df4b10d247aa mod_python-2.7.11.tgz 175763
diff --git a/dev-python/mod_python/files/digest-mod_python-3.1.4 b/dev-python/mod_python/files/digest-mod_python-3.1.4
new file mode 100644
index 000000000000..6bcbaf03bc26
--- /dev/null
+++ b/dev-python/mod_python/files/digest-mod_python-3.1.4
@@ -0,0 +1 @@
+MD5 607175958137b06bcda91110414c82a1 mod_python-3.1.4.tgz 308510
diff --git a/dev-python/mod_python/mod_python-2.7.11.ebuild b/dev-python/mod_python/mod_python-2.7.11.ebuild
new file mode 100644
index 000000000000..4452b6868e18
--- /dev/null
+++ b/dev-python/mod_python/mod_python-2.7.11.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mod_python/mod_python-2.7.11.ebuild,v 1.1 2005/02/26 12:27:02 kloeri Exp $
+
+inherit python apache-module
+
+DESCRIPTION="Python module for Apache 1.x, not for Apache 2.x"
+SRC_URI="mirror://apache/httpd/modpython/${P}.tgz"
+HOMEPAGE="http://www.modpython.org/"
+
+LICENSE="as-is"
+KEYWORDS="~x86"
+SLOT="0"
+IUSE=""
+
+APACHE1_MOD_CONF="${PV}/16_${PN}"
+APACHE1_MOD_DEFINE="PYTHON"
+
+DOCFILES="COPYRIGHT CREDITS NEWS README"
+
+need_apache1
+
+src_compile() {
+	sed -ie 's:OPT=:OPT=$(OPTFLAGS):' ${S}/src/Makefile.in
+	sed -ie 's/\(\\"thread\\" in sys.builtin_module_names\)/int(\1)/' ${S}/configure
+
+	export OPTFLAGS="`/usr/sbin/apxs -q CFLAGS`"
+	econf --with-apxs=${APXS1} || die "econf failed"
+
+	sed -ie 's:LIBEXECDIR=:LIBEXECDIR=${D}:' Makefile
+	sed -ie 's:PY_STD_LIB=:PY_STD_LIB=${D}:' Makefile
+	sed -ie 's:CFLAGS=$(OPT) $(INCLUDES):CFLAGS=$(OPT) $(INCLUDES) -DEAPI -O0:' ${S}/src/Makefile
+	emake || die "emake failed"
+}
+
+src_install() {
+	python_version
+	PY_LIBPATH="/usr/lib/python${PYVER}"
+
+	dodir ${APACHE1_MODULESDIR}
+	dodir ${PY_LIBPATH}
+
+	# compileall.py is needed or make install will fail
+	cp ${PY_LIBPATH}/compileall.py ${D}${PY_LIBPATH}
+	emake install || die
+	rm ${D}${PY_LIBPATH}/compileall.py
+
+	insinto /usr/share/doc/${PF}/html
+	doins doc-html/*
+	insinto /usr/share/doc/${PF}/html/icons
+	doins doc-html/icons/*
+
+	apache-module_src_install
+}
diff --git a/dev-python/mod_python/mod_python-3.1.4.ebuild b/dev-python/mod_python/mod_python-3.1.4.ebuild
new file mode 100644
index 000000000000..9b61a09b5f10
--- /dev/null
+++ b/dev-python/mod_python/mod_python-3.1.4.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mod_python/mod_python-3.1.4.ebuild,v 1.1 2005/02/26 12:27:02 kloeri Exp $
+
+inherit python eutils apache-module
+
+DESCRIPTION="An Apache2 DSO providing an embedded Python interpreter"
+HOMEPAGE="http://www.modpython.org/"
+SRC_URI="mirror://apache/httpd/modpython/${P}.tgz"
+
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="x86 alpha ppc ~sparc ~amd64"
+IUSE=""
+DEPEND="dev-lang/python"
+
+APACHE2_MOD_CONF="2.7.11/16_${PN}"
+APACHE2_MOD_DEFINE="PYTHON"
+
+DOCFILES="README NEWS CREDITS COPYRIGHT"
+
+need_apache2
+
+src_unpack() {
+	unpack ${A} || die "unpack failed"
+	cd ${S} || die "cd \$S failed"
+
+	# remove optimisations, we do that outside portage
+	sed -ie 's:--optimize 2:--no-compile:' dist/Makefile.in
+
+	# Fix compilation when using Python-2.3
+	if has_version ">=dev-lang/python-2.3"; then
+		sed -ie 's:LONG_LONG:PY_LONG_LONG:g' "${S}/src/requestobject.c"
+	fi
+}
+
+src_compile() {
+	./configure --with-apxs=${APXS2} || die
+	emake OPT="`apxs2 -q CFLAGS` -fPIC" || die
+}
+
+src_install() {
+	#dodir ${APACHE2_MODULESDIR}
+	#make install DESTDIR=${D} LIBEXECDIR=/usr/lib/apache2-extramodules || die
+	emake DESTDIR=${D} install || die
+
+	dohtml doc-html/*
+	insinto /usr/share/doc/${PF}/html/icons
+	doins doc-html/icons/*
+
+	apache-module_src_install
+}
+
+pkg_postinst() {
+	python_version
+	python_mod_optimize /usr/lib/python${PYVER}/site-packages/mod_python
+	apache-module_pkg_postinst
+}
+
+pkg_postrm() {
+	python_mod_cleanup
+}