From 441d1370330332b7d78f238d2f5e13f7aed5e4e0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 25 Dec 2020 23:06:25 +0000 Subject: gentoo christmass resync : 25.12.2020 --- net-libs/serf/Manifest | 4 +- net-libs/serf/files/serf-1.3.9-python3-check.patch | 74 ++++++++++++++++++++++ net-libs/serf/serf-1.3.9-r1.ebuild | 74 ---------------------- net-libs/serf/serf-1.3.9-r2.ebuild | 3 +- 4 files changed, 78 insertions(+), 77 deletions(-) create mode 100644 net-libs/serf/files/serf-1.3.9-python3-check.patch delete mode 100644 net-libs/serf/serf-1.3.9-r1.ebuild (limited to 'net-libs/serf') diff --git a/net-libs/serf/Manifest b/net-libs/serf/Manifest index 717b5dfba0d2..73bd1fe6e54c 100644 --- a/net-libs/serf/Manifest +++ b/net-libs/serf/Manifest @@ -1,9 +1,9 @@ AUX serf-1.3.8-openssl.patch 960 BLAKE2B ba24959e39cafd03d041e349806b03feeca52fc1432fa96a39cf44fe392ad5e25bfc11e305d20b752f0469445f3a0932bd1d1de0646c3a95a9c24aec36560d81 SHA512 902f0b28a0166bb2c30127600eeacd8117ab9c8a21787aec7f6ee77b94554a613ec1bdcaef3bbbd730254c9c26a7c40b47906b296ca869af909ec18d9f2ad59b AUX serf-1.3.8-static-lib.patch 1922 BLAKE2B 66e518933fd12141916e93955d9648149de4d82f82ba66b9c574a21720d7bad61ea2d575363426d297f1649d394cfac4fcd8b5f963dd307d60db2f08fa3e2a2f SHA512 c5d7cbc7ed7632e3ead1a1eec36106a4e50f89c42b7099d8e6bc2a3021b4b3058c16cb1aef1fedbb26e6bd5b4d0b12b34567d40c38c0f1c5cb6528e924db9e84 AUX serf-1.3.9-libressl.patch 394 BLAKE2B aa1a15b09b64c55d52e87df9f9a069f0d8ae3be3dc399431d3429bf0a174e2df5151ba2f03eb47f8e8a6771a1c2581d29643f1a630efc385485a69aa937d33e8 SHA512 fc547b040a4e10243ab4dc7d8873e8197861c07b4442aeda939aa27ed963432402bd55d2895b86c5156638d9425dd6a5457b081e9d3c02283f9fc640579f181c +AUX serf-1.3.9-python3-check.patch 2896 BLAKE2B b757a9d1d3c4d5f9928e70a0182b3c7a0756ddea3b081378a7180f334eca697cccc5fe637dc8226d72daafbe5440aa595def447f76a52ab9f11e8bc626be846b SHA512 2538c2c80f924fa823a28e00e40688af0a38cb94ae2302cee83070645017e8321a0647e947a98c9d541228054acb8e470a465e4f2d5782b99a9b782aac86dfc1 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-r1.ebuild 2054 BLAKE2B 6f7d698e7e77eda30d0725d1ac55662ef69262e4d2599e2b74a867911c6b24deb29dce5a82eb75d53a2e8be52c62c0e03ef09ff40d27a1f3808a7a9aac8e9cac SHA512 ca6e8e60e6c587e35fdeffe0d231db79354f929b79953633cc4348d1b16fb3f4dacf5f5ce49ce6f19f31d8e87b4a112dcd56e9ea53e66ce6a2c5288352bdd334 -EBUILD serf-1.3.9-r2.ebuild 2096 BLAKE2B b789d66135b7449549b838cadc11aed704b89892268f4d83b661cb08a13a2e322430097504c41cf8d5cffefb3227bb24f1eceea83151dd35a033a7c597025536 SHA512 1f5cdaa4c6a13270119ff94a14b25e6e7288299ada259135c09bcc9a7a7421248e22f1bdd44a858954112917453789ec27b6cda28be5cf717f84c75d00052f9e +EBUILD serf-1.3.9-r2.ebuild 2153 BLAKE2B b09553e1f47e7474a579417f840ae881ac723a7d1eb57e23622a2b609b15cbd1317c95871217fea306742cbc43f041df800f03379516310042f232bb0919be79 SHA512 f648ccb2672accaf3ed7ac35e95798c8e8e0c45d11aad8f7b38b07b18b2e9c9e7cd85ed4de8b614553520fdebb1143c2a26fec8ca802caea82224a08562e6bb9 MISC metadata.xml 364 BLAKE2B 4b056d98adb1b4ccbce29960437043811c10e06e014f0dc163fc74eeac02a149a6ea657b208f4db5ff43543cfb5ead80d1741c3ae897862761f34bdf80cfbd08 SHA512 aed78883d0c6c7c32429fc10446f79116b8b2a2321f3d473021b79ff07a67084141f9806c38da292e536e6f8234771a1f9bb7829d1968619769a30db1a818877 diff --git a/net-libs/serf/files/serf-1.3.9-python3-check.patch b/net-libs/serf/files/serf-1.3.9-python3-check.patch new file mode 100644 index 000000000000..fbbfe36fefe0 --- /dev/null +++ b/net-libs/serf/files/serf-1.3.9-python3-check.patch @@ -0,0 +1,74 @@ +From 05eae144c6b3ed85f0829de6278a8f89505506f0 Mon Sep 17 00:00:00 2001 +From: Bert Huijben +Date: Mon, 2 Nov 2015 17:50:29 +0000 +Subject: [PATCH] * build/check.py Print a bit more information about the + failed test. The returncode might be interesting to track down signal + problems. + +git-svn-id: https://svn.apache.org/repos/asf/serf/trunk@1712098 13f79535-47bb-0310-9956-ffa450edef68 +--- + build/check.py | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/build/check.py b/build/check.py +index fc49d336..75287016 100755 +--- a/build/check.py ++++ b/build/check.py +@@ -55,13 +55,13 @@ + print "== Testing %s ==" % (case) + try: + subprocess.check_call([SERF_RESPONSE_EXE, case]) +- except subprocess.CalledProcessError: +- print "ERROR: test case %s failed" % (case) ++ except subprocess.CalledProcessError, x: ++ print "ERROR: test failed in '%s', exit code=%d" % (x.cmd, x.returncode) + sys.exit(1) + + print "== Running the unit tests ==" + try: + subprocess.check_call(TEST_ALL_EXE) +- except subprocess.CalledProcessError: +- print "ERROR: test(s) failed in test_all" ++ except subprocess.CalledProcessError, x: ++ print "ERROR: test(s) failed in '%s', exit code=%d" % (x.cmd, x.returncode) + sys.exit(1) +From 773a2ee2ca7a48dd8356707fa6774afcf5b85470 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Branko=20=C4=8Cibej?= +Date: Sat, 9 Jun 2018 08:10:10 +0000 +Subject: [PATCH] Make the tests run with Python 3.x. + +* build/check.py: Add parentheses around 'print' statement arguments + so that they work when 'print' is a function. + +git-svn-id: https://svn.apache.org/repos/asf/serf/trunk@1833223 13f79535-47bb-0310-9956-ffa450edef68 +--- + build/check.py | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/build/check.py b/build/check.py +index 75287016..e05760f9 100755 +--- a/build/check.py ++++ b/build/check.py +@@ -52,16 +52,16 @@ + + # Find test responses and run them one by one + for case in glob.glob(testdir + "/testcases/*.response"): +- print "== Testing %s ==" % (case) ++ print("== Testing %s ==" % (case)) + try: + subprocess.check_call([SERF_RESPONSE_EXE, case]) +- except subprocess.CalledProcessError, x: +- print "ERROR: test failed in '%s', exit code=%d" % (x.cmd, x.returncode) ++ except subprocess.CalledProcessError as x: ++ print("ERROR: test failed in '%s', exit code=%d" % (x.cmd, x.returncode)) + sys.exit(1) + +- print "== Running the unit tests ==" ++ print("== Running the unit tests ==") + try: + subprocess.check_call(TEST_ALL_EXE) +- except subprocess.CalledProcessError, x: +- print "ERROR: test(s) failed in '%s', exit code=%d" % (x.cmd, x.returncode) ++ except subprocess.CalledProcessError as x: ++ print("ERROR: test(s) failed in '%s', exit code=%d" % (x.cmd, x.returncode)) + sys.exit(1) diff --git a/net-libs/serf/serf-1.3.9-r1.ebuild b/net-libs/serf/serf-1.3.9-r1.ebuild deleted file mode 100644 index 94fa59dfda68..000000000000 --- a/net-libs/serf/serf-1.3.9-r1.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# 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 ) - -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}" -} diff --git a/net-libs/serf/serf-1.3.9-r2.ebuild b/net-libs/serf/serf-1.3.9-r2.ebuild index e0703ec15916..b75c44ccaa25 100644 --- a/net-libs/serf/serf-1.3.9-r2.ebuild +++ b/net-libs/serf/serf-1.3.9-r2.ebuild @@ -3,7 +3,7 @@ EAPI="7" -PYTHON_COMPAT=( python3_6 python3_7 python3_8 ) +PYTHON_COMPAT=( python3_6 python3_7 python3_8 python3_9 ) inherit python-any-r1 scons-utils toolchain-funcs flag-o-matic @@ -29,6 +29,7 @@ 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 "${FILESDIR}"/${PN}-1.3.9-libressl.patch ) src_prepare() { -- cgit v1.2.3