gentoo resync : 29.12.2022

3 files changed, 2 insertions, 81 deletions

diff --git a/net-libs/serf/Manifest b/net-libs/serf/Manifest
index cc3d42ece817..b86bed791d9f 100644
--- a/net-libs/serf/Manifest
+++ b/net-libs/serf/Manifest
@@ -6,6 +6,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 2017 BLAKE2B 58b1c8f3f47c1f481162b35dd5feeb207ef74dad4b42740e53872423fd1ec98d9915ed95a57178568654c1bcc57d9ea79119243dc8948e77325ba5e92b9d5f8d SHA512 97064317879b772e7de74b8779808be7242e25a5478bd33e2c9a3dcc942cef54bd744afd5fbb3e7d38b4a6cf594b77bdf830fc08d912b7a7bc0b79f4d4db16b5
-EBUILD serf-1.3.9-r3.ebuild 2139 BLAKE2B 83c56ebea322b1ad4c669236c1f6fc1cdeeaed85b2a00fc96fc6e16bbc31b310fcc185295d44fef27f653dcad3f3917ee4e358b431ed72b43ff71129b4fbdbc7 SHA512 d1ba55e08fd3d5221add2d567fde511a7b33dd93664fb719188dac58d38e88ead870e01efe768a2b465086a7d787a02251d7646b6aa86dd059776300b0f439cf
+EBUILD serf-1.3.9-r3.ebuild 2132 BLAKE2B 64f1167fac712834d7f2fcff076fa2840cd2e2f402cc0e692f8c669a973ec470117eaab5d1636bd5994227612be49981b3f04c883f1b3ba922e2359f63ffa346 SHA512 b721894617c110e27a0b12dd068e57daee948165ab156dd794908c619d21affc8f460bdff56881c536b6efdb8ffc83c5ecb5935f73952cab1e7d3b5d265054ce
 MISC metadata.xml 412 BLAKE2B 0c84a591f559e156e38d074ebf645ae696371af6ed9bce2d844841059347653d18ffa6e96f92e92aab7ec95e7310a1a28e8a7ceb9ab562a6e2179e59bb9cd985 SHA512 1cde9c461ea2a3516c2aee1c7c8e7dd7e24b5cbc0d7d48a6443186f16083b869c7b6bfbeb7cf006af0ed90f3b85c911281f03a6a8ede92fdf5e04f51d8f0a73d
diff --git a/net-libs/serf/serf-1.3.9-r2.ebuild b/net-libs/serf/serf-1.3.9-r2.ebuild
deleted file mode 100644
index 873b3807ea7d..000000000000
--- a/net-libs/serf/serf-1.3.9-r2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-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 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="kerberos"
-# Many test failures.
-RESTRICT="test"
-
-RDEPEND="dev-libs/apr:1=
-	dev-libs/apr-util:1=
-	dev-libs/openssl: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-python3-check.patch
-)
-
-src_prepare() {
-	default
-
-	# https://code.google.com/p/serf/issues/detail?id=133
-	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__
-}
-
-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
-		# 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"
-		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}"
-}
diff --git a/net-libs/serf/serf-1.3.9-r3.ebuild b/net-libs/serf/serf-1.3.9-r3.ebuild
index adc74891f4d4..4851e027732c 100644
--- a/net-libs/serf/serf-1.3.9-r3.ebuild
+++ b/net-libs/serf/serf-1.3.9-r3.ebuild
@@ -13,7 +13,7 @@ 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"
+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"
 # Many test failures.
 RESTRICT="test"