gentoo resync : 30.05.2020

3 files changed, 90 insertions, 0 deletions

diff --git a/net-libs/serf/Manifest b/net-libs/serf/Manifest
index 656fe57364b2..fa3dca673e72 100644
--- a/net-libs/serf/Manifest
+++ b/net-libs/serf/Manifest
@@ -3,6 +3,7 @@ AUX serf-1.3.8-openssl.patch 960 BLAKE2B ba24959e39cafd03d041e349806b03feeca52fc
 AUX serf-1.3.8-scons_variables.patch 3553 BLAKE2B 528a642abd693f4052f3af9d1580defde70fe1ea4ee9e3c117847249b270cb8928a63282d4be34ece1aa29b8230fe42393329f56b5286526f168097d184efcec SHA512 e492c5a9289700330e964a9b42da9002f1b992ed197a9aea54f188188264e8dc2047a3005c9724769ff5e845d5b9db31d622981e016284523fc65dec6a3c04bf
 AUX serf-1.3.8-static-lib.patch 1922 BLAKE2B 66e518933fd12141916e93955d9648149de4d82f82ba66b9c574a21720d7bad61ea2d575363426d297f1649d394cfac4fcd8b5f963dd307d60db2f08fa3e2a2f SHA512 c5d7cbc7ed7632e3ead1a1eec36106a4e50f89c42b7099d8e6bc2a3021b4b3058c16cb1aef1fedbb26e6bd5b4d0b12b34567d40c38c0f1c5cb6528e924db9e84
 AUX serf-1.3.8-tests.patch 3159 BLAKE2B 96cd539541f8ca59dd5693bed44854d2aa626cdecaf89e754e8123166559f8e6518f3cde372a42f6d0455302d53dba6a55e51fd44734e1984730f34a090969a3 SHA512 d2b89743e38492a0626b509864c34a3747d73b5aeb7a22df84ce739588663582eea3b6c3d599b8e42896b1720c529e19c5497ff4e830e67981f0664b5e6c533d
+AUX serf-1.3.9-libressl.patch 394 BLAKE2B aa1a15b09b64c55d52e87df9f9a069f0d8ae3be3dc399431d3429bf0a174e2df5151ba2f03eb47f8e8a6771a1c2581d29643f1a630efc385485a69aa937d33e8 SHA512 fc547b040a4e10243ab4dc7d8873e8197861c07b4442aeda939aa27ed963432402bd55d2895b86c5156638d9425dd6a5457b081e9d3c02283f9fc640579f181c
 AUX serf-1.3.9-python3.patch 965 BLAKE2B 0f7444b19ec1f2b32c165ddf08d96113cb22ca3518eb7257885a582ed50dd3119a6459a52f134d149729cfc967265d6b9c478ec5d6f08a8a589bb5db0893d7bf SHA512 cf6726b860b876503820d8a42ff821f932bd1bf9a6157c98ebcbe77ebe71835ab4d2395fb9463fa187ef457100ededa59f9a7c430f98735c59f878cff600ff07
 AUX serf-1.3.9-python3_byte.patch 1079 BLAKE2B 7e8c328d101c3642cc82be9f92f26e9af49ada5df040da088e35869efddeaaf043cba06fe6c626380e9a68b10f1f5a61e393405d039bb7b59d9d00d00d95e066 SHA512 b02b3eb8fa27a7a133ebe6bd958f378bcc5daf9a1871e5a4015ec8fb292736cf65ba7776ef3297ceb3b4fb767ae4f22cc44e0e3b4a222887c73107e3c03e4533
 DIST serf-1.3.8.tar.bz2 143337 BLAKE2B 873f78ec7fab6323e3351e43ed7b03e8208be8d7ced5a017ca121ecbc091de49a963e69beeee592f39dfab23ff30d4bda3378192ea24f2ec07a5569ee19dc062 SHA512 78787a0d1e3e72dd9afc2e0de65e9af3b4303fefdcb865bd5e087fae570a7fe4d1395ce021756db4685c6e63e31c495563afe57baf677bf9846657f5d63d4205
@@ -10,5 +11,6 @@ DIST serf-1.3.9.tar.bz2 145132 BLAKE2B 59776f85b409b2eaea81f3e07b0301515e20cbd2a
 EBUILD serf-1.3.8-r1.ebuild 2069 BLAKE2B 65a5e2ff2eed6eec0119275ba9547ff4b7a3ce78dca38374e45a8c060f2ff265e0cf7afb504a3c26476866b6579d597785a919905b593aa04685299f91c412fe SHA512 363a3430963cc39cf7f88575c401186d83be1c92b226d2e1356d84c3ad60ce3624ec78c398f99144d67cc26736705b9028b1cbccfde0e8d005dbba4c6a481a89
 EBUILD serf-1.3.8.ebuild 1456 BLAKE2B 17382c17f6e9cfd9c86a7439b4bfb809044cc109e3cea1e9c0f072ba30fb5997edbcee40b46e55784feed6efca4d169329baec3ef9321e7f24cf0228c4427953 SHA512 a06af1e5c87bd64727f309b0d85ae7676b64d0847c0cca44a2389448cd092350f559e67b213cef130e72b38b0425ee0e4a297f717832f9e132e1213adc80ca33
 EBUILD serf-1.3.9-r1.ebuild 2054 BLAKE2B 6f7d698e7e77eda30d0725d1ac55662ef69262e4d2599e2b74a867911c6b24deb29dce5a82eb75d53a2e8be52c62c0e03ef09ff40d27a1f3808a7a9aac8e9cac SHA512 ca6e8e60e6c587e35fdeffe0d231db79354f929b79953633cc4348d1b16fb3f4dacf5f5ce49ce6f19f31d8e87b4a112dcd56e9ea53e66ce6a2c5288352bdd334
+EBUILD serf-1.3.9-r2.ebuild 2104 BLAKE2B 7a2161b1bc1ebaa27837e2285c9d8c0e89e4d7f836d1e03141b16914941210450e6d620b0e80ed21f9cb53796b2e07e3cd6ef41c9f872b9d475880317fcf217f SHA512 0ab048246a075b326d8d56db9bba3aaf75ea6f34712e25bb6e7013103e261fb8c6a5ab57279e2f80a963e7c7f4d351841e8d7e805f53279e77e491dcb60df7ad
 EBUILD serf-1.3.9.ebuild 2071 BLAKE2B 706481c2dd5e1f3150d04cb55bf33396010cbe9980480497fcbf5eb484cda2d06a6da58ce5d17a18587a7cf23c904e34f8d05217dbf827c7bc5ac6bd14d68077 SHA512 c05e6f9d6eb392836c80d553b3d56fd7e4b3b2df09b3365c2be48a4eefcd25ddad389b19aad6e8b82867bc796890240acfa081a1c581f75c3b6430fb8aaf4699
 MISC metadata.xml 364 BLAKE2B 4b056d98adb1b4ccbce29960437043811c10e06e014f0dc163fc74eeac02a149a6ea657b208f4db5ff43543cfb5ead80d1741c3ae897862761f34bdf80cfbd08 SHA512 aed78883d0c6c7c32429fc10446f79116b8b2a2321f3d473021b79ff07a67084141f9806c38da292e536e6f8234771a1f9bb7829d1968619769a30db1a818877
diff --git a/net-libs/serf/files/serf-1.3.9-libressl.patch b/net-libs/serf/files/serf-1.3.9-libressl.patch
new file mode 100644
index 000000000000..fe9319fffa86
--- /dev/null
+++ b/net-libs/serf/files/serf-1.3.9-libressl.patch
@@ -0,0 +1,13 @@
+diff --git a/buckets/ssl_buckets.c b/buckets/ssl_buckets.c
+index b01e535..6fadb0c 100644
+--- a/buckets/ssl_buckets.c
++++ b/buckets/ssl_buckets.c
+@@ -1156,7 +1156,7 @@ static void init_ssl_libraries(void)
+         }
+ #endif
+ 
+-#ifdef USE_OPENSSL_1_1_API
++#if defined(USE_OPENSSL_1_1_API) && !defined(LIBRESSL_VERSION_NUMBER)
+         OPENSSL_malloc_init();
+ #else
+         CRYPTO_malloc_init();
diff --git a/net-libs/serf/serf-1.3.9-r2.ebuild b/net-libs/serf/serf-1.3.9-r2.ebuild
new file mode 100644
index 000000000000..646928a7b050
--- /dev/null
+++ b/net-libs/serf/serf-1.3.9-r2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_6 python3_7 python3_8 )
+
+inherit python-any-r1 scons-utils toolchain-funcs flag-o-matic
+
+DESCRIPTION="HTTP client library"
+HOMEPAGE="https://serf.apache.org/"
+SRC_URI="mirror://apache/${PN}/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+IUSE="kerberos static-libs libressl"
+RESTRICT="test"
+
+RDEPEND="dev-libs/apr:1=
+	dev-libs/apr-util:1=
+	!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
+	sys-libs/zlib:0=
+	kerberos? ( virtual/krb5 )"
+DEPEND="${RDEPEND}
+	>=dev-util/scons-2.3.0"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.3.8-static-lib.patch
+	"${FILESDIR}"/${PN}-1.3.8-openssl.patch
+	"${FILESDIR}"/${PN}-1.3.9-python3.patch
+	"${FILESDIR}"/${PN}-1.3.9-python3_byte.patch
+	"${FILESDIR}"/${PN}-1.3.9-libressl.patch )
+
+src_prepare() {
+	default
+
+	# https://code.google.com/p/serf/issues/detail?id=133
+	sed -e "/env.Append(CCFLAGS=\['-O2'\])/d" -i SConstruct
+
+	# need limits.h for PATH_MAX (only when EXTENSIONS is enabled)
+	[[ ${CHOST} == *-solaris* ]] && append-cppflags -D__EXTENSIONS__
+}
+
+src_compile() {
+	myesconsargs=(
+		PREFIX="${EPREFIX}/usr"
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+		# These config scripts are sent through a shell with an empty env
+		# which breaks the SYSROOT usage in them.  Set the vars inline to
+		# avoid that.
+		APR="SYSROOT='${SYSROOT}' ${SYSROOT}${EPREFIX}/usr/bin/apr-1-config"
+		APU="SYSROOT='${SYSROOT}' ${SYSROOT}${EPREFIX}/usr/bin/apu-1-config"
+		BUILD_STATIC=$(usex static-libs)
+		AR="$(tc-getAR)"
+		RANLIB="$(tc-getRANLIB)"
+		CC="$(tc-getCC)"
+		CPPFLAGS="${CPPFLAGS}"
+		CFLAGS="${CFLAGS}"
+		LINKFLAGS="${LDFLAGS}"
+	)
+
+	if use kerberos; then
+		myesconsargs+=( GSSAPI="${SYSROOT}${EPREFIX}/usr/bin/krb5-config" )
+	fi
+
+	escons "${myesconsargs[@]}"
+}
+
+src_test() {
+	escons check
+}
+
+src_install() {
+	escons install --install-sandbox="${D}"
+}