Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/redis/
Date: Fri, 29 Apr 2022 04:11:45
Message-Id: 1651205491.bbec9c4e706c8bd175da219ba26d35def506c064.sam@gentoo
1 commit: bbec9c4e706c8bd175da219ba26d35def506c064
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Fri Apr 29 04:10:50 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Fri Apr 29 04:11:31 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbec9c4e
7
8 dev-db/redis: restore partial Lua eclass machinery
9
10 It's apparently still needed even if using bundled copy.
11
12 Closes: https://bugs.gentoo.org/841422
13 Signed-off-by: Sam James <sam <AT> gentoo.org>
14
15 dev-db/redis/{redis-6.2.7.ebuild => redis-6.2.7-r1.ebuild} | 13 +++++++------
16 1 file changed, 7 insertions(+), 6 deletions(-)
17
18 diff --git a/dev-db/redis/redis-6.2.7.ebuild b/dev-db/redis/redis-6.2.7-r1.ebuild
19 similarity index 93%
20 rename from dev-db/redis/redis-6.2.7.ebuild
21 rename to dev-db/redis/redis-6.2.7-r1.ebuild
22 index a40a02c92f80..daabb56d3c64 100644
23 --- a/dev-db/redis/redis-6.2.7.ebuild
24 +++ b/dev-db/redis/redis-6.2.7-r1.ebuild
25 @@ -9,13 +9,14 @@ EAPI=8
26 # - 5.2 fails with:
27 # scripting.c:(.text+0x1f9b): undefined reference to `lua_open'
28 # because lua_open became lua_newstate in 5.2
29 -#LUA_COMPAT=( lua5-1 luajit )
30 +LUA_COMPAT=( lua5-1 luajit )
31
32 # Upstream have deviated too far from vanilla Lua, adding their own APIs
33 -# like lua_enablereadonlytable
34 -inherit autotools flag-o-matic systemd toolchain-funcs tmpfiles
35 +# like lua_enablereadonlytable, but we still need the eclass and such
36 +# for bug #841422.
37 +inherit autotools flag-o-matic systemd toolchain-funcs lua-single tmpfiles
38
39 -DESCRIPTION="A persistent caching system, key-value and data structures database"
40 +DESCRIPTION="A persistent caching system, key-value, and data structures database"
41 HOMEPAGE="https://redis.io"
42 SRC_URI="https://download.redis.io/releases/${P}.tar.gz"
43
44 @@ -94,11 +95,11 @@ src_prepare() {
45
46 # Use the correct pkgconfig name for Lua.
47 # The upstream configure script handles luajit specially, and is not
48 - # effected by these changes.
49 - # -e "/PKG_CHECK_MODULES.*\<LUA\>/s,lua5.1,${ELUA},g" \
50 + # affected by these changes.
51 sed -i \
52 -e "/^AC_INIT/s|, [0-9].+, |, $PV, |" \
53 -e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \
54 + -e "/PKG_CHECK_MODULES.*\<LUA\>/s,lua5.1,${ELUA},g" \
55 configure.ac || die "Sed failed for configure.ac"
56 eautoreconf
57 }