diff options
| author |   Marek Szuba <marecki@gentoo.org> | 2021-07-13 11:50:06 +0100 |
|---|---|---|
| committer | Marek Szuba <marecki@gentoo.org> | 2021-07-13 12:20:52 +0100 |
| commit | b38538ccf12f3a2631208e35a75dc74e0a712c21 (patch) | |
| tree | 2f3e9f7333b1af3844592f24e287d2fcf78e5972 /net-proxy/haproxy/haproxy-2.4.9999.ebuild | |
| parent | virtual/gsasl: keyword 2 for ~riscv (diff) | |
| download | gentoo-b38538ccf12f3a2631208e35a75dc74e0a712c21.tar.gz gentoo-b38538ccf12f3a2631208e35a75dc74e0a712c21.tar.bz2 gentoo-b38538ccf12f3a2631208e35a75dc74e0a712c21.zip | |
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@gentoo.org>
Diffstat (limited to 'net-proxy/haproxy/haproxy-2.4.9999.ebuild')
| -rw-r--r-- | net-proxy/haproxy/haproxy-2.4.9999.ebuild | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/net-proxy/haproxy/haproxy-2.4.9999.ebuild b/net-proxy/haproxy/haproxy-2.4.9999.ebuild index 31171c86ed5b..9183ede9a103 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 |