From: Anthony G. Basile <blueness@gentoo.org>
Date: Wed, 10 Aug 2016 07:13:14 +0000 (-0400)
Subject: net-proxy/haproxy: add libressl support
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7dc34f0c133ed543d68074d8ff71e4f1193bda51;p=gentoo.git

net-proxy/haproxy: add libressl support

Package-Manager: portage-2.2.28
---

diff --git a/net-proxy/haproxy/haproxy-1.5.18.ebuild b/net-proxy/haproxy/haproxy-1.5.18.ebuild
index 5225980feb81..56a14f50d2b5 100644
--- a/net-proxy/haproxy/haproxy-1.5.18.ebuild
+++ b/net-proxy/haproxy/haproxy-1.5.18.ebuild
@@ -15,12 +15,17 @@ SRC_URI="http://haproxy.1wt.eu/download/$(get_version_component_range 1-2)/src/$
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="+crypt examples +pcre pcre-jit ssl tools vim-syntax +zlib"
-
-DEPEND="pcre? ( dev-libs/libpcre
-				pcre-jit? ( dev-libs/libpcre[jit] )
-				)
-	ssl? ( dev-libs/openssl:0[zlib?] )
+IUSE="+crypt examples libressl +pcre pcre-jit ssl tools vim-syntax +zlib"
+
+DEPEND="
+	pcre? (
+		dev-libs/libpcre
+		pcre-jit? ( dev-libs/libpcre[jit] )
+	)
+	ssl? (
+		!libressl? ( dev-libs/openssl:0=[zlib?] )
+		libressl? ( dev-libs/libressl:0= )
+	)
 	zlib? ( sys-libs/zlib )"
 RDEPEND="${DEPEND}"
 
diff --git a/net-proxy/haproxy/haproxy-1.6.7.ebuild b/net-proxy/haproxy/haproxy-1.6.7.ebuild
index cd98d1ecfa4c..5b2d0aa04025 100644
--- a/net-proxy/haproxy/haproxy-1.6.7.ebuild
+++ b/net-proxy/haproxy/haproxy-1.6.7.ebuild
@@ -15,12 +15,17 @@ SRC_URI="http://haproxy.1wt.eu/download/$(get_version_component_range 1-2)/src/$
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="+crypt doc examples net_ns +pcre pcre-jit ssl tools vim-syntax +zlib" # lua
+IUSE="+crypt doc examples libressl net_ns +pcre pcre-jit ssl tools vim-syntax +zlib" # lua
 
-DEPEND="pcre? ( dev-libs/libpcre
+DEPEND="
+	pcre? (
+		dev-libs/libpcre
 		pcre-jit? ( dev-libs/libpcre[jit] )
 	)
-	ssl? ( dev-libs/openssl:0[zlib?] )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0=[zlib?] )
+		libressl? ( dev-libs/libressl:0= )
+	)
 	zlib? ( sys-libs/zlib )"
 # lua? ( dev-lang/lua:5.3 )
 RDEPEND="${DEPEND}"
diff --git a/net-proxy/haproxy/haproxy-9999.ebuild b/net-proxy/haproxy/haproxy-9999.ebuild
index 2446dbfdac11..6306bfac4c92 100644
--- a/net-proxy/haproxy/haproxy-9999.ebuild
+++ b/net-proxy/haproxy/haproxy-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -15,12 +15,17 @@ EGIT_REPO_URI="http://master.formilux.org/git/people/willy/haproxy.git"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS=""
-IUSE="+crypt examples +pcre pcre-jit ssl tools vim-syntax +zlib"
-
-DEPEND="pcre? ( dev-libs/libpcre
-				pcre-jit? ( dev-libs/libpcre[jit] )
-				)
-	ssl? ( dev-libs/openssl:0[zlib?] )
+IUSE="+crypt examples libressl +pcre pcre-jit ssl tools vim-syntax +zlib"
+
+DEPEND="
+	pcre? (
+		dev-libs/libpcre
+		pcre-jit? ( dev-libs/libpcre[jit] )
+	)
+	ssl? (
+		!libressl? ( dev-libs/openssl:0=[zlib?] )
+		libressl? ( dev-libs/libressl:0= )
+	)
 	zlib? ( sys-libs/zlib )"
 RDEPEND="${DEPEND}"