Makred stable, and added support for apache-1.3.33

4 files changed, 20 insertions, 9 deletions

diff --git a/net-www/mod_ssl/ChangeLog b/net-www/mod_ssl/ChangeLog
index b5388b528cb0..0e49b67c939e 100644
--- a/net-www/mod_ssl/ChangeLog
+++ b/net-www/mod_ssl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-www/mod_ssl
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_ssl/ChangeLog,v 1.52 2004/10/23 21:18:09 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_ssl/ChangeLog,v 1.53 2004/10/29 13:14:59 stuart Exp $
+
+  29 Oct 2004; Stuart Herbert <stuart@gentoo.org> mod_ssl-2.8.21.ebuild:
+  Marked stable on x86; added --force so that this mod_ssl can be used with
+  apache-1.3.33 (temporary measure until mod_ssl is bumped upstream)
 
 *mod_ssl-2.8.21 (23 Oct 2004)
 
diff --git a/net-www/mod_ssl/Manifest b/net-www/mod_ssl/Manifest
index 256c11abc71b..ef6b03be8781 100644
--- a/net-www/mod_ssl/Manifest
+++ b/net-www/mod_ssl/Manifest
@@ -1,10 +1,10 @@
-MD5 cf20dfaf977c018513933f7343c6b1f3 ChangeLog 6262
+MD5 e44da799c2aab7c51859680f96390a06 ChangeLog 6481
 MD5 d2da0e45d7e39184d1cb7abbe3879086 metadata.xml 159
 MD5 7f02b177b06559b9aab3444c173343bc mod_ssl-2.8.17.ebuild 2183
 MD5 9eba5451e8883ea7e9cedf5b02c97e62 mod_ssl-2.8.18.ebuild 2183
-MD5 1e2466f680717170d5820cf5c0282a53 mod_ssl-2.8.19.ebuild 2275
+MD5 cfd9c7caa14eb7b323a6a6d4d62d71b0 mod_ssl-2.8.19.ebuild 2283
 MD5 039d11eaea2cf73a6585e177bd8e6ed9 mod_ssl-2.8.20.ebuild 2283
-MD5 ab81b6c0a943e4ce2b2e49b73d2fa451 mod_ssl-2.8.21.ebuild 2289
+MD5 011b1995d6776a3b9e7c0ae08f9957a9 mod_ssl-2.8.21.ebuild 2411
 MD5 9ba9eb8eced950cd59cb8dadd090f908 files/digest-mod_ssl-2.8.17 73
 MD5 f53031df0c0d1a5bd75a9151d0810e9e files/digest-mod_ssl-2.8.18 73
 MD5 dd92adba34e6b36ef6fd2750869e1a18 files/gentestcrt.sh 8801
diff --git a/net-www/mod_ssl/mod_ssl-2.8.19.ebuild b/net-www/mod_ssl/mod_ssl-2.8.19.ebuild
index e970406e2d22..c6503f0927e6 100644
--- a/net-www/mod_ssl/mod_ssl-2.8.19.ebuild
+++ b/net-www/mod_ssl/mod_ssl-2.8.19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.19.ebuild,v 1.8 2004/08/01 14:49:47 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_ssl/mod_ssl-2.8.19.ebuild,v 1.9 2004/10/29 13:14:59 stuart Exp $
 
 MY_P=${P}-1.3.31
 S=${WORKDIR}/${MY_P}
@@ -11,6 +11,7 @@ HOMEPAGE="http://www.modssl.org/"
 KEYWORDS="x86 ppc sparc alpha hppa mips"
 LICENSE="as-is"
 SLOT="0"
+IUSE=""
 
 DEPEND="=net-www/apache-1.3.31*
 	>=dev-libs/openssl-0.9.6k"
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 7f1e733ad3c8..04fd841b8c63 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-2004 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.1 2004/10/23 21:18:09 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_ssl/mod_ssl-2.8.21.ebuild,v 1.2 2004/10/29 13:14:59 stuart Exp $
 
 MY_P=${P}-1.3.32
 S=${WORKDIR}/${MY_P}
@@ -8,12 +8,12 @@ DESCRIPTION="An SSL module for the Apache Web server"
 SRC_URI="http://www.modssl.org/source/${MY_P}.tar.gz"
 HOMEPAGE="http://www.modssl.org/"
 
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips"
+KEYWORDS="x86 ~ppc ~sparc ~alpha ~hppa ~mips"
 LICENSE="as-is"
 SLOT="0"
 IUSE=""
 
-DEPEND="=net-www/apache-1.3.32*
+DEPEND="|| ( =net-www/apache-1.3.32* =net-www/apache-1.3.33* )
 	>=dev-libs/openssl-0.9.6k"
 
 src_unpack() {
@@ -25,8 +25,14 @@ src_unpack() {
 }
 
 src_compile() {
+	myconf=""
+
 	if has_version '=sys-libs/gdbm-1.8.3*' ; then
-	     myconf = "--enable-rule=SSL_SDBM"
+	     myconf="--enable-rule=SSL_SDBM"
+	fi
+
+	if has_version '=net-www/apache-1.3.33' ; then
+		myconf="${myconf} --force"
 	fi
 
 	SSL_BASE=SYSTEM \