[patch] serf.patch

serf.patch (text/plain), 1.84 KB, created by Benda Xu on 2019-12-02 14:57:36 UTC

--- serf-1.3.9.ebuild	2019-12-02 22:48:15.893676270 +0800
+++ serf-1.3.9-r1.ebuild	2019-12-02 22:50:45.495937419 +0800
@@ -1,9 +1,11 @@
-# Copyright 2008-2018 Arfrever Frehtes Taifersar Arahesis and others
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="7"
 
-inherit eutils scons-utils toolchain-funcs flag-o-matic
+PYTHON_COMPAT=( python3_6 )
+
+inherit python-any-r1 scons-utils toolchain-funcs flag-o-matic
 
 DESCRIPTION="HTTP client library"
 HOMEPAGE="https://serf.apache.org/"
@@ -11,7 +13,7 @@
 
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~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"
 
@@ -23,12 +25,13 @@
 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() {
-	#epatch "${FILESDIR}/${PN}-1.3.2-disable_linking_against_unneeded_libraries.patch"
-	#epatch "${FILESDIR}/${PN}-1.3.8-scons_variables.patch"
-	#epatch "${FILESDIR}/${PN}-1.3.8-tests.patch"
-	epatch "${FILESDIR}/${PN}-1.3.8-static-lib.patch"
-	epatch "${FILESDIR}/${PN}-1.3.8-openssl.patch"
+	default
 
 	# https://code.google.com/p/serf/issues/detail?id=133
 	sed -e "/env.Append(CCFLAGS=\['-O2'\])/d" -i SConstruct
@@ -59,7 +62,7 @@
 		myesconsargs+=( GSSAPI="${SYSROOT}${EPREFIX}/usr/bin/krb5-config" )
 	fi
 
-	escons
+	escons "${myesconsargs[@]}"
 }
 
 src_test() {