Version bump (bug 516034), taking maint.

Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090

5 files changed, 110 insertions, 7 deletions

diff --git a/www-apache/mod_python/ChangeLog b/www-apache/mod_python/ChangeLog
index 05b0fcab9e8b..aaabc1feab0b 100644
--- a/www-apache/mod_python/ChangeLog
+++ b/www-apache/mod_python/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-apache/mod_python
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_python/ChangeLog,v 1.27 2014/08/10 20:17:28 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_python/ChangeLog,v 1.28 2014/09/20 13:14:45 xmw Exp $
+
+*mod_python-3.5.0 (20 Sep 2014)
+
+  20 Sep 2014; Michael Weber <xmw@gentoo.org>
+  +files/mod_python-3.5.0-buildsystem.patch, +mod_python-3.5.0.ebuild,
+  metadata.xml:
+  Version bump (bug 516034), taking maint.
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org>
   mod_python-3.3.1-r1.ebuild:
diff --git a/www-apache/mod_python/Manifest b/www-apache/mod_python/Manifest
index 594b5066d0cc..9dedb264de1c 100644
--- a/www-apache/mod_python/Manifest
+++ b/www-apache/mod_python/Manifest
@@ -4,15 +4,20 @@ Hash: SHA256
 AUX 16_mod_python.conf 976 SHA256 a04639a0e18fc7d3f503706d285bee4a14b007ef1faa2810cd6e7ca642f2f30e SHA512 775256d40dc9faed31cc17102d3679153ae44104753ca554ce2062cc22d35fa13dc2d1868667de4286ca36a422b5aebfcecf95950dfd49e335d6f874f716965f WHIRLPOOL 158b3a049428c4766dc33079e70842a0e3c72afcc60f5bc2f84c175c91137e942191adb255f782034539c775fc59bb0aa6b9bf620eb6b637d0c4f56c95b47ba1
 AUX mod_python-3.3.1-LDFLAGS.patch 517 SHA256 22c9159bd6a752b42f79226e0c7c305478c63e0069ec34b033387055a46db17a SHA512 b2726daf6f001f0db884a82e3244166d19858a66512e373c930a9bf6a41f3d7d53a2d2e5ad241be34b5f7697a62f1b8dbe98603ca0a76337ec5e68ab39372fbb WHIRLPOOL 8924eda603b2e104bffe90a12672222c34836139a4f0556ad6cdfc882d025766504bfd83418f0671471daec7702c4798dc41234147e419b1d60f496c284ca324
 AUX mod_python-3.3.1-apache-2.4.patch 1284 SHA256 75a620f20c68b1c3a8353249956e717f317abbdb810729ea11072415435f11e6 SHA512 0f172dc1370e085f6af02aa49650dbd8889ad318f9e1da18bdd406c4be8504886655658e132a0a059c7bfb887b64690046f82509a526890d0e6eb95b62d8a641 WHIRLPOOL c382f06beb30e6f368ce31b62d4cc88d11826dff6c950034e1a149a36a3f99af55991166f65cb8d47190ee2fa99a752b7c2118852ff170faedf0516272a04257
+AUX mod_python-3.5.0-buildsystem.patch 1036 SHA256 fa179ab40bbf2ff7dfa878483fc81ab3a1c1eb3537d06df8bb4b12e78e857509 SHA512 62869fe6ea5616bd0398029df89ddbcf6c0e434a0a85756b786c10cadba0dafe5d2b4d02171a53ba09aaeb4b47ea4e6c91859e1f41bf723e4de4b01cc9301ffb WHIRLPOOL a9648d6b32e84ceb2167b0f14e0819a7dac2b3394728dc7177cb63fd410f0d053f506409c3bef5b297609972590c7ebd30c93bfa0a8c88d8308a1a0d6a2b77f9
 AUX mod_python-apr_brigade_sentinel.patch 520 SHA256 d2cf3ed0d8261dbe8262a394e9723601bc6d87ec24ea8dbcb1b3bc5c58eaa67b SHA512 85065cbd556e22a7dfbad825c74a571eab05a1b7c7855a149529ee69f6d44362372d46637fea86e29154fc00d7ba5907124c4096f8fc2f71259ac64a4dc34da9 WHIRLPOOL 429412102b737fbd9c036908471d72ae2894ba1dcaffa2401d932cf606d866bf0df2b43eb6af276a792d67e3bf22661b5be7b8e8b037aebbe68e5d3b45b60688
 DIST mod_python-3.3.1.tgz 447954 SHA256 ad2331fd5fcfd720ef9e3482973fc2d06eff36ba0c44693cfa42056a62175a6b SHA512 b3c3d5ed624e0152d8904a7566be80c04622889b79350bb981e8adfbcc62a22cde6ebe609d76a67c57096b8d3fcdfd6c59e47aac39b73e614f8192e3061164f9 WHIRLPOOL 5c0e9c9cbd1553d5036d2331359fb7384caf587e5bc09368ed2da1cf80e7e613f21393b72d60bc5b82464df991cab9850d4d90e6f4964626d78f9814182ae947
+DIST mod_python-3.5.0.tgz 571403 SHA256 0ef09058ed98b41c18d899d8b710a0cce2df2b53c44d877401133b3f28bdca90 SHA512 a8838c807db36bd316e44c43c1b1db6d6565a30d1823664f3d44667f5843274ff5f77a849fcfa226fcfb6d399ef2dd983939ff0f6db8849a3e7d25ceafe0c765 WHIRLPOOL 677db711d64d7519eca27890e865cbf773f97253b0ff97b1192b9b8a89c1427c3906b6ba5fa1fcfe146ee5c5d5afc25c141b80119df3741a80db160b0b7a64c8
 EBUILD mod_python-3.3.1-r1.ebuild 1633 SHA256 402196fe6d47f31aede7c51c3879410f1752cdfea4624f8c76ba60d4bfb2fa3c SHA512 14b7f2cd2646293d9bec5df71abce81ef0493018e79e12e42f7e62d0ec2cd7cc30767654d506df9518c67fdccaec26ec15a5b44566463709db34f1af9e8ef3f2 WHIRLPOOL daa4b4b92f8d3454cef56af4145af39c4693a1a5a085ee9cae98a81802fc2cc97ffd91c13179f4d8328dee694e92736d57b091deca7736a3e4a640f607e5cf6d
-MISC ChangeLog 12068 SHA256 75f21e0bb6ec5e9135e6d84f0204bcb89f00053cb39a6bf1b9400d706ca24dd7 SHA512 d1d672a20e9e3756b4dacdfd883444f4e2e90a0b32ee706487e1ef5827cec525c0148f1eb3d17c3469a6dc3c56f39827d9020ed6d207ded09ba6748d729bbb42 WHIRLPOOL 19ed0a29599a19a3739a8ff680534ebca2f8f017c1ab4953d9805e5a02613f97a362ddbd7b02add974c1f1cbef0e111c05824aea6fdae63eef6814fca549ca1e
-MISC metadata.xml 1113 SHA256 adb5920b54d7d30fcb3189b4e97ca96b5264843244324ece09e8432bf8d1a81d SHA512 21eecdef3d089be56e881c1b12508a651e9188b273dab2e29c3a88818e5aa2cbc1f97406a577dba9479691ab61f0640e98c6350220b2ae4762817cd1cb71e67d WHIRLPOOL 6e8c93524759157e7ca9e3cb81ecf08f22aeae97a5947e5055865f8e44d7178fbb96cb7221168a07011e8af86a5f4c1fab2ace2bd255939a18afcb7b3ba632ec
+EBUILD mod_python-3.5.0.ebuild 1111 SHA256 0113126b0374f6b7076f0902208f192405f8ac75c4f50cf5927dceb45fdb81cf SHA512 f817ab0b9fc1d8d970f41b58203f8eef8e552e23c541739bc3ad24af31c3f8fe725a85421825805c9ad8a22c3cb6b08c7013e2c6114040d9ba453d6f6a2d21ee WHIRLPOOL 762db714a6e297a3955b017ce391f753c405570b4883d75775db34b0a9b5faaf61341a17c4dba05375461ed439277034f625c37888b4306629c8394ed8f3f806
+MISC ChangeLog 12275 SHA256 652f8fc46a3713be40800855a2be9a3ecfa6b0c03b745bac4fa8d6b066045cf5 SHA512 aaa740f1cd71ed5594562b4d6045602850477518fb3076715dc379c3b78dc58959776a3a344b5d7261fdc984108baa56489fa54a0ad7c6708beb763caff085aa WHIRLPOOL c9952112d58756b19adbb2fc9ee38da0ff0ceab4bee6543f6bcf657f42a451c7bc53f5291ac30862ca873c2a6b9003f0d6c29c20c26c0de331cb263509dc351b
+MISC metadata.xml 1133 SHA256 24f7c64bf7d26c786f97a44d5e356c494e849b706b21116c19224b4a402b6a88 SHA512 bdcef7913120cacd6c4bc7f2d5405ec58d68c15c8603a624c952669309426276c4adfa61bd62f8881ba0ec47b9459f6c810e66cd303e55081a0130f039e4378c WHIRLPOOL 0b619c3a0204d4cb00c92b8bb26df5fd621c7087dcbed6004d7f6e2ae4b3a5ddd14e1defc91b3f0eb0ed807a8b2826abbddc5109322a534bd79fb82c051e2921
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPn01kACgkQcaHudmEf86rbIwCeLMCWgPTwtZnrCkaKoO0DJcyk
-In8AmwesXVWbXIYuLyfCfTw8qTjq1ATy
-=GrU7
+iL4EAREIAGYFAlQdfclfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
+bnBncC5maWZ0aGhvcnNlbWFuLm5ldDY3QjA4MzdGODg1NUMxMjIzNUQ0MDgxNzky
+N0FERDBDNjJFRUYwOTAACgkQknrdDGLu8JDM2AD8CktJb4QyJKcFBfu7HZOVCoQ1
+Yrbb+r99VjrWnkhzhmwA/2t6MBLPcXy0ECMabUCmbgj5wFWa5eh8tT0yLsoxZ9pt
+=wCtO
 -----END PGP SIGNATURE-----
diff --git a/www-apache/mod_python/files/mod_python-3.5.0-buildsystem.patch b/www-apache/mod_python/files/mod_python-3.5.0-buildsystem.patch
new file mode 100644
index 000000000000..5941a5016857
--- /dev/null
+++ b/www-apache/mod_python/files/mod_python-3.5.0-buildsystem.patch
@@ -0,0 +1,35 @@
+--- mod_python-3.5.0/scripts/Makefile.in
++++ mod_python-3.5.0/scripts/Makefile.in
+@@ -26,4 +26,5 @@
+ 	rm -f Makefile
+ 
+ install:
++	$(INSTALL) -d $(DESTDIR)$(BINDIR)
+ 	$(INSTALL) -m 0755 mod_python $(DESTDIR)$(BINDIR)/mod_python
+--- mod_python-3.5.0/dist/Makefile.in
++++ mod_python-3.5.0/dist/Makefile.in
+@@ -34,9 +34,9 @@
+ install_py_lib: mod_python src
+ 	@cd src; $(MAKE) psp_parser.c
+ 	if test -z "$(DESTDIR)" ; then \
+-		$(PYTHON_BIN) setup.py install --optimize 2 --force ; \
++		$(PYTHON_BIN) setup.py install --no-compile --force ; \
+ 	else \
+-		$(PYTHON_BIN) setup.py install --optimize 2 --force --root $(DESTDIR) ; \
++		$(PYTHON_BIN) setup.py install --no-compile --force --root $(DESTDIR) ; \
+ 	fi
+ 
+ mod_python.so:
+--- mod_python-3.5.0/Makefile.in
++++ mod_python-3.5.0/Makefile.in
+@@ -31,8 +31,8 @@
+ dso: @DSO@
+ 
+ do_dso:
+-	@cd src && $(MAKE)
+-	@cd dist && $(MAKE) build
++	cd src && $(MAKE)
++	cd dist && $(MAKE) build
+ 	@echo
+ 	@echo 'Now run sudo make install'
+ 	@echo '  (or, if you only want to perform a partial install,'
diff --git a/www-apache/mod_python/metadata.xml b/www-apache/mod_python/metadata.xml
index 64620fe00508..3ebe14c49028 100644
--- a/www-apache/mod_python/metadata.xml
+++ b/www-apache/mod_python/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
+	<maintainer>
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
 	<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
diff --git a/www-apache/mod_python/mod_python-3.5.0.ebuild b/www-apache/mod_python/mod_python-3.5.0.ebuild
new file mode 100644
index 000000000000..520296f94aba
--- /dev/null
+++ b/www-apache/mod_python/mod_python-3.5.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_python/mod_python-3.5.0.ebuild,v 1.1 2014/09/20 13:14:45 xmw Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+
+inherit apache-module eutils python-single-r1
+
+DESCRIPTION="An Apache2 module providing an embedded Python interpreter"
+HOMEPAGE="http://modpython.org/"
+SRC_URI="http://dist.modpython.org/dist/${P}.tgz"
+
+LICENSE="Apache-2.0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86"
+IUSE="doc test"
+SLOT="0"
+
+APACHE2_MOD_CONF="16_${PN}"
+APACHE2_MOD_DEFINE="PYTHON"
+need_apache2_2
+
+RDEPEND="${RDEPEND}"
+DEPEND="${DEPEND}
+	test? (
+		app-admin/apache-tools
+		net-misc/curl
+	)"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-buildsystem.patch
+
+	export CFLAGS="$(apxs2 -q CFLAGS)"
+	export LDFLAGS="$(apxs2 -q LDFLAGS)"
+}
+
+src_compile() {
+	default
+}
+
+src_test() {
+	cd test || die
+	PYTHONPATH="$(ls -d ${S}/dist/build/lib.*)" ${PYTHON} test.py || die
+}
+
+src_install() {
+	default
+
+	use doc && dohtml -r doc-html/*
+
+	apache-module_src_install
+}