1 |
commit: 7436cf7779be6c334808e8f7c075a16738642002 |
2 |
Author: Tomáš Mózes <hydrapolic <AT> gmail <DOT> com> |
3 |
AuthorDate: Fri May 29 02:56:25 2020 +0000 |
4 |
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun May 31 04:27:02 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7436cf77 |
7 |
|
8 |
dev-db/redis: drop old |
9 |
|
10 |
Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com> |
11 |
(cherry picked from commit 68f9ef8bba76defe19ca6b4c59a5226f86130686) |
12 |
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org> |
13 |
|
14 |
dev-db/redis/Manifest | 1 - |
15 |
dev-db/redis/redis-6.0.3.ebuild | 160 ---------------------------------------- |
16 |
2 files changed, 161 deletions(-) |
17 |
|
18 |
diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest |
19 |
index c5e8a19d62e..001c4915229 100644 |
20 |
--- a/dev-db/redis/Manifest |
21 |
+++ b/dev-db/redis/Manifest |
22 |
@@ -4,5 +4,4 @@ DIST redis-5.0.5.tar.gz 1975750 BLAKE2B 3a0463685ae30f9d38e96d7324ae624474f02311 |
23 |
DIST redis-5.0.7.tar.gz 1984203 BLAKE2B a4e65784ae5d673833d1a6df73800d95ca4d8db7ec045c166027d0c372291e2f5fa2ccc4fe8d4a081b7a967c154fcf03d4b097c5d7b05755a52b465e441ad7ee SHA512 75c1d4bcca3e28d80f6b6942f0153ff33538d706339c69bddd2646c36f88b901c77dde09fba5629ba90ace00077e45d37b0a822a863f9f737ef9a79eb7093d9d |
24 |
DIST redis-5.0.8.tar.gz 1985757 BLAKE2B e46af2133e066ccb91a8eb2c2fbfefe3747e1cfa71efa78dd50830e1bc1d83261f78ed6ff75b789b238709d9f72d5d401be2f2dd698bd19c41c091d10e0baf47 SHA512 106a74ab910267472fb418fdeb4f39e29efe9d73ed5af78b7847c91eaabd473dd729a63078e72d8e87c842169502946e9a0a97c42dea415db82732864c7c46dc |
25 |
DIST redis-5.0.9.tar.gz 1986574 BLAKE2B 7802d0556d11c9be8577b9bb3f4dbad8c2419b38659001421f96040e8a64a4a304e9dc1f06d82802ce1c92515d166cfd37c2f347df4c4cda0c2c4c2bb10d27c5 SHA512 d2c7bc1f769bc5d179bfe6e71954962813b50597eafc752a9b1edf2fd87e84707b7daf0910db56dd0e89cb3bdb3e551da7f111ae4899f505bac5f77f99744c13 |
26 |
-DIST redis-6.0.3.tar.gz 2210882 BLAKE2B 9a83f6373469dcebb95bb0cbf10ffd56d9cb7eddc68e099d871bd41961929a7a56745566ef3969ddee23e1ddb0f5519da0a1245bb639abbec3c9b45b7c494386 SHA512 88978285db62cb8aa6e27fcd2075bbdb13f2606eaa702491047080bd6396d79d59336f0310d049d88a57e8e7b7096d716f9408b41cc658788a3902627770a807 |
27 |
DIST redis-6.0.4.tar.gz 2217173 BLAKE2B b93b405bbca06cfeafd57d92bc7966ffe97c22cf2b906729772431ca57d1beeb4ff67c7dad27c711ef676e30c0932fc24cf9be475cb6a2a31c21d8b0a3312f44 SHA512 8b0922fd7a9d03d4c21d4822da2c7b16a79c65151d3084b03bbacb35dfc2213a0847115c36ffbe8cc1e7b8664ed142e1e05e9f3f262a5e8a043849b398c7547d |
28 |
|
29 |
diff --git a/dev-db/redis/redis-6.0.3.ebuild b/dev-db/redis/redis-6.0.3.ebuild |
30 |
deleted file mode 100644 |
31 |
index 5e62c2dd9e4..00000000000 |
32 |
--- a/dev-db/redis/redis-6.0.3.ebuild |
33 |
+++ /dev/null |
34 |
@@ -1,160 +0,0 @@ |
35 |
-# Copyright 1999-2020 Gentoo Authors |
36 |
-# Distributed under the terms of the GNU General Public License v2 |
37 |
- |
38 |
-EAPI=7 |
39 |
- |
40 |
-inherit autotools flag-o-matic systemd toolchain-funcs |
41 |
- |
42 |
-DESCRIPTION="A persistent caching system, key-value and data structures database" |
43 |
-HOMEPAGE="https://redis.io" |
44 |
-SRC_URI="http://download.redis.io/releases/${P}.tar.gz" |
45 |
- |
46 |
-LICENSE="BSD" |
47 |
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris" |
48 |
-IUSE="+jemalloc luajit tcmalloc test" |
49 |
-RESTRICT="!test? ( test )" |
50 |
-SLOT="0" |
51 |
- |
52 |
-# Redis does NOT build with Lua 5.2 or newer at this time. |
53 |
-# This should link correctly with both unslotted & slotted Lua, without |
54 |
-# changes. |
55 |
-COMMON_DEPEND=" |
56 |
- jemalloc? ( >=dev-libs/jemalloc-5.1:= ) |
57 |
- luajit? ( dev-lang/luajit:2 ) |
58 |
- !luajit? ( || ( dev-lang/lua:5.1 =dev-lang/lua-5.1*:0 ) ) |
59 |
- tcmalloc? ( dev-util/google-perftools ) |
60 |
-" |
61 |
- |
62 |
-RDEPEND=" |
63 |
- ${COMMON_DEPEND} |
64 |
- acct-group/redis |
65 |
- acct-user/redis |
66 |
-" |
67 |
- |
68 |
-BDEPEND=" |
69 |
- ${COMMON_DEPEND} |
70 |
- virtual/pkgconfig |
71 |
-" |
72 |
- |
73 |
-# Tcl is only needed in the CHOST test env |
74 |
-DEPEND=" |
75 |
- ${COMMON_DEPEND} |
76 |
- test? ( dev-lang/tcl:0= )" |
77 |
- |
78 |
-REQUIRED_USE="?? ( jemalloc tcmalloc )" |
79 |
- |
80 |
-PATCHES=( |
81 |
- "${FILESDIR}"/${PN}-3.2.3-config.patch |
82 |
- "${FILESDIR}"/${PN}-5.0-shared.patch |
83 |
- "${FILESDIR}"/${PN}-6.0.3-sharedlua.patch |
84 |
- "${FILESDIR}"/${PN}-5.0.8-ppc-atomic.patch |
85 |
- "${FILESDIR}"/${PN}-sentinel-5.0-config.patch |
86 |
-) |
87 |
- |
88 |
-src_prepare() { |
89 |
- default |
90 |
- |
91 |
- # unstable on jemalloc |
92 |
- > tests/unit/memefficiency.tcl || die |
93 |
- |
94 |
- # Copy lua modules into build dir |
95 |
- cp "${S}"/deps/lua/src/{fpconv,lua_bit,lua_cjson,lua_cmsgpack,lua_struct,strbuf}.c "${S}"/src || die |
96 |
- cp "${S}"/deps/lua/src/{fpconv,strbuf}.h "${S}"/src || die |
97 |
- # Append cflag for lua_cjson |
98 |
- # https://github.com/antirez/redis/commit/4fdcd213#diff-3ba529ae517f6b57803af0502f52a40bL61 |
99 |
- append-cflags "-DENABLE_CJSON_GLOBAL" |
100 |
- |
101 |
- # now we will rewrite present Makefiles |
102 |
- local makefiles="" MKF |
103 |
- for MKF in $(find -name 'Makefile' | cut -b 3-); do |
104 |
- mv "${MKF}" "${MKF}.in" |
105 |
- sed -i -e 's:$(CC):@CC@:g' \ |
106 |
- -e 's:$(CFLAGS):@AM_CFLAGS@:g' \ |
107 |
- -e 's: $(DEBUG)::g' \ |
108 |
- -e 's:$(OBJARCH)::g' \ |
109 |
- -e 's:ARCH:TARCH:g' \ |
110 |
- -e '/^CCOPT=/s:$: $(LDFLAGS):g' \ |
111 |
- "${MKF}.in" \ |
112 |
- || die "Sed failed for ${MKF}" |
113 |
- makefiles+=" ${MKF}" |
114 |
- done |
115 |
- # autodetection of compiler and settings; generates the modified Makefiles |
116 |
- cp "${FILESDIR}"/configure.ac-3.2 configure.ac || die |
117 |
- |
118 |
- # Use the correct pkgconfig name for Lua |
119 |
- if false && has_version 'dev-lang/lua:5.3'; then |
120 |
- # Lua5.3 gives: |
121 |
- #lua_bit.c:83:2: error: #error "Unknown number type, check LUA_NUMBER_* in luaconf.h" |
122 |
- LUAPKGCONFIG=lua5.3 |
123 |
- elif false && has_version 'dev-lang/lua:5.2'; then |
124 |
- # Lua5.2 fails with: |
125 |
- # scripting.c:(.text+0x1f9b): undefined reference to `lua_open' |
126 |
- # Because lua_open because lua_newstate in 5.2 |
127 |
- LUAPKGCONFIG=lua5.2 |
128 |
- elif has_version 'dev-lang/lua:5.1'; then |
129 |
- LUAPKGCONFIG=lua5.1 |
130 |
- else |
131 |
- LUAPKGCONFIG=lua |
132 |
- fi |
133 |
- # The upstream configure script handles luajit specially, and is not |
134 |
- # effected by these changes. |
135 |
- einfo "Selected LUAPKGCONFIG=${LUAPKGCONFIG}" |
136 |
- sed -i \ |
137 |
- -e "/^AC_INIT/s|, [0-9].+, |, $PV, |" \ |
138 |
- -e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \ |
139 |
- -e "/PKG_CHECK_MODULES.*\<LUA\>/s,lua5.1,${LUAPKGCONFIG},g" \ |
140 |
- configure.ac || die "Sed failed for configure.ac" |
141 |
- eautoreconf |
142 |
-} |
143 |
- |
144 |
-src_configure() { |
145 |
- econf $(use_with luajit) |
146 |
-} |
147 |
- |
148 |
-src_compile() { |
149 |
- local myconf="" |
150 |
- |
151 |
- if use jemalloc; then |
152 |
- myconf+="MALLOC=jemalloc" |
153 |
- elif use tcmalloc; then |
154 |
- myconf+="MALLOC=tcmalloc" |
155 |
- else |
156 |
- myconf+="MALLOC=libc" |
157 |
- fi |
158 |
- |
159 |
- tc-export CC |
160 |
- emake V=1 ${myconf} CC="${CC}" |
161 |
-} |
162 |
- |
163 |
-src_install() { |
164 |
- insinto /etc/ |
165 |
- doins redis.conf sentinel.conf |
166 |
- use prefix || fowners redis:redis /etc/{redis,sentinel}.conf |
167 |
- fperms 0644 /etc/{redis,sentinel}.conf |
168 |
- |
169 |
- newconfd "${FILESDIR}/redis.confd-r1" redis |
170 |
- newinitd "${FILESDIR}/redis.initd-5" redis |
171 |
- |
172 |
- systemd_newunit "${FILESDIR}/redis.service-3" redis.service |
173 |
- systemd_newtmpfilesd "${FILESDIR}/redis.tmpfiles-2" redis.conf |
174 |
- |
175 |
- newconfd "${FILESDIR}/redis-sentinel.confd" redis-sentinel |
176 |
- newinitd "${FILESDIR}/redis-sentinel.initd" redis-sentinel |
177 |
- |
178 |
- insinto /etc/logrotate.d/ |
179 |
- newins "${FILESDIR}/${PN}.logrotate" ${PN} |
180 |
- |
181 |
- dodoc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO README.md |
182 |
- |
183 |
- dobin src/redis-cli |
184 |
- dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-rdb |
185 |
- fperms 0750 /usr/sbin/redis-benchmark |
186 |
- dosym redis-server /usr/sbin/redis-sentinel |
187 |
- |
188 |
- if use prefix; then |
189 |
- diropts -m0750 |
190 |
- else |
191 |
- diropts -m0750 -o redis -g redis |
192 |
- fi |
193 |
- keepdir /var/{log,lib}/redis |
194 |
-} |