commit: 6663909d307d2d6b05e1d83e763e11db918a67ce Author: John Helmert III <ajak <AT> gentoo <DOT> org> AuthorDate: Tue May 23 04:22:00 2023 +0000 Commit: John Helmert III <ajak <AT> gentoo <DOT> org> CommitDate: Tue May 23 04:46:48 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6663909d
dev-libs/hiredis: drop 0.14.1 Bug: https://bugs.gentoo.org/816318 Signed-off-by: John Helmert III <ajak <AT> gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/31137 dev-libs/hiredis/Manifest | 1 - .../hiredis-0.13.3-disable-network-tests.patch | 36 ---------- .../hiredis/files/hiredis-0.14.1-honor-AR.patch | 11 --- dev-libs/hiredis/hiredis-0.14.1.ebuild | 83 ---------------------- 4 files changed, 131 deletions(-) diff --git a/dev-libs/hiredis/Manifest b/dev-libs/hiredis/Manifest index e56d2c6315f8..171a4ffec6a0 100644 --- a/dev-libs/hiredis/Manifest +++ b/dev-libs/hiredis/Manifest @@ -1,3 +1,2 @@ -DIST hiredis-0.14.1.tar.gz 64372 BLAKE2B 9846b05e21bfadb876e26ab45bf5c29a3283b602ef725dfbd877815be690bb5579551f0c452e1d8abf9ae985f6b71408a3b86b343ca5d6dce58dd4897640996a SHA512 a7310f2d65075df0c17636a0220e16487759471a3442b1de2595ab747565f6b6262e37131613b13e396b31050bcbe5529c35d420cd43fd7d500d9d563d469c4f DIST hiredis-1.0.2.tar.gz 98139 BLAKE2B 86d872cfec3d4e925d5d68e4f4faf1301aa6d706bd0406a8080471e14afc2c25db13b9a0937d29baccd457611af8e46922b5379183c7470c9ae1860aac3af096 SHA512 86497a1c21869bbe535378885eee6dbd594ef96325966511a3513f81e501af0f5ac7fed864f3230372f3ac7a23c05bad477fa5aa90b9747c9fb1408028174f9b DIST hiredis-1.1.0.tar.gz 122002 BLAKE2B 74c23816e59ea241c68640f99970ae68536a1cd605ac1a7146bf52e355f5f74b3d39fb81be02741cf776c06b47b9d5acc7ec66bfdcf802dec3ed68fb28a82b1b SHA512 9dad012c144ed24de6aa413a3a10d19a9d0d9ece18dbc388406cd86c5b98cb66c76c586cb559c601ed13a75051d8921dc2882534cc3605513fde47d57276c3bb diff --git a/dev-libs/hiredis/files/hiredis-0.13.3-disable-network-tests.patch b/dev-libs/hiredis/files/hiredis-0.13.3-disable-network-tests.patch deleted file mode 100644 index 000e2537b5a0..000000000000 --- a/dev-libs/hiredis/files/hiredis-0.13.3-disable-network-tests.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git test.c test.c -index 8fde554..89ed6a0 100644 ---- a/test.c -+++ b/test.c -@@ -343,6 +343,7 @@ static void test_free_null(void) { - static void test_blocking_connection_errors(void) { - redisContext *c; - -+#if 0 - test("Returns error when host cannot be resolved: "); - c = redisConnect((char*)"idontexist.test", 6379); - test_cond(c->err == REDIS_ERR_OTHER && -@@ -353,6 +354,7 @@ static void test_blocking_connection_errors(void) { - strcmp(c->errstr,"Temporary failure in name resolution") == 0 || - strcmp(c->errstr,"no address associated with name") == 0)); - redisFree(c); -+#endif - - test("Returns error when the port is not open: "); - c = redisConnect((char*)"localhost", 1); -@@ -773,6 +775,7 @@ int main(int argc, char **argv) { - test_blocking_connection_errors(); - test_free_null(); - -+#if 0 - printf("\nTesting against TCP connection (%s:%d):\n", cfg.tcp.host, cfg.tcp.port); - cfg.type = CONN_TCP; - test_blocking_connection(cfg); -@@ -781,6 +784,7 @@ int main(int argc, char **argv) { - test_invalid_timeout_errors(cfg); - test_append_formatted_commands(cfg); - if (throughput) test_throughput(cfg); -+#endif - - printf("\nTesting against Unix socket connection (%s):\n", cfg.unix.path); - cfg.type = CONN_UNIX; diff --git a/dev-libs/hiredis/files/hiredis-0.14.1-honor-AR.patch b/dev-libs/hiredis/files/hiredis-0.14.1-honor-AR.patch deleted file mode 100644 index 0bfcf0988e81..000000000000 --- a/dev-libs/hiredis/files/hiredis-0.14.1-honor-AR.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -51,7 +51,7 @@ DYLIB_MAJOR_NAME=$(LIBNAME).$(DYLIBSUFFIX).$(HIREDIS_MAJOR) - DYLIBNAME=$(LIBNAME).$(DYLIBSUFFIX) - DYLIB_MAKE_CMD=$(CC) -shared -Wl,-soname,$(DYLIB_MINOR_NAME) -o $(DYLIBNAME) $(LDFLAGS) - STLIBNAME=$(LIBNAME).$(STLIBSUFFIX) --STLIB_MAKE_CMD=ar rcs $(STLIBNAME) -+STLIB_MAKE_CMD=$(AR) rcs $(STLIBNAME) - - # Platform-specific overrides - uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') diff --git a/dev-libs/hiredis/hiredis-0.14.1.ebuild b/dev-libs/hiredis/hiredis-0.14.1.ebuild deleted file mode 100644 index 8711e421b030..000000000000 --- a/dev-libs/hiredis/hiredis-0.14.1.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DESCRIPTION="Minimalistic C client library for the Redis database" -HOMEPAGE="https://github.com/redis/hiredis"; -SRC_URI="https://github.com/redis/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/0.14" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-solaris" -IUSE="examples static-libs test" -RESTRICT="!test? ( test )" - -DEPEND="test? ( dev-db/redis )" - -PATCHES=( - "${FILESDIR}"/${PN}-0.13.3-disable-network-tests.patch - "${FILESDIR}"/${PN}-0.14.1-honor-AR.patch -) - -src_prepare() { - default - - # use GNU ld syntax on Solaris - sed -i -e '/DYLIB_MAKE_CMD=.* -G/d' Makefile || die -} - -_build() { - emake \ - AR="$(tc-getAR)" \ - CC="$(tc-getCC)" \ - PREFIX="${EPREFIX}/usr" \ - LIBRARY_PATH="$(get_libdir)" \ - DEBUG_FLAGS= \ - OPTIMIZATION= \ - "$@" -} - -src_compile() { - # The static lib re-uses the same objects as the shared lib, so - # overhead is low w/creating it all the time. It's also needed - # by the tests. - _build dynamic static hiredis.pc -} - -src_test() { - local REDIS_PID="${T}"/hiredis.pid - local REDIS_SOCK="${T}"/hiredis.sock - local REDIS_PORT=56379 - local REDIS_TEST_CONFIG="daemonize yes - pidfile ${REDIS_PID} - port ${REDIS_PORT} - bind 127.0.0.1 - unixsocket //${REDIS_SOCK}" - - _build hiredis-test - - "${EPREFIX}"/usr/sbin/redis-server - <<< "${REDIS_TEST_CONFIG}" || die - ./hiredis-test -h 127.0.0.1 -p ${REDIS_PID} -s ${REDIS_SOCK} - local ret=$? - - kill "$(<"${REDIS_PID}")" || die - [[ ${ret} != "0" ]] && die "tests failed" -} - -src_install() { - _build PREFIX="${ED}/usr" install - - if ! use static-libs ; then - find "${ED}" -name '*.a' -delete || die - fi - - insinto /usr/$(get_libdir)/pkgconfig - doins ${PN}.pc - - local DOCS=( CHANGELOG.md README.md ) - use examples && DOCS+=( examples ) - einstalldocs -}
