Fixed issue with detecting if python is compiled with threads. Added description to metadata.

5 files changed, 109 insertions, 4 deletions

diff --git a/dev-python/mod_python/ChangeLog b/dev-python/mod_python/ChangeLog
index c2f81c8ac9cf..045b4e9e79c4 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-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mod_python/ChangeLog,v 1.24 2004/07/15 02:26:10 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mod_python/ChangeLog,v 1.25 2004/09/04 08:22:25 lucass Exp $
+
+*mod_python-2.7.10-r1 (04 Sep 2004)
+
+  04 Sep 2004; Lukasz Strzygowski <lucass@gentoo.org> metadata.xml,
+  +mod_python-2.7.10-r1.ebuild:
+  Fixed issue with detecting if python is compiled with threads.
+  Added description to metadata.
 
   14 Jul 2004; Jason Wever <weeve@gentoo.org> mod_python-3.1.3.ebuild:
   Added ~sparc keyword, resolves bug #57102.
diff --git a/dev-python/mod_python/Manifest b/dev-python/mod_python/Manifest
index 52b42c532051..7af651d65db4 100644
--- a/dev-python/mod_python/Manifest
+++ b/dev-python/mod_python/Manifest
@@ -1,8 +1,10 @@
+MD5 df579dbf653971373cafd06127030640 mod_python-2.7.10-r1.ebuild 2664
+MD5 c4f91ae4a4079a42f4b5b6dbcb8f8c26 mod_python-3.1.3.ebuild 1769
+MD5 e3fe1ef2a654696a5be60895f688b11e mod_python-2.7.10.ebuild 2464
 MD5 fd0fe60f2ddcb6daa2efee4cfa9b58bd ChangeLog 3727
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
-MD5 e3fe1ef2a654696a5be60895f688b11e mod_python-2.7.10.ebuild 2464
-MD5 c4f91ae4a4079a42f4b5b6dbcb8f8c26 mod_python-3.1.3.ebuild 1769
 MD5 05bbbfafd26dcf70f83fcc2b015751dc files/16_mod_python.conf 1106
+MD5 eedde8a8dd90829d24fdb18cc86054f6 files/digest-mod_python-2.7.10-r1 66
+MD5 01ce560a5062d990e685e78b756fa5ba files/mod_python.conf 70
 MD5 eedde8a8dd90829d24fdb18cc86054f6 files/digest-mod_python-2.7.10 66
 MD5 67e42121ddce856c5d7021b3eca7abdb files/digest-mod_python-3.1.3 65
-MD5 01ce560a5062d990e685e78b756fa5ba files/mod_python.conf 70
diff --git a/dev-python/mod_python/files/digest-mod_python-2.7.10-r1 b/dev-python/mod_python/files/digest-mod_python-2.7.10-r1
new file mode 100644
index 000000000000..6786b906ffea
--- /dev/null
+++ b/dev-python/mod_python/files/digest-mod_python-2.7.10-r1
@@ -0,0 +1 @@
+MD5 12c98bdefa06735679efc878b81e9bb2 mod_python-2.7.10.tgz 175631
diff --git a/dev-python/mod_python/metadata.xml b/dev-python/mod_python/metadata.xml
index de483c53568f..d472a45ee799 100644
--- a/dev-python/mod_python/metadata.xml
+++ b/dev-python/mod_python/metadata.xml
@@ -2,4 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>python</herd>
+<longdescription>
+Mod_python is an Apache module that embeds the Python interpreter within
+the server. With mod_python you can write web-based applications in Python
+that will run many times faster than traditional CGI and will have access
+to advanced features such as ability to retain database connections and
+other data between hits and access to Apache internals.
+</longdescription>
 </pkgmetadata>
diff --git a/dev-python/mod_python/mod_python-2.7.10-r1.ebuild b/dev-python/mod_python/mod_python-2.7.10-r1.ebuild
new file mode 100644
index 000000000000..de677d8e7631
--- /dev/null
+++ b/dev-python/mod_python/mod_python-2.7.10-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2004 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.10-r1.ebuild,v 1.1 2004/09/04 08:22:25 lucass Exp $
+
+inherit python
+
+DESCRIPTION="Python module for Apache 1.x, not for Apache 2.x"
+SRC_URI="mirror://apache/modpython/${P}.tgz"
+HOMEPAGE="http://www.modpython.org/"
+
+LICENSE="as-is"
+KEYWORDS="~x86"
+SLOT="0"
+IUSE=""
+
+DEPEND="=net-www/apache-1*"
+
+src_unpack() {
+	unpack ${A}
+	# 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 -e 's:OPT=:OPT=$(OPTFLAGS):' -i ${S}/src/Makefile.in
+
+	# Python 2.3 prints True/False instead of, expected
+	# by script configure, 1/0, so we need to convert it to int.
+	sed -e 's/\(\\"thread\\" in sys.builtin_module_names\)/int(\1)/' -i ${S}/configure
+}
+
+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 || die "econf failed"
+
+	sed -e 's/LIBEXECDIR=\/usr\/lib\/apache/LIBEXECDIR=${D}\/usr\/lib\/apache-extramodules/' \
+		-e 's/PY_STD_LIB=/PY_STD_LIB=${D}/' \
+		-i Makefile
+
+	sed -e 's/CFLAGS=$(OPT) $(INCLUDES)/CFLAGS=$(OPT) $(INCLUDES) -DEAPI -O0/' \
+		-i ${S}/src/Makefile
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	python_version
+	PY_LIBPATH="/usr/lib/python${PYVER}"
+
+	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/${PF}/html
+	doins doc-html/*
+	insinto /usr/share/doc/${PF}/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
+	:;
+}