Gentoo Archives: gentoo-commits

From: "Robin H. Johnson" <robbat2@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libmemcached/files/, dev-libs/libmemcached/
Date: Fri, 01 Dec 2017 17:56:39
Message-Id: 1512150988.e41906c2a727e0c867becb0f084c450071544594.robbat2@gentoo
1 commit: e41906c2a727e0c867becb0f084c450071544594
2 Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
3 AuthorDate: Fri Dec 1 17:55:34 2017 +0000
4 Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
5 CommitDate: Fri Dec 1 17:56:28 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e41906c2
7
8 dev-libs/libmemcached: cleanup
9
10 Package-Manager: Portage-2.3.16, Repoman-2.3.6
11
12 dev-libs/libmemcached/Manifest | 6 +-
13 .../files/libmemcached-1.0.17-gcc4_8.patch | 183 ---------------------
14 dev-libs/libmemcached/libmemcached-0.50.ebuild | 65 --------
15 .../libmemcached/libmemcached-1.0.17-r3.ebuild | 49 ------
16 .../libmemcached/libmemcached-1.0.17-r4.ebuild | 50 ------
17 5 files changed, 2 insertions(+), 351 deletions(-)
18
19 diff --git a/dev-libs/libmemcached/Manifest b/dev-libs/libmemcached/Manifest
20 index 40b12673467..928493f86d6 100644
21 --- a/dev-libs/libmemcached/Manifest
22 +++ b/dev-libs/libmemcached/Manifest
23 @@ -1,4 +1,2 @@
24 -DIST libmemcached-0.50.tar.gz 884272 SHA256 d3ed82f9c5cdfa816047ed6b7475b5708f9040b5cf3d9e2aed55de235e8b2f9a SHA512 f06a17b365779eb8fb0c94982e5141643ed17f91e5137565ff756912cf96b3f68b11a643f84d0cba1b474411f16a64086cc311ac5cea4bc3792da81b40d423b7 WHIRLPOOL fc1d3107772a45e844764c570261ccd2556ff11b770377c84788cc3d8a8ee946a8e5b3527c21e70c1c5aa1d9493270d9079f8a75cd5387835ccd7def1cab0f9e
25 -DIST libmemcached-1.0.14.tar.gz 1000929 SHA256 32eaea2c4b8965a12bd33fe1af043d7e20b7ec64977937973a3d97514f1e946b SHA512 4c0371cc4752eeee94baad6063b2413f096b5050166ce761ac26080559537dab32b69131a97703fdebf8f4886520d4bc29c7d4d8d1df6d0d681c81b88354c15b WHIRLPOOL be3760f75a6de33687272b5bf7be950edb0a3f96184c7f8f7e1cb47ff85479ea76c277f298d36f21a5f15c1ce8e04a0714f1bf73700711842bb4c0841959674a
26 -DIST libmemcached-1.0.17.tar.gz 1023177 SHA256 7bb27b2589400f918df1cf5002cb01ef7ccac6e23f818604e2386de62c80bba5 SHA512 7cc2a836524a628f4617bad12e8ea3b0192a3f8530a3588a076daac56b3e773d7d36823091a81d6447da9fe9d017849c59dbbcc65190ff9817bb985dc6c11a3b WHIRLPOOL 34b57811750667bca59efa5a4356a15dd2bd0135534c1d157df4b3d9ff3575db1848f363914ee1b6b606a45dae3145985c791f11ae5890a7493207cb2e9eb3b4
27 -DIST libmemcached-1.0.18.tar.gz 1039649 SHA256 e22c0bb032fde08f53de9ffbc5a128233041d9f33b5de022c0978a2149885f82 SHA512 2d95fea63b8b6dc7ded42c3a88a54aad74d5a1d417af1247144dae4a88c3b639a3aabc0c2b66661ff69a7609a314efaaae236e10971af9c428a4bca0a0101585 WHIRLPOOL f7d8f405306fd7cbfee6ba8b340305bc79b1dbcd6a2a2dcb0ee74a24d8928e5a5a7f0d20afebf58cecf44e7ca3fd66abd2d30041848b89ddbb10eb1da9179b94
28 +DIST libmemcached-1.0.14.tar.gz 1000929 BLAKE2B 6dfef0fa5714e6383514ff28d3eb75740f30f7adce4e4c0ea4c26a6667fc6cfa5df84e0c52b47393d156e9a8e5de0409699b47d77128a400f64f37b981977dbb SHA512 4c0371cc4752eeee94baad6063b2413f096b5050166ce761ac26080559537dab32b69131a97703fdebf8f4886520d4bc29c7d4d8d1df6d0d681c81b88354c15b
29 +DIST libmemcached-1.0.18.tar.gz 1039649 BLAKE2B e55acdc4c0cb2417f01b2980f7f71d9dfd685877361622422ee812f9e066ed2711549d457cf1b4a48a14c778e820b54abfe0c6274812c71fc7961e68167975e9 SHA512 2d95fea63b8b6dc7ded42c3a88a54aad74d5a1d417af1247144dae4a88c3b639a3aabc0c2b66661ff69a7609a314efaaae236e10971af9c428a4bca0a0101585
30
31 diff --git a/dev-libs/libmemcached/files/libmemcached-1.0.17-gcc4_8.patch b/dev-libs/libmemcached/files/libmemcached-1.0.17-gcc4_8.patch
32 deleted file mode 100644
33 index 5f42d3f3cab..00000000000
34 --- a/dev-libs/libmemcached/files/libmemcached-1.0.17-gcc4_8.patch
35 +++ /dev/null
36 @@ -1,183 +0,0 @@
37 -Description: Fix compilation with gcc-4.8
38 - This patch fixes the error flags made incompatible with gcc-4.8:
39 - g++: error: -fsanitize=address is incompatible with -fsanitize=thread
40 -Author: Brian Aker
41 -Last-Update: 2013-06-14
42 -Bug: https://bugs.launchpad.net/libmemcached/+bug/1164442
43 -
44 ---- a/libtest/run.gdb 2012-03-26 01:08:09 +0000
45 -+++ b/libtest/run.gdb 2013-04-10 05:25:24 +0000
46 -@@ -1,5 +1,6 @@
47 - set logging on
48 - set logging overwrite on
49 - set environment LIBTEST_IN_GDB=1
50 -+set ASAN_OPTIONS=abort_on_error=1
51 - run
52 - thread apply all bt
53 -
54 ---- a/m4/ax_harden_compiler_flags.m4 2013-02-12 05:44:21 +0000
55 -+++ b/m4/ax_harden_compiler_flags.m4 2013-04-10 05:25:24 +0000
56 -@@ -53,7 +53,7 @@
57 - # ? _APPEND_COMPILE_FLAGS_ERROR([-Wlong-long]) -- Don't turn on for
58 - # compatibility issues memcached_stat_st
59 -
60 --#serial 8
61 -+#serial 9
62 -
63 - AC_DEFUN([_WARNINGS_AS_ERRORS],
64 - [AC_CACHE_CHECK([if all warnings into errors],[ac_cv_warnings_as_errors],
65 -@@ -92,9 +92,12 @@
66 - _APPEND_COMPILE_FLAGS_ERROR([-H])
67 - _APPEND_COMPILE_FLAGS_ERROR([-ggdb])
68 - _APPEND_COMPILE_FLAGS_ERROR([-g])
69 -- _APPEND_COMPILE_FLAGS_ERROR([-O0])],
70 -- [_APPEND_COMPILE_FLAGS_ERROR([-g])
71 -- _APPEND_COMPILE_FLAGS_ERROR([-O2])])
72 -+ _APPEND_COMPILE_FLAGS_ERROR([-O0]),
73 -+ _APPEND_COMPILE_FLAGS_ERROR([-fno-omit-frame-pointer])
74 -+ ],[
75 -+ _APPEND_COMPILE_FLAGS_ERROR([-g])
76 -+ _APPEND_COMPILE_FLAGS_ERROR([-O2])
77 -+ ])
78 -
79 - AS_IF([test "x$ac_cv_vcs_checkout" = xyes],
80 - [_APPEND_COMPILE_FLAGS_ERROR([-fstack-check])
81 -@@ -155,26 +158,31 @@
82 - _APPEND_COMPILE_FLAGS_ERROR([-Wundef])
83 - _APPEND_COMPILE_FLAGS_ERROR([-Wunsafe-loop-optimizations])
84 - _APPEND_COMPILE_FLAGS_ERROR([-funsafe-loop-optimizations])
85 -- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=address])
86 -- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=integer])
87 -- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=thread])
88 -- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=memory])
89 -- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=alignment])
90 -- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=bool])
91 -- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=bounds])
92 -- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=enum])
93 -- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=float-cast-overflow])
94 -- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=float-divide-by-zero])
95 -- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=integer-divide-by-zero])
96 -- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=null])
97 -- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=object-size])
98 -- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=return])
99 -- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=shift])
100 -- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=signed-integer-overflow])
101 -- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=unreachable])
102 -- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=unsigned-integer-overflow])
103 -- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=vla-bound])
104 -- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=vptr])
105 -+ AS_IF([test "x$ac_cv_vcs_checkout" = xyes],[
106 -+ _APPEND_COMPILE_FLAGS_ERROR([-fno-omit-frame-pointer])
107 -+ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=address])
108 -+ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=integer])
109 -+ AS_IF([test "x$enable_shared" = "xyes"],[
110 -+ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=thread])
111 -+ ])
112 -+ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=memory])
113 -+ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=alignment])
114 -+ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=bool])
115 -+ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=bounds])
116 -+ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=enum])
117 -+ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=float-cast-overflow])
118 -+ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=float-divide-by-zero])
119 -+ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=integer-divide-by-zero])
120 -+ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=null])
121 -+ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=object-size])
122 -+ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=return])
123 -+ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=shift])
124 -+ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=signed-integer-overflow])
125 -+ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=unreachable])
126 -+ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=unsigned-integer-overflow])
127 -+ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=vla-bound])
128 -+ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=vptr])
129 -+ ])
130 - _APPEND_COMPILE_FLAGS_ERROR([-Wclobbered])
131 - _APPEND_COMPILE_FLAGS_ERROR([-Wunused])
132 - _APPEND_COMPILE_FLAGS_ERROR([-Wunused-result])
133 -@@ -186,6 +194,7 @@
134 - _APPEND_COMPILE_FLAGS_ERROR([-fwrapv])
135 - _APPEND_COMPILE_FLAGS_ERROR([-fmudflapt])
136 - _APPEND_COMPILE_FLAGS_ERROR([-pipe])
137 -+ _APPEND_COMPILE_FLAGS_ERROR([-Wsizeof-pointer-memaccess])
138 -
139 - AS_IF([test "x$ax_enable_debug" = xno],
140 - [AS_IF([test "x$ac_cv_vcs_checkout" = xyes],
141 -@@ -213,9 +222,12 @@
142 - _APPEND_COMPILE_FLAGS_ERROR([-H])
143 - _APPEND_COMPILE_FLAGS_ERROR([-ggdb])
144 - _APPEND_COMPILE_FLAGS_ERROR([-g])
145 -- _APPEND_COMPILE_FLAGS_ERROR([-O0])],
146 -- [_APPEND_COMPILE_FLAGS_ERROR([-g])
147 -- _APPEND_COMPILE_FLAGS_ERROR([-O2])])
148 -+ _APPEND_COMPILE_FLAGS_ERROR([-O0]),
149 -+ _APPEND_COMPILE_FLAGS_ERROR([-fno-omit-frame-pointer])
150 -+ ],[
151 -+ _APPEND_COMPILE_FLAGS_ERROR([-g])
152 -+ _APPEND_COMPILE_FLAGS_ERROR([-O2])
153 -+ ])
154 -
155 - AS_IF([test "x$ac_cv_vcs_checkout" = xyes],
156 - [_APPEND_COMPILE_FLAGS_ERROR([-fstack-check])
157 -@@ -268,27 +280,32 @@
158 - _APPEND_COMPILE_FLAGS_ERROR([-funsafe-loop-optimizations])
159 - _APPEND_COMPILE_FLAGS_ERROR([-Wc++11-compat])
160 - # _APPEND_COMPILE_FLAGS_ERROR([-Weffc++])
161 -- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=address])
162 -- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=integer])
163 -- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=thread])
164 -- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=memory])
165 -- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=alignment])
166 -- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=bool])
167 -- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=bounds])
168 -- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=enum])
169 -- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=float-cast-overflow])
170 -- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=float-divide-by-zero])
171 -- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=integer-divide-by-zero])
172 -- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=null])
173 -- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=object-size])
174 -- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=return])
175 -- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=shift])
176 -- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=signed-integer-overflow])
177 -- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=unreachable])
178 -- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=unsigned-integer-overflow])
179 -- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=vla-bound])
180 -- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=vptr])
181 --# _APPEND_COMPILE_FLAGS_ERROR([-Wold-style-cast])
182 -+ AS_IF([test "x$ac_cv_vcs_checkout" = xyes],[
183 -+ _APPEND_COMPILE_FLAGS_ERROR([-fno-omit-frame-pointer])
184 -+ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=address])
185 -+ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=integer])
186 -+ AS_IF([test "x$enable_shared" = "xyes"],[
187 -+ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=thread])
188 -+ ])
189 -+ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=memory])
190 -+ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=alignment])
191 -+ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=bool])
192 -+ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=bounds])
193 -+ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=enum])
194 -+ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=float-cast-overflow])
195 -+ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=float-divide-by-zero])
196 -+ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=integer-divide-by-zero])
197 -+ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=null])
198 -+ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=object-size])
199 -+ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=return])
200 -+ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=shift])
201 -+ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=signed-integer-overflow])
202 -+ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=unreachable])
203 -+ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=unsigned-integer-overflow])
204 -+ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=vla-bound])
205 -+ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=vptr])
206 -+ ])
207 -+# _APPEND_COMPILE_FLAGS_ERROR([-Wold-style-cast])
208 - _APPEND_COMPILE_FLAGS_ERROR([-Wclobbered])
209 - _APPEND_COMPILE_FLAGS_ERROR([-Wunused])
210 - _APPEND_COMPILE_FLAGS_ERROR([-Wunused-result])
211 -@@ -301,6 +318,7 @@
212 - _APPEND_COMPILE_FLAGS_ERROR([-fwrapv])
213 - _APPEND_COMPILE_FLAGS_ERROR([-fmudflapt])
214 - _APPEND_COMPILE_FLAGS_ERROR([-pipe])
215 -+ _APPEND_COMPILE_FLAGS_ERROR([-Wsizeof-pointer-memaccess])
216 -
217 - AS_IF([test "x$ax_enable_debug" = xno],
218 - [AS_IF([test "x$ac_cv_vcs_checkout" = xyes],
219 -
220
221 diff --git a/dev-libs/libmemcached/libmemcached-0.50.ebuild b/dev-libs/libmemcached/libmemcached-0.50.ebuild
222 deleted file mode 100644
223 index 1f9bf894d97..00000000000
224 --- a/dev-libs/libmemcached/libmemcached-0.50.ebuild
225 +++ /dev/null
226 @@ -1,65 +0,0 @@
227 -# Copyright 1999-2015 Gentoo Foundation
228 -# Distributed under the terms of the GNU General Public License v2
229 -
230 -EAPI="3"
231 -
232 -inherit eutils multilib
233 -
234 -DESCRIPTION="a C client library to the memcached server"
235 -HOMEPAGE="http://tangent.org/552/libmemcached.html"
236 -SRC_URI="https://launchpad.net/${PN}/1.0/${PV}/+download/${P}.tar.gz"
237 -
238 -LICENSE="BSD"
239 -SLOT="0"
240 -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~sparc-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
241 -IUSE="debug doc hsieh +libevent sasl static-libs tcmalloc"
242 -
243 -DEPEND="net-misc/memcached
244 - virtual/perl-Pod-Parser
245 - doc? ( dev-python/sphinx )
246 - libevent? ( dev-libs/libevent )
247 - tcmalloc? ( dev-util/google-perftools )
248 - sasl? ( virtual/gsasl )"
249 -RDEPEND="${DEPEND}"
250 -
251 -src_prepare() {
252 - # These tests freezes for me
253 - sed -i -e "/connectionpool/d" \
254 - -e "/lp:583031/d" tests/mem_functions.cc || die
255 -}
256 -
257 -src_configure() {
258 - econf \
259 - --disable-dtrace \
260 - --disable-libinnodb \
261 - $(use_enable debug assert) \
262 - $(use_with debug debug) \
263 - $(use_enable hsieh hsieh_hash) \
264 - $(use_enable libevent libevent) \
265 - $(use_enable tcmalloc tcmalloc) \
266 - $(use_with sasl libsasl-prefix) \
267 - $(use_with sasl libsasl2-prefix) \
268 - $(use_enable static-libs static)
269 -}
270 -
271 -src_compile() {
272 - emake || die
273 -
274 - if use doc; then
275 - emake html-local || die
276 - fi
277 -}
278 -
279 -src_install() {
280 - emake DESTDIR="${D}" install || die "Install failed"
281 -
282 - use static-libs || rm -f "${D}"/usr/$(get_libdir)/lib*.la
283 -
284 - dodoc AUTHORS ChangeLog README THANKS TODO
285 - # remove manpage to avoid collision, see bug #299330
286 - rm -f "${D}"/usr/share/man/man1/memdump.* || die "Install failed"
287 - newman docs/man/memdump.1 memcached_memdump.1
288 - if use doc; then
289 - dohtml -r docs/html/* || die
290 - fi
291 -}
292
293 diff --git a/dev-libs/libmemcached/libmemcached-1.0.17-r3.ebuild b/dev-libs/libmemcached/libmemcached-1.0.17-r3.ebuild
294 deleted file mode 100644
295 index a9cd9f3a1fd..00000000000
296 --- a/dev-libs/libmemcached/libmemcached-1.0.17-r3.ebuild
297 +++ /dev/null
298 @@ -1,49 +0,0 @@
299 -# Copyright 1999-2014 Gentoo Foundation
300 -# Distributed under the terms of the GNU General Public License v2
301 -
302 -EAPI=5
303 -
304 -inherit autotools eutils multilib
305 -RESTRICT="test" # https://bugs.gentoo.org/show_bug.cgi?id=498250 https://bugs.launchpad.net/gentoo/+bug/1278023
306 -
307 -DESCRIPTION="a C client library to the memcached server"
308 -HOMEPAGE="http://libmemcached.org/libMemcached.html"
309 -SRC_URI="https://launchpad.net/${PN}/1.0/${PV}/+download/${P}.tar.gz"
310 -
311 -LICENSE="BSD"
312 -SLOT="0"
313 -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
314 -IUSE="debug hsieh +libevent sasl static-libs"
315 -
316 -DEPEND="net-misc/memcached
317 - sasl? ( dev-libs/cyrus-sasl )
318 - libevent? ( dev-libs/libevent )"
319 -RDEPEND="${DEPEND}"
320 -
321 -src_prepare() {
322 - epatch "${FILESDIR}/${PN}-1.0.17-gcc4_8.patch"
323 - eautoreconf
324 -}
325 -
326 -src_configure() {
327 - econf \
328 - --disable-dtrace \
329 - $(use_enable static-libs static) \
330 - $(use_enable sasl sasl) \
331 - $(use_enable debug debug) \
332 - $(use_enable debug assert) \
333 - $(use_enable hsieh hsieh_hash) \
334 - --libdir=/usr/$(get_libdir) \
335 - ${myconf}
336 -}
337 -
338 -src_install() {
339 - emake DESTDIR="${D}" install
340 -
341 - use static-libs || rm -f "${D}"/usr/$(get_libdir)/lib*.la
342 -
343 - dodoc AUTHORS ChangeLog README THANKS TODO
344 - # remove manpage to avoid collision, see bug #299330
345 - rm -f "${D}"/usr/share/man/man1/memdump.*
346 - newman man/memdump.1 memcached_memdump.1
347 -}
348
349 diff --git a/dev-libs/libmemcached/libmemcached-1.0.17-r4.ebuild b/dev-libs/libmemcached/libmemcached-1.0.17-r4.ebuild
350 deleted file mode 100644
351 index 4e98e815134..00000000000
352 --- a/dev-libs/libmemcached/libmemcached-1.0.17-r4.ebuild
353 +++ /dev/null
354 @@ -1,50 +0,0 @@
355 -# Copyright 1999-2014 Gentoo Foundation
356 -# Distributed under the terms of the GNU General Public License v2
357 -
358 -EAPI=5
359 -
360 -inherit autotools eutils multilib
361 -RESTRICT="test" # https://bugs.gentoo.org/show_bug.cgi?id=498250 https://bugs.launchpad.net/gentoo/+bug/1278023
362 -
363 -DESCRIPTION="a C client library to the memcached server"
364 -HOMEPAGE="http://libmemcached.org/libMemcached.html"
365 -SRC_URI="https://launchpad.net/${PN}/1.0/${PV}/+download/${P}.tar.gz"
366 -
367 -LICENSE="BSD"
368 -SLOT="0"
369 -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
370 -IUSE="debug hsieh +libevent sasl static-libs"
371 -
372 -DEPEND="net-misc/memcached
373 - sasl? ( dev-libs/cyrus-sasl )
374 - libevent? ( dev-libs/libevent )"
375 -RDEPEND="${DEPEND}"
376 -
377 -src_prepare() {
378 - sed -i '6i CFLAGS = @CFLAGS@' Makefile.am
379 - epatch "${FILESDIR}/${PN}-1.0.17-gcc4_8.patch"
380 - eautoreconf
381 -}
382 -
383 -src_configure() {
384 - econf \
385 - --disable-dtrace \
386 - $(use_enable static-libs static) \
387 - $(use_enable sasl sasl) \
388 - $(use_enable debug debug) \
389 - $(use_enable debug assert) \
390 - $(use_enable hsieh hsieh_hash) \
391 - --libdir=/usr/$(get_libdir) \
392 - ${myconf}
393 -}
394 -
395 -src_install() {
396 - emake DESTDIR="${D}" install
397 -
398 - use static-libs || rm -f "${D}"/usr/$(get_libdir)/lib*.la
399 -
400 - dodoc AUTHORS ChangeLog README THANKS TODO
401 - # remove manpage to avoid collision, see bug #299330
402 - rm -f "${D}"/usr/share/man/man1/memdump.*
403 - newman man/memdump.1 memcached_memdump.1
404 -}