Address dependency issues caused by depend.apache. Refer to bug 107127.

Package-Manager: portage-2.1_rc4-r1

3 files changed, 47 insertions, 36 deletions

diff --git a/dev-python/mod_python/ChangeLog b/dev-python/mod_python/ChangeLog
index 26156e683198..245f88f3ec04 100644
--- a/dev-python/mod_python/ChangeLog
+++ b/dev-python/mod_python/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/mod_python
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mod_python/ChangeLog,v 1.42 2006/04/01 15:10:24 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mod_python/ChangeLog,v 1.43 2006/06/04 18:20:40 vericgar Exp $
+
+  04 Jun 2006; Michael Stewart <vericgar@gentoo.org>
+  mod_python-3.1.4-r1.ebuild:
+  Address dependency issues caused by depend.apache. Refer to bug 107127.
 
   01 Apr 2006; Aron Griffis <agriffis@gentoo.org>
   mod_python-3.1.4-r1.ebuild:
diff --git a/dev-python/mod_python/Manifest b/dev-python/mod_python/Manifest
index e4a8c90d82b6..850ab6ec0e14 100644
--- a/dev-python/mod_python/Manifest
+++ b/dev-python/mod_python/Manifest
@@ -1,61 +1,67 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 cbe470b79c81c478f53b84ac60edfa8b ChangeLog 6295
-RMD160 566f9af5699985af58d6eea97c80f22cec8ae4cc ChangeLog 6295
-SHA256 c5a185be32a4cb7f89dc46bacd2c708eec3e578782862130ef1b5fc98bf5c631 ChangeLog 6295
+AUX 16_mod_python-r1.conf 1101 RMD160 7221a2a77cc1481855bfac75191d666c642861b8 SHA1 2b2061929b9e2a6b2690b231718f269394151270 SHA256 fffa4ce78f0bbe242e88b19a23d1e69fcaa2cfad73954f72d78688ee3a9523d3
 MD5 fc933df167083c6c8abc4d2e28c6274d files/16_mod_python-r1.conf 1101
 RMD160 7221a2a77cc1481855bfac75191d666c642861b8 files/16_mod_python-r1.conf 1101
 SHA256 fffa4ce78f0bbe242e88b19a23d1e69fcaa2cfad73954f72d78688ee3a9523d3 files/16_mod_python-r1.conf 1101
+AUX 16_mod_python.conf 1106 RMD160 b06302aab6fc73f37b14cb2768096ab493c9b231 SHA1 be93a21c2cebcd9b32573ceb6c28e0df7037c4d2 SHA256 eb748fed2d394f49d1fb13e2594c79816f1389600e38be80cc5ffe971b83c117
 MD5 05bbbfafd26dcf70f83fcc2b015751dc files/16_mod_python.conf 1106
 RMD160 b06302aab6fc73f37b14cb2768096ab493c9b231 files/16_mod_python.conf 1106
 SHA256 eb748fed2d394f49d1fb13e2594c79816f1389600e38be80cc5ffe971b83c117 files/16_mod_python.conf 1106
-MD5 eedde8a8dd90829d24fdb18cc86054f6 files/digest-mod_python-2.7.10 66
-RMD160 1c73ee613de27ce9f82534edee4f71e63673febe files/digest-mod_python-2.7.10 66
-SHA256 8ff2683e238ff291c1863ce0ac5da52034de6cd4dd149200f6b43e85cfe37942 files/digest-mod_python-2.7.10 66
-MD5 f9aea2b5454c22f2e134e3698099f890 files/digest-mod_python-2.7.11 66
-RMD160 b60c5c052c76fdf8c1ba7cc4d1ff25a6d1612f31 files/digest-mod_python-2.7.11 66
-SHA256 42c807da21cb2853ec0fb8cfe3e05805e824419b26efdb2bfdc2cf3460b2c3ba files/digest-mod_python-2.7.11 66
-MD5 67e42121ddce856c5d7021b3eca7abdb files/digest-mod_python-3.1.3-r1 65
-RMD160 a3c1e3a1f96b5147e5b981f5abba7b3ba2320bf8 files/digest-mod_python-3.1.3-r1 65
-SHA256 ad20dd020854998e455df7b287585573f516604124b6074cb35f713503b2081e files/digest-mod_python-3.1.3-r1 65
-MD5 c4619f17df8352dc648c0f89b61e17b6 files/digest-mod_python-3.1.4 65
-RMD160 4254c933f8d6d73d42c6528564f84f723ec71ff7 files/digest-mod_python-3.1.4 65
-SHA256 9e3531acd8ea7e35d468a4ea77f17e9946f575507614e7b0643f26aca06fdb25 files/digest-mod_python-3.1.4 65
-MD5 c4619f17df8352dc648c0f89b61e17b6 files/digest-mod_python-3.1.4-r1 65
-RMD160 4254c933f8d6d73d42c6528564f84f723ec71ff7 files/digest-mod_python-3.1.4-r1 65
-SHA256 9e3531acd8ea7e35d468a4ea77f17e9946f575507614e7b0643f26aca06fdb25 files/digest-mod_python-3.1.4-r1 65
+AUX mod_python-3.1.4-configure-bash-3.1.patch 473 RMD160 be33f1c882941d32b9c65224d12739ffe1d94319 SHA1 d6732c0f49bf109212e77e7200404231f2479568 SHA256 7d07b64ce193dd139c4e7ccb7fcb8ccc0ee7729202735b26e07307a52553b7fb
 MD5 437d3b6af39626eb8dfb88127db3883c files/mod_python-3.1.4-configure-bash-3.1.patch 473
 RMD160 be33f1c882941d32b9c65224d12739ffe1d94319 files/mod_python-3.1.4-configure-bash-3.1.patch 473
 SHA256 7d07b64ce193dd139c4e7ccb7fcb8ccc0ee7729202735b26e07307a52553b7fb files/mod_python-3.1.4-configure-bash-3.1.patch 473
+AUX mod_python.conf 70 RMD160 d72e3d7076d0ed7eb68aaddc858e29389adfb9c3 SHA1 fbbd8297e5c82cde901d0424817a522030ef5b1a SHA256 8220f03f6b1071f984ec736f3e50dfc1b16051e9cc2a91d6dc64694584c28cfe
 MD5 01ce560a5062d990e685e78b756fa5ba files/mod_python.conf 70
 RMD160 d72e3d7076d0ed7eb68aaddc858e29389adfb9c3 files/mod_python.conf 70
 SHA256 8220f03f6b1071f984ec736f3e50dfc1b16051e9cc2a91d6dc64694584c28cfe files/mod_python.conf 70
+AUX publisher-2.diff 1383 RMD160 0e1c6a2bf22836fc5eb92c775f12f1e753d07240 SHA1 ed233c047d9248318be02d9a4da5c89da00d67f9 SHA256 828de8712538599f87acb0149a4a5c435a53aaba05262fc84e0527ad1f79b68d
 MD5 0779383c65d90a5161e7a11ab5bbbbec files/publisher-2.diff 1383
 RMD160 0e1c6a2bf22836fc5eb92c775f12f1e753d07240 files/publisher-2.diff 1383
 SHA256 828de8712538599f87acb0149a4a5c435a53aaba05262fc84e0527ad1f79b68d files/publisher-2.diff 1383
-MD5 4238f8266f49d6a9dbe435b27aa5cbb2 metadata.xml 1061
-RMD160 181f0edbb61dae133206cb760f9a1e485e960623 metadata.xml 1061
-SHA256 8055ef4e2954a77a90a3d3c48438fb7993442d22b2737c563ba3af67069e658a metadata.xml 1061
+DIST mod_python-2.7.10.tgz 175631
+DIST mod_python-2.7.11.tgz 175763
+DIST mod_python-3.1.3.tgz 293548
+DIST mod_python-3.1.4.tgz 308510
+EBUILD mod_python-2.7.10.ebuild 2466 RMD160 956944d967c93effebb274fd19a731b4fefa424d SHA1 d53f52d96e73ff1ab7fdf28203ea616df4011025 SHA256 08447cfd49d90bcdd4de6210952fd918e9863f00abbefb966f49bfba4c4e12b2
 MD5 67997ffb188bf18507f6a2ac093227a6 mod_python-2.7.10.ebuild 2466
 RMD160 956944d967c93effebb274fd19a731b4fefa424d mod_python-2.7.10.ebuild 2466
 SHA256 08447cfd49d90bcdd4de6210952fd918e9863f00abbefb966f49bfba4c4e12b2 mod_python-2.7.10.ebuild 2466
+EBUILD mod_python-2.7.11.ebuild 1711 RMD160 3db67fd20f699cbeea69ec92a1921cba6b5862ad SHA1 32f6db7e20083ebc3275fd62438a32037da30c7c SHA256 a3045434c87d1f079c0b081f80afb19d09b5aa2220823bcfd097313f576a8fea
 MD5 628388f842ff5c9d0959bce9e3c28075 mod_python-2.7.11.ebuild 1711
 RMD160 3db67fd20f699cbeea69ec92a1921cba6b5862ad mod_python-2.7.11.ebuild 1711
 SHA256 a3045434c87d1f079c0b081f80afb19d09b5aa2220823bcfd097313f576a8fea mod_python-2.7.11.ebuild 1711
+EBUILD mod_python-3.1.3-r1.ebuild 1875 RMD160 db7f7210ccf4de0aa78939ef9173fdfea631222c SHA1 92822ca9d35e5c1d9a2caf90e93aee9a9ff2ccf1 SHA256 985daeab3897ebba1e603742623238b0ff774eacf143cfd58e42efaa2f774a5a
 MD5 c21328b1a8879707a158196fc9caa5c2 mod_python-3.1.3-r1.ebuild 1875
 RMD160 db7f7210ccf4de0aa78939ef9173fdfea631222c mod_python-3.1.3-r1.ebuild 1875
 SHA256 985daeab3897ebba1e603742623238b0ff774eacf143cfd58e42efaa2f774a5a mod_python-3.1.3-r1.ebuild 1875
-MD5 95c658f453133487d3a81ed8ecf51fb6 mod_python-3.1.4-r1.ebuild 1639
-RMD160 c4bea15507b1d0b819523407f784da644c21a791 mod_python-3.1.4-r1.ebuild 1639
-SHA256 f7e7ad40004056f3553234650663bce7dcf74e26d13fc250695e43e2191d5712 mod_python-3.1.4-r1.ebuild 1639
+EBUILD mod_python-3.1.4-r1.ebuild 1659 RMD160 ae43695ae0fd67eefbf01c56ca5295f4ffc96951 SHA1 b6229cf4442373826bcb22513334935654f75884 SHA256 857491d71f7a52c55db7d4d2f1f240b00f0259842ba1f771d334a71e5b266471
+MD5 76dcccf10c6279669b1b6bb664dee6ea mod_python-3.1.4-r1.ebuild 1659
+RMD160 ae43695ae0fd67eefbf01c56ca5295f4ffc96951 mod_python-3.1.4-r1.ebuild 1659
+SHA256 857491d71f7a52c55db7d4d2f1f240b00f0259842ba1f771d334a71e5b266471 mod_python-3.1.4-r1.ebuild 1659
+EBUILD mod_python-3.1.4.ebuild 1534 RMD160 e9e100076b6dfb9c677a3ca3d81ed46b8ced85ba SHA1 f8dbae6e5340677299bff9acb5a2acdad2ffc01d SHA256 54c65c5579f288bffa7b0c1a03796b4b0e8b7e65e7a6bed5241d69e7fc120528
 MD5 7014ce279d11b10e01891e484d5e6486 mod_python-3.1.4.ebuild 1534
 RMD160 e9e100076b6dfb9c677a3ca3d81ed46b8ced85ba mod_python-3.1.4.ebuild 1534
 SHA256 54c65c5579f288bffa7b0c1a03796b4b0e8b7e65e7a6bed5241d69e7fc120528 mod_python-3.1.4.ebuild 1534
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
-
-iD8DBQFELpfqJrHF4yAQTrARAqUpAJ9MM3sEhkA/NUmwMxdyrIRn2w+9UQCfWUUP
-Puk5DL3EjrlEHUDBWIvbKr8=
-=nJre
------END PGP SIGNATURE-----
+MISC ChangeLog 6453 RMD160 ed890dc33d5a95a79ba727784daee688aae08bcf SHA1 bb3e15ef2cf744a862f2f58b6232785fc8b20b2f SHA256 6f123b8bbfc48e5a6e3cb155bb34355c4438bd14f380ed8f6153882bce2b6bc3
+MD5 02b614196cec291ccf712c934c17c8ec ChangeLog 6453
+RMD160 ed890dc33d5a95a79ba727784daee688aae08bcf ChangeLog 6453
+SHA256 6f123b8bbfc48e5a6e3cb155bb34355c4438bd14f380ed8f6153882bce2b6bc3 ChangeLog 6453
+MISC metadata.xml 1061 RMD160 181f0edbb61dae133206cb760f9a1e485e960623 SHA1 2495194ebd305d7012702d3cd40a2d89d0b99eee SHA256 8055ef4e2954a77a90a3d3c48438fb7993442d22b2737c563ba3af67069e658a
+MD5 4238f8266f49d6a9dbe435b27aa5cbb2 metadata.xml 1061
+RMD160 181f0edbb61dae133206cb760f9a1e485e960623 metadata.xml 1061
+SHA256 8055ef4e2954a77a90a3d3c48438fb7993442d22b2737c563ba3af67069e658a metadata.xml 1061
+MD5 eedde8a8dd90829d24fdb18cc86054f6 files/digest-mod_python-2.7.10 66
+RMD160 1c73ee613de27ce9f82534edee4f71e63673febe files/digest-mod_python-2.7.10 66
+SHA256 8ff2683e238ff291c1863ce0ac5da52034de6cd4dd149200f6b43e85cfe37942 files/digest-mod_python-2.7.10 66
+MD5 f9aea2b5454c22f2e134e3698099f890 files/digest-mod_python-2.7.11 66
+RMD160 b60c5c052c76fdf8c1ba7cc4d1ff25a6d1612f31 files/digest-mod_python-2.7.11 66
+SHA256 42c807da21cb2853ec0fb8cfe3e05805e824419b26efdb2bfdc2cf3460b2c3ba files/digest-mod_python-2.7.11 66
+MD5 67e42121ddce856c5d7021b3eca7abdb files/digest-mod_python-3.1.3-r1 65
+RMD160 a3c1e3a1f96b5147e5b981f5abba7b3ba2320bf8 files/digest-mod_python-3.1.3-r1 65
+SHA256 ad20dd020854998e455df7b287585573f516604124b6074cb35f713503b2081e files/digest-mod_python-3.1.3-r1 65
+MD5 c4619f17df8352dc648c0f89b61e17b6 files/digest-mod_python-3.1.4 65
+RMD160 4254c933f8d6d73d42c6528564f84f723ec71ff7 files/digest-mod_python-3.1.4 65
+SHA256 9e3531acd8ea7e35d468a4ea77f17e9946f575507614e7b0643f26aca06fdb25 files/digest-mod_python-3.1.4 65
+MD5 c4619f17df8352dc648c0f89b61e17b6 files/digest-mod_python-3.1.4-r1 65
+RMD160 4254c933f8d6d73d42c6528564f84f723ec71ff7 files/digest-mod_python-3.1.4-r1 65
+SHA256 9e3531acd8ea7e35d468a4ea77f17e9946f575507614e7b0643f26aca06fdb25 files/digest-mod_python-3.1.4-r1 65
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
index 226cf7a3968e..74971b01c9b0 100644
--- a/dev-python/mod_python/mod_python-3.1.4-r1.ebuild
+++ b/dev-python/mod_python/mod_python-3.1.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.8 2006/04/01 15:10:24 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mod_python/mod_python-3.1.4-r1.ebuild,v 1.9 2006/06/04 18:20:40 vericgar Exp $
 
 inherit python eutils apache-module autotools
 
@@ -13,6 +13,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 ~ia64 ppc sparc x86"
 IUSE=""
 DEPEND="dev-lang/python"
+RDEPEND="${DEPEND}"
 
 #APACHE2_MOD_CONF="2.7.11/16_${PN}"
 APACHE2_MOD_DEFINE="PYTHON"