dev-db/redis: bump to 4.0.7

Package-Manager: Portage-2.3.20, Repoman-2.3.6
(cherry picked from commit 8f86b7032cbabca455c6c20e2d7e9b3e52e124f7)
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/6970

diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest
index 46426aee5f1186d36bf384dbdd6e5e54088d39ed..c7d324f6f3e93f9a9987e71f7ed2313df2f387d1 100644 (file)
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@@ -4,3 +4,4 @@ DIST redis-3.2.8.tar.gz 1547237 BLAKE2B fb03e263ad7b135dff38e018d9b830c4992cf331
 DIST redis-4.0.1.tar.gz 1711660 BLAKE2B 0b8881baa78908df4adcc1aabfa0ea9554900f8b54d204ffa054752ba4355da2b56408501ede81a69cc1f34ebbb9fc984335738ea9f343ddcd4e9fb9a0d64c8e SHA512 62dec537aebd12340b9642f5f8b07fd98757c9e648dcd539a0411f207db3495923c5a6a9941036c56b2d574ee38b46d08558668111e322345ef549f93fada26f
 DIST redis-4.0.2.tar.gz 1713990 BLAKE2B 307ab76b336f7520e14a23a1577c46e1b63cc5a5a5b6afb725cb87934fbcb62107085671fd1072d1142ce8e92f069e6b6064c9f4468335bc6997897c8f494471 SHA512 1458909c6fc16cff8ca5e6dddff23b988ee1e447f2d0bccf5941553b22bab6abb851732b3fe53dafb8a69d6c0939c3ce7e0686d51e03be720fb018c038d3b1b4
 DIST redis-4.0.6.tar.gz 1723533 BLAKE2B 94c2a9b7eeaa676efaac75cd5c143b0f4b02440b5a21ecc9b2a68cc27ad4abc1fc4d7dbc903dea5d956ce737ca434ea5b5bdde4a35df3a3689da60c5fb0bddf1 SHA512 784aad612664df666c36f969cb6a9ab794f004abcf9aa761bd1f5f0f8fdb248d5b38f48a59b68c2de7d2a344755f1537efc9d5847de0d662302699ed94d40813
+DIST redis-4.0.7.tar.gz 1729488 BLAKE2B 7a5337b868e4da4a7387b31bc9d6bd4c86abd701b9ba999f64296ed5188cbba7208ced466973a500730ca03e70a9a85fbab2fb4700fdc977e58defc0126487d1 SHA512 6f317d9e76224b2a2b047dc8f56b126ea85ee5c6112c4c6238cb5cdfa3a83756bff3a82b106b00d1124a93d210a900d836587b8d9563916f19274de0e84c4c6b

diff --git a/dev-db/redis/redis-4.0.7.ebuild b/dev-db/redis/redis-4.0.7.ebuild
new file mode 100644 (file)
index 0000000..c7f8131
--- /dev/null
+++ b/dev-db/redis/redis-4.0.7.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils flag-o-matic systemd toolchain-funcs user
+
+DESCRIPTION="A persistent caching system, key-value and data structures database"
+HOMEPAGE="http://redis.io/"
+SRC_URI="http://download.redis.io/releases/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+IUSE="+jemalloc tcmalloc luajit test"
+SLOT="0"
+
+# Redis does NOT build with Lua 5.2 or newer at this time.
+# This should link correctly with both unslotted & slotted Lua, without
+# changes.
+RDEPEND="
+       luajit? ( dev-lang/luajit:2 )
+       !luajit? ( || ( dev-lang/lua:5.1 =dev-lang/lua-5.1*:0 ) )
+       tcmalloc? ( dev-util/google-perftools )
+       jemalloc? ( >=dev-libs/jemalloc-3.2 )"
+
+DEPEND="
+       ${RDEPEND}
+       virtual/pkgconfig
+       >=sys-devel/autoconf-2.63
+       test? ( dev-lang/tcl:0= )"
+
+REQUIRED_USE="?? ( tcmalloc jemalloc )"
+
+S="${WORKDIR}/${PN}-${PV/_/-}"
+
+pkg_setup() {
+       enewgroup redis 75
+       enewuser redis 75 -1 /var/lib/redis redis
+}
+
+src_prepare() {
+       eapply \
+               "${FILESDIR}"/${PN}-3.2.3-config.patch \
+               "${FILESDIR}"/${PN}-4.0.1-shared.patch \
+               "${FILESDIR}"/${PN}-4.0.1-sharedlua.patch \
+               "${FILESDIR}"/${PN}-sentinel-4.0.6-config.patch
+       eapply_user
+
+       # Copy lua modules into build dir
+       cp "${S}"/deps/lua/src/{fpconv,lua_bit,lua_cjson,lua_cmsgpack,lua_struct,strbuf}.c "${S}"/src || die
+       cp "${S}"/deps/lua/src/{fpconv,strbuf}.h "${S}"/src || die
+       # Append cflag for lua_cjson
+       # https://github.com/antirez/redis/commit/4fdcd213#diff-3ba529ae517f6b57803af0502f52a40bL61
+       append-cflags "-DENABLE_CJSON_GLOBAL"
+
+       # now we will rewrite present Makefiles
+       local makefiles="" MKF
+       for MKF in $(find -name 'Makefile' | cut -b 3-); do
+               mv "${MKF}" "${MKF}.in"
+               sed -i  -e 's:$(CC):@CC@:g' \
+                       -e 's:$(CFLAGS):@AM_CFLAGS@:g' \
+                       -e 's: $(DEBUG)::g' \
+                       -e 's:$(OBJARCH)::g' \
+                       -e 's:ARCH:TARCH:g' \
+                       -e '/^CCOPT=/s:$: $(LDFLAGS):g' \
+                       "${MKF}.in" \
+               || die "Sed failed for ${MKF}"
+               makefiles+=" ${MKF}"
+       done
+       # autodetection of compiler and settings; generates the modified Makefiles
+       cp "${FILESDIR}"/configure.ac-3.2 configure.ac || die
+
+       # Use the correct pkgconfig name for Lua
+       has_version 'dev-lang/lua:5.1' \
+               && LUAPKGCONFIG=lua5.1 \
+               || LUAPKGCONFIG=lua
+       sed -i  \
+               -e "/^AC_INIT/s|, [0-9].+, |, $PV, |" \
+               -e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \
+               -e "/PKG_CHECK_MODULES.*\<LUA\>/s,lua5.1,${LUAPKGCONFIG},g" \
+               configure.ac || die "Sed failed for configure.ac"
+       eautoreconf
+}
+
+src_configure() {
+       econf \
+               $(use_with luajit)
+
+       # 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 CC AR RANLIB
+
+       local myconf=""
+
+       if use tcmalloc; then
+               myconf="${myconf} USE_TCMALLOC=yes"
+       elif use jemalloc; then
+               myconf="${myconf} JEMALLOC_SHARED=yes"
+       else
+               myconf="${myconf} MALLOC=yes"
+       fi
+
+       emake ${myconf} V=1 CC="${CC}" AR="${AR} rcu" RANLIB="${RANLIB}"
+}
+
+src_install() {
+       insinto /etc/
+       doins redis.conf sentinel.conf
+       use prefix || fowners redis:redis /etc/{redis,sentinel}.conf
+       fperms 0644 /etc/{redis,sentinel}.conf
+
+       newconfd "${FILESDIR}/redis.confd-r1" redis
+       newinitd "${FILESDIR}/redis.initd-5" redis
+
+       systemd_newunit "${FILESDIR}/redis.service-2" redis.service
+       systemd_newtmpfilesd "${FILESDIR}/redis.tmpfiles" redis.conf
+
+       newconfd "${FILESDIR}/redis-sentinel.confd" redis-sentinel
+       newinitd "${FILESDIR}/redis-sentinel.initd" redis-sentinel
+
+       insinto /etc/logrotate.d/
+       newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+       dodoc 00-RELEASENOTES BUGS CONTRIBUTING 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
+}