summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDirkjan Ochtman <djc@gentoo.org>2013-10-15 09:52:18 +0000
committerDirkjan Ochtman <djc@gentoo.org>2013-10-15 09:52:18 +0000
commit367dccbf0dac2e17d159f288328314278934397b (patch)
treeffd3a3b1845610a9905145e519d38b17b19046ee /www-apache
parentFirst in several revisions to the apcupsd ebuild, finally starting to get it ... (diff)
downloadhistorical-367dccbf0dac2e17d159f288328314278934397b.tar.gz
historical-367dccbf0dac2e17d159f288328314278934397b.tar.bz2
historical-367dccbf0dac2e17d159f288328314278934397b.zip
Fix bug 450022 (python-single-r1 for mod_wsgi).
Package-Manager: portage-2.2.7/cvs/Linux x86_64 Manifest-Sign-Key: 0x30380381
Diffstat (limited to 'www-apache')
-rw-r--r--www-apache/mod_wsgi/ChangeLog11
-rw-r--r--www-apache/mod_wsgi/Manifest23
-rw-r--r--www-apache/mod_wsgi/mod_wsgi-3.4-r1.ebuild (renamed from www-apache/mod_wsgi/mod_wsgi-3.3.ebuild)21
3 files changed, 34 insertions, 21 deletions
diff --git a/www-apache/mod_wsgi/ChangeLog b/www-apache/mod_wsgi/ChangeLog
index ee8855505f26..207503e771ba 100644
--- a/www-apache/mod_wsgi/ChangeLog
+++ b/www-apache/mod_wsgi/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for www-apache/mod_wsgi
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_wsgi/ChangeLog,v 1.36 2012/11/27 19:37:31 pacho Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_wsgi/ChangeLog,v 1.37 2013/10/15 09:52:12 djc Exp $
+
+*mod_wsgi-3.4-r1 (15 Oct 2013)
+
+ 15 Oct 2013; Dirkjan Ochtman <djc@gentoo.org> -mod_wsgi-3.3.ebuild,
+ +mod_wsgi-3.4-r1.ebuild:
+ Remove old version, support python-single-r1 (bug 450022, thanks to Joachim
+ Breur <gentoo@jmbreuer.net> for the patch).
27 Nov 2012; Pacho Ramos <pacho@gentoo.org> metadata.xml:
Drop apache herd as discussed in http://www.gossamer-
diff --git a/www-apache/mod_wsgi/Manifest b/www-apache/mod_wsgi/Manifest
index f04f9829016b..8c303bae6f33 100644
--- a/www-apache/mod_wsgi/Manifest
+++ b/www-apache/mod_wsgi/Manifest
@@ -3,16 +3,25 @@ Hash: SHA256
AUX 70_mod_wsgi.conf 100 SHA256 a4c1b49eb8c6d6609ad8ae8a9f8d6621f9f2bbc2c99addef3e2d6404ac364ed7 SHA512 6e0310d3f5dd8da4653c8502ad297ffe73c04e04c5fdd87721c407e839ba81ba4060394bcd1f06ef26d2d98cf007b585a382eb5f566345817999cd237adfa833 WHIRLPOOL 762b666fb53ea05456b6240a4b2d47a6b7249dac49c513fe746e214ddac7ec97ec5b84e975975c38bf529073aa79d6543c284eb79d5c845acb655fb1b0401330
AUX mod_wsgi-3.3-python-3.2.patch 8849 SHA256 49c15768d67ef05b9dad2d6890c139e744e6945c00ce3d333b10c7077e4dc899 SHA512 a0f2c605c2fd081e2dfd06936b8023c8500246be195da11c3b95e875940601e0b8191dc955bddf9bdba48a4b29610a6b34f0221b5d6340a16345dee1da4453fd WHIRLPOOL 96d9bfe6096a0c8bcef8a15b6dfce1501339f07084f36dc48d71265faabfcd32a01801b129db8a9a5c787d65b30de86303bc8b7c0207c687006048c6d987f95b
-DIST mod_wsgi-3.3.tar.gz 117930 SHA256 d96e1078990484cfe5579df1e95dc73f009495e9c3f9a066b0983650bd9e3243
DIST mod_wsgi-3.4.tar.gz 122739 SHA256 ae85c98e9e146840ab3c3e4490e6774f9bef0f99b9f679fca786b2adb5b4b6e8 SHA512 55b5a4fc4553f4a41fa064062c9f15800c493ff50397399ef053398920333b92290118fd920d1179d153b8602ec169c3919bec51f8f7f9f28223580dd01c472c WHIRLPOOL b6eba4969af07db9c0043f4cba6ea41349ae0514d9205e72defe83ad86ab25771d4fd1d8796d641ae3ff0c0e05c2c45c8f56300b0fb1263616001e8655b12d54
-EBUILD mod_wsgi-3.3.ebuild 801 SHA256 556d1a54bca96772a53fd2ef18eadc983bc77941501960e8e12a217e0e6aaf0a SHA512 60d5ba618c12c312581f88d23a4ba51aeb886278b24248ca3a1f9022f8a767232e3dc5d47de6d5d9c17963a47eb2bccc00a6d953e02fd40335c830afce674e4f WHIRLPOOL 63eb0a5ef455a0ab3fe578360593a847ff4152ec71a923997fda8e7f50859ad3417fe6a7d6d832d5ed1642509bb4372e97505507834629c0ec77b60b8e23b578
+EBUILD mod_wsgi-3.4-r1.ebuild 823 SHA256 1af5da4b8b94ebc8e9c2088794eeb21b7f2de62aaed99540c9e26e829f3317d4 SHA512 e268d37d70ba93c24b79ff60d7c9467ac1faff1dc017ab4871b5c22465d5fb5622e3ac836e4b9c248dc38377b587814cfa422e8373572671c903f14708408947 WHIRLPOOL 182f845129d3db9dba6af63f0753392f38c1fd9bd7b7c0f9d71311e606a7ded0e215ccecfc5014d3187376d5e637df59abf3065817e535cabbb30ecd9210e6fb
EBUILD mod_wsgi-3.4.ebuild 733 SHA256 19e063beb15c38c1e50df8ccfd88dd1566409ba5efc00e44afa09ac0f58fc092 SHA512 f2b8434f71f62a5abe1c236adc3145fdf307ff835c2190f5e6f1816dae77a76dca754205bf1301af38e114032b573b610a1261b747eadc62f65134999cae626f WHIRLPOOL 51885b58b469a75049ad404ee127d4800f59ca092faf8daade27eb18b8a6765c1166201ed468657a397afa20064b6affd340cfebf118a0a4bc3716ef42510455
-MISC ChangeLog 4639 SHA256 3f2888ebf7610223297dabb0f4c29ddafca602d3e18e74e2c169f5f216650229 SHA512 40e170b0a56280e62e94eed6abbfe0fb5736f77479c429b276805780ed195f57aab65c59f11d286d3bae554fe4623cc73af95725353b32be9f16bdf8fdf27ddb WHIRLPOOL 12d9cc2ad932855c884396290ca248fe1fc6c2ee90e2afa7d2d0f3e63135686e2fd88d04514bf15d93f3f4a0ae8f072821dc0cd8a41e1bfa30e74f234c496952
+MISC ChangeLog 4891 SHA256 0e8a218bb03319cfc5b06623147ddcbfbcd7d1abd0244c5db77773b278432e6f SHA512 bd278e1bc512501504d1de319a2f25b4a3660a804f814922a6e8ef1fed2bcbe03fa985f2ea342ca2dfa7656d34a7438de0ab1751faf1d278df4c009c8018d74c WHIRLPOOL f04c5dc46b7d01177a25eec417f973fe0b69999f58ff7b4bc37b814f71c1549ba23f83aedbc660668905eb3edd3cffbc7cd55e7d9a444e77656d291a819b866b
MISC metadata.xml 308 SHA256 a1a0c8f1bf4bf5f539eaeeddad1bd8c8f7d879d5c47f3949aa59cfef6ed6e614 SHA512 03cebb9e02684cfc74404d22d345d99f82badddbf23ff9e9b17c124262790d598b25327e75f3a9f3fa04da8f844fde16fe57599886dba666524ae408d3924289 WHIRLPOOL 84ea366db830d5a9d5e022e921dd14ad11aa2609ba8115daa7c27b0b41f5f8caaaa671c7d4721fc711479830458a0ad7b2a26794f583717febb793409cc06909
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
-iEYEAREIAAYFAlC1FnwACgkQCaWpQKGI+9SCkwCfQzpOOtMdbLIa9aLNwA4CZPiI
-F/oAnREE43yBOx7luY6ipYXL17Graqwc
-=qllA
+iQIcBAEBCAAGBQJSXRBSAAoJEJ+WuSkwOAOBMFEP/10SOnvIWWQh7Jmy9CoIpKXp
+M/BwL27dQecx/6IQsthPWsTa5bVcGVUweMg6MZYF+rr+Nu0zwaI/0JqHafo/HMLX
+ewRwYywe1chkVXZlYuzZ93gs6tWf/yvXzBHk0lFsSBT7g1rd7AonSybRInunaHPN
+zjDvam84UE2axeSZmEgEiRZt2OZ8eT8pM1r56RhOaRuCU2vO3VgwJNdWM9DrQQK1
+Etzwxy7wWWr+1N3AQBXIgRhU/KaJDWK0K+Ue5mSedZYpDw3zLX4tcegboPycv1ck
+mYs079+scNTd5iiLTjQjSC8dhipaAns2ELKLNIDlK73fRAlcrHyMqzqafuSGt4Q8
+4uJqX8L12FXAgGrtxpkl/ch7cTR9Pvx0a6XP+J0BcrReS2NdhwnlfRjHyQJ7XjP0
+x1yz62zUVUNkeMJ19Dc5C0rlWkQMfVD6omFf0fxLlxd/p4ofp4R+8l0CKHi2GsI0
+4FOPy7MbkJKE7zYz9/ycWY7MRSn6XRg9SrUVmT2F+nkR9BJuS/+zWR6zHNbHC3PH
+Xf+yYlaPv3T5kp4P3WrTNWp5JelXYxyKsaa7Dvgsnmzux6N4Gglys+7DcS+fKIEz
+akLmxV8BXAuiFkJtgEOrPrMzvJkn08x+fjfcLDZ1TvZqXUUgukyT3xzoZwY1zM+U
+SSzkOLSpvF3VEFsLd39r
+=ythd
-----END PGP SIGNATURE-----
diff --git a/www-apache/mod_wsgi/mod_wsgi-3.3.ebuild b/www-apache/mod_wsgi/mod_wsgi-3.4-r1.ebuild
index e30522e0fffa..f034d3237459 100644
--- a/www-apache/mod_wsgi/mod_wsgi-3.3.ebuild
+++ b/www-apache/mod_wsgi/mod_wsgi-3.4-r1.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_wsgi/mod_wsgi-3.3.ebuild,v 1.5 2011/04/22 21:58:23 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_wsgi/mod_wsgi-3.4-r1.ebuild,v 1.1 2013/10/15 09:52:12 djc Exp $
-EAPI="3"
-PYTHON_DEPEND="*"
-PYTHON_USE_WITH="threads"
+EAPI="5"
-inherit apache-module eutils python
+PYTHON_COMPAT=( python2_6 python2_7 python3_1 python3_2 python3_3 )
+PYTHON_REQ_USE="threads"
+
+inherit apache-module eutils python-single-r1
DESCRIPTION="An Apache2 module for running Python WSGI applications."
HOMEPAGE="http://code.google.com/p/modwsgi/"
@@ -14,7 +15,7 @@ SRC_URI="http://modwsgi.googlecode.com/files/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
IUSE=""
DEPEND=""
@@ -27,12 +28,8 @@ DOCFILES="README"
need_apache2
-src_prepare() {
- epatch "${FILESDIR}/${P}-python-3.2.patch"
-}
-
src_configure() {
- econf --with-apxs=${APXS}
+ econf --with-apxs=${APXS} --with-python=${PYTHON}
}
src_compile() {