commit: d172589652a0ba58013a4eaad4f1fa78d7ca870f
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sat May 1 14:51:46 2021 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sat May 1 14:52:14 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1725896
net-proxy/haproxy: remove libressl support
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
net-proxy/haproxy/haproxy-1.8.29.ebuild | 5 ++---
net-proxy/haproxy/haproxy-1.8.30.ebuild | 5 ++---
net-proxy/haproxy/haproxy-2.0.14-r2.ebuild | 5 ++---
net-proxy/haproxy/haproxy-2.0.21.ebuild | 5 ++---
net-proxy/haproxy/haproxy-2.0.22.ebuild | 5 ++---
net-proxy/haproxy/haproxy-2.0.9999.ebuild | 5 ++---
net-proxy/haproxy/haproxy-2.2.12.ebuild | 5 ++---
net-proxy/haproxy/haproxy-2.2.13.ebuild | 5 ++---
net-proxy/haproxy/haproxy-2.2.5-r1.ebuild | 5 ++---
net-proxy/haproxy/haproxy-2.2.9999.ebuild | 5 ++---
net-proxy/haproxy/haproxy-2.3.9.ebuild | 5 ++---
net-proxy/haproxy/haproxy-2.3.9999.ebuild | 5 ++---
12 files changed, 24 insertions(+), 36 deletions(-)
diff --git a/net-proxy/haproxy/haproxy-1.8.29.ebuild
b/net-proxy/haproxy/haproxy-1.8.29.ebuild
index 861e6ae7a25..6b6c80be510 100644
--- a/net-proxy/haproxy/haproxy-1.8.29.ebuild
+++ b/net-proxy/haproxy/haproxy-1.8.29.ebuild
@@ -20,7 +20,7 @@ fi
LICENSE="GPL-2 LGPL-2.1"
SLOT="0/$(ver_cut 1-2)"
-IUSE="+crypt doc examples libressl slz net_ns +pcre pcre-jit pcre2 pcre2-jit
ssl
+IUSE="+crypt doc examples slz net_ns +pcre pcre-jit pcre2 pcre2-jit ssl
systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
REQUIRED_USE="pcre-jit? ( pcre )
pcre2-jit? ( pcre2 )
@@ -38,8 +38,7 @@ DEPEND="
pcre2-jit? ( dev-libs/libpcre2[jit] )
)
ssl? (
- !libressl? ( dev-libs/openssl:0=[zlib?] )
- libressl? ( dev-libs/libressl:0= )
+ dev-libs/openssl:0=[zlib?]
)
slz? ( dev-libs/libslz:= )
systemd? ( sys-apps/systemd )
diff --git a/net-proxy/haproxy/haproxy-1.8.30.ebuild
b/net-proxy/haproxy/haproxy-1.8.30.ebuild
index 861e6ae7a25..6b6c80be510 100644
--- a/net-proxy/haproxy/haproxy-1.8.30.ebuild
+++ b/net-proxy/haproxy/haproxy-1.8.30.ebuild
@@ -20,7 +20,7 @@ fi
LICENSE="GPL-2 LGPL-2.1"
SLOT="0/$(ver_cut 1-2)"
-IUSE="+crypt doc examples libressl slz net_ns +pcre pcre-jit pcre2 pcre2-jit
ssl
+IUSE="+crypt doc examples slz net_ns +pcre pcre-jit pcre2 pcre2-jit ssl
systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
REQUIRED_USE="pcre-jit? ( pcre )
pcre2-jit? ( pcre2 )
@@ -38,8 +38,7 @@ DEPEND="
pcre2-jit? ( dev-libs/libpcre2[jit] )
)
ssl? (
- !libressl? ( dev-libs/openssl:0=[zlib?] )
- libressl? ( dev-libs/libressl:0= )
+ dev-libs/openssl:0=[zlib?]
)
slz? ( dev-libs/libslz:= )
systemd? ( sys-apps/systemd )
diff --git a/net-proxy/haproxy/haproxy-2.0.14-r2.ebuild
b/net-proxy/haproxy/haproxy-2.0.14-r2.ebuild
index bffd36a3ab4..59e794398e8 100644
--- a/net-proxy/haproxy/haproxy-2.0.14-r2.ebuild
+++ b/net-proxy/haproxy/haproxy-2.0.14-r2.ebuild
@@ -20,7 +20,7 @@ fi
LICENSE="GPL-2 LGPL-2.1"
SLOT="0/$(ver_cut 1-2)"
-IUSE="+crypt doc examples libressl slz +net_ns +pcre pcre-jit pcre2 pcre2-jit
prometheus-exporter
+IUSE="+crypt doc examples slz +net_ns +pcre pcre-jit pcre2 pcre2-jit
prometheus-exporter
ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
REQUIRED_USE="pcre-jit? ( pcre )
pcre2-jit? ( pcre2 )
@@ -38,8 +38,7 @@ DEPEND="
pcre2-jit? ( dev-libs/libpcre2[jit] )
)
ssl? (
- !libressl? ( dev-libs/openssl:0=[zlib?] )
- libressl? ( dev-libs/libressl:0= )
+ dev-libs/openssl:0=[zlib?]
)
slz? ( dev-libs/libslz:= )
systemd? ( sys-apps/systemd )
diff --git a/net-proxy/haproxy/haproxy-2.0.21.ebuild
b/net-proxy/haproxy/haproxy-2.0.21.ebuild
index 94d32f6c96a..85d813df107 100644
--- a/net-proxy/haproxy/haproxy-2.0.21.ebuild
+++ b/net-proxy/haproxy/haproxy-2.0.21.ebuild
@@ -20,7 +20,7 @@ fi
LICENSE="GPL-2 LGPL-2.1"
SLOT="0/$(ver_cut 1-2)"
-IUSE="+crypt doc examples libressl slz +net_ns +pcre pcre-jit pcre2 pcre2-jit
prometheus-exporter
+IUSE="+crypt doc examples slz +net_ns +pcre pcre-jit pcre2 pcre2-jit
prometheus-exporter
ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
REQUIRED_USE="pcre-jit? ( pcre )
pcre2-jit? ( pcre2 )
@@ -38,8 +38,7 @@ DEPEND="
pcre2-jit? ( dev-libs/libpcre2[jit] )
)
ssl? (
- !libressl? ( dev-libs/openssl:0=[zlib?] )
- libressl? ( dev-libs/libressl:0= )
+ dev-libs/openssl:0=[zlib?]
)
slz? ( dev-libs/libslz:= )
systemd? ( sys-apps/systemd )
diff --git a/net-proxy/haproxy/haproxy-2.0.22.ebuild
b/net-proxy/haproxy/haproxy-2.0.22.ebuild
index 94d32f6c96a..85d813df107 100644
--- a/net-proxy/haproxy/haproxy-2.0.22.ebuild
+++ b/net-proxy/haproxy/haproxy-2.0.22.ebuild
@@ -20,7 +20,7 @@ fi
LICENSE="GPL-2 LGPL-2.1"
SLOT="0/$(ver_cut 1-2)"
-IUSE="+crypt doc examples libressl slz +net_ns +pcre pcre-jit pcre2 pcre2-jit
prometheus-exporter
+IUSE="+crypt doc examples slz +net_ns +pcre pcre-jit pcre2 pcre2-jit
prometheus-exporter
ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
REQUIRED_USE="pcre-jit? ( pcre )
pcre2-jit? ( pcre2 )
@@ -38,8 +38,7 @@ DEPEND="
pcre2-jit? ( dev-libs/libpcre2[jit] )
)
ssl? (
- !libressl? ( dev-libs/openssl:0=[zlib?] )
- libressl? ( dev-libs/libressl:0= )
+ dev-libs/openssl:0=[zlib?]
)
slz? ( dev-libs/libslz:= )
systemd? ( sys-apps/systemd )
diff --git a/net-proxy/haproxy/haproxy-2.0.9999.ebuild
b/net-proxy/haproxy/haproxy-2.0.9999.ebuild
index bdd4de3bca2..212a9472379 100644
--- a/net-proxy/haproxy/haproxy-2.0.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.0.9999.ebuild
@@ -20,7 +20,7 @@ fi
LICENSE="GPL-2 LGPL-2.1"
SLOT="0/$(ver_cut 1-2)"
-IUSE="+crypt doc examples libressl slz +net_ns +pcre pcre-jit pcre2 pcre2-jit
prometheus-exporter
+IUSE="+crypt doc examples slz +net_ns +pcre pcre-jit pcre2 pcre2-jit
prometheus-exporter
ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
REQUIRED_USE="pcre-jit? ( pcre )
pcre2-jit? ( pcre2 )
@@ -38,8 +38,7 @@ DEPEND="
pcre2-jit? ( dev-libs/libpcre2[jit] )
)
ssl? (
- !libressl? ( dev-libs/openssl:0=[zlib?] )
- libressl? ( dev-libs/libressl:0= )
+ dev-libs/openssl:0=[zlib?]
)
systemd? ( sys-apps/systemd )
slz? ( dev-libs/libslz:= )
diff --git a/net-proxy/haproxy/haproxy-2.2.12.ebuild
b/net-proxy/haproxy/haproxy-2.2.12.ebuild
index 94d32f6c96a..85d813df107 100644
--- a/net-proxy/haproxy/haproxy-2.2.12.ebuild
+++ b/net-proxy/haproxy/haproxy-2.2.12.ebuild
@@ -20,7 +20,7 @@ fi
LICENSE="GPL-2 LGPL-2.1"
SLOT="0/$(ver_cut 1-2)"
-IUSE="+crypt doc examples libressl slz +net_ns +pcre pcre-jit pcre2 pcre2-jit
prometheus-exporter
+IUSE="+crypt doc examples slz +net_ns +pcre pcre-jit pcre2 pcre2-jit
prometheus-exporter
ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
REQUIRED_USE="pcre-jit? ( pcre )
pcre2-jit? ( pcre2 )
@@ -38,8 +38,7 @@ DEPEND="
pcre2-jit? ( dev-libs/libpcre2[jit] )
)
ssl? (
- !libressl? ( dev-libs/openssl:0=[zlib?] )
- libressl? ( dev-libs/libressl:0= )
+ dev-libs/openssl:0=[zlib?]
)
slz? ( dev-libs/libslz:= )
systemd? ( sys-apps/systemd )
diff --git a/net-proxy/haproxy/haproxy-2.2.13.ebuild
b/net-proxy/haproxy/haproxy-2.2.13.ebuild
index 94d32f6c96a..85d813df107 100644
--- a/net-proxy/haproxy/haproxy-2.2.13.ebuild
+++ b/net-proxy/haproxy/haproxy-2.2.13.ebuild
@@ -20,7 +20,7 @@ fi
LICENSE="GPL-2 LGPL-2.1"
SLOT="0/$(ver_cut 1-2)"
-IUSE="+crypt doc examples libressl slz +net_ns +pcre pcre-jit pcre2 pcre2-jit
prometheus-exporter
+IUSE="+crypt doc examples slz +net_ns +pcre pcre-jit pcre2 pcre2-jit
prometheus-exporter
ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
REQUIRED_USE="pcre-jit? ( pcre )
pcre2-jit? ( pcre2 )
@@ -38,8 +38,7 @@ DEPEND="
pcre2-jit? ( dev-libs/libpcre2[jit] )
)
ssl? (
- !libressl? ( dev-libs/openssl:0=[zlib?] )
- libressl? ( dev-libs/libressl:0= )
+ dev-libs/openssl:0=[zlib?]
)
slz? ( dev-libs/libslz:= )
systemd? ( sys-apps/systemd )
diff --git a/net-proxy/haproxy/haproxy-2.2.5-r1.ebuild
b/net-proxy/haproxy/haproxy-2.2.5-r1.ebuild
index 2c82ff8d723..f2141551be5 100644
--- a/net-proxy/haproxy/haproxy-2.2.5-r1.ebuild
+++ b/net-proxy/haproxy/haproxy-2.2.5-r1.ebuild
@@ -20,7 +20,7 @@ fi
LICENSE="GPL-2 LGPL-2.1"
SLOT="0/$(ver_cut 1-2)"
-IUSE="+crypt doc examples libressl slz +net_ns +pcre pcre-jit pcre2 pcre2-jit
prometheus-exporter
+IUSE="+crypt doc examples slz +net_ns +pcre pcre-jit pcre2 pcre2-jit
prometheus-exporter
ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
REQUIRED_USE="pcre-jit? ( pcre )
pcre2-jit? ( pcre2 )
@@ -38,8 +38,7 @@ DEPEND="
pcre2-jit? ( dev-libs/libpcre2[jit] )
)
ssl? (
- !libressl? ( dev-libs/openssl:0=[zlib?] )
- libressl? ( dev-libs/libressl:0= )
+ dev-libs/openssl:0=[zlib?]
)
slz? ( dev-libs/libslz:= )
systemd? ( sys-apps/systemd )
diff --git a/net-proxy/haproxy/haproxy-2.2.9999.ebuild
b/net-proxy/haproxy/haproxy-2.2.9999.ebuild
index 94d32f6c96a..85d813df107 100644
--- a/net-proxy/haproxy/haproxy-2.2.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.2.9999.ebuild
@@ -20,7 +20,7 @@ fi
LICENSE="GPL-2 LGPL-2.1"
SLOT="0/$(ver_cut 1-2)"
-IUSE="+crypt doc examples libressl slz +net_ns +pcre pcre-jit pcre2 pcre2-jit
prometheus-exporter
+IUSE="+crypt doc examples slz +net_ns +pcre pcre-jit pcre2 pcre2-jit
prometheus-exporter
ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
REQUIRED_USE="pcre-jit? ( pcre )
pcre2-jit? ( pcre2 )
@@ -38,8 +38,7 @@ DEPEND="
pcre2-jit? ( dev-libs/libpcre2[jit] )
)
ssl? (
- !libressl? ( dev-libs/openssl:0=[zlib?] )
- libressl? ( dev-libs/libressl:0= )
+ dev-libs/openssl:0=[zlib?]
)
slz? ( dev-libs/libslz:= )
systemd? ( sys-apps/systemd )
diff --git a/net-proxy/haproxy/haproxy-2.3.9.ebuild
b/net-proxy/haproxy/haproxy-2.3.9.ebuild
index 463b8b547e6..a2280c3fd25 100644
--- a/net-proxy/haproxy/haproxy-2.3.9.ebuild
+++ b/net-proxy/haproxy/haproxy-2.3.9.ebuild
@@ -20,7 +20,7 @@ fi
LICENSE="GPL-2 LGPL-2.1"
SLOT="0/$(ver_cut 1-2)"
-IUSE="+crypt doc examples libressl slz +net_ns +pcre pcre-jit pcre2 pcre2-jit
prometheus-exporter
+IUSE="+crypt doc examples slz +net_ns +pcre pcre-jit pcre2 pcre2-jit
prometheus-exporter
ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
REQUIRED_USE="pcre-jit? ( pcre )
pcre2-jit? ( pcre2 )
@@ -38,8 +38,7 @@ DEPEND="
pcre2-jit? ( dev-libs/libpcre2[jit] )
)
ssl? (
- !libressl? ( dev-libs/openssl:0=[zlib?] )
- libressl? ( dev-libs/libressl:0= )
+ dev-libs/openssl:0=[zlib?]
)
slz? ( dev-libs/libslz:= )
systemd? ( sys-apps/systemd )
diff --git a/net-proxy/haproxy/haproxy-2.3.9999.ebuild
b/net-proxy/haproxy/haproxy-2.3.9999.ebuild
index 94d32f6c96a..85d813df107 100644
--- a/net-proxy/haproxy/haproxy-2.3.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.3.9999.ebuild
@@ -20,7 +20,7 @@ fi
LICENSE="GPL-2 LGPL-2.1"
SLOT="0/$(ver_cut 1-2)"
-IUSE="+crypt doc examples libressl slz +net_ns +pcre pcre-jit pcre2 pcre2-jit
prometheus-exporter
+IUSE="+crypt doc examples slz +net_ns +pcre pcre-jit pcre2 pcre2-jit
prometheus-exporter
ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
REQUIRED_USE="pcre-jit? ( pcre )
pcre2-jit? ( pcre2 )
@@ -38,8 +38,7 @@ DEPEND="
pcre2-jit? ( dev-libs/libpcre2[jit] )
)
ssl? (
- !libressl? ( dev-libs/openssl:0=[zlib?] )
- libressl? ( dev-libs/libressl:0= )
+ dev-libs/openssl:0=[zlib?]
)
slz? ( dev-libs/libslz:= )
systemd? ( sys-apps/systemd )
