From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C787513933E for ; Wed, 21 Jul 2021 13:27:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ECD56E09AB; Wed, 21 Jul 2021 13:27:51 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BC58DE09AB for ; Wed, 21 Jul 2021 13:27:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6FA77342A5C for ; Wed, 21 Jul 2021 13:27:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D44A07D3 for ; Wed, 21 Jul 2021 13:27:48 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1626874055.a363a2c673789ca3ceb63017eca2444e8ebdb385.whissi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-proxy/haproxy/haproxy-2.0.14-r3.ebuild net-proxy/haproxy/haproxy-2.0.14-r4.ebuild net-proxy/haproxy/haproxy-2.0.22-r1.ebuild net-proxy/haproxy/haproxy-2.0.22-r2.ebuild net-proxy/haproxy/haproxy-2.0.23-r1.ebuild net-proxy/haproxy/haproxy-2.0.23.ebuild net-proxy/haproxy/haproxy-2.0.9999.ebuild net-proxy/haproxy/haproxy-2.2.14-r1.ebuild net-proxy/haproxy/haproxy-2.2.14-r2.ebuild net-proxy/haproxy/haproxy-2.2.15-r1.ebuild net-proxy/haproxy/haproxy-2.2.15.ebuild net-proxy/haproxy/haproxy-2.2.5-r2.ebuild net-proxy/haproxy/haproxy-2.2.5-r3.ebuild net-proxy/haproxy/haproxy-2.2.9999.ebuild net-proxy/haproxy/haproxy-2.3.10-r1.ebuild net-proxy/haproxy/haproxy-2.3.10-r2.ebuild net-proxy/haproxy/haproxy-2.3.12-r1.ebuild net-proxy/haproxy/haproxy-2.3.12.ebuild net-proxy/haproxy/haproxy-2.3.9999.ebuild net-proxy/haproxy/haproxy-2.4.1-r1.ebuild net-proxy/haproxy/haproxy-2.4.1-r2.ebuild net-proxy/haproxy/haproxy-2.4.2-r1.ebuild net-proxy/haproxy/haproxy-2.4.2.ebuild net-proxy/haproxy /haproxy-2.4.9999.ebuild X-VCS-Directories: net-proxy/haproxy/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: a363a2c673789ca3ceb63017eca2444e8ebdb385 X-VCS-Branch: master Date: Wed, 21 Jul 2021 13:27:48 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b346496c-911f-442e-8c41-ebfb0be2e87b X-Archives-Hash: 7ebe9be052ecb44d1652cb0d099e36a0 commit: a363a2c673789ca3ceb63017eca2444e8ebdb385 Author: Thomas Deutschmann gentoo org> AuthorDate: Wed Jul 21 13:26:02 2021 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Wed Jul 21 13:27:35 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a363a2c6 net-proxy/haproxy: don't depend on dev-libs/openssl[zlib] Package-Manager: Portage-3.0.21, Repoman-3.0.3 Signed-off-by: Thomas Deutschmann gentoo.org> ...y-2.0.14-r3.ebuild => haproxy-2.0.14-r4.ebuild} | 2 +- ...y-2.2.14-r1.ebuild => haproxy-2.0.22-r2.ebuild} | 2 +- ...y-2.0.22-r1.ebuild => haproxy-2.0.23-r1.ebuild} | 2 +- net-proxy/haproxy/haproxy-2.0.9999.ebuild | 2 +- ...roxy-2.0.23.ebuild => haproxy-2.2.14-r2.ebuild} | 2 +- ...y-2.2.14-r1.ebuild => haproxy-2.2.15-r1.ebuild} | 2 +- net-proxy/haproxy/haproxy-2.2.15.ebuild | 186 --------------------- ...oxy-2.2.5-r2.ebuild => haproxy-2.2.5-r3.ebuild} | 2 +- net-proxy/haproxy/haproxy-2.2.9999.ebuild | 2 +- ...y-2.3.10-r1.ebuild => haproxy-2.3.10-r2.ebuild} | 2 +- ...roxy-2.3.12.ebuild => haproxy-2.3.12-r1.ebuild} | 2 +- net-proxy/haproxy/haproxy-2.3.9999.ebuild | 2 +- ...aproxy-2.4.2.ebuild => haproxy-2.4.1-r2.ebuild} | 2 +- ...oxy-2.4.1-r1.ebuild => haproxy-2.4.2-r1.ebuild} | 2 +- net-proxy/haproxy/haproxy-2.4.9999.ebuild | 2 +- 15 files changed, 14 insertions(+), 200 deletions(-) diff --git a/net-proxy/haproxy/haproxy-2.0.14-r3.ebuild b/net-proxy/haproxy/haproxy-2.0.14-r4.ebuild similarity index 99% rename from net-proxy/haproxy/haproxy-2.0.14-r3.ebuild rename to net-proxy/haproxy/haproxy-2.0.14-r4.ebuild index 68db0dd8989..462ffc137f9 100644 --- a/net-proxy/haproxy/haproxy-2.0.14-r3.ebuild +++ b/net-proxy/haproxy/haproxy-2.0.14-r4.ebuild @@ -43,7 +43,7 @@ DEPEND=" pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( - dev-libs/openssl:0=[zlib?] + dev-libs/openssl:0= ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) diff --git a/net-proxy/haproxy/haproxy-2.2.14-r1.ebuild b/net-proxy/haproxy/haproxy-2.0.22-r2.ebuild similarity index 99% copy from net-proxy/haproxy/haproxy-2.2.14-r1.ebuild copy to net-proxy/haproxy/haproxy-2.0.22-r2.ebuild index 6335de9e475..894bf001b81 100644 --- a/net-proxy/haproxy/haproxy-2.2.14-r1.ebuild +++ b/net-proxy/haproxy/haproxy-2.0.22-r2.ebuild @@ -43,7 +43,7 @@ DEPEND=" pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( - dev-libs/openssl:0=[zlib?] + dev-libs/openssl:0= ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) diff --git a/net-proxy/haproxy/haproxy-2.0.22-r1.ebuild b/net-proxy/haproxy/haproxy-2.0.23-r1.ebuild similarity index 99% rename from net-proxy/haproxy/haproxy-2.0.22-r1.ebuild rename to net-proxy/haproxy/haproxy-2.0.23-r1.ebuild index 6335de9e475..894bf001b81 100644 --- a/net-proxy/haproxy/haproxy-2.0.22-r1.ebuild +++ b/net-proxy/haproxy/haproxy-2.0.23-r1.ebuild @@ -43,7 +43,7 @@ DEPEND=" pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( - dev-libs/openssl:0=[zlib?] + dev-libs/openssl:0= ) 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 6335de9e475..894bf001b81 100644 --- a/net-proxy/haproxy/haproxy-2.0.9999.ebuild +++ b/net-proxy/haproxy/haproxy-2.0.9999.ebuild @@ -43,7 +43,7 @@ DEPEND=" pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( - dev-libs/openssl:0=[zlib?] + dev-libs/openssl:0= ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) diff --git a/net-proxy/haproxy/haproxy-2.0.23.ebuild b/net-proxy/haproxy/haproxy-2.2.14-r2.ebuild similarity index 99% rename from net-proxy/haproxy/haproxy-2.0.23.ebuild rename to net-proxy/haproxy/haproxy-2.2.14-r2.ebuild index 6335de9e475..894bf001b81 100644 --- a/net-proxy/haproxy/haproxy-2.0.23.ebuild +++ b/net-proxy/haproxy/haproxy-2.2.14-r2.ebuild @@ -43,7 +43,7 @@ DEPEND=" pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( - dev-libs/openssl:0=[zlib?] + dev-libs/openssl:0= ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) diff --git a/net-proxy/haproxy/haproxy-2.2.14-r1.ebuild b/net-proxy/haproxy/haproxy-2.2.15-r1.ebuild similarity index 99% rename from net-proxy/haproxy/haproxy-2.2.14-r1.ebuild rename to net-proxy/haproxy/haproxy-2.2.15-r1.ebuild index 6335de9e475..894bf001b81 100644 --- a/net-proxy/haproxy/haproxy-2.2.14-r1.ebuild +++ b/net-proxy/haproxy/haproxy-2.2.15-r1.ebuild @@ -43,7 +43,7 @@ DEPEND=" pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( - dev-libs/openssl:0=[zlib?] + dev-libs/openssl:0= ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) diff --git a/net-proxy/haproxy/haproxy-2.2.15.ebuild b/net-proxy/haproxy/haproxy-2.2.15.ebuild deleted file mode 100644 index 6335de9e475..00000000000 --- a/net-proxy/haproxy/haproxy-2.2.15.ebuild +++ /dev/null @@ -1,186 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -LUA_COMPAT=( lua5-3 ) - -[[ ${PV} == *9999 ]] && SCM="git-r3" -inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM} - -MY_P="${PN}-${PV/_beta/-dev}" - -DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments" -HOMEPAGE="http://www.haproxy.org" -if [[ ${PV} != *9999 ]]; then - SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz" - KEYWORDS="~amd64 ~arm ~ppc ~x86" -else - EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/" - EGIT_BRANCH=master -fi - -LICENSE="GPL-2 LGPL-2.1" -SLOT="0/$(ver_cut 1-2)" -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 ) - pcre? ( !pcre2 ) - lua? ( ${LUA_REQUIRED_USE} ) - device-atlas? ( pcre ) - ?? ( slz zlib )" - -BDEPEND="virtual/pkgconfig" -DEPEND=" - crypt? ( virtual/libcrypt:= ) - pcre? ( - dev-libs/libpcre - pcre-jit? ( dev-libs/libpcre[jit] ) - ) - pcre2? ( - dev-libs/libpcre2:= - pcre2-jit? ( dev-libs/libpcre2:=[jit] ) - ) - ssl? ( - dev-libs/openssl:0=[zlib?] - ) - slz? ( dev-libs/libslz:= ) - systemd? ( sys-apps/systemd ) - zlib? ( sys-libs/zlib ) - lua? ( ${LUA_DEPS} ) - device-atlas? ( dev-libs/device-atlas-api-c )" -RDEPEND="${DEPEND} - acct-group/haproxy - acct-user/haproxy" - -S="${WORKDIR}/${MY_P}" - -DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README ) -CONTRIBS=( halog iprange ) -# ip6range is present in 1.6, but broken. -ver_test ${PV} -ge 1.7.0 && CONTRIBS+=( ip6range spoa_example tcploop ) -# TODO: mod_defender - requires apache / APR, modsecurity - the same -ver_test ${PV} -ge 1.8.0 && CONTRIBS+=( hpack ) - -haproxy_use() { - (( $# != 2 )) && die "${FUNCNAME} " - - usex "${1}" "USE_${2}=1" "USE_${2}=" -} - -pkg_setup() { - use lua && lua-single_pkg_setup - if use net_ns; then - CONFIG_CHECK="~NET_NS" - linux-info_pkg_setup - fi -} - -src_compile() { - local -a args=( - V=1 - TARGET=linux-glibc - ) - - # TODO: PCRE2_WIDTH? - args+=( $(haproxy_use threads THREAD) ) - args+=( $(haproxy_use crypt LIBCRYPT) ) - args+=( $(haproxy_use net_ns NS) ) - args+=( $(haproxy_use pcre PCRE) ) - args+=( $(haproxy_use pcre-jit PCRE_JIT) ) - args+=( $(haproxy_use pcre2 PCRE2) ) - args+=( $(haproxy_use pcre2-jit PCRE2_JIT) ) - args+=( $(haproxy_use ssl OPENSSL) ) - args+=( $(haproxy_use slz SLZ) ) - args+=( $(haproxy_use zlib ZLIB) ) - args+=( $(haproxy_use lua LUA) ) - args+=( $(haproxy_use 51degrees 51DEGREES) ) - args+=( $(haproxy_use device-atlas DEVICEATLAS) ) - args+=( $(haproxy_use wurfl WURFL) ) - args+=( $(haproxy_use systemd SYSTEMD) ) - - # For now, until the strict-aliasing breakage will be fixed - append-cflags -fno-strict-aliasing - - # Bug #668002 - if use ppc || use arm || use hppa; then - TARGET_LDFLAGS=-latomic - fi - - if use prometheus-exporter; then - EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o" - fi - - # HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing - emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" ${args[@]} - emake -C contrib/systemd SBINDIR=/usr/sbin - - if use tools ; then - for contrib in ${CONTRIBS[@]} ; do - # Those two includes are a workaround for hpack Makefile missing those - emake -C contrib/${contrib} \ - CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]} - done - fi -} - -src_install() { - dosbin haproxy - dosym ../sbin/haproxy /usr/bin/haproxy - - newconfd "${FILESDIR}/${PN}.confd" ${PN} - newinitd "${FILESDIR}/${PN}.initd-r6" ${PN} - - doman doc/haproxy.1 - - systemd_dounit contrib/systemd/haproxy.service - - einstalldocs - - # The errorfiles are used by upstream defaults. - insinto /etc/haproxy/errors/ - doins examples/errorfiles/* - - if use doc; then - dodoc ROADMAP doc/*.txt - #if use lua; then - # TODO: doc/lua-api/ - #fi - fi - - if use tools ; then - has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog - has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange - has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range - has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example - has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example - has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop - has "hpack" "${CONTRIBS[@]}" && newbin contrib/hpack/gen-rht haproxy_hpack - fi - - if use examples ; then - docinto examples - dodoc examples/*.cfg - dodoc doc/seamless_reload.txt - fi - - if use vim-syntax ; then - insinto /usr/share/vim/vimfiles/syntax - doins contrib/syntax-highlight/haproxy.vim - fi -} - -pkg_postinst() { - if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then - ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service." - ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created." - ewarn "Make use of them with the \"user\" and \"group\" directives." - - if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then - einfo "Please consult the installed documentation for learning the configuration file's syntax." - einfo "The documentation and sample configuration files are installed here:" - einfo " ${EROOT}/usr/share/doc/${PF}" - fi - fi -} diff --git a/net-proxy/haproxy/haproxy-2.2.5-r2.ebuild b/net-proxy/haproxy/haproxy-2.2.5-r3.ebuild similarity index 99% rename from net-proxy/haproxy/haproxy-2.2.5-r2.ebuild rename to net-proxy/haproxy/haproxy-2.2.5-r3.ebuild index 5ef90b045a3..e74a1dba415 100644 --- a/net-proxy/haproxy/haproxy-2.2.5-r2.ebuild +++ b/net-proxy/haproxy/haproxy-2.2.5-r3.ebuild @@ -43,7 +43,7 @@ DEPEND=" pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( - dev-libs/openssl:0=[zlib?] + dev-libs/openssl:0= ) 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 6335de9e475..894bf001b81 100644 --- a/net-proxy/haproxy/haproxy-2.2.9999.ebuild +++ b/net-proxy/haproxy/haproxy-2.2.9999.ebuild @@ -43,7 +43,7 @@ DEPEND=" pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( - dev-libs/openssl:0=[zlib?] + dev-libs/openssl:0= ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) diff --git a/net-proxy/haproxy/haproxy-2.3.10-r1.ebuild b/net-proxy/haproxy/haproxy-2.3.10-r2.ebuild similarity index 99% rename from net-proxy/haproxy/haproxy-2.3.10-r1.ebuild rename to net-proxy/haproxy/haproxy-2.3.10-r2.ebuild index 56c62e7ad7d..d2978148fb5 100644 --- a/net-proxy/haproxy/haproxy-2.3.10-r1.ebuild +++ b/net-proxy/haproxy/haproxy-2.3.10-r2.ebuild @@ -43,7 +43,7 @@ DEPEND=" pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( - dev-libs/openssl:0=[zlib?] + dev-libs/openssl:0= ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) diff --git a/net-proxy/haproxy/haproxy-2.3.12.ebuild b/net-proxy/haproxy/haproxy-2.3.12-r1.ebuild similarity index 99% rename from net-proxy/haproxy/haproxy-2.3.12.ebuild rename to net-proxy/haproxy/haproxy-2.3.12-r1.ebuild index 56c62e7ad7d..d2978148fb5 100644 --- a/net-proxy/haproxy/haproxy-2.3.12.ebuild +++ b/net-proxy/haproxy/haproxy-2.3.12-r1.ebuild @@ -43,7 +43,7 @@ DEPEND=" pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( - dev-libs/openssl:0=[zlib?] + dev-libs/openssl:0= ) 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 56c62e7ad7d..d2978148fb5 100644 --- a/net-proxy/haproxy/haproxy-2.3.9999.ebuild +++ b/net-proxy/haproxy/haproxy-2.3.9999.ebuild @@ -43,7 +43,7 @@ DEPEND=" pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( - dev-libs/openssl:0=[zlib?] + dev-libs/openssl:0= ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) diff --git a/net-proxy/haproxy/haproxy-2.4.2.ebuild b/net-proxy/haproxy/haproxy-2.4.1-r2.ebuild similarity index 99% rename from net-proxy/haproxy/haproxy-2.4.2.ebuild rename to net-proxy/haproxy/haproxy-2.4.1-r2.ebuild index 9183ede9a10..5c4cee22742 100644 --- a/net-proxy/haproxy/haproxy-2.4.2.ebuild +++ b/net-proxy/haproxy/haproxy-2.4.1-r2.ebuild @@ -43,7 +43,7 @@ DEPEND=" pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( - dev-libs/openssl:0=[zlib?] + dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) diff --git a/net-proxy/haproxy/haproxy-2.4.1-r1.ebuild b/net-proxy/haproxy/haproxy-2.4.2-r1.ebuild similarity index 99% rename from net-proxy/haproxy/haproxy-2.4.1-r1.ebuild rename to net-proxy/haproxy/haproxy-2.4.2-r1.ebuild index 9183ede9a10..5c4cee22742 100644 --- a/net-proxy/haproxy/haproxy-2.4.1-r1.ebuild +++ b/net-proxy/haproxy/haproxy-2.4.2-r1.ebuild @@ -43,7 +43,7 @@ DEPEND=" pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( - dev-libs/openssl:0=[zlib?] + dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) diff --git a/net-proxy/haproxy/haproxy-2.4.9999.ebuild b/net-proxy/haproxy/haproxy-2.4.9999.ebuild index 9183ede9a10..5c4cee22742 100644 --- a/net-proxy/haproxy/haproxy-2.4.9999.ebuild +++ b/net-proxy/haproxy/haproxy-2.4.9999.ebuild @@ -43,7 +43,7 @@ DEPEND=" pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( - dev-libs/openssl:0=[zlib?] + dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib )