From 8fbd420dce8836e6503b162092e07b6a77a89f1d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 13 Oct 2017 21:03:07 +0100 Subject: gentoo resync : 13.10.2017 --- dev-db/redis/Manifest | 6 +- dev-db/redis/files/redis.initd-5 | 4 +- dev-db/redis/redis-3.2.8-r4.ebuild | 131 ------------------------------------- dev-db/redis/redis-3.2.8-r5.ebuild | 131 +++++++++++++++++++++++++++++++++++++ dev-db/redis/redis-4.0.2-r1.ebuild | 130 ++++++++++++++++++++++++++++++++++++ dev-db/redis/redis-4.0.2.ebuild | 130 ------------------------------------ 6 files changed, 267 insertions(+), 265 deletions(-) delete mode 100644 dev-db/redis/redis-3.2.8-r4.ebuild create mode 100644 dev-db/redis/redis-3.2.8-r5.ebuild create mode 100644 dev-db/redis/redis-4.0.2-r1.ebuild delete mode 100644 dev-db/redis/redis-4.0.2.ebuild (limited to 'dev-db/redis') diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest index 020cb70b610b..281f1134390c 100644 --- a/dev-db/redis/Manifest +++ b/dev-db/redis/Manifest @@ -13,7 +13,7 @@ AUX redis-4.0.1-sharedlua.patch 2568 SHA256 76a14354c456cdcb50507392d34a6b126706 AUX redis.confd 450 SHA256 8c68e29dc88c8ad99b9212a448d313d1406ef02c7638398b2e48ea1ca8aa937b SHA512 c6347cc6e17e9ce93fd081608b19c4977c3e1ffd58d2a417804ca3e647967800ac11859bd05d5437c36310dcd7552c11f35965e4521c5266c3414387d4796a6b WHIRLPOOL 72fb07431293f0e382af98c5a0b7eeca146cab84153befdd808328aa27404cd74d55d524b5442ad10de5989917351299bc7610e0be75d11d2e31fb5353beb45a AUX redis.confd-r1 511 SHA256 d995e4b96a4e11e8012edd470288f9b48b87b5a144a357bbaedd411c9bb1329d SHA512 f041e6b1da2c579a7dcf40e411ff47bc4675e5931e04f4353888ed5864b7e0c94d53fc98faee982c65a69d0154ee1f624fbadbbcc3a324aec583eefee6fb7133 WHIRLPOOL e819dddfbfe2730a30e1d85b85a68908abe573788b2ef13fb73d2e0e561c22845e2e564643ee93a76df2f22508280de753fc8f4708b23436d3599dd70d478635 AUX redis.initd-4 780 SHA256 94257e625ee8c0212dd8afdaa9871796f9944a3ee68641cbde902a1a8a9c6fa9 SHA512 779a35db0f603956c9ab7827f1d0a0b20d5dcab041aafca2055dfd413056de5e572c9996929ef9bf3c54b5f56e4a3a20f2eaaec306b5790252b46ebae30e74b6 WHIRLPOOL 22af0f74c4b1c1120288264d3c1261e38d51b30b0e01e0fd1693e2f4568e1252662ec31e26591142c9e32ffdaa0d0ab89b66bcdf2fbb2f67932735b1a5dc87e5 -AUX redis.initd-5 590 SHA256 b7d0b0fe1467507ba15be1aa009a355279bd8318880d37289f6534bd753bcf30 SHA512 1f9b065c7facece193556d923016a977da811deb1bb19d1607a3f6ac257b78de5d91b829a66d799e54c40e93d00bf3eb43a97476c79b6b46c38c3fd25dd7a702 WHIRLPOOL cc010188604f33fa7994738fe881d0cfed46fabd4afb849c983dcaa93362588c73c6704fba2afec5964abf4e60edeb33b22261186bb7cfeb517b2181adf83709 +AUX redis.initd-5 696 SHA256 b38e33e455719aa89bf19cda5cbcf093987a8dca82221e257cf642bcbb388ec0 SHA512 cd5ae1cb0beded7c70fc7ab0bcbfe378dbac5bf78235877fedb4599c01bfcffc36909e638b032b29c79c5a5c55da11795c58a845b6eadf4cc41174903070183d WHIRLPOOL 84de2edb4f4d46ae770c4f2f8fe61a5467d556322cafa3da35e113c6a4b67263e5e2d7117f2a36cf26a881cd08020e2cf42318f23683ff52cb25ac6e5fa06e90 AUX redis.service-2 253 SHA256 e65ec7fdac98f30fb72ab73656e4467e74c8900d2664cba64d9baf9e16eaee1b SHA512 b42b73bb54ccc0d16adafb91aabe010092f548ec7979d8a0ed1c4563d9fca378eeb74c0c556f7565a32199ed30ca8a13d6b610d9cda39fd23da1428a410f62cc WHIRLPOOL e2b041b37bf95cbe4ed6684238034497c971352db602a86adbb5ef0626967b4ab20dd9ae412c0cae009a8470e502426b0135e4c676858c11d6e10c97a677baee AUX redis.tmpfiles 61 SHA256 68e4c7e3159068400cbc7d07e84b5618f9d829dc7a4f18253783c6256a53031a SHA512 741ff5a4df5b04e7af4e81357812bf5b6cf992bc18b6052074aef134401d0a92703a2e41f52966012c05ea80fac5636435c8d3e6ed55e62a5711526ba67ee738 WHIRLPOOL 2c6f4d9e5382c43e935db16bf120b24cd8de517bc067dcab91b3230a8ddced7ecc5ed37626464d3f1a7880d2d41efdf3cecfd1029a38aaa2edf3d20de74489b4 DIST redis-3.0.7.tar.gz 1375200 SHA256 b2a791c4ea3bb7268795c45c6321ea5abcc24457178373e6a6e3be6372737f23 SHA512 6c8f4c88d911e1433fd28efff2f6d62763e08be89814ebf4aa4e68e2c8bd605eba24ca3410548b2f480ae094437ce96c0bafa7a5762b3b405d5d850886297ba3 WHIRLPOOL 53c2c967b999bbcb5b45117bbad74b46457158ad94e8c43566311dd3d58c63c2d0cc2dac5dc9e8806821c2532ee4beded17e039da4ddeae958e5a0092429ee3a @@ -25,10 +25,10 @@ EBUILD redis-3.0.7-r1.ebuild 3312 SHA256 178857c68ff546fe0e5a5bd968afc0979e17e60 EBUILD redis-3.0.7.ebuild 3312 SHA256 178857c68ff546fe0e5a5bd968afc0979e17e60ab41ed3539655d836c1f036d6 SHA512 de42869cd28e6b9f7ce63ef0baaa64acc0b5465d2bb2a0c23013a42c0a00059a18620ab428eae88b33f4d6a3b37b2e6cc0dc71135af807dbd9d524908d1d80fb WHIRLPOOL 26d3325a56be5d02fa6571d3bfca3a399c765f7ba2e7d6577b13f0117ea5d4b97c7449d1dd2c3eb942f8711bf5c22ec38dd2db42af455b3e2c1d93be40b54e37 EBUILD redis-3.2.5.ebuild 3578 SHA256 1c935a9f011cf9ceba6a75fb2b0d204817b4aa70cb7bd7e003aa94f98473e627 SHA512 72d8563a1eee0e62d34a3c04583c210a95c0fdd306512f63714324ac6e1302f5a06debb56bae083f9102eef9cade1674f6d5dd746ca7ab796e70592aef659021 WHIRLPOOL ef8f61ee53edbd01e55119105a961bddd4188b92dc55ae54a1ff9a4fe02f0b9139c06abf54864180529a569442785e84592f952e8df0d694f28606835f6d9e07 EBUILD redis-3.2.8-r2.ebuild 3579 SHA256 7e4ea5f0a2396bd4c0a5e0da06c42422ff58b3fc8d165f00f52012f38749045d SHA512 3acf577e2509cf29ae5274117ec5c512fe390167d88c38b6fd375a5d145e4b94704990b23e3a18d6e8ab6c91e5d5bebb5d6c9330a9975b7ef9aa2d14c0914282 WHIRLPOOL 227ca8851ce549c4947c9a258071b44a1f4c5c3a779946a1d998fbe468741e9be73a275ce01337ab9a02840e5f7452268abd92d396fe3179746a8f767fda7382 -EBUILD redis-3.2.8-r4.ebuild 3891 SHA256 3a9ceddc4b209bf1952223300badbf5ab81d72533485d4248422594d828f5d05 SHA512 00d62cc9e030912c942030466b397accc11100e64175df3031b9e9e67c11d4ac62b0fea66fea903264c3e0eedd883c4c188d563e24a74e9ec1af3cc54ade0bda WHIRLPOOL 8a887d676f07f8116f00c05ef220e22be0b81a17abce12e0e89f3cf112e226cb083c347ee41a5d4b6a8b3eec48b6f5b743d1eba375cfa091157eac876592a915 +EBUILD redis-3.2.8-r5.ebuild 3891 SHA256 3a9ceddc4b209bf1952223300badbf5ab81d72533485d4248422594d828f5d05 SHA512 00d62cc9e030912c942030466b397accc11100e64175df3031b9e9e67c11d4ac62b0fea66fea903264c3e0eedd883c4c188d563e24a74e9ec1af3cc54ade0bda WHIRLPOOL 8a887d676f07f8116f00c05ef220e22be0b81a17abce12e0e89f3cf112e226cb083c347ee41a5d4b6a8b3eec48b6f5b743d1eba375cfa091157eac876592a915 EBUILD redis-4.0.1-r1.ebuild 3722 SHA256 4305a38f60f529600e36ced799a5c780c32a152e5d4e2efcdbf200bb92b8ab0a SHA512 d928b9714a9c028fbe14286c975a5ba385384c4ff32311e060252ccf9802e2f58d945d261a9fd5cd512d7142cb82fdb41a44955c046c253ee399e09578b42a0d WHIRLPOOL cf4a5bd6128143c87808282e24a439d527c6f3efde4308231d8fafd393a41b3869fdebf61c0791ad350ff2665651b4816e46377f8e62820da819d51647cba068 EBUILD redis-4.0.1.ebuild 3507 SHA256 8e8281d3c068e21e6e925ff905603dc645262577eaa898a4c7032ab479ad7dfb SHA512 e0a258e5e2333d9c88d5ebba37f52cb772bb17d77b719edc0ce443a3a2ac09cd064766fcf7541503fe656ca2f77d890ae911f518b2552e2673f650cc8bd4d13d WHIRLPOOL 62f2267dceddce78da7b81aa49d40087afb39981743ec02a3337c11202e880fbc9126b49a88dc38cfec8d6bc4391565b1573fcbcab420019cb674271e8b40e4b -EBUILD redis-4.0.2.ebuild 3814 SHA256 949258b27da78e4663f65e1eea15882543cb8978c0dd90e83334026c17cc461e SHA512 3e053a76b16dd7a73cadd890bd5d3afc9a4652f4b5503d0a0c9f135e0c4711e085533cdf3422cdca571ea49ee7769b62145421423a0d619e3941620ab173bd52 WHIRLPOOL 916a0944ff241821cebf34b748c6ef30d80a6cd90fab53e0ba0eb2a15ada43a1a00035b145cab77bbb88727ba674f7edd40c8b4d2d0bc723ddfc4bf58d98caba +EBUILD redis-4.0.2-r1.ebuild 3814 SHA256 949258b27da78e4663f65e1eea15882543cb8978c0dd90e83334026c17cc461e SHA512 3e053a76b16dd7a73cadd890bd5d3afc9a4652f4b5503d0a0c9f135e0c4711e085533cdf3422cdca571ea49ee7769b62145421423a0d619e3941620ab173bd52 WHIRLPOOL 916a0944ff241821cebf34b748c6ef30d80a6cd90fab53e0ba0eb2a15ada43a1a00035b145cab77bbb88727ba674f7edd40c8b4d2d0bc723ddfc4bf58d98caba MISC ChangeLog 9085 SHA256 ed9cb241c3bfe71d3211e01c2a198c4d8e42fbfd42633487141ec65e7c3bd7e4 SHA512 ebcb05824a18732c1daf72785a6ef59305378ea215f3910487fec354771f7a9137d27f0c4bf50a935829f2bd3bce5dbe2bb1a7faf478fc1c8dc01398e435f8b2 WHIRLPOOL e9bce2718149978854fc4adbc99db7daadd1687bf67e68b075ccea02659c71dad7c620a39740d1ac70e0f6a855cc5638b4a3237b85b4719a0ea8100d7524d959 MISC ChangeLog-2015 14790 SHA256 2b26170b052d7ee86954593cf4c8ac44c071e702b546cfb10b5821371efa5bea SHA512 80ece5f6c84ad894aad3290665c6d2099f7c57eee8682fe85d2ab59969099d5f7e229a81968c02f63601b7e40123073394ffeccb58edfa8c374b6148213956f5 WHIRLPOOL c8828bedd95dc6814790355ad42ed2d378831f821c5185a1db2a45c89ebb770a5fbc3453b4893e7d9831ac98a5384fcaecc920cbda97ba5d7c4a98a4121f33b3 MISC metadata.xml 632 SHA256 623fd6b8e252684955a557e3bd26a6fa237dce08702e8373a9eb65207a609a14 SHA512 a032eb7204137f8c5e7b75f8b214b0b6fd7f2a119b261a3da2e0cf8979fda5a5f25643870515a8e8d821ff63df3d17808a6e3189cc16a0f87c88f479571e8ef5 WHIRLPOOL 652c5fcb32bf4a79400534743cb5b4803d813daf9ec363ca38c5c1c2c7f3292b16a50e99845274486fbe5c8dda2abe1ce98da28350f18c06a5d508146a7bd172 diff --git a/dev-db/redis/files/redis.initd-5 b/dev-db/redis/files/redis.initd-5 index a567b1e210d8..bfeeb6925ec0 100644 --- a/dev-db/redis/files/redis.initd-5 +++ b/dev-db/redis/files/redis.initd-5 @@ -9,8 +9,10 @@ : ${REDIS_GROUP:=redis} : ${REDIS_TIMEOUT:=30} +# https://bugs.gentoo.org/631002#c10 +# Force '--daemonize no' to override the config file command="/usr/sbin/redis-server" -command_args="${REDIS_OPTS}" +command_args="${REDIS_OPTS} --daemonize no" command_background="true" command_user="${REDIS_USER}:${REDIS_GROUP}" pidfile="/run/${RC_SVCNAME}.pid" diff --git a/dev-db/redis/redis-3.2.8-r4.ebuild b/dev-db/redis/redis-3.2.8-r4.ebuild deleted file mode 100644 index cb1541102b7c..000000000000 --- a/dev-db/redis/redis-3.2.8-r4.ebuild +++ /dev/null @@ -1,131 +0,0 @@ -# Copyright 1999-2017 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="virtual/pkgconfig - >=sys-devel/autoconf-2.63 - test? ( dev-lang/tcl:0= ) - ${RDEPEND}" -REQUIRED_USE="?? ( tcmalloc jemalloc )" - -S="${WORKDIR}/${PN}-${PV/_/-}" - -pkg_setup() { - enewgroup redis 75 - enewuser redis 75 -1 /var/lib/redis redis -} - -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-3.2.5-shared.patch \ - "${FILESDIR}"/${PN}-3.2.3-config.patch \ - "${FILESDIR}"/${PN}-3.2.3-sharedlua.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="" - 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 - - # 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.*\/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 - # geohash-int can't be built with -std=c99 either - # also, don't define ANSI/c99 for lua twice - sed -i -e "s:-std=c99::g" deps/linenoise/Makefile deps/geohash-int/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 - - 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 -} diff --git a/dev-db/redis/redis-3.2.8-r5.ebuild b/dev-db/redis/redis-3.2.8-r5.ebuild new file mode 100644 index 000000000000..cb1541102b7c --- /dev/null +++ b/dev-db/redis/redis-3.2.8-r5.ebuild @@ -0,0 +1,131 @@ +# Copyright 1999-2017 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="virtual/pkgconfig + >=sys-devel/autoconf-2.63 + test? ( dev-lang/tcl:0= ) + ${RDEPEND}" +REQUIRED_USE="?? ( tcmalloc jemalloc )" + +S="${WORKDIR}/${PN}-${PV/_/-}" + +pkg_setup() { + enewgroup redis 75 + enewuser redis 75 -1 /var/lib/redis redis +} + +src_prepare() { + epatch \ + "${FILESDIR}"/${PN}-3.2.5-shared.patch \ + "${FILESDIR}"/${PN}-3.2.3-config.patch \ + "${FILESDIR}"/${PN}-3.2.3-sharedlua.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="" + 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 + + # 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.*\/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 + # geohash-int can't be built with -std=c99 either + # also, don't define ANSI/c99 for lua twice + sed -i -e "s:-std=c99::g" deps/linenoise/Makefile deps/geohash-int/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 + + 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 +} diff --git a/dev-db/redis/redis-4.0.2-r1.ebuild b/dev-db/redis/redis-4.0.2-r1.ebuild new file mode 100644 index 000000000000..1449a3567826 --- /dev/null +++ b/dev-db/redis/redis-4.0.2-r1.ebuild @@ -0,0 +1,130 @@ +# Copyright 1999-2017 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="virtual/pkgconfig + >=sys-devel/autoconf-2.63 + test? ( dev-lang/tcl:0= ) + ${RDEPEND}" +REQUIRED_USE="?? ( tcmalloc jemalloc )" + +S="${WORKDIR}/${PN}-${PV/_/-}" + +pkg_setup() { + enewgroup redis 75 + enewuser redis 75 -1 /var/lib/redis redis +} + +src_prepare() { + epatch \ + "${FILESDIR}"/${PN}-4.0.1-shared.patch \ + "${FILESDIR}"/${PN}-3.2.3-config.patch \ + "${FILESDIR}"/${PN}-4.0.1-sharedlua.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="" + 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 + + # 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.*\/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 + + 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 +} diff --git a/dev-db/redis/redis-4.0.2.ebuild b/dev-db/redis/redis-4.0.2.ebuild deleted file mode 100644 index 1449a3567826..000000000000 --- a/dev-db/redis/redis-4.0.2.ebuild +++ /dev/null @@ -1,130 +0,0 @@ -# Copyright 1999-2017 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="virtual/pkgconfig - >=sys-devel/autoconf-2.63 - test? ( dev-lang/tcl:0= ) - ${RDEPEND}" -REQUIRED_USE="?? ( tcmalloc jemalloc )" - -S="${WORKDIR}/${PN}-${PV/_/-}" - -pkg_setup() { - enewgroup redis 75 - enewuser redis 75 -1 /var/lib/redis redis -} - -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-4.0.1-shared.patch \ - "${FILESDIR}"/${PN}-3.2.3-config.patch \ - "${FILESDIR}"/${PN}-4.0.1-sharedlua.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="" - 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 - - # 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.*\/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 - - 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 -} -- cgit v1.2.3