From ef0f7d4eae3000c74bb21400a33031fa27ee914f Mon Sep 17 00:00:00 2001 From: Manuel Rüger Date: Wed, 22 Jul 2015 11:41:36 +0000 Subject: Remove old. Package-Manager: portage-2.2.20/cvs/Linux x86_64 --- www-apache/mod_limitipconn/ChangeLog | 8 ++- www-apache/mod_limitipconn/Manifest | 16 +---- .../mod_limitipconn/mod_limitipconn-0.22-r1.ebuild | 26 -------- .../mod_limitipconn/mod_limitipconn-0.23.ebuild | 26 -------- www-apache/mod_python/ChangeLog | 8 ++- www-apache/mod_python/Manifest | 27 +------- .../files/mod_python-3.3.1-LDFLAGS.patch | 14 ---- .../files/mod_python-3.3.1-apache-2.4.patch | 38 ----------- .../files/mod_python-apr_brigade_sentinel.patch | 12 ---- www-apache/mod_python/mod_python-3.3.1-r1.ebuild | 75 ---------------------- 10 files changed, 15 insertions(+), 235 deletions(-) delete mode 100644 www-apache/mod_limitipconn/mod_limitipconn-0.22-r1.ebuild delete mode 100644 www-apache/mod_limitipconn/mod_limitipconn-0.23.ebuild delete mode 100644 www-apache/mod_python/files/mod_python-3.3.1-LDFLAGS.patch delete mode 100644 www-apache/mod_python/files/mod_python-3.3.1-apache-2.4.patch delete mode 100644 www-apache/mod_python/files/mod_python-apr_brigade_sentinel.patch delete mode 100644 www-apache/mod_python/mod_python-3.3.1-r1.ebuild (limited to 'www-apache') diff --git a/www-apache/mod_limitipconn/ChangeLog b/www-apache/mod_limitipconn/ChangeLog index f7503126bb8b..20f06d3b04f8 100644 --- a/www-apache/mod_limitipconn/ChangeLog +++ b/www-apache/mod_limitipconn/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-apache/mod_limitipconn -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_limitipconn/ChangeLog,v 1.14 2014/08/10 20:16:28 slyfox Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_limitipconn/ChangeLog,v 1.15 2015/07/22 11:40:04 mrueg Exp $ + + 22 Jul 2015; Manuel Rüger -mod_limitipconn-0.22-r1.ebuild, + -mod_limitipconn-0.23.ebuild: + Remove old. 10 Aug 2014; Sergei Trofimovich mod_limitipconn-0.22-r1.ebuild, mod_limitipconn-0.23.ebuild, diff --git a/www-apache/mod_limitipconn/Manifest b/www-apache/mod_limitipconn/Manifest index 6d72adf8427c..ea4eb98c723d 100644 --- a/www-apache/mod_limitipconn/Manifest +++ b/www-apache/mod_limitipconn/Manifest @@ -1,19 +1,5 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - AUX 27_mod_limitipconn.conf 554 SHA256 b66b7c2824eedf49dba6d808fc1870cb8e7c3cfc1fab2c1002b9f22ded5a31c6 SHA512 7ded8b48b769529a8fcb6b25855d31ef82cf3de423a75ae5e986974ba2c21643adff235ec9bfcde1955513d10fc3fc9dde172ddb9fb43626eb625bed96936c3d WHIRLPOOL bf3917246b27313d9bbf716154a97016bec7ff0d4c7896c0c12faa44596068b505e8f36d285f65f7edec1f5ab630901ae11f1bcad57d24108071e817c0fe35df -DIST mod_limitipconn-0.22.tar.gz 6333 SHA256 c11e308316f8fe2fb46e365f6b2d4aa389aa220094f7ed8e555853c2734f70b1 SHA512 67edfcf112e2a2b4cd1ffae83beb659987809e867eb3edb01547f9d869c06066ac3a5bcefa6191c0580ef85054f2c6c10b948a8ad11fd5c09ee2a863c8824dbd WHIRLPOOL 57a74ff76329b92f5bebc333c71057d55fd517db5a100cc3ff3470d2bafdb33d6601078c0dc99603afc5e12cd771ca0fb6022b8f5a7f019c8274f3fcb4fe5bb6 -DIST mod_limitipconn-0.23.tar.bz2 9851 SHA256 eca35131e2d17b4499d7be13190cc0cdd5c82d83660b8bc96c79dc617defa6ec SHA512 090f70a3bc4f63a99337630cead07f713c4657302f5e3aca9b30927efe06e7e3ae21a28e5a3fbcd2a7ef596bc9b5a2c918b26155a71615593420fc007d95f348 WHIRLPOOL 52932e5818d802871fb770e65b28dea1eda47aec9a66690e51c78513176a02211ac70f72915f0762399ec6d201dc8aa62811dcf3d06dfb65aeae6a26d55939d4 DIST mod_limitipconn-0.24.tar.bz2 10150 SHA256 69ca8fbf99d4e02db75e129df07d1604db771e9c10c1b199e2accaa96aec2a1f SHA512 caf1337231ac83ef57938b0f89769afcf309a4a09a0a2c3fb171e49f038d42a5859dfdac06b2c7766f05d9431132b8752aa8ad5164794c89638eb90f392e827f WHIRLPOOL 740f0b2901099544f1fc03154ccec9ccac393501c1e5ffa8a3727a5f336cbceb54334174fb7f6b8e46cfdb8d49858b79d47fe6cc3ab056ff5c74826df77e0ad2 -EBUILD mod_limitipconn-0.22-r1.ebuild 666 SHA256 f34e8a0b8eba32b1028108896b23f577162dbc879c416384c254ffe3a607c68d SHA512 ce69db122bccb8ee785853fc5afde89ebfa3166e335c2a7f9bbe067cb2f641d2e311697599dfccad42864885b333ca4c688a5065fb5618223ad60dfee4cf0ecb WHIRLPOOL b04b28ba104a315535d17108f653d98b1c51ca2aca8a7cc37997377e0f4138f81b699c3ddb6cf562329dd6d998c3621727bd5d83f4f18bcc3c9b23d465dad1d3 -EBUILD mod_limitipconn-0.23.ebuild 671 SHA256 6917c28d2a6b99e14145792baafc12489d408cd6a1fdbc38ec86782687edab76 SHA512 3c5721d1bf6b1098f96f3e48f99a8a7d89292ad52afa876279ec99c162e9d8004f09c720073e6ebfe66817a7459cc36fc1b0f823e1e7dba7fa0f4eace5f11b64 WHIRLPOOL 00a5f90667cf64d10c2ce3bb1f1d211ab282cd28b13b2c712cd2010924f8e04265bca561c2d2f438a722f162beed2a26ec650cb348e661a0e4a4edac3a73cd7e EBUILD mod_limitipconn-0.24.ebuild 671 SHA256 f7d08dde626e2272c33d5abd460d54725d805bfc17eecdca313341150b768abc SHA512 96e634d52ff9d6d7de17ac4baf4a78e2a5b12a2d5ce0c632803a4dcf61c81d46f32f2e70b60d30943444c4f31542fda622c35cbed9b74b8b2ce334abf9e87092 WHIRLPOOL af28f5a7028fac2f3ce549af138b4cdff2811d74425d4ff01bdf1478d0236e9ba391a1df84a1557ab757a4b8f9916faaf7f009dc0a764da481cc41fbfa9aef48 -MISC ChangeLog 4596 SHA256 170001c553cce8edbe65bc9e2b5a7ce23bd9eab090fb6a46ebeb9e89c4565883 SHA512 f4597e2118e2c4f251dbe7169cb7a6d99a8389a8e47aaaf2fa715fe4051ff65dffd841956b783048f668b0718eef8bcf3a7b9cd20941c4787420ac499990b8db WHIRLPOOL 92a3ee9e2c5ed61f94551e6d8a6144dbddd792d1e8ee091025e4910c2b3a03ba41976bf7d1d3fe04c98b16ab5cb72ae8342e6b59e8a0929c8a6c50c73598fcd2 +MISC ChangeLog 4723 SHA256 8cbbd6ea249b8393b09b4dc64de9f214b4fb8214241116b02407a61a1a7155aa SHA512 77814b9875451537751a7608abfdc6a2b7305788506e1ff88cd1eb41a28305977e4fa1b81cdb08558864025bf3c9cb0e190da1e633629d7b077676094427bba3 WHIRLPOOL 493c3f8cce9d63a1c6f31d5650fa10ed7e40fd078195de874f463a212f3d46d72bf533a14511d0e1a12eb1690ce971cca437e1f884d3c218795de35d2accd13b MISC metadata.xml 421 SHA256 a9809b7a2426ff730db20137fe206c113c1afe18a895234df9e3b6ad32178838 SHA512 3cfc9f494da37f6e9e4f625317f1eebcfa3848a7aecf59eef83b6636b628376e22cfdaa081c06029a696cd7009db6b29c60e69fee92405d440f4caf7937ce9a3 WHIRLPOOL c4c484f7b6deaba61735744f1c1d0a33706d3954f6f37f40d5d6e5697c84d3d8ebe1c5dc8a5b65ef297739814a8d55def7da8c55d39734c486ab9b2d21e9dd32 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iEYEAREIAAYFAlPn0x0ACgkQcaHudmEf86psCQCfV4CAsH4Ri7VlX0p4zh5DTUAl -u5IAnAhRkQ2JVnBgEZI1W365Stgy/zGv -=ptzm ------END PGP SIGNATURE----- diff --git a/www-apache/mod_limitipconn/mod_limitipconn-0.22-r1.ebuild b/www-apache/mod_limitipconn/mod_limitipconn-0.22-r1.ebuild deleted file mode 100644 index 333b6a681723..000000000000 --- a/www-apache/mod_limitipconn/mod_limitipconn-0.22-r1.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_limitipconn/mod_limitipconn-0.22-r1.ebuild,v 1.3 2014/08/10 20:16:28 slyfox Exp $ - -inherit apache-module - -DESCRIPTION="Allows administrators to limit the number of simultaneous downloads permitted" -HOMEPAGE="http://dominia.org/djao/limitipconn2.html" -SRC_URI="http://dominia.org/djao/limit/${P}.tar.gz" - -LICENSE="MIT" -SLOT="2" -KEYWORDS="amd64 ppc x86" -IUSE="" - -DEPEND="" -RDEPEND="" - -RESTRICT="test" - -APACHE2_MOD_CONF="27_${PN}" -APACHE2_MOD_DEFINE="LIMITIPCONN INFO" - -DOCFILES="ChangeLog README" - -need_apache2 diff --git a/www-apache/mod_limitipconn/mod_limitipconn-0.23.ebuild b/www-apache/mod_limitipconn/mod_limitipconn-0.23.ebuild deleted file mode 100644 index a39499584594..000000000000 --- a/www-apache/mod_limitipconn/mod_limitipconn-0.23.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_limitipconn/mod_limitipconn-0.23.ebuild,v 1.6 2014/08/10 20:16:28 slyfox Exp $ - -inherit apache-module - -DESCRIPTION="Allows administrators to limit the number of simultaneous downloads permitted" -HOMEPAGE="http://dominia.org/djao/limitipconn2.html" -SRC_URI="http://dominia.org/djao/limit/${P}.tar.bz2" - -LICENSE="Apache-2.0" -SLOT="2" -KEYWORDS="amd64 ppc x86" -IUSE="" - -DEPEND="" -RDEPEND="" - -RESTRICT="test" - -APACHE2_MOD_CONF="27_${PN}" -APACHE2_MOD_DEFINE="LIMITIPCONN INFO" - -DOCFILES="ChangeLog README" - -need_apache2 diff --git a/www-apache/mod_python/ChangeLog b/www-apache/mod_python/ChangeLog index a9e3466cb233..c063774bbd89 100644 --- a/www-apache/mod_python/ChangeLog +++ b/www-apache/mod_python/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for www-apache/mod_python # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_python/ChangeLog,v 1.35 2015/06/02 05:18:18 jmorgan Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_python/ChangeLog,v 1.36 2015/07/22 11:41:33 mrueg Exp $ + + 22 Jul 2015; Manuel Rüger + -files/mod_python-3.3.1-LDFLAGS.patch, + -files/mod_python-3.3.1-apache-2.4.patch, + -files/mod_python-apr_brigade_sentinel.patch, -mod_python-3.3.1-r1.ebuild: + Remove old. 02 Jun 2015; Jack Morgan mod_python-3.5.0.ebuild: sparc stable wrt bug #529544 diff --git a/www-apache/mod_python/Manifest b/www-apache/mod_python/Manifest index a70646d48b73..6f7e0c1096a6 100644 --- a/www-apache/mod_python/Manifest +++ b/www-apache/mod_python/Manifest @@ -1,31 +1,6 @@ ------BEGIN PGP SIGNED MESSAGE----- -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 EBUILD mod_python-3.5.0.ebuild 1107 SHA256 08123496228fe4e45d7b7db4146122e455760743691bc03a57cc572659729017 SHA512 f7ea516558c3b29592528fa15e0d6376e6bd932f187ef554eefcc5e74fef61740c8b1eb543615309c29bcadc8e7795cd300b7b900be3631d0f65413e6100047f WHIRLPOOL 483e25bf6c4a0e73eedd75fc0b2e0ef55537ec55fe8e561d54f64dec00ee9afbbfdb1e539881d9acf024f58d59864d55f5fa5b9f0dd116e643132231780451c1 -MISC ChangeLog 13053 SHA256 1f7e063edd55d75b47cc3557f68c091cab5ea0caefcc40c9e40feaf942af58a5 SHA512 017fd033f4b5ac321295902f24b98239b5da3d90fee18419231687b562e4446137643299bded4973363fc61e8fdf70483e58f8457211f4d95b5554707b4ea405 WHIRLPOOL c4756120e1626590c1f44266322d0a59bb5bae061b7bea9069cc7987e5362af27f737e37e8cd912cd26f2aabc8e044ed4d65a76c62d457bacc8223cfcc6097c9 +MISC ChangeLog 13276 SHA256 480d1cad4fe1be2d32260cd3e7bce4cfc834800203fa73559505f739b70c456e SHA512 154d064e63dd1afd18e0063ae7450b9be1a6107db51daffab54879a1faa1f8efe828b244efd98b8d77c3051de4d19231b654c6bfaf2788f187c3a095c3269955 WHIRLPOOL ab204007534cc550604224caa866424485522b2b2a819a80c33537c700eabafb0aef3daa0ba921f7cf0e8470572d03bc405014bdc2e12c337548eda449d80332 MISC metadata.xml 1133 SHA256 24f7c64bf7d26c786f97a44d5e356c494e849b706b21116c19224b4a402b6a88 SHA512 bdcef7913120cacd6c4bc7f2d5405ec58d68c15c8603a624c952669309426276c4adfa61bd62f8881ba0ec47b9459f6c810e66cd303e55081a0130f039e4378c WHIRLPOOL 0b619c3a0204d4cb00c92b8bb26df5fd621c7087dcbed6004d7f6e2ae4b3a5ddd14e1defc91b3f0eb0ed807a8b2826abbddc5109322a534bd79fb82c051e2921 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQIcBAEBCAAGBQJVbTyIAAoJENNAYYQy1of1SkoP/2tGWwNeUVqamPL6JklD7PSc -ULGZJjj+mV+kZzKdp7SqfLggqGyJSzzv1RsHHI5MtUMwcHwNdVCQ6feUJBVeB8h2 -kkpHN2eakZ7FXWPYIHhqZGT6edichCyDRlOMli55mB6UYiwa2RjykIRLe/A+JwSx -yOv313kEyTICUpaRU/qp+qvVg5wRNr0YI+JY0gNnbbx7S11mkwoJnQlwtdRcVcL+ -dB2epTdv//7d0bl/4tLwq06GU6prtHFXtIVCX3VB4mSCyWp/6nUIvn//TjwUqFKU -gRngBRdvkk0IlTagyzl/EpNbY6+25QC/unlDqTkvxpFB0eTewmir2yW/EUga4M6t -FeqUoT4zEaudoETsYWv3PUElUokttfGzDG21qePaBipie3Pu3zO/eQb6EHn3Iqgl -dvhHY2dvpI6RYNNJm8nbwFKWnoR+cVjUwHVRn3gi4QYMqjTcStvi9nabqZjA6qso -hQrQxMk69KYUt4brqvrQEf4bVpuo17RX/I2Y4qwVSPN5yc6XRi9JJOKOY8Mciljw -611Iz0+qGAlVgqszIdAqUC74ysvAsAK5P6Bz35XRB5CMC1rrDA4CTb/Bdfid6lKE -Cny4ubSFtHt5Lwz6i9cXZhgXcL0AAXu0JX0aWrSk3yCtOT8x8HrPLK+6YoCpPXEp -jWcgJDKK25o82oUCidS0 -=OHkI ------END PGP SIGNATURE----- diff --git a/www-apache/mod_python/files/mod_python-3.3.1-LDFLAGS.patch b/www-apache/mod_python/files/mod_python-3.3.1-LDFLAGS.patch deleted file mode 100644 index 0562f93db748..000000000000 --- a/www-apache/mod_python/files/mod_python-3.3.1-LDFLAGS.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- configure.in -+++ configure.in -@@ -267,10 +267,7 @@ - AC_MSG_CHECKING(linker flags used to link Python) - AC_SUBST(LDFLAGS) - PyLFS=`grep "^LINKFORSHARED=" ${PyLIBPL}/Makefile | cut -f2 -d= | tr '\011\012\015' ' '` --PyLDFLAGS=`grep "^LDFLAGS=" ${PyLIBPL}/Makefile | cut -f2 -d= | tr '\011\012\015' ' '` --LDFLAGS="${LDFLAGS} ${PyLFS} ${PyLDFLAGS}" --LDFLAGS="${LDFLAGS} ${PY_LDFLAGS}" --AC_MSG_RESULT($PY_LDFLAGS) -+LDFLAGS="${LDFLAGS} ${PyLFS}" - - AC_MSG_CHECKING(where Python include files are) - AC_SUBST(INCLUDES) diff --git a/www-apache/mod_python/files/mod_python-3.3.1-apache-2.4.patch b/www-apache/mod_python/files/mod_python-3.3.1-apache-2.4.patch deleted file mode 100644 index 135ef2e765b4..000000000000 --- a/www-apache/mod_python/files/mod_python-3.3.1-apache-2.4.patch +++ /dev/null @@ -1,38 +0,0 @@ -TODO: -src/requestobject.c uses ap_requires() which has been removed in r368027. -https://svn.apache.org/viewvc?view=rev&revision=368027 - ---- src/include/mod_python.h.in -+++ src/include/mod_python.h.in -@@ -72,6 +72,11 @@ - #endif - #endif - -+#if !AP_MODULE_MAGIC_AT_LEAST(20081201,0) -+#define ap_unixd_config unixd_config -+#define ap_unixd_set_global_mutex_perms unixd_set_global_mutex_perms -+#endif -+ - /* Python headers */ - /* this gets rid of some compile warnings */ - #if defined(_POSIX_THREADS) ---- src/mod_python.c -+++ src/mod_python.c -@@ -555,14 +555,14 @@ - else { - - /*XXX As of httpd 2.0.4, the below should be just -- a call to unixd_set_global_mutex_perms(mutex[n]); and -+ a call to ap_unixd_set_global_mutex_perms(mutex[n]); and - nothing else... For now, while 2.0.48 isn't commonplace yet, - this ugly code should be here */ - - #if !defined(OS2) && !defined(WIN32) && !defined(BEOS) && !defined(NETWARE) - if (!geteuid()) { -- chown(fname, unixd_config.user_id, -1); -- unixd_set_global_mutex_perms(mutex[n]); -+ chown(fname, ap_unixd_config.user_id, -1); -+ ap_unixd_set_global_mutex_perms(mutex[n]); - } - #endif - } diff --git a/www-apache/mod_python/files/mod_python-apr_brigade_sentinel.patch b/www-apache/mod_python/files/mod_python-apr_brigade_sentinel.patch deleted file mode 100644 index 95e3ea2eccfb..000000000000 --- a/www-apache/mod_python/files/mod_python-apr_brigade_sentinel.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -burN mod_python-3.3.1.original/src/connobject.c mod_python-3.3.1/src/connobject.c ---- mod_python-3.3.1.original/src/connobject.c 2006-12-03 05:36:37.000000000 +0100 -+++ mod_python-3.3.1/src/connobject.c 2008-07-15 01:05:01.000000000 +0200 -@@ -139,7 +139,7 @@ - bytes_read = 0; - - while ((bytes_read < len || len == 0) && -- !(b == APR_BRIGADE_SENTINEL(b) || -+ !(b == APR_BRIGADE_SENTINEL(bb) || - APR_BUCKET_IS_EOS(b) || APR_BUCKET_IS_FLUSH(b))) { - - const char *data; \ No newline at end of file diff --git a/www-apache/mod_python/mod_python-3.3.1-r1.ebuild b/www-apache/mod_python/mod_python-3.3.1-r1.ebuild deleted file mode 100644 index 06705fce4885..000000000000 --- a/www-apache/mod_python/mod_python-3.3.1-r1.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# 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.3.1-r1.ebuild,v 1.9 2014/08/10 20:17:28 slyfox Exp $ - -EAPI="3" -PYTHON_DEPEND="2" - -inherit apache-module autotools eutils python - -DESCRIPTION="An Apache2 module 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="alpha amd64 ia64 ~mips ppc sparc x86" -IUSE="" -RESTRICT="test" # bug 343663 - -DEPEND="" -RDEPEND="" - -APACHE2_MOD_CONF="16_${PN}" -APACHE2_MOD_DEFINE="PYTHON" - -DOCFILES="README NEWS CREDITS" - -need_apache2_2 - -pkg_setup() { - python_set_active_version 2 -} - -src_prepare() { - epatch "${FILESDIR}/${PN}-apr_brigade_sentinel.patch" - epatch "${FILESDIR}/${P}-apache-2.4.patch" - epatch "${FILESDIR}/${P}-LDFLAGS.patch" - - # Remove optimisations, we do that outside Portage - sed -i -e 's:--optimize 2:--no-compile:' dist/Makefile.in - - eautoreconf -} - -src_configure() { - econf --with-apxs=${APXS} -} - -src_compile() { - emake OPT="`apxs2 -q CFLAGS` -fPIC" || die "emake failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - dohtml -r doc-html/* - apache-module_src_install -} - -src_test() { - cd test - PYTHONPATH="$(ls -d ${S}/dist/build/lib.*)" - sed -i \ - -e "120ios.environ['PYTHONPATH']=\"${PYTHONPATH}\"" \ - test.py || die "sed failed" - "$(PYTHON)" test.py || die "tests failed" -} - -pkg_postinst() { - apache-module_pkg_postinst - python_mod_optimize mod_python -} - -pkg_postrm() { - python_mod_cleanup mod_python -} -- cgit v1.2.3-65-gdbad