Added ssl USE flag support

5 files changed, 27 insertions, 14 deletions

diff --git a/net-www/apache/ChangeLog b/net-www/apache/ChangeLog
index e455a10a12a8..798bc67f2c9a 100644
--- a/net-www/apache/ChangeLog
+++ b/net-www/apache/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-www/apache
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.287 2004/10/29 12:10:46 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.288 2004/10/29 15:21:15 stuart Exp $
+
+  29 Oct 2004; Stuart Herbert <stuart@gentoo.org> apache-1.3.32-r1.ebuild,
+  apache-1.3.33.ebuild:
+  Added ssl USE flag support
+
+  29 Oct 2004; Stuart Herbert <stuart@gentoo.org> apache-1.3.32-r1.ebuild,
+  apache-1.3.33.ebuild:
+  Marked stable on x86
 
   29 Oct 2004; Stuart Herbert <stuart@gentoo.org> apache-1.3.33.ebuild:
   Updated to use existing mod_ssl for now
diff --git a/net-www/apache/Manifest b/net-www/apache/Manifest
index 62f1b0c1fdd5..c19af4b6ceb1 100644
--- a/net-www/apache/Manifest
+++ b/net-www/apache/Manifest
@@ -4,14 +4,14 @@ MD5 c46f4b015504b2b22e0b8a7917ec84bf apache-1.3.31-r2.ebuild 6864
 MD5 f71001bc9b282e7eb336570621b54328 apache-1.3.31-r3.ebuild 6872
 MD5 08b63251db95f14ddbdc4b0368d48702 apache-1.3.31.ebuild 6693
 MD5 c5b1ef03a59e0a8fc24a52f78cafc86b apache-2.0.50.ebuild 12925
-MD5 097dc11a0c44c5cace07624cfa2d5442 ChangeLog 48853
+MD5 f83accc0f928a50fb1ea187c04b135d3 ChangeLog 48976
 MD5 190e9f0c2c609961ca653a7d08e0a13e apache-2.0.51-r1.ebuild 12858
 MD5 8f1b0aafba0dfaa809f85a1dc53db750 apache-2.0.52.ebuild 12854
 MD5 5b6dd438f81019e56fa641841c0c13fe metadata.xml 501
 MD5 c4728dbf14f69ec79e3dc9d3636e3f0b apache-1.3.32.ebuild 6616
 MD5 9571486ae781f512a13ff50006873ff2 apache-2.0.51.ebuild 12849
-MD5 f492ca3f2e3aa39f1f89802929fd9700 apache-1.3.32-r1.ebuild 6611
-MD5 017d08d11ecf1fe8074323b8834c5431 apache-1.3.33.ebuild 6722
+MD5 30e02c3f1b76fc37c6aa10fa5c905ed1 apache-1.3.32-r1.ebuild 6610
+MD5 0af78d285817832d2ac3d1e8519a09c2 apache-1.3.33.ebuild 6815
 MD5 8b12871dd74fcd3f4fdf451c9d8c259e files/00_apache_manual.conf 781
 MD5 998b4b7df08eb15641e0b9132443b365 files/apache-1.3.27-apachectl.patch 1328
 MD5 37d2c4ea8e1a6725deaca42b6aa22c69 files/apache-1.3.27_db4_gentoo.patch 1006
@@ -45,7 +45,7 @@ MD5 59a6ba7dcde461f5350af41e6aff92b1 files/robots.txt 342
 MD5 d3626a1e31a675c60d066c111d552adf files/suexec.pam 59
 MD5 161245c7aa1eb785db53b34d6a10be43 files/suexec_pam_gentoo.patch 2149
 MD5 c560ade7dafffbfdd05ec6deb125280b files/digest-apache-1.3.32-r1 215
-MD5 bc75fe38027fb8f1c3740643f3cdbc1c files/digest-apache-1.3.33 139
+MD5 189cfb35b6320ae3ab57a32dbadd18f2 files/digest-apache-1.3.33 212
 MD5 69d40992fa9301ce3198a0115fa1f31c files/digest-apache-2.0.51 137
 MD5 869ec17a0417518aa1d9d9566a958fb5 files/2.0.40/40_mod_ssl.conf 3185
 MD5 1d10cc98714a34ddc38525743c2989f9 files/2.0.40/41_mod_ssl.default-vhost.conf 8053
diff --git a/net-www/apache/apache-1.3.32-r1.ebuild b/net-www/apache/apache-1.3.32-r1.ebuild
index 0bb80a264d80..2592e07d0d63 100644
--- a/net-www/apache/apache-1.3.32-r1.ebuild
+++ b/net-www/apache/apache-1.3.32-r1.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/apache/apache-1.3.32-r1.ebuild,v 1.5 2004/10/26 08:43:06 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.32-r1.ebuild,v 1.6 2004/10/29 15:21:15 stuart Exp $
 
 inherit eutils fixheadtails
 
@@ -11,7 +11,7 @@ mod_ssl_ver=2.8.21
 S=${WORKDIR}/${PN}_${PV}
 DESCRIPTION="The Apache Web Server"
 HOMEPAGE="http://www.apache.org http://www.modssl.org"
-KEYWORDS="~x86 ppc sparc alpha ~hppa amd64 ~ia64 ~mips"
+KEYWORDS="x86 ppc sparc alpha ~hppa amd64 ~ia64 ~mips"
 SRC_URI="http://www.apache.org/dist/httpd/apache_${PV}.tar.gz
 	ftp://ftp.modssl.org/source/mod_ssl-${mod_ssl_ver}-${PV}.tar.gz
 	http://dev.gentoo.org/~tigger/apache-patches-1.3.32-r1.tar.bz2"
diff --git a/net-www/apache/apache-1.3.33.ebuild b/net-www/apache/apache-1.3.33.ebuild
index 790a2c084649..d9419dde248e 100644
--- a/net-www/apache/apache-1.3.33.ebuild
+++ b/net-www/apache/apache-1.3.33.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/apache/apache-1.3.33.ebuild,v 1.2 2004/10/29 12:10:46 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.33.ebuild,v 1.3 2004/10/29 15:21:15 stuart Exp $
 
 # stuart@gentoo.org - 2004/10/29:
 #
@@ -8,16 +8,17 @@
 
 inherit eutils fixheadtails
 
-IUSE="pam"
+IUSE="pam ssl"
 
-mod_ssl_ver=2.8.21
+mod_ssl_dep=2.8.21
+mod_ssl_ver=2.8.21-1.3.32
 
 S=${WORKDIR}/${PN}_${PV}
 DESCRIPTION="The Apache Web Server"
 HOMEPAGE="http://www.apache.org http://www.modssl.org"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~mips"
+KEYWORDS="x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~mips"
 SRC_URI="http://www.apache.org/dist/httpd/apache_${PV}.tar.gz
-	ftp://ftp.modssl.org/source/mod_ssl-${mod_ssl_ver}-1.3.32.tar.gz
+	ftp://ftp.modssl.org/source/mod_ssl-${mod_ssl_ver}.tar.gz
 	http://dev.gentoo.org/~stuart/apache-patches-1.3.33.tar.bz2"
 
 # The mod_ssl archive is only for providing the EAPI patch in here.
@@ -29,7 +30,10 @@ DEPEND="dev-lang/perl <=sys-libs/db-4.1
 	>=dev-libs/expat-1.95.2
 	>=sys-apps/sed-4
 	=sys-libs/db-1*
-	selinux? ( sec-policy/selinux-apache )"
+	selinux? ( sec-policy/selinux-apache )
+	ssl? ( =net-www/mod_ssl-${mod_ssl_dep} )
+	!<net-www/mod_ssl-${mod_ssl_dep}"
+
 LICENSE="Apache-2.0"
 SLOT="1"
 
@@ -48,7 +52,7 @@ src_unpack() {
 	ht_fix_file src/Configure src/helpers/getuid.sh
 
 	# setup eapi...
-	myssl=${WORKDIR}/mod_ssl-${mod_ssl_ver}-${PV}
+	myssl=${WORKDIR}/mod_ssl-${mod_ssl_ver}
 	cp ${myssl}/pkg.eapi/*.h src/include
 	cp ${myssl}/pkg.eapi/*.c src/ap
 	epatch ${myssl}/pkg.eapi/eapi.patch || die "eapi"
diff --git a/net-www/apache/files/digest-apache-1.3.33 b/net-www/apache/files/digest-apache-1.3.33
index 44794be1e42f..a298ce69b43d 100644
--- a/net-www/apache/files/digest-apache-1.3.33
+++ b/net-www/apache/files/digest-apache-1.3.33
@@ -1,2 +1,3 @@
 MD5 3dfd2c3778f37a2dfc22b97417a61407 apache_1.3.33.tar.gz 2468567
+MD5 19994ade6f8c46aa6cac87bca797fe82 mod_ssl-2.8.21-1.3.32.tar.gz 754629
 MD5 076a31dd788955ae49316ead2368e71d apache-patches-1.3.33.tar.bz2 14275