Fix problems with -ssl compilation of www-servers/nginx (see bug 293785).

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 19 insertions, 15 deletions

diff --git a/www-servers/nginx/ChangeLog b/www-servers/nginx/ChangeLog
index 204626d0abd5..4a7f17f82b85 100644
--- a/www-servers/nginx/ChangeLog
+++ b/www-servers/nginx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-servers/nginx
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.231 2009/12/08 14:49:37 djc Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.232 2010/01/01 20:33:10 djc Exp $
+
+  01 Jan 2010; Dirkjan Ochtman <djc@gentoo.org> nginx-0.7.64.ebuild,
+  nginx-0.8.29.ebuild:
+  Fix problems with ssl requirements (see bug 293785 for discussion).
 
 *nginx-0.8.29 (08 Dec 2009)
 *nginx-0.7.64 (08 Dec 2009)
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index e3e17d1fc2ad..3f224513411f 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -15,8 +15,8 @@ DIST nginx-0.8.29.tar.gz 617202 RMD160 5960e7ec51261ec667f45722333971e26b759af4
 EBUILD nginx-0.5.38.ebuild 2953 RMD160 82f38767612e0fa42760435b044c0723645b5920 SHA1 4b6033ac8b4c63a5b207c9ce478a9bc820e4e18d SHA256 6fc8868965a6a1bca92fddf777f6bfdc6550ca0902cd47db895ab3dec5fa406a
 EBUILD nginx-0.6.39.ebuild 3065 RMD160 8d86dee4b70e98c62f1950d7fbc497335f6bd0c0 SHA1 ca5dc97e05ffe1f6d14cf973b3405a338c762d0c SHA256 c55e5dc81dd6f48513152a34f2c3feea6de495994ab8d8fb43ab9096b8ab563a
 EBUILD nginx-0.7.62.ebuild 3266 RMD160 c43344c6945dc7b0fe8b36054fda2e21b7a19b22 SHA1 26e76db9a98cbe052ceb4b9e3a4d63ab071f2df7 SHA256 dfb55c9fc3cddbf8f9166096795c9f190300aebb84a3314f13729ff07c4768e0
-EBUILD nginx-0.7.64.ebuild 3261 RMD160 7aa8274c93d0e1998761176208333f0d159b5d12 SHA1 8d6033474d0532cf2fab16addcf9368bf3bf3471 SHA256 d20023dedcbb083e6ed9eefdc0e103c2e95ad773fb79706a0aea61708d98814b
+EBUILD nginx-0.7.64.ebuild 3244 RMD160 f5499165904fe39739c29d2da9338161cc2dd08b SHA1 1322af1b8f49d2f2a6f2aee0a2bb0677d8b69006 SHA256 fb1c128cd457940dae677158fc7636ce1df4536d9ece46da97801bda2f5ac11e
 EBUILD nginx-0.8.17.ebuild 3593 RMD160 1661c53de84e5ab9fc18876615bd7b1051b1e2d8 SHA1 e67a2904063912468c82fcdb181507b6528e449d SHA256 025508e9313338b9727fc1e509eec8f5132dc03fabb2783245673312ce81c7e1
-EBUILD nginx-0.8.29.ebuild 3591 RMD160 bd9d98419a9eca7f7bb7fc2127e5a67a565ce028 SHA1 13a8f6408b57aeb480cde906535ac5b0889f4332 SHA256 f9bc7a867441382a1f9ac4da6176bc0b2e234ea822f744eb8a228424122c3182
-MISC ChangeLog 37636 RMD160 ed3308cf4f09e387e0d5128bf5e29a220b04fe73 SHA1 048c493091220994ee2d2e6d226dac69b4d56105 SHA256 af9a3956eafbb489636049cc351ac322cfde33cc941d35569fe579587ee9d99a
+EBUILD nginx-0.8.29.ebuild 3574 RMD160 b75520b5e7a4700c0d6f3ce517a22b5cbd5f842e SHA1 47f4a7a0dbf8d595b33232fcdb3c06944edf5990 SHA256 4c09af005cefeb4c95e966aa1c22f2520fdf4dc2c4f2e7d9f99f2909c00da288
+MISC ChangeLog 37799 RMD160 f7495b8dc635108dde442b4ed7217268632816c5 SHA1 b52001ad65dce7483cf26276efc786c18d282be3 SHA256 29647f89c8085b994866b5fba3ebcf211c3bb56c591cf7de817c288ad1366483
 MISC metadata.xml 658 RMD160 7294560d00411e37fcc73d1d93f0582f7991b380 SHA1 85d04bdf906447f68042f21c12b18016059c0371 SHA256 e73d513e05935ab2dceb674477ff4ff70e39e48171782e0882a2a44993f01ce8
diff --git a/www-servers/nginx/nginx-0.7.64.ebuild b/www-servers/nginx/nginx-0.7.64.ebuild
index 7e65b5d2a4ad..d4a3fb7818c4 100644
--- a/www-servers/nginx/nginx-0.7.64.ebuild
+++ b/www-servers/nginx/nginx-0.7.64.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.7.64.ebuild,v 1.1 2009/12/08 14:49:37 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.7.64.ebuild,v 1.2 2010/01/01 20:33:10 djc Exp $
 
 inherit eutils ssl-cert toolchain-funcs
 
@@ -14,8 +14,8 @@ KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
 IUSE="addition debug fastcgi flv imap pcre perl random-index ssl status sub webdav zlib"
 
 DEPEND="dev-lang/perl
+	dev-libs/openssl
 	pcre? ( >=dev-libs/libpcre-4.2 )
-	ssl? ( dev-libs/openssl )
 	zlib? ( sys-libs/zlib )
 	perl? ( >=dev-lang/perl-5.8 )"
 
@@ -64,6 +64,8 @@ src_compile() {
 	tc-export CC
 	./configure \
 		--prefix=/usr \
+		--with-cc-opt="-I${ROOT}/usr/include" \
+		--with-ld-opt="-L${ROOT}/usr/lib" \
 		--conf-path=/etc/${PN}/${PN}.conf \
 		--http-log-path=/var/log/${PN}/access_log \
 		--error-log-path=/var/log/${PN}/error_log \
@@ -71,8 +73,6 @@ src_compile() {
 		--http-client-body-temp-path=/var/tmp/${PN}/client \
 		--http-proxy-temp-path=/var/tmp/${PN}/proxy \
 		--http-fastcgi-temp-path=/var/tmp/${PN}/fastcgi \
-		--with-md5-asm --with-md5=/usr/include \
-		--with-sha1-asm --with-sha1=/usr/include \
 		${myconf} || die "configure failed"
 
 	emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}" || die "failed to compile"
diff --git a/www-servers/nginx/nginx-0.8.29.ebuild b/www-servers/nginx/nginx-0.8.29.ebuild
index 95f1dec2948a..920b1dd7c2c6 100644
--- a/www-servers/nginx/nginx-0.8.29.ebuild
+++ b/www-servers/nginx/nginx-0.8.29.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.8.29.ebuild,v 1.1 2009/12/08 14:49:37 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.8.29.ebuild,v 1.2 2010/01/01 20:33:10 djc Exp $
 
 inherit eutils ssl-cert toolchain-funcs
 
@@ -14,8 +14,8 @@ KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
 IUSE="addition debug fastcgi flv imap ipv6 pcre perl random-index securelink ssl status sub webdav zlib"
 
 DEPEND="dev-lang/perl
+	dev-libs/openssl
 	pcre? ( >=dev-libs/libpcre-4.2 )
-	ssl? ( dev-libs/openssl )
 	zlib? ( sys-libs/zlib )
 	perl? ( >=dev-lang/perl-5.8 )"
 
@@ -71,6 +71,8 @@ src_compile() {
 	tc-export CC
 	./configure \
 		--prefix=/usr \
+		--with-cc-opt="-I${ROOT}/usr/include" \
+		--with-ld-opt="-L${ROOT}/usr/lib" \
 		--conf-path=/etc/${PN}/${PN}.conf \
 		--http-log-path=/var/log/${PN}/access_log \
 		--error-log-path=/var/log/${PN}/error_log \
@@ -78,8 +80,6 @@ src_compile() {
 		--http-client-body-temp-path=/var/tmp/${PN}/client \
 		--http-proxy-temp-path=/var/tmp/${PN}/proxy \
 		--http-fastcgi-temp-path=/var/tmp/${PN}/fastcgi \
-		--with-md5-asm --with-md5=/usr/include \
-		--with-sha1-asm --with-sha1=/usr/include \
 		${myconf} || die "configure failed"
 
 	emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}" || die "failed to compile"