replaced ./configure with econf to force search paths to /usr rather than /usr/local (#97992)

(Portage version: 2.0.51.22-r1)

8 files changed, 83 insertions, 171 deletions

diff --git a/dev-python/mod_python/ChangeLog b/dev-python/mod_python/ChangeLog
index 7046e3074bd5..2224504c8a26 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mod_python/ChangeLog,v 1.32 2005/05/05 12:53:56 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mod_python/ChangeLog,v 1.33 2005/07/06 10:50:26 liquidx Exp $
+
+*mod_python-3.1.4-r1 (06 Jul 2005)
+
+  06 Jul 2005; Alastair Tse <liquidx@gentoo.org>
+  -mod_python-2.7.10-r1.ebuild, -mod_python-3.1.3.ebuild,
+  +mod_python-3.1.4-r1.ebuild:
+  replaced ./configure with econf to force search paths to /usr rather than
+  /usr/local (#97992)
 
   05 May 2005; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
   Add apache herd as maintainers.
diff --git a/dev-python/mod_python/Manifest b/dev-python/mod_python/Manifest
index 3066533d1833..f2d97d1396f8 100644
--- a/dev-python/mod_python/Manifest
+++ b/dev-python/mod_python/Manifest
@@ -1,28 +1,20 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 eeb4d18110c623dfed18a9c097b39a97 mod_python-3.1.3.ebuild 1879
-MD5 3cd9a71487590f5789bcb43c74698602 mod_python-2.7.11.ebuild 1712
 MD5 370b2cc46a3257f879d166f1b504ccb3 ChangeLog 4959
 MD5 5d633b60e858786a7b3676d5bc1b790a metadata.xml 566
-MD5 c21328b1a8879707a158196fc9caa5c2 mod_python-3.1.3-r1.ebuild 1875
-MD5 7014ce279d11b10e01891e484d5e6486 mod_python-3.1.4.ebuild 1534
 MD5 56e0e23014de3fcd64cd488154dc0c14 mod_python-2.7.10-r1.ebuild 2670
 MD5 67997ffb188bf18507f6a2ac093227a6 mod_python-2.7.10.ebuild 2466
+MD5 eeb4d18110c623dfed18a9c097b39a97 mod_python-3.1.3.ebuild 1879
+MD5 3cd9a71487590f5789bcb43c74698602 mod_python-2.7.11.ebuild 1712
+MD5 c21328b1a8879707a158196fc9caa5c2 mod_python-3.1.3-r1.ebuild 1875
+MD5 7014ce279d11b10e01891e484d5e6486 mod_python-3.1.4.ebuild 1534
+MD5 3a538a6c5a0062312824b8b9039e3bfc mod_python-3.1.4-r1.ebuild 1528
 MD5 05bbbfafd26dcf70f83fcc2b015751dc files/16_mod_python.conf 1106
-MD5 67e42121ddce856c5d7021b3eca7abdb files/digest-mod_python-3.1.3 65
-MD5 c4619f17df8352dc648c0f89b61e17b6 files/digest-mod_python-3.1.4 65
+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 65
+MD5 01ce560a5062d990e685e78b756fa5ba files/mod_python.conf 70
 MD5 fc933df167083c6c8abc4d2e28c6274d files/16_mod_python-r1.conf 1101
-MD5 0779383c65d90a5161e7a11ab5bbbbec files/publisher-2.diff 1383
 MD5 f9aea2b5454c22f2e134e3698099f890 files/digest-mod_python-2.7.11 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-r1 65
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCehd5Kf2g/qXtneoRAgJsAKCuLClXr40ylASM0AxmCPmYVrYH2wCfZWIx
-hvXi90pkm1lhkfwwn05MJGw=
-=lB0G
------END PGP SIGNATURE-----
+MD5 c4619f17df8352dc648c0f89b61e17b6 files/digest-mod_python-3.1.4 65
+MD5 0779383c65d90a5161e7a11ab5bbbbec files/publisher-2.diff 1383
+MD5 c4619f17df8352dc648c0f89b61e17b6 files/digest-mod_python-3.1.4-r1 65
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
deleted file mode 100644
index 6786b906ffea..000000000000
--- a/dev-python/mod_python/files/digest-mod_python-2.7.10-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 12c98bdefa06735679efc878b81e9bb2 mod_python-2.7.10.tgz 175631
diff --git a/dev-python/mod_python/files/digest-mod_python-3.1.3 b/dev-python/mod_python/files/digest-mod_python-3.1.3
deleted file mode 100644
index 2e72ee8ba450..000000000000
--- a/dev-python/mod_python/files/digest-mod_python-3.1.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2e1983e35edd428f308b0dfeb1c23bfe mod_python-3.1.3.tgz 293548
diff --git a/dev-python/mod_python/files/digest-mod_python-3.1.4-r1 b/dev-python/mod_python/files/digest-mod_python-3.1.4-r1
new file mode 100644
index 000000000000..6bcbaf03bc26
--- /dev/null
+++ b/dev-python/mod_python/files/digest-mod_python-3.1.4-r1
@@ -0,0 +1 @@
+MD5 607175958137b06bcda91110414c82a1 mod_python-3.1.4.tgz 308510
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
deleted file mode 100644
index 910a4b37e639..000000000000
--- a/dev-python/mod_python/mod_python-2.7.10-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# 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.10-r1.ebuild,v 1.2 2005/02/11 19:45:40 pythonhead 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
-	:;
-}
diff --git a/dev-python/mod_python/mod_python-3.1.3.ebuild b/dev-python/mod_python/mod_python-3.1.3.ebuild
deleted file mode 100644
index e4c4bb0bf4f4..000000000000
--- a/dev-python/mod_python/mod_python-3.1.3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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.3.ebuild,v 1.10 2005/02/11 19:45:40 pythonhead Exp $
-
-inherit python eutils
-
-DESCRIPTION="An Apache2 DSO providing an embedded Python interpreter"
-HOMEPAGE="http://www.modpython.org/"
-SRC_URI="mirror://apache/modpython/${P}.tgz"
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="x86 alpha ppc ~sparc ~amd64"
-IUSE=""
-DEPEND="dev-lang/python
-	>=net-www/apache-2.0"
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S} || die
-	# remove optimisations, we do that outside portage
-	sed -i -e 's:--optimize 2:--no-compile:' 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"
-	#Fixes publisher info leak bug# 80109 CAN-2005-0088
-	epatch ${FILESDIR}/publisher-2.diff
-}
-
-src_compile() {
-	./configure --with-apxs=/usr/sbin/apxs2 || die
-	make OPT="`apxs2 -q CFLAGS` -fPIC" || die
-}
-
-src_install() {
-	dodir /usr/lib/apache2-extramodules
-	make install DESTDIR=${D} LIBEXECDIR=/usr/lib/apache2-extramodules || die
-	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/*
-	insinto /usr/share/doc/${PF}/html/icons
-	doins doc-html/icons/*
-}
-
-pkg_postinst() {
-	python_version
-	python_mod_optimize /usr/lib/python${PYVER}/site-packages/mod_python
-
-	einfo "To have Apache run python programs, please do the following:"
-	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"
-	einfo "installed in /usr/share/doc/${PF}/html/index.html."
-}
-
-pkg_postrm() {
-	python_mod_cleanup
-}
diff --git a/dev-python/mod_python/mod_python-3.1.4-r1.ebuild b/dev-python/mod_python/mod_python-3.1.4-r1.ebuild
new file mode 100644
index 000000000000..ba0c07bc0918
--- /dev/null
+++ b/dev-python/mod_python/mod_python-3.1.4-r1.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-r1.ebuild,v 1.1 2005/07/06 10:50:26 liquidx 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() {
+	econf --with-apxs=${APXS2} || die
+	emake OPT="`apxs2 -q CFLAGS` -fPIC" || die
+}
+
+src_install() {
+	emake DESTDIR=${D} install || die
+
+	dohtml doc-html/*
+	insinto /usr/share/doc/${PF}/html/icons
+	doins doc-html/icons/*
+
+	apache-module_src_install
+	insinto ${APACHE2_MODULES_CONFDIR}
+	newins ${FILESDIR}/16_${PN}-r1.conf 16_${PN}.conf
+}
+
+pkg_postinst() {
+	python_version
+	python_mod_optimize /usr/lib/python${PYVER}/site-packages/mod_python
+	apache-module_pkg_postinst
+}
+
+pkg_postrm() {
+	python_mod_cleanup
+}