commit: 42944642f12a758e2f602227ac2553e70b5330c5 Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org> AuthorDate: Tue Apr 26 15:25:07 2022 +0000 Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org> CommitDate: Tue Apr 26 15:28:13 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42944642
net-proxy/haproxy: Unify live ebuilds. Default to PCRE2, bug 838013 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Christian Ruppert <idl0r <AT> gentoo.org> net-proxy/haproxy/haproxy-2.0.9999.ebuild | 24 +++++++++++------------- net-proxy/haproxy/haproxy-2.2.9999.ebuild | 24 +++++++++++------------- net-proxy/haproxy/haproxy-2.4.9999.ebuild | 22 ++++++++++------------ net-proxy/haproxy/haproxy-2.5.9999.ebuild | 22 ++++++++++------------ net-proxy/haproxy/haproxy-9999.ebuild | 24 +++++++++++------------- 5 files changed, 53 insertions(+), 63 deletions(-) diff --git a/net-proxy/haproxy/haproxy-2.0.9999.ebuild b/net-proxy/haproxy/haproxy-2.0.9999.ebuild index f85333d3df83..4ec0188ead43 100644 --- a/net-proxy/haproxy/haproxy-2.0.9999.ebuild +++ b/net-proxy/haproxy/haproxy-2.0.9999.ebuild @@ -14,7 +14,10 @@ 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" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" +elif [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/"; + EGIT_BRANCH=master else EGIT_REPO_URI="https://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/" EGIT_BRANCH=master @@ -22,11 +25,9 @@ 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 +IUSE="+crypt doc examples slz +net_ns +pcre pcre-jit prometheus-exporter ssl systemd +threads tools vim-syntax +zlib lua 51degrees wurfl" REQUIRED_USE="pcre-jit? ( pcre ) - pcre2-jit? ( pcre2 ) - pcre? ( !pcre2 ) lua? ( ${LUA_REQUIRED_USE} ) ?? ( slz zlib )" @@ -34,12 +35,8 @@ 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] ) + pcre-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0= @@ -79,16 +76,17 @@ src_compile() { local -a args=( V=1 TARGET=linux-glibc + # Switching to PCRE2 by default, bug 838013 + PCRE= + PCRE_JIT= ) # 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 pcre PCRE2) ) + args+=( $(haproxy_use pcre-jit PCRE2_JIT) ) args+=( $(haproxy_use ssl OPENSSL) ) args+=( $(haproxy_use slz SLZ) ) args+=( $(haproxy_use zlib ZLIB) ) diff --git a/net-proxy/haproxy/haproxy-2.2.9999.ebuild b/net-proxy/haproxy/haproxy-2.2.9999.ebuild index f85333d3df83..4ec0188ead43 100644 --- a/net-proxy/haproxy/haproxy-2.2.9999.ebuild +++ b/net-proxy/haproxy/haproxy-2.2.9999.ebuild @@ -14,7 +14,10 @@ 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" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" +elif [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/"; + EGIT_BRANCH=master else EGIT_REPO_URI="https://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/" EGIT_BRANCH=master @@ -22,11 +25,9 @@ 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 +IUSE="+crypt doc examples slz +net_ns +pcre pcre-jit prometheus-exporter ssl systemd +threads tools vim-syntax +zlib lua 51degrees wurfl" REQUIRED_USE="pcre-jit? ( pcre ) - pcre2-jit? ( pcre2 ) - pcre? ( !pcre2 ) lua? ( ${LUA_REQUIRED_USE} ) ?? ( slz zlib )" @@ -34,12 +35,8 @@ 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] ) + pcre-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0= @@ -79,16 +76,17 @@ src_compile() { local -a args=( V=1 TARGET=linux-glibc + # Switching to PCRE2 by default, bug 838013 + PCRE= + PCRE_JIT= ) # 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 pcre PCRE2) ) + args+=( $(haproxy_use pcre-jit PCRE2_JIT) ) args+=( $(haproxy_use ssl OPENSSL) ) args+=( $(haproxy_use slz SLZ) ) args+=( $(haproxy_use zlib ZLIB) ) diff --git a/net-proxy/haproxy/haproxy-2.4.9999.ebuild b/net-proxy/haproxy/haproxy-2.4.9999.ebuild index e50349eab9a2..959a7a9dac4f 100644 --- a/net-proxy/haproxy/haproxy-2.4.9999.ebuild +++ b/net-proxy/haproxy/haproxy-2.4.9999.ebuild @@ -15,6 +15,9 @@ 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 ~arm64 ~ppc ~x86" +elif [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/"; + EGIT_BRANCH=master else EGIT_REPO_URI="https://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/" EGIT_BRANCH=master @@ -22,11 +25,9 @@ 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 +IUSE="+crypt doc examples +slz +net_ns +pcre pcre-jit prometheus-exporter ssl systemd +threads tools vim-syntax zlib lua 51degrees wurfl" REQUIRED_USE="pcre-jit? ( pcre ) - pcre2-jit? ( pcre2 ) - pcre? ( !pcre2 ) lua? ( ${LUA_REQUIRED_USE} ) ?? ( slz zlib )" @@ -34,12 +35,8 @@ 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] ) + pcre-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0= @@ -74,16 +71,17 @@ src_compile() { local -a args=( V=1 TARGET=linux-glibc + # Switching to PCRE2 by default, bug 838013 + PCRE= + PCRE_JIT= ) # 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 pcre PCRE2) ) + args+=( $(haproxy_use pcre-jit PCRE2_JIT) ) args+=( $(haproxy_use ssl OPENSSL) ) args+=( $(haproxy_use slz SLZ) ) args+=( $(haproxy_use zlib ZLIB) ) diff --git a/net-proxy/haproxy/haproxy-2.5.9999.ebuild b/net-proxy/haproxy/haproxy-2.5.9999.ebuild index e50349eab9a2..959a7a9dac4f 100644 --- a/net-proxy/haproxy/haproxy-2.5.9999.ebuild +++ b/net-proxy/haproxy/haproxy-2.5.9999.ebuild @@ -15,6 +15,9 @@ 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 ~arm64 ~ppc ~x86" +elif [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/"; + EGIT_BRANCH=master else EGIT_REPO_URI="https://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/" EGIT_BRANCH=master @@ -22,11 +25,9 @@ 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 +IUSE="+crypt doc examples +slz +net_ns +pcre pcre-jit prometheus-exporter ssl systemd +threads tools vim-syntax zlib lua 51degrees wurfl" REQUIRED_USE="pcre-jit? ( pcre ) - pcre2-jit? ( pcre2 ) - pcre? ( !pcre2 ) lua? ( ${LUA_REQUIRED_USE} ) ?? ( slz zlib )" @@ -34,12 +35,8 @@ 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] ) + pcre-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0= @@ -74,16 +71,17 @@ src_compile() { local -a args=( V=1 TARGET=linux-glibc + # Switching to PCRE2 by default, bug 838013 + PCRE= + PCRE_JIT= ) # 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 pcre PCRE2) ) + args+=( $(haproxy_use pcre-jit PCRE2_JIT) ) args+=( $(haproxy_use ssl OPENSSL) ) args+=( $(haproxy_use slz SLZ) ) args+=( $(haproxy_use zlib ZLIB) ) diff --git a/net-proxy/haproxy/haproxy-9999.ebuild b/net-proxy/haproxy/haproxy-9999.ebuild index 4b1f8887b4de..9b0bc07daa75 100644 --- a/net-proxy/haproxy/haproxy-9999.ebuild +++ b/net-proxy/haproxy/haproxy-9999.ebuild @@ -15,18 +15,19 @@ 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 ~arm64 ~ppc ~x86" -else +elif [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/"; EGIT_BRANCH=master +else + EGIT_REPO_URI="https://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/" + EGIT_BRANCH=master fi LICENSE="GPL-2 LGPL-2.1" SLOT="0/${PV}" -IUSE="+crypt doc examples +slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter +IUSE="+crypt doc examples +slz +net_ns +pcre pcre-jit prometheus-exporter ssl systemd +threads tools vim-syntax zlib lua 51degrees wurfl" REQUIRED_USE="pcre-jit? ( pcre ) - pcre2-jit? ( pcre2 ) - pcre? ( !pcre2 ) lua? ( ${LUA_REQUIRED_USE} ) ?? ( slz zlib )" @@ -34,12 +35,8 @@ 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] ) + pcre-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0= @@ -74,16 +71,17 @@ src_compile() { local -a args=( V=1 TARGET=linux-glibc + # Switching to PCRE2 by default, bug 838013 + PCRE= + PCRE_JIT= ) # 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 pcre PCRE2) ) + args+=( $(haproxy_use pcre-jit PCRE2_JIT) ) args+=( $(haproxy_use ssl OPENSSL) ) args+=( $(haproxy_use slz SLZ) ) args+=( $(haproxy_use zlib ZLIB) )
