commit:     24d6fad60934566f9e65bafe16c64d5740421908
Author:     Petr Vaněk <arkamar <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  3 10:27:34 2025 +0000
Commit:     Petr Vaněk <arkamar <AT> gentoo <DOT> org>
CommitDate: Fri Oct  3 10:36:04 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24d6fad6

dev-db/redis: add 7.4.6

Bug: https://bugs.gentoo.org/963695
Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org>

 dev-db/redis/Manifest           |   1 +
 dev-db/redis/redis-7.4.6.ebuild | 196 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 197 insertions(+)

diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest
index 6fa3b531c641..f17f19c9f4a7 100644
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@@ -11,6 +11,7 @@ DIST redis-7.4.1.tar.gz 3529512 BLAKE2B 
097c9ff0356a86909898e8defe9394c88bc2de71
 DIST redis-7.4.3.tar.gz 3573038 BLAKE2B 
fcaecbaa5b11e5365f3ec9e64e1490d7ba21938896cefbf8eb6ec20dce515b05740005437934c411b62cba4cf647e9e9395bd81c3172c64a2404e17f9fed37a7
 SHA512 
f2d835626589d551c0473ac47b9d7c195c1b51c287bb5c761bca198dde2032f1fcc5ad663c80bb0d0be2c2cad6487494779125e3128717987df951e936aee09c
 DIST redis-7.4.4.tar.gz 3573922 BLAKE2B 
eb1df46c19b276ce0163142d079e645170948e53222d0ff43a7fbd8864866bef0db4afd0ddf627057a1fce12360b291438e4176ee1c1d759d05b32c741ff54ff
 SHA512 
4391f8c06820cc799ba9c5d5066511347d470d4d0c44e558a7278fbca9d92da2be1cb2f789786180f2c26954e93b02de20c0828870b208b185de21dd17a86fc6
 DIST redis-7.4.5.tar.gz 3574983 BLAKE2B 
d0f7639c0e1356b33d00355a8fcd2eb46f87e30a5958614b8f370f49d155178974b3dd58c470bacc83e1e8bca507fc37ed215217535045f205cc3d258d2930fa
 SHA512 
d957ef20c8012f858826ab6ee006c573a1dcc4adadd0134defa9d5beff66ea875e23406727866b431a554712b82427e4612dfd790b6d64a905c9afc7fb518bf3
+DIST redis-7.4.6.tar.gz 3580220 BLAKE2B 
5fe5cd68996e8cdc69b8e1291833fd14b9084e01ac41c9d10e7590d76e4dbeeaea0e253091650acf4b7870c995b1faebbde4dccdec450bb0c7c31637a268868b
 SHA512 
58ed4de47af06305996e23908afb8ae7d8eb8d40951044d9a318bf8a595f777f255281a6e87835f40fa34fe86e240f2bcbc9c009b80a8d26aac71503d0fade69
 DIST redis-8.0.2.tar.gz 3860147 BLAKE2B 
a150aced0bcbeb390f37f6d3761cfc2790a5d7c0669d60f9b42eec5e8b94d3f0e6d2c96af9e27a61d3a0015f0006a646573f31ea8b0fb40ef96aaff34004bb3a
 SHA512 
ea7bf9899779aa1568d628f53333b27b1ac79a3f60c9acca264b21321fa05d1049710d496c9ff3c62a21e08d4063be55a0728ec3e53f558d9a288d85c8c16017
 DIST redis-8.0.3.tar.gz 3866333 BLAKE2B 
bb2617502ed35d6284d46e8dbf7755685a7cb61f3e8ec4e0d8768e750c68379be9384098963ea34d68e66cc9a782a8eee669b1bf8654874927938867e169b842
 SHA512 
28e271d941f045167841b6365fe32a633df50b845bc7a540238ac205fa1e532121adf9993ed2446f091801617bf579869714b999865d7a3a6ec66a32053770b9
 DIST redis-8.2.0.tar.gz 3939849 BLAKE2B 
4fe11865d59b13c15c422316bec6bf8dd82c62aabfe4eb62d1c7e9ff445020f4d61f419760c421f276d1c02d54ab31bedceb1b05043355fff30ae3731f7b3d10
 SHA512 
39c66307e85725c0d2541b0e84bde3dd51be79a7295cfd27053b54df78269bde69432f5d174b73cd9b66a7547579734eb16d36f36c2fc6f455f4a2dd71f066a9

diff --git a/dev-db/redis/redis-7.4.6.ebuild b/dev-db/redis/redis-7.4.6.ebuild
new file mode 100644
index 000000000000..da2295b6100e
--- /dev/null
+++ b/dev-db/redis/redis-7.4.6.ebuild
@@ -0,0 +1,196 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# N.B.: It is no clue in porting to Lua eclasses, as upstream have deviated
+# too far from vanilla Lua, adding their own APIs like lua_enablereadonlytable
+
+inherit autotools edo multiprocessing systemd tmpfiles toolchain-funcs
+
+DESCRIPTION="A persistent caching system, key-value, and data structures 
database"
+HOMEPAGE="
+       https://redis.io
+       https://github.com/redis/redis
+"
+SRC_URI="
+       https://github.com/redis/redis/archive/refs/tags/${PV}.tar.gz
+               -> ${P}.tar.gz
+"
+
+LICENSE="|| ( RSAL-2 SSPL-1 ) Boost-1.0"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 
~amd64-linux ~x86-linux"
+IUSE="+jemalloc selinux ssl systemd tcmalloc test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+       jemalloc? ( >=dev-libs/jemalloc-5.1:=[stats] )
+       ssl? ( dev-libs/openssl:0= )
+       systemd? ( sys-apps/systemd:= )
+       tcmalloc? ( dev-util/google-perftools )
+"
+
+RDEPEND="
+       ${DEPEND}
+       acct-group/redis
+       acct-user/redis
+       selinux? ( sec-policy/selinux-redis )
+"
+
+BDEPEND="
+       acct-group/redis
+       acct-user/redis
+       virtual/pkgconfig
+       test? (
+               dev-lang/tcl:0=
+               ssl? ( dev-tcltk/tls )
+       )
+"
+
+REQUIRED_USE="?? ( jemalloc tcmalloc )"
+
+PATCHES=(
+       "${FILESDIR}"/${PN}-6.2.1-config.patch
+       "${FILESDIR}"/${PN}-7.2.0-system-jemalloc.patch
+       "${FILESDIR}"/${PN}-6.2.3-ppc-atomic.patch
+       "${FILESDIR}"/${PN}-sentinel-7.2.0-config.patch
+       "${FILESDIR}"/${PN}-7.0.4-no-which.patch
+)
+
+src_prepare() {
+       default
+
+       # Respect user CFLAGS in bundled lua
+       sed -i '/LUA_CFLAGS/s: -O2::g' deps/Makefile || die
+
+       # now we will rewrite present Makefiles
+       local makefiles="" MKF
+       local mysedconf=(
+               -e 's:$(CC):@CC@:g'
+               -e 's:$(CFLAGS):@AM_CFLAGS@:g'
+               -e 's: $(DEBUG)::g'
+
+               -e 's:-Werror ::g'
+               -e 's:-Werror=deprecated-declarations ::g'
+       )
+       for MKF in $(find -name 'Makefile' | cut -b 3-); do
+               mv "${MKF}" "${MKF}.in"
+               sed -i "${mysedconf[@]}" "${MKF}.in" || die "Sed failed for 
${MKF}"
+               makefiles+=" ${MKF}"
+       done
+       # autodetection of compiler and settings; generates the modified 
Makefiles
+       cp "${FILESDIR}"/configure.ac-7.0 configure.ac || die
+
+       sed -i \
+               -e "/^AC_INIT/s|, __PV__, |, $PV, |" \
+               -e 
"s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \
+               configure.ac || die "Sed failed for configure.ac"
+       eautoreconf
+}
+
+src_configure() {
+       econf
+
+       # Linenoise can't be built with -std=c99, see 
https://bugs.gentoo.org/451164
+       # also, don't define ANSI/c99 for lua twice
+       sed -i -e "s:-std=c99::g" deps/linenoise/Makefile deps/Makefile || die
+}
+
+src_compile() {
+       tc-export AR CC RANLIB
+
+       local myconf=(
+               AR="${AR}"
+               CC="${CC}"
+               RANLIB="${RANLIB}"
+
+               V=1 # verbose
+
+               # OPTIMIZATION defaults to -O3. Let's respect user CFLAGS by 
setting it
+               # to empty value.
+               OPTIMIZATION=''
+               # Disable debug flags in bundled hiredis
+               DEBUG_FLAGS=''
+
+               BUILD_TLS=$(usex ssl)
+               USE_SYSTEMD=$(usex systemd)
+       )
+
+       if use jemalloc; then
+               myconf+=( MALLOC=jemalloc )
+       elif use tcmalloc; then
+               myconf+=( MALLOC=tcmalloc )
+       else
+               myconf+=( MALLOC=libc )
+       fi
+
+       emake "${myconf[@]}"
+}
+
+src_test() {
+       local runtestargs=(
+               --clients "$(makeopts_jobs)" # see bug #649868
+
+               --skiptest "Active defrag eval scripts" # see bug #851654
+       )
+
+       if has usersandbox ${FEATURES} || ! has userpriv ${FEATURES}; then
+               ewarn "oom-score-adj related tests will be skipped." \
+                       "They are known to fail with FEATURES usersandbox or 
-userpriv. See bug #756382."
+
+               runtestargs+=(
+                       # unit/oom-score-adj was introduced in version 6.2.0
+                       --skipunit unit/oom-score-adj # see bug #756382
+
+                       # Following test was added in version 7.0.0 to 
unit/introspection.
+                       # It also tries to adjust OOM score.
+                       --skiptest "CONFIG SET rollback on apply error"
+               )
+       fi
+
+       if use ssl; then
+               edo ./utils/gen-test-certs.sh
+               runtestargs+=( --tls )
+       fi
+
+       edo ./runtest "${runtestargs[@]}"
+}
+
+src_install() {
+       insinto /etc/redis
+       doins redis.conf sentinel.conf
+       use prefix || fowners -R redis:redis /etc/redis 
/etc/redis/{redis,sentinel}.conf
+       fperms 0750 /etc/redis
+       fperms 0644 /etc/redis/{redis,sentinel}.conf
+
+       newconfd "${FILESDIR}/redis.confd-r2" redis
+       newinitd "${FILESDIR}/redis.initd-6" redis
+
+       systemd_newunit "${FILESDIR}/redis.service-4" redis.service
+       newtmpfiles "${FILESDIR}/redis.tmpfiles-2" redis.conf
+
+       newconfd "${FILESDIR}/redis-sentinel.confd-r1" redis-sentinel
+       newinitd "${FILESDIR}/redis-sentinel.initd-r1" redis-sentinel
+
+       insinto /etc/logrotate.d/
+       newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+       dodoc 00-RELEASENOTES BUGS CONTRIBUTING.md MANIFESTO README.md
+
+       dobin src/redis-cli
+       dosbin src/redis-benchmark src/redis-server src/redis-check-aof 
src/redis-check-rdb
+       fperms 0750 /usr/sbin/redis-benchmark
+       dosym redis-server /usr/sbin/redis-sentinel
+
+       if use prefix; then
+               diropts -m0750
+       else
+               diropts -m0750 -o redis -g redis
+       fi
+       keepdir /var/{log,lib}/redis
+}
+
+pkg_postinst() {
+       tmpfiles_process redis.conf
+}

Reply via email to