From fcc5224904648a8e6eb528d7603154160a20022f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 2 Feb 2022 01:39:05 +0000 Subject: gentoo resync : 02.02.2022 --- net-libs/serf/Manifest | 4 ++-- net-libs/serf/metadata.xml | 5 +++-- net-libs/serf/serf-1.3.9-r2.ebuild | 14 ++++++++------ 3 files changed, 13 insertions(+), 10 deletions(-) (limited to 'net-libs/serf') diff --git a/net-libs/serf/Manifest b/net-libs/serf/Manifest index 88705696b9a2..c2c64db9b712 100644 --- a/net-libs/serf/Manifest +++ b/net-libs/serf/Manifest @@ -4,5 +4,5 @@ AUX serf-1.3.9-python3-check.patch 2896 BLAKE2B b757a9d1d3c4d5f9928e70a0182b3c7a 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.9.tar.bz2 145132 BLAKE2B 59776f85b409b2eaea81f3e07b0301515e20cbd2aa0ef05c1c38aa8152a6d5627e526e4bc160abb1fd438e9fa46f97096c639860729d2ea8e0b2fcfcf8222002 SHA512 9f5418d991840a08d293d1ecba70cd9534a207696d002f22dbe62354e7b005955112a0d144a76c89c7f7ad3b4c882e54974441fafa0c09c4aa25c49c021ca75d -EBUILD serf-1.3.9-r2.ebuild 2014 BLAKE2B aa22ce26d181ccc59edbca02fec8b088b2d007e24486c4b8c6faee9e2f257ae004bc96c3fade209b47b5395ea12bd1945a0df3e4107105599f347d90736a7fc6 SHA512 03945716d34e57bbf18b892afd0357ff2ab6b80a346fb20f529679fe16d6eaf3748fa2b83c8533212463cd8dbd8f064feacce0e7c9406b7b2154a74b4116dd42 -MISC metadata.xml 360 BLAKE2B ae27ed2b7da27e4f375903df19c5a82e8fbdf2a4db8190f3e99157c8fe8fe54e181e45efef941aa9d16a413b8c95c0a42eea54d6e6272c02609b11e68bdf7739 SHA512 bbe65b8f140a7dfe870af1c97b8bc4a3f0b034a234f344fc4620965ebe66d9eea804806b43409a106ba905b29d74e8e7cdeff065a89f5beb751e7f70c1b54700 +EBUILD serf-1.3.9-r2.ebuild 2017 BLAKE2B 58b1c8f3f47c1f481162b35dd5feeb207ef74dad4b42740e53872423fd1ec98d9915ed95a57178568654c1bcc57d9ea79119243dc8948e77325ba5e92b9d5f8d SHA512 97064317879b772e7de74b8779808be7242e25a5478bd33e2c9a3dcc942cef54bd744afd5fbb3e7d38b4a6cf594b77bdf830fc08d912b7a7bc0b79f4d4db16b5 +MISC metadata.xml 412 BLAKE2B 0c84a591f559e156e38d074ebf645ae696371af6ed9bce2d844841059347653d18ffa6e96f92e92aab7ec95e7310a1a28e8a7ceb9ab562a6e2179e59bb9cd985 SHA512 1cde9c461ea2a3516c2aee1c7c8e7dd7e24b5cbc0d7d48a6443186f16083b869c7b6bfbeb7cf006af0ed90f3b85c911281f03a6a8ede92fdf5e04f51d8f0a73d diff --git a/net-libs/serf/metadata.xml b/net-libs/serf/metadata.xml index 9bb005e5c177..5480aa8168b5 100644 --- a/net-libs/serf/metadata.xml +++ b/net-libs/serf/metadata.xml @@ -3,9 +3,10 @@ arfrever.fta@gmail.com + Arfrever Frehtes Taifersar Arahesis - floppym@gentoo.org - Mike Gilbert + jsmolic@gentoo.org + Jakov Smolić diff --git a/net-libs/serf/serf-1.3.9-r2.ebuild b/net-libs/serf/serf-1.3.9-r2.ebuild index daf94ac8d992..873b3807ea7d 100644 --- a/net-libs/serf/serf-1.3.9-r2.ebuild +++ b/net-libs/serf/serf-1.3.9-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" -PYTHON_COMPAT=( python3_{8,9} ) +PYTHON_COMPAT=( python3_{8..10} ) inherit python-any-r1 scons-utils toolchain-funcs flag-o-matic @@ -14,7 +14,8 @@ 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 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="kerberos static-libs" +IUSE="kerberos" +# Many test failures. RESTRICT="test" RDEPEND="dev-libs/apr:1= @@ -25,7 +26,8 @@ RDEPEND="dev-libs/apr:1= DEPEND="${RDEPEND} >=dev-util/scons-2.3.0" -PATCHES=( "${FILESDIR}"/${PN}-1.3.8-static-lib.patch +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 @@ -36,7 +38,7 @@ src_prepare() { default # https://code.google.com/p/serf/issues/detail?id=133 - sed -e "/env.Append(CCFLAGS=\['-O2'\])/d" -i SConstruct + sed -e "/env.Append(CCFLAGS=\['-O2'\])/d" -i SConstruct || die # need limits.h for PATH_MAX (only when EXTENSIONS is enabled) [[ ${CHOST} == *-solaris* ]] && append-cppflags -D__EXTENSIONS__ @@ -44,6 +46,7 @@ src_prepare() { src_compile() { myesconsargs=( + BUILD_STATIC=no PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" # These config scripts are sent through a shell with an empty env @@ -51,7 +54,6 @@ src_compile() { # 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)" -- cgit v1.2.3