From: "Marek Szuba" <marecki@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/
Date: Tue, 13 Jul 2021 11:21:03 +0000 (UTC) [thread overview]
Message-ID: <1626175252.b38538ccf12f3a2631208e35a75dc74e0a712c21.marecki@gentoo> (raw)
commit: b38538ccf12f3a2631208e35a75dc74e0a712c21
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 13 10:50:06 2021 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Tue Jul 13 11:20:52 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b38538cc
net-proxy/haproxy: migrate to lua-single.eclass
Identical changes in all the ebuilds, tested on 2.2.5-r2 both with and
without USE=lua - no problems. Exactly the same logic as before the
migration, i.e. only lua5-3 is supported and that is the version that
should be used even if any others are present (upstream Makefile only
looks for unversioned "lua" if it cannot explicitly find 5.3, at least
in the more recent versions anyway).
Changing this without revbumps because USE=lua is still masked on this
package.
Invoking maintainer time-out on this issue.
Closes: https://bugs.gentoo.org/752825
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
net-proxy/haproxy/haproxy-1.8.30-r1.ebuild | 9 +++++++--
net-proxy/haproxy/haproxy-2.0.14-r3.ebuild | 9 +++++++--
net-proxy/haproxy/haproxy-2.0.22-r1.ebuild | 9 +++++++--
net-proxy/haproxy/haproxy-2.0.9999.ebuild | 9 +++++++--
net-proxy/haproxy/haproxy-2.2.14-r1.ebuild | 9 +++++++--
net-proxy/haproxy/haproxy-2.2.5-r2.ebuild | 9 +++++++--
net-proxy/haproxy/haproxy-2.2.9999.ebuild | 9 +++++++--
net-proxy/haproxy/haproxy-2.3.10-r1.ebuild | 9 +++++++--
net-proxy/haproxy/haproxy-2.3.12.ebuild | 9 +++++++--
net-proxy/haproxy/haproxy-2.3.9999.ebuild | 9 +++++++--
net-proxy/haproxy/haproxy-2.4.1-r1.ebuild | 9 +++++++--
net-proxy/haproxy/haproxy-2.4.2.ebuild | 9 +++++++--
net-proxy/haproxy/haproxy-2.4.9999.ebuild | 9 +++++++--
13 files changed, 91 insertions(+), 26 deletions(-)
diff --git a/net-proxy/haproxy/haproxy-1.8.30-r1.ebuild b/net-proxy/haproxy/haproxy-1.8.30-r1.ebuild
index 90d01074475..e6b1932baf9 100644
--- a/net-proxy/haproxy/haproxy-1.8.30-r1.ebuild
+++ b/net-proxy/haproxy/haproxy-1.8.30-r1.ebuild
@@ -3,8 +3,10 @@
EAPI="7"
+LUA_COMPAT=( lua5-3 )
+
[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic systemd linux-info ${SCM}
+inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
MY_P="${PN}-${PV/_beta/-dev}"
@@ -25,9 +27,11 @@ 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? (
@@ -44,7 +48,7 @@ DEPEND="
slz? ( dev-libs/libslz:= )
systemd? ( sys-apps/systemd )
zlib? ( sys-libs/zlib )
- lua? ( dev-lang/lua:5.3 )
+ lua? ( ${LUA_DEPS} )
device-atlas? ( dev-libs/device-atlas-api-c )"
RDEPEND="${DEPEND}
acct-group/haproxy
@@ -66,6 +70,7 @@ haproxy_use() {
}
pkg_setup() {
+ use lua && lua-single_pkg_setup
if use net_ns; then
CONFIG_CHECK="~NET_NS"
linux-info_pkg_setup
diff --git a/net-proxy/haproxy/haproxy-2.0.14-r3.ebuild b/net-proxy/haproxy/haproxy-2.0.14-r3.ebuild
index 49cfe55e3a3..68db0dd8989 100644
--- a/net-proxy/haproxy/haproxy-2.0.14-r3.ebuild
+++ b/net-proxy/haproxy/haproxy-2.0.14-r3.ebuild
@@ -3,8 +3,10 @@
EAPI="7"
+LUA_COMPAT=( lua5-3 )
+
[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic systemd linux-info ${SCM}
+inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
MY_P="${PN}-${PV/_beta/-dev}"
@@ -25,9 +27,11 @@ 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? (
@@ -44,7 +48,7 @@ DEPEND="
slz? ( dev-libs/libslz:= )
systemd? ( sys-apps/systemd )
zlib? ( sys-libs/zlib )
- lua? ( dev-lang/lua:5.3 )
+ lua? ( ${LUA_DEPS} )
device-atlas? ( dev-libs/device-atlas-api-c )"
RDEPEND="${DEPEND}
acct-group/haproxy
@@ -66,6 +70,7 @@ haproxy_use() {
}
pkg_setup() {
+ use lua && lua-single_pkg_setup
if use net_ns; then
CONFIG_CHECK="~NET_NS"
linux-info_pkg_setup
diff --git a/net-proxy/haproxy/haproxy-2.0.22-r1.ebuild b/net-proxy/haproxy/haproxy-2.0.22-r1.ebuild
index 42c17e31be4..6335de9e475 100644
--- a/net-proxy/haproxy/haproxy-2.0.22-r1.ebuild
+++ b/net-proxy/haproxy/haproxy-2.0.22-r1.ebuild
@@ -3,8 +3,10 @@
EAPI="7"
+LUA_COMPAT=( lua5-3 )
+
[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic systemd linux-info ${SCM}
+inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
MY_P="${PN}-${PV/_beta/-dev}"
@@ -25,9 +27,11 @@ 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? (
@@ -44,7 +48,7 @@ DEPEND="
slz? ( dev-libs/libslz:= )
systemd? ( sys-apps/systemd )
zlib? ( sys-libs/zlib )
- lua? ( dev-lang/lua:5.3 )
+ lua? ( ${LUA_DEPS} )
device-atlas? ( dev-libs/device-atlas-api-c )"
RDEPEND="${DEPEND}
acct-group/haproxy
@@ -66,6 +70,7 @@ haproxy_use() {
}
pkg_setup() {
+ use lua && lua-single_pkg_setup
if use net_ns; then
CONFIG_CHECK="~NET_NS"
linux-info_pkg_setup
diff --git a/net-proxy/haproxy/haproxy-2.0.9999.ebuild b/net-proxy/haproxy/haproxy-2.0.9999.ebuild
index 0dd6f708510..41c1558bb74 100644
--- a/net-proxy/haproxy/haproxy-2.0.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.0.9999.ebuild
@@ -3,8 +3,10 @@
EAPI="7"
+LUA_COMPAT=( lua5-3 )
+
[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic systemd linux-info ${SCM}
+inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
MY_P="${PN}-${PV/_beta/-dev}"
@@ -25,9 +27,11 @@ 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? (
@@ -44,7 +48,7 @@ DEPEND="
systemd? ( sys-apps/systemd )
slz? ( dev-libs/libslz:= )
zlib? ( sys-libs/zlib )
- lua? ( dev-lang/lua:5.3 )
+ lua? ( ${LUA_DEPS} )
device-atlas? ( dev-libs/device-atlas-api-c )"
RDEPEND="${DEPEND}
acct-group/haproxy
@@ -66,6 +70,7 @@ haproxy_use() {
}
pkg_setup() {
+ use lua && lua-single_pkg_setup
if use net_ns; then
CONFIG_CHECK="~NET_NS"
linux-info_pkg_setup
diff --git a/net-proxy/haproxy/haproxy-2.2.14-r1.ebuild b/net-proxy/haproxy/haproxy-2.2.14-r1.ebuild
index 42c17e31be4..6335de9e475 100644
--- a/net-proxy/haproxy/haproxy-2.2.14-r1.ebuild
+++ b/net-proxy/haproxy/haproxy-2.2.14-r1.ebuild
@@ -3,8 +3,10 @@
EAPI="7"
+LUA_COMPAT=( lua5-3 )
+
[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic systemd linux-info ${SCM}
+inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
MY_P="${PN}-${PV/_beta/-dev}"
@@ -25,9 +27,11 @@ 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? (
@@ -44,7 +48,7 @@ DEPEND="
slz? ( dev-libs/libslz:= )
systemd? ( sys-apps/systemd )
zlib? ( sys-libs/zlib )
- lua? ( dev-lang/lua:5.3 )
+ lua? ( ${LUA_DEPS} )
device-atlas? ( dev-libs/device-atlas-api-c )"
RDEPEND="${DEPEND}
acct-group/haproxy
@@ -66,6 +70,7 @@ haproxy_use() {
}
pkg_setup() {
+ use lua && lua-single_pkg_setup
if use net_ns; then
CONFIG_CHECK="~NET_NS"
linux-info_pkg_setup
diff --git a/net-proxy/haproxy/haproxy-2.2.5-r2.ebuild b/net-proxy/haproxy/haproxy-2.2.5-r2.ebuild
index f773d9548c6..5ef90b045a3 100644
--- a/net-proxy/haproxy/haproxy-2.2.5-r2.ebuild
+++ b/net-proxy/haproxy/haproxy-2.2.5-r2.ebuild
@@ -3,8 +3,10 @@
EAPI="7"
+LUA_COMPAT=( lua5-3 )
+
[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic systemd linux-info ${SCM}
+inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
MY_P="${PN}-${PV/_beta/-dev}"
@@ -25,9 +27,11 @@ 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? (
@@ -44,7 +48,7 @@ DEPEND="
slz? ( dev-libs/libslz:= )
systemd? ( sys-apps/systemd )
zlib? ( sys-libs/zlib )
- lua? ( dev-lang/lua:5.3 )
+ lua? ( ${LUA_DEPS} )
device-atlas? ( dev-libs/device-atlas-api-c )"
RDEPEND="${DEPEND}
acct-group/haproxy
@@ -67,6 +71,7 @@ haproxy_use() {
}
pkg_setup() {
+ use lua && lua-single_pkg_setup
if use net_ns; then
CONFIG_CHECK="~NET_NS"
linux-info_pkg_setup
diff --git a/net-proxy/haproxy/haproxy-2.2.9999.ebuild b/net-proxy/haproxy/haproxy-2.2.9999.ebuild
index 42c17e31be4..6335de9e475 100644
--- a/net-proxy/haproxy/haproxy-2.2.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.2.9999.ebuild
@@ -3,8 +3,10 @@
EAPI="7"
+LUA_COMPAT=( lua5-3 )
+
[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic systemd linux-info ${SCM}
+inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
MY_P="${PN}-${PV/_beta/-dev}"
@@ -25,9 +27,11 @@ 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? (
@@ -44,7 +48,7 @@ DEPEND="
slz? ( dev-libs/libslz:= )
systemd? ( sys-apps/systemd )
zlib? ( sys-libs/zlib )
- lua? ( dev-lang/lua:5.3 )
+ lua? ( ${LUA_DEPS} )
device-atlas? ( dev-libs/device-atlas-api-c )"
RDEPEND="${DEPEND}
acct-group/haproxy
@@ -66,6 +70,7 @@ haproxy_use() {
}
pkg_setup() {
+ use lua && lua-single_pkg_setup
if use net_ns; then
CONFIG_CHECK="~NET_NS"
linux-info_pkg_setup
diff --git a/net-proxy/haproxy/haproxy-2.3.10-r1.ebuild b/net-proxy/haproxy/haproxy-2.3.10-r1.ebuild
index 143c6394abd..56c62e7ad7d 100644
--- a/net-proxy/haproxy/haproxy-2.3.10-r1.ebuild
+++ b/net-proxy/haproxy/haproxy-2.3.10-r1.ebuild
@@ -3,8 +3,10 @@
EAPI="7"
+LUA_COMPAT=( lua5-3 )
+
[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic systemd linux-info ${SCM}
+inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
MY_P="${PN}-${PV/_beta/-dev}"
@@ -25,9 +27,11 @@ 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? (
@@ -44,7 +48,7 @@ DEPEND="
slz? ( dev-libs/libslz:= )
systemd? ( sys-apps/systemd )
zlib? ( sys-libs/zlib )
- lua? ( dev-lang/lua:5.3 )
+ lua? ( ${LUA_DEPS} )
device-atlas? ( dev-libs/device-atlas-api-c )"
RDEPEND="${DEPEND}
acct-group/haproxy
@@ -66,6 +70,7 @@ haproxy_use() {
}
pkg_setup() {
+ use lua && lua-single_pkg_setup
if use net_ns; then
CONFIG_CHECK="~NET_NS"
linux-info_pkg_setup
diff --git a/net-proxy/haproxy/haproxy-2.3.12.ebuild b/net-proxy/haproxy/haproxy-2.3.12.ebuild
index 143c6394abd..56c62e7ad7d 100644
--- a/net-proxy/haproxy/haproxy-2.3.12.ebuild
+++ b/net-proxy/haproxy/haproxy-2.3.12.ebuild
@@ -3,8 +3,10 @@
EAPI="7"
+LUA_COMPAT=( lua5-3 )
+
[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic systemd linux-info ${SCM}
+inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
MY_P="${PN}-${PV/_beta/-dev}"
@@ -25,9 +27,11 @@ 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? (
@@ -44,7 +48,7 @@ DEPEND="
slz? ( dev-libs/libslz:= )
systemd? ( sys-apps/systemd )
zlib? ( sys-libs/zlib )
- lua? ( dev-lang/lua:5.3 )
+ lua? ( ${LUA_DEPS} )
device-atlas? ( dev-libs/device-atlas-api-c )"
RDEPEND="${DEPEND}
acct-group/haproxy
@@ -66,6 +70,7 @@ haproxy_use() {
}
pkg_setup() {
+ use lua && lua-single_pkg_setup
if use net_ns; then
CONFIG_CHECK="~NET_NS"
linux-info_pkg_setup
diff --git a/net-proxy/haproxy/haproxy-2.3.9999.ebuild b/net-proxy/haproxy/haproxy-2.3.9999.ebuild
index 143c6394abd..56c62e7ad7d 100644
--- a/net-proxy/haproxy/haproxy-2.3.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.3.9999.ebuild
@@ -3,8 +3,10 @@
EAPI="7"
+LUA_COMPAT=( lua5-3 )
+
[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic systemd linux-info ${SCM}
+inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
MY_P="${PN}-${PV/_beta/-dev}"
@@ -25,9 +27,11 @@ 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? (
@@ -44,7 +48,7 @@ DEPEND="
slz? ( dev-libs/libslz:= )
systemd? ( sys-apps/systemd )
zlib? ( sys-libs/zlib )
- lua? ( dev-lang/lua:5.3 )
+ lua? ( ${LUA_DEPS} )
device-atlas? ( dev-libs/device-atlas-api-c )"
RDEPEND="${DEPEND}
acct-group/haproxy
@@ -66,6 +70,7 @@ haproxy_use() {
}
pkg_setup() {
+ use lua && lua-single_pkg_setup
if use net_ns; then
CONFIG_CHECK="~NET_NS"
linux-info_pkg_setup
diff --git a/net-proxy/haproxy/haproxy-2.4.1-r1.ebuild b/net-proxy/haproxy/haproxy-2.4.1-r1.ebuild
index 31171c86ed5..9183ede9a10 100644
--- a/net-proxy/haproxy/haproxy-2.4.1-r1.ebuild
+++ b/net-proxy/haproxy/haproxy-2.4.1-r1.ebuild
@@ -3,8 +3,10 @@
EAPI="7"
+LUA_COMPAT=( lua5-3 )
+
[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic systemd linux-info ${SCM}
+inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
MY_P="${PN}-${PV/_beta/-dev}"
@@ -25,9 +27,11 @@ 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? (
@@ -43,7 +47,7 @@ DEPEND="
)
systemd? ( sys-apps/systemd )
zlib? ( sys-libs/zlib )
- lua? ( dev-lang/lua:5.3 )
+ lua? ( ${LUA_DEPS} )
device-atlas? ( dev-libs/device-atlas-api-c )"
RDEPEND="${DEPEND}
acct-group/haproxy
@@ -61,6 +65,7 @@ haproxy_use() {
}
pkg_setup() {
+ use lua && lua-single_pkg_setup
if use net_ns; then
CONFIG_CHECK="~NET_NS"
linux-info_pkg_setup
diff --git a/net-proxy/haproxy/haproxy-2.4.2.ebuild b/net-proxy/haproxy/haproxy-2.4.2.ebuild
index 31171c86ed5..9183ede9a10 100644
--- a/net-proxy/haproxy/haproxy-2.4.2.ebuild
+++ b/net-proxy/haproxy/haproxy-2.4.2.ebuild
@@ -3,8 +3,10 @@
EAPI="7"
+LUA_COMPAT=( lua5-3 )
+
[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic systemd linux-info ${SCM}
+inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
MY_P="${PN}-${PV/_beta/-dev}"
@@ -25,9 +27,11 @@ 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? (
@@ -43,7 +47,7 @@ DEPEND="
)
systemd? ( sys-apps/systemd )
zlib? ( sys-libs/zlib )
- lua? ( dev-lang/lua:5.3 )
+ lua? ( ${LUA_DEPS} )
device-atlas? ( dev-libs/device-atlas-api-c )"
RDEPEND="${DEPEND}
acct-group/haproxy
@@ -61,6 +65,7 @@ haproxy_use() {
}
pkg_setup() {
+ use lua && lua-single_pkg_setup
if use net_ns; then
CONFIG_CHECK="~NET_NS"
linux-info_pkg_setup
diff --git a/net-proxy/haproxy/haproxy-2.4.9999.ebuild b/net-proxy/haproxy/haproxy-2.4.9999.ebuild
index 31171c86ed5..9183ede9a10 100644
--- a/net-proxy/haproxy/haproxy-2.4.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.4.9999.ebuild
@@ -3,8 +3,10 @@
EAPI="7"
+LUA_COMPAT=( lua5-3 )
+
[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic systemd linux-info ${SCM}
+inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
MY_P="${PN}-${PV/_beta/-dev}"
@@ -25,9 +27,11 @@ 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? (
@@ -43,7 +47,7 @@ DEPEND="
)
systemd? ( sys-apps/systemd )
zlib? ( sys-libs/zlib )
- lua? ( dev-lang/lua:5.3 )
+ lua? ( ${LUA_DEPS} )
device-atlas? ( dev-libs/device-atlas-api-c )"
RDEPEND="${DEPEND}
acct-group/haproxy
@@ -61,6 +65,7 @@ haproxy_use() {
}
pkg_setup() {
+ use lua && lua-single_pkg_setup
if use net_ns; then
CONFIG_CHECK="~NET_NS"
linux-info_pkg_setup
next reply other threads:[~2021-07-13 11:21 UTC|newest]
Thread overview: 329+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-13 11:21 Marek Szuba [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-11-08 14:33 [gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/ Christian Ruppert
2024-11-08 14:32 Christian Ruppert
2024-11-08 14:06 Christian Ruppert
2024-11-08 14:06 Christian Ruppert
2024-10-17 7:16 Christian Ruppert
2024-10-17 7:16 Christian Ruppert
2024-10-17 7:16 Christian Ruppert
2024-09-19 16:05 Christian Ruppert
2024-09-19 12:33 Christian Ruppert
2024-09-03 14:36 Christian Ruppert
2024-09-03 14:02 Christian Ruppert
2024-09-03 14:02 Christian Ruppert
2024-07-12 8:04 Christian Ruppert
2024-06-18 14:38 Christian Ruppert
2024-06-18 14:01 Christian Ruppert
2024-06-14 13:23 Christian Ruppert
2024-06-12 7:15 Christian Ruppert
2024-06-12 7:15 Christian Ruppert
2024-06-11 9:33 Christian Ruppert
2024-06-10 15:03 Christian Ruppert
2024-06-10 14:37 Christian Ruppert
2024-05-01 23:18 Ionen Wolkens
2024-05-01 23:18 Ionen Wolkens
2024-05-01 23:18 Ionen Wolkens
2024-04-08 8:36 Christian Ruppert
2024-04-08 8:36 Christian Ruppert
2024-02-27 10:38 Christian Ruppert
2024-02-16 10:41 Christian Ruppert
2024-02-16 8:44 Christian Ruppert
2024-02-04 21:42 Ionen Wolkens
2024-02-04 21:42 Ionen Wolkens
2024-02-04 21:42 Ionen Wolkens
2024-02-04 21:42 Ionen Wolkens
2024-02-04 21:42 Ionen Wolkens
2024-02-04 21:42 Ionen Wolkens
2024-01-31 17:24 Christian Ruppert
2024-01-20 8:08 Christian Ruppert
2024-01-20 8:08 Christian Ruppert
2024-01-15 18:25 Christian Ruppert
2023-12-18 10:07 Christian Ruppert
2023-12-07 14:31 Christian Ruppert
2023-12-06 8:18 Christian Ruppert
2023-11-17 19:06 Christian Ruppert
2023-10-03 18:42 Arthur Zamarin
2023-09-07 9:57 Christian Ruppert
2023-08-21 17:02 Christian Ruppert
2023-08-21 17:02 Christian Ruppert
2023-08-10 6:57 Christian Ruppert
2023-08-09 14:31 Christian Ruppert
2023-08-09 14:15 Christian Ruppert
2023-07-17 19:09 Sam James
2023-07-17 19:09 Sam James
2023-07-17 19:09 Sam James
2023-07-17 19:09 Sam James
2023-07-17 19:04 Sam James
2023-07-17 19:04 Sam James
2023-07-17 19:04 Sam James
2023-07-17 19:04 Sam James
2023-07-03 12:46 Christian Ruppert
2023-06-12 13:30 Christian Ruppert
2023-06-10 7:31 Christian Ruppert
2023-06-07 17:24 Christian Ruppert
2023-05-31 19:18 Christian Ruppert
2023-05-31 19:18 Christian Ruppert
2023-05-31 19:18 Christian Ruppert
2023-05-02 14:20 Christian Ruppert
2023-05-02 13:04 Christian Ruppert
2023-04-27 17:05 Christian Ruppert
2023-04-02 19:30 Arthur Zamarin
2023-04-02 19:30 Arthur Zamarin
2023-03-28 13:43 Christian Ruppert
2023-03-28 9:00 Christian Ruppert
2023-03-21 8:44 Christian Ruppert
2023-03-13 12:06 Christian Ruppert
2023-02-19 19:56 Sam James
2023-02-14 8:27 Christian Ruppert
2023-02-08 10:53 Christian Ruppert
2023-02-08 10:53 Christian Ruppert
2023-01-27 14:25 Christian Ruppert
2023-01-23 8:05 Christian Ruppert
2022-12-20 8:08 Christian Ruppert
2022-12-15 4:57 Sam James
2022-12-09 9:50 Christian Ruppert
2022-12-06 9:26 Christian Ruppert
2022-12-06 9:26 Christian Ruppert
2022-12-05 11:01 Christian Ruppert
2022-12-05 8:55 Christian Ruppert
2022-12-05 8:55 Christian Ruppert
2022-11-18 20:07 Arthur Zamarin
2022-11-18 20:07 Arthur Zamarin
2022-11-18 20:07 Arthur Zamarin
2022-11-18 20:07 Arthur Zamarin
2022-11-18 20:07 Arthur Zamarin
2022-11-18 20:07 Arthur Zamarin
2022-10-10 9:06 Christian Ruppert
2022-09-23 8:27 Christian Ruppert
2022-09-22 15:30 Christian Ruppert
2022-09-22 14:56 Christian Ruppert
2022-09-19 8:30 Christian Ruppert
2022-08-29 12:38 Jakov Smolić
2022-08-29 12:38 Jakov Smolić
2022-08-29 12:38 Jakov Smolić
2022-08-22 13:53 Christian Ruppert
2022-08-22 8:50 Christian Ruppert
2022-07-28 8:05 Christian Ruppert
2022-07-27 13:45 Christian Ruppert
2022-07-26 8:28 Christian Ruppert
2022-07-22 19:24 Christian Ruppert
2022-07-22 18:52 Christian Ruppert
2022-06-28 9:27 Christian Ruppert
2022-06-21 15:03 Christian Ruppert
2022-06-21 15:01 Christian Ruppert
2022-06-21 14:57 Christian Ruppert
2022-06-16 16:30 Sam James
2022-06-01 11:35 Christian Ruppert
2022-06-01 11:35 Christian Ruppert
2022-05-13 15:56 Christian Ruppert
2022-05-13 15:56 Christian Ruppert
2022-05-06 15:37 Christian Ruppert
2022-05-02 7:09 Christian Ruppert
2022-04-26 15:28 Christian Ruppert
2022-04-26 15:28 Christian Ruppert
2022-04-11 8:08 Christian Ruppert
2022-04-06 13:44 Christian Ruppert
2022-04-06 13:32 Christian Ruppert
2022-04-06 13:32 Christian Ruppert
2022-04-06 13:22 Christian Ruppert
2022-03-26 0:01 Sam James
2022-03-26 0:01 Sam James
2022-03-14 17:12 Christian Ruppert
2022-03-14 16:58 Christian Ruppert
2022-03-10 11:45 Jakov Smolić
2022-03-10 11:45 Jakov Smolić
2022-03-10 11:45 Jakov Smolić
2022-03-10 11:45 Jakov Smolić
2022-03-07 19:09 Jakov Smolić
2022-03-07 19:09 Jakov Smolić
2022-03-07 19:09 Jakov Smolić
2022-03-07 19:09 Jakov Smolić
2022-03-05 8:54 Christian Ruppert
2022-02-28 11:22 Christian Ruppert
2022-02-20 10:19 Christian Ruppert
2022-02-16 21:12 Christian Ruppert
2022-01-26 9:58 Christian Ruppert
2022-01-26 9:57 Christian Ruppert
2022-01-12 8:16 Christian Ruppert
2022-01-10 14:00 Christian Ruppert
2022-01-10 8:34 Christian Ruppert
2021-12-24 8:06 Christian Ruppert
2021-12-07 7:57 Christian Ruppert
2021-12-07 7:57 Christian Ruppert
2021-11-24 11:13 Christian Ruppert
2021-11-24 11:13 Christian Ruppert
2021-11-24 11:13 Christian Ruppert
2021-11-20 10:24 Arthur Zamarin
2021-11-20 10:24 Arthur Zamarin
2021-11-20 10:24 Arthur Zamarin
2021-11-11 14:58 Christian Ruppert
2021-11-06 8:23 Jakov Smolić
2021-11-06 8:23 Jakov Smolić
2021-11-06 8:23 Jakov Smolić
2021-10-08 14:23 Christian Ruppert
2021-10-02 23:48 Sam James
2021-10-02 23:48 Sam James
2021-10-02 23:48 Sam James
2021-10-02 23:17 Sam James
2021-10-02 23:17 Sam James
2021-10-02 23:17 Sam James
2021-09-07 16:38 Christian Ruppert
2021-08-26 14:55 Sam James
2021-08-26 14:55 Sam James
2021-08-23 22:16 Agostino Sarubbo
2021-08-23 10:46 Agostino Sarubbo
2021-08-23 10:44 Agostino Sarubbo
2021-08-17 17:25 Christian Ruppert
2021-07-21 13:27 Thomas Deutschmann
2021-07-20 19:44 Christian Ruppert
2021-07-20 16:59 Christian Ruppert
2021-07-10 8:21 Christian Ruppert
2021-06-25 13:39 Christian Ruppert
2021-06-03 19:15 Sam James
2021-05-19 7:41 Christian Ruppert
2021-05-18 11:17 Christian Ruppert
2021-05-18 11:12 Christian Ruppert
2021-05-03 8:06 Christian Ruppert
2021-05-01 14:52 Mikle Kolyada
2021-04-12 14:28 Christian Ruppert
2021-04-12 10:29 Christian Ruppert
2021-04-06 7:18 Christian Ruppert
2021-04-06 7:18 Christian Ruppert
2021-04-03 15:44 Sam James
2021-03-31 15:32 Christian Ruppert
2021-03-30 20:33 Christian Ruppert
2021-03-25 16:15 Christian Ruppert
2021-03-19 11:51 Christian Ruppert
2021-03-18 14:55 Christian Ruppert
2021-03-18 13:37 Christian Ruppert
2021-03-16 15:11 Christian Ruppert
2021-03-03 15:57 Christian Ruppert
2021-03-03 15:22 Christian Ruppert
2021-02-08 8:36 Christian Ruppert
2021-01-14 8:40 Christian Ruppert
2021-01-11 8:36 Christian Ruppert
2020-12-17 13:23 Sam James
2020-12-13 9:17 Sam James
2020-12-10 19:52 Thomas Deutschmann
2020-12-10 19:52 Thomas Deutschmann
2020-12-01 10:31 Christian Ruppert
2020-11-30 8:50 Christian Ruppert
2020-11-29 8:20 Agostino Sarubbo
2020-11-27 16:12 Agostino Sarubbo
2020-11-16 8:10 Christian Ruppert
2020-11-09 11:32 Christian Ruppert
2020-11-06 12:16 Christian Ruppert
2020-11-06 10:56 Christian Ruppert
2020-11-06 9:17 Christian Ruppert
2020-10-05 9:16 Christian Ruppert
2020-09-22 16:20 罗百科
2020-07-23 8:32 Christian Ruppert
2020-07-22 9:40 Christian Ruppert
2020-07-08 9:09 Christian Ruppert
2020-06-09 9:45 Christian Ruppert
2020-06-02 7:56 Christian Ruppert
2020-06-02 7:56 Christian Ruppert
2020-05-23 19:19 Matt Turner
2020-05-23 19:19 Matt Turner
2020-05-23 19:19 Matt Turner
2020-04-24 23:35 Thomas Deutschmann
2020-04-24 9:19 Christian Ruppert
2020-04-24 9:17 Christian Ruppert
2020-04-24 9:17 Christian Ruppert
2020-04-14 12:32 Agostino Sarubbo
2020-04-08 9:48 Agostino Sarubbo
2020-04-07 10:32 Agostino Sarubbo
2020-04-02 13:10 Christian Ruppert
2020-03-30 13:41 Agostino Sarubbo
2020-03-30 13:36 Agostino Sarubbo
2020-03-30 13:14 Agostino Sarubbo
2020-03-09 9:57 Christian Ruppert
2020-02-17 11:16 Christian Ruppert
2020-02-14 15:00 Christian Ruppert
2020-01-07 10:23 Christian Ruppert
2019-11-27 9:51 Christian Ruppert
2019-11-27 9:51 Christian Ruppert
2019-11-25 18:32 Christian Ruppert
2019-11-25 18:32 Christian Ruppert
2019-10-29 8:11 Christian Ruppert
2019-10-29 8:06 Christian Ruppert
2019-10-07 7:16 Christian Ruppert
2019-09-26 13:24 Christian Ruppert
2019-09-10 14:22 Christian Ruppert
2019-08-11 11:20 David Seifert
2019-08-08 20:35 Christian Ruppert
2019-07-23 17:14 Christian Ruppert
2019-07-18 8:15 Christian Ruppert
2019-06-27 7:30 Christian Ruppert
2019-06-24 13:03 Christian Ruppert
2019-06-24 7:30 Christian Ruppert
2019-06-18 7:26 Christian Ruppert
2019-04-26 8:57 Christian Ruppert
2019-04-24 9:58 Christian Ruppert
2019-04-24 9:48 Christian Ruppert
2019-04-15 7:26 Christian Ruppert
2019-04-15 7:26 Christian Ruppert
2019-02-12 11:44 Christian Ruppert
2019-02-07 9:14 Christian Ruppert
2019-01-29 8:47 Christian Ruppert
2019-01-17 8:31 Christian Ruppert
2019-01-08 19:48 Christian Ruppert
2019-01-04 14:11 Christian Ruppert
2018-12-20 10:16 Christian Ruppert
2018-12-20 10:16 Christian Ruppert
2018-10-03 20:56 Mikle Kolyada
2018-08-22 5:00 Markus Meier
2018-08-07 8:50 Agostino Sarubbo
2018-08-06 22:20 Thomas Deutschmann
2018-07-31 7:42 Christian Ruppert
2018-07-20 22:22 Mikle Kolyada
2018-07-16 11:14 Christian Ruppert
2018-07-15 14:39 Mikle Kolyada
2018-06-05 7:19 Christian Ruppert
2018-04-19 16:24 Christian Ruppert
2018-04-16 8:54 Christian Ruppert
2018-03-19 9:27 Sergei Trofimovich
2018-02-13 9:17 Christian Ruppert
2018-02-13 9:17 Christian Ruppert
2018-02-13 9:17 Christian Ruppert
2018-02-12 22:10 Thomas Deutschmann
2018-01-08 9:02 Christian Ruppert
2018-01-08 9:02 Christian Ruppert
2017-11-26 23:23 David Seifert
2017-08-22 19:21 Robin H. Johnson
2017-07-10 9:11 Christian Ruppert
2017-07-10 9:11 Christian Ruppert
2017-06-19 11:48 Christian Ruppert
2017-05-09 9:48 Christian Ruppert
2017-03-14 23:29 Michael Weber
2017-02-28 9:24 Christian Ruppert
2017-02-28 9:24 Christian Ruppert
2017-01-31 9:02 Robin H. Johnson
2017-01-22 21:01 Robin H. Johnson
2016-12-25 21:21 Robin H. Johnson
2016-12-15 22:07 Robin H. Johnson
2016-12-05 15:56 Robin H. Johnson
2016-12-05 15:56 Robin H. Johnson
2016-12-05 15:56 Robin H. Johnson
2016-12-05 15:56 Robin H. Johnson
2016-09-28 19:54 Christian Ruppert
2016-09-28 19:54 Christian Ruppert
2016-09-28 19:54 Christian Ruppert
2016-09-28 19:54 Christian Ruppert
2016-09-28 19:54 Christian Ruppert
2016-09-28 19:54 Christian Ruppert
2016-08-18 20:50 Christian Ruppert
2016-08-10 7:13 Anthony G. Basile
2016-07-20 19:14 Christian Ruppert
2016-07-04 18:04 Christian Ruppert
2016-05-25 18:12 Christian Ruppert
2016-05-25 18:12 Christian Ruppert
2016-03-16 20:04 Christian Ruppert
2016-03-16 20:04 Christian Ruppert
2016-02-24 20:59 Patrice Clement
2016-01-06 11:46 Christian Ruppert
2016-01-06 11:46 Christian Ruppert
2015-11-09 20:36 Christian Ruppert
2015-10-25 22:06 Christian Ruppert
2015-10-16 20:11 Christian Ruppert
2015-08-09 17:44 Mikle Kolyada
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1626175252.b38538ccf12f3a2631208e35a75dc74e0a712c21.marecki@gentoo \
--to=marecki@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox