Fix DEPEND so mod_ssl-2.8.21 will work with <=apache-1.3.33-r1.

Package-Manager: portage-2.0.51.19

3 files changed, 30 insertions, 13 deletions

diff --git a/net-www/mod_ssl/ChangeLog b/net-www/mod_ssl/ChangeLog
index bfdf690e8510..7044834a4499 100644
--- a/net-www/mod_ssl/ChangeLog
+++ b/net-www/mod_ssl/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-www/mod_ssl
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_ssl/ChangeLog,v 1.64 2005/03/09 19:04:33 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_ssl/ChangeLog,v 1.65 2005/03/21 00:42:59 beu Exp $
+
+  21 Mar 2005; Elfyn McBratney <beu@gentoo.org> mod_ssl-2.8.21.ebuild:
+  Fix DEPEND so mod_ssl-2.8.21 will work with <=apache-1.3.33-r1.
 
   09 Mar 2005; Markus Rothe <corsair@gentoo.org> mod_ssl-2.8.22.ebuild:
   Added ~ppc64 to KEYWORDS
diff --git a/net-www/mod_ssl/Manifest b/net-www/mod_ssl/Manifest
index 843f01c8dc09..2b01b191226b 100644
--- a/net-www/mod_ssl/Manifest
+++ b/net-www/mod_ssl/Manifest
@@ -1,19 +1,29 @@
-MD5 88ba7ccea47d26f354ec14042d818059 ChangeLog 7749
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 41d6c0ba999d7b4af929e07368693a3f metadata.xml 261
 MD5 609be93e28d891306f418387b75ce2b7 mod_ssl-2.8.17.ebuild 2182
 MD5 48f150354d6b2e4ca36a0d093cb1a163 mod_ssl-2.8.18.ebuild 2181
-MD5 5733724945a027232dbf298c455eca94 mod_ssl-2.8.19.ebuild 2284
-MD5 41fcd0884bdc50fde055a124928bee00 mod_ssl-2.8.20.ebuild 2283
-MD5 9b087be100a0e247d0858950d4da6186 mod_ssl-2.8.21.ebuild 2417
+MD5 8453cd038894bcab70c5b9b98a2923c3 ChangeLog 7883
 MD5 8ca0688117f55aa5bdded72aa78cb6a9 mod_ssl-2.8.22.ebuild 1769
+MD5 8505667d0061d313901ecf057f54497b mod_ssl-2.8.21.ebuild 2450
+MD5 41fcd0884bdc50fde055a124928bee00 mod_ssl-2.8.20.ebuild 2283
+MD5 5733724945a027232dbf298c455eca94 mod_ssl-2.8.19.ebuild 2284
+MD5 54cbf53816f2c9c80600ea9f37ab02ba files/digest-mod_ssl-2.8.22 73
 MD5 9ba9eb8eced950cd59cb8dadd090f908 files/digest-mod_ssl-2.8.17 73
-MD5 f53031df0c0d1a5bd75a9151d0810e9e files/digest-mod_ssl-2.8.18 73
-MD5 89239995d079a1bd9abc580e2264c71b files/digest-mod_ssl-2.8.19 73
-MD5 dd87f058ab62ac5c5da4b03713e9184a files/digest-mod_ssl-2.8.20 73
-MD5 289c880e2ff1c2de91eda32e7e486085 files/digest-mod_ssl-2.8.21 73
+MD5 515630b3e53faa458b8ec7a0e73bef55 files/10_mod_ssl.conf 2859
 MD5 dd92adba34e6b36ef6fd2750869e1a18 files/gentestcrt.sh 8801
+MD5 f53031df0c0d1a5bd75a9151d0810e9e files/digest-mod_ssl-2.8.18 73
 MD5 71ac46d211c8aa42c7a5e51c6165862a files/mod_ssl.conf 2460
 MD5 8270779f233bc311118f53ebce7338e7 files/ssl.default-vhost.conf 6985
-MD5 515630b3e53faa458b8ec7a0e73bef55 files/10_mod_ssl.conf 2859
+MD5 dd87f058ab62ac5c5da4b03713e9184a files/digest-mod_ssl-2.8.20 73
+MD5 289c880e2ff1c2de91eda32e7e486085 files/digest-mod_ssl-2.8.21 73
 MD5 959a0125c23ead91b0071f4ffc54e9bc files/default-ssl.conf 7653
-MD5 54cbf53816f2c9c80600ea9f37ab02ba files/digest-mod_ssl-2.8.22 73
+MD5 89239995d079a1bd9abc580e2264c71b files/digest-mod_ssl-2.8.19 73
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCPhirjUHll2nfF60RAmeOAJ0bI/y8AG+YnTHGFiWnGaBWzf3yXwCeK5Vc
+gaN8VeGjK6yRfTlvYrOL7KE=
+=lJ5h
+-----END PGP SIGNATURE-----
diff --git a/net-www/mod_ssl/mod_ssl-2.8.21.ebuild b/net-www/mod_ssl/mod_ssl-2.8.21.ebuild
index c597ff1c2ea8..aec0dc0424c5 100644
--- a/net-www/mod_ssl/mod_ssl-2.8.21.ebuild
+++ b/net-www/mod_ssl/mod_ssl-2.8.21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_ssl/mod_ssl-2.8.21.ebuild,v 1.13 2005/01/08 21:43:06 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_ssl/mod_ssl-2.8.21.ebuild,v 1.14 2005/03/21 00:42:59 beu Exp $
 
 MY_P=${P}-1.3.32
 S=${WORKDIR}/${MY_P}
@@ -13,7 +13,11 @@ SLOT="0"
 KEYWORDS="alpha amd64 hppa ia64 mips ppc sparc x86"
 IUSE=""
 
-DEPEND="|| ( =net-www/apache-1.3.32* =net-www/apache-1.3.33 )
+DEPEND="|| (
+		>=net-www/apache-1.3.32*
+		=net-www/apache-1.3.33*
+	)
+	!>=net-www/apache-1.3.33-r2
 	>=dev-libs/openssl-0.9.6k"
 
 src_unpack() {