gentoo Easter resync : 12.04.2020

3 files changed, 83 insertions, 2 deletions

diff --git a/dev-libs/hiredis/Manifest b/dev-libs/hiredis/Manifest
index b060ea56fdf1..585e84409d13 100644
--- a/dev-libs/hiredis/Manifest
+++ b/dev-libs/hiredis/Manifest
@@ -1,6 +1,8 @@
 AUX hiredis-0.13.3-disable-network-tests.patch 1297 BLAKE2B 49b87fc28763d551c51524941dd8254765569546997dea69d427473799fe4921b96013cff79a9c09af3341bee848274a5b2281c16785fd44592ebbec866c6978 SHA512 bfbf4ee0a6780cbdcac4c8578aacac241d2b00c94dedd4f298ff06d65cab100f446072573ea0b57a513d3f7146070776fa08e949374e43272c2b05e601f250fc
 DIST hiredis-0.13.3.tar.gz 58291 BLAKE2B 2af5853475a48b1f05c17100197633af61663a23a1259c702545938367b6a5b9fc09b886e12f57d27f23db3f5c636bb42d7e58887cc1481b7016cea405345ddb SHA512 0d8b71d5ee4105e8aaeeee308795afc2c1f60a04b0bfe8ae873d800a0c157882ec307efa04a8d0e63b538fd3fc3f88eedf4d46cb87c8937e2403927aeb7e434c
 DIST hiredis-0.14.0.tar.gz 63061 BLAKE2B 1923a63317f5f4a5bcbc9f8fd35e11fda15c30bb766d377f3be1eaf961cf34339e16b9b7c468b5bf07e513db4913c564e49eb29a2684b945db6c914b07d01905 SHA512 57a81a35b4750f0ca9dba830789483667f8ca1559f13b0ebdc3fab3e34ad16b2809f9734cf88157041263784e11447556b7a748bfb7ef318a60bb5dda3e358a0
-EBUILD hiredis-0.13.3.ebuild 1870 BLAKE2B edf832971345fea7b22d6531e4de41cc0e8f7671dc5b44f6ee86ca964737ae25227045be0f9aed9ab3ee1d6db8b2dc6c61427e78bf5bb3597c005f6f32a408b4 SHA512 7c33b0d0a3f3f9b7adf0eec49b43dd2c511739112dc255d47853e9e1e333f6b3df288488fe8f7de3237f7616c6e1ae60dd3beb3f1348b1f1feb22d6d878c6d27
+DIST hiredis-0.14.1.tar.gz 64372 BLAKE2B 9846b05e21bfadb876e26ab45bf5c29a3283b602ef725dfbd877815be690bb5579551f0c452e1d8abf9ae985f6b71408a3b86b343ca5d6dce58dd4897640996a SHA512 a7310f2d65075df0c17636a0220e16487759471a3442b1de2595ab747565f6b6262e37131613b13e396b31050bcbe5529c35d420cd43fd7d500d9d563d469c4f
+EBUILD hiredis-0.13.3.ebuild 1871 BLAKE2B c53bf4e99c2b335ad9cbaa1dc53b79a36b81762cd38b24a243cf7f5a82634ad5341773986cf5b60e2e066ddb0c3e2d4692e9381c327dadc759fa93ad870a0729 SHA512 242c465f98d85d6fb8cfc78ee19ce16f87a2435b8b9a5caceda7ea989243fe0fd60d5d55f6c6e4392712673ef5ab6e7ac8b1ccb57c7bef71be5ecd9e6bf02c74
 EBUILD hiredis-0.14.0.ebuild 1878 BLAKE2B 7ff27e77c4add05ac81f8c1c9dc67e0f03c45210827ac65831270d66f2e02b6760d40730e7d4c13cf32dffee5ba0e026a670492a1763504732aa8d71d6abdf5f SHA512 27bcf235b400677386844802bd8099c8b60418c7eb63c557c20987298286a47e9ebbf477bd64098c9ef76c6e9548d814b90e3e0576b90960735b046bf98808c8
+EBUILD hiredis-0.14.1.ebuild 1869 BLAKE2B baed0625ddf7cf07ffe0bbc4f4d1a033a196ad1896c7d175902e798cf20ae8a933efe502465af5a35ad5268f4716824a39432102c6dd85adaf631d46226c5878 SHA512 29f5812ba5bb3806974b50b83a10bbc7392b64e9a879209b3eae4bb23f0019ba2bfaf6d472ece0fe59c3a88dfb4d83810019395d2191193a10453a1e52f301a6
 MISC metadata.xml 324 BLAKE2B 4b317777c17533d9f574064a410d1431dde5ac68fe50b25140f63cd21829b30cede1a4e3d38996eb50de1cc38257a9e5eabb2c2871c1d5727132a698048de93e SHA512 5c81a7e5c915ae46f6d2849806534ee520d413f8ca2f640c7441a61a478652bdc6f0a2501504843b1f07b557c06c0045e92ee87a949e018f7d95884e38faf78c
diff --git a/dev-libs/hiredis/hiredis-0.13.3.ebuild b/dev-libs/hiredis/hiredis-0.13.3.ebuild
index 1526c0b01db6..01aa7b487e7c 100644
--- a/dev-libs/hiredis/hiredis-0.13.3.ebuild
+++ b/dev-libs/hiredis/hiredis-0.13.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/redis/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/0.13"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~x64-solaris"
 IUSE="examples static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/hiredis/hiredis-0.14.1.ebuild b/dev-libs/hiredis/hiredis-0.14.1.ebuild
new file mode 100644
index 000000000000..9028b420d2de
--- /dev/null
+++ b/dev-libs/hiredis/hiredis-0.14.1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2020 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 )"
+
+src_prepare() {
+	local PATCHES=( "${FILESDIR}/${PN}-0.13.3-disable-network-tests.patch" )
+	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)" \
+		ARCH= \
+		DEBUG= \
+		OPTIMIZATION="${CPPFLAGS}" \
+		"$@"
+}
+
+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
+
+	/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
+		rm "${ED}/usr/$(get_libdir)/libhiredis.a" || die
+	fi
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins ${PN}.pc
+
+	local DOCS=( CHANGELOG.md README.md )
+	use examples && DOCS+=( examples )
+	einstalldocs
+}