Diff serf-1.3.8 with a serf-1.3.8-r1

/usr/portage/net-libs/serf/serf-1.3.8-r1.ebuild 2018-11-27 19:09:00.000000000 +0300
3 3

  
4 4
EAPI="5"
5 5

  
6
inherit eutils scons-utils toolchain-funcs
6
inherit eutils scons-utils toolchain-funcs flag-o-matic
7 7

  
8 8
DESCRIPTION="HTTP client library"
9 9
HOMEPAGE="https://serf.apache.org/"
......
11 11

  
12 12
LICENSE="Apache-2.0"
13 13
SLOT="1"
14
KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
15
IUSE="kerberos"
14
KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
15
IUSE="kerberos static-libs libressl"
16 16
RESTRICT="test"
17 17

  
18 18
RDEPEND="dev-libs/apr:1=
19 19
	dev-libs/apr-util:1=
20
	dev-libs/openssl:0=
20
	!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
21 21
	sys-libs/zlib:0=
22 22
	kerberos? ( virtual/krb5 )"
23 23
DEPEND="${RDEPEND}
......
27 27
	epatch "${FILESDIR}/${PN}-1.3.2-disable_linking_against_unneeded_libraries.patch"
28 28
	epatch "${FILESDIR}/${PN}-1.3.8-scons_variables.patch"
29 29
	epatch "${FILESDIR}/${PN}-1.3.8-tests.patch"
30
	epatch "${FILESDIR}/${PN}-1.3.8-static-lib.patch"
31
	epatch "${FILESDIR}/${PN}-1.3.8-openssl.patch"
30 32

  
31 33
	# https://code.google.com/p/serf/issues/detail?id=133
32 34
	sed -e "/env.Append(CCFLAGS=\['-O2'\])/d" -i SConstruct
35

  
36
	# need limits.h for PATH_MAX (only when EXTENSIONS is enabled)
37
	[[ ${CHOST} == *-solaris* ]] && append-cppflags -D__EXTENSIONS__
33 38
}
34 39

  
35 40
src_compile() {
36
	local myesconsargs=(
41
	myesconsargs=(
37 42
		PREFIX="${EPREFIX}/usr"
38 43
		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
39
		APR="${EPREFIX}/usr/bin/apr-1-config"
40
		APU="${EPREFIX}/usr/bin/apu-1-config"
41
		OPENSSL="${EPREFIX}/usr"
44
		# These config scripts are sent through a shell with an empty env
45
		# which breaks the SYSROOT usage in them.  Set the vars inline to
46
		# avoid that.
47
		APR="SYSROOT='${SYSROOT}' ${SYSROOT}${EPREFIX}/usr/bin/apr-1-config"
48
		APU="SYSROOT='${SYSROOT}' ${SYSROOT}${EPREFIX}/usr/bin/apu-1-config"
49
		BUILD_STATIC=$(usex static-libs)
50
		AR="$(tc-getAR)"
51
		RANLIB="$(tc-getRANLIB)"
42 52
		CC="$(tc-getCC)"
43 53
		CPPFLAGS="${CPPFLAGS}"
44 54
		CFLAGS="${CFLAGS}"
......
46 56
	)
47 57

  
48 58
	if use kerberos; then
49
		myesconsargs+=(GSSAPI="${EPREFIX}/usr/bin/krb5-config")
59
		myesconsargs+=( GSSAPI="${SYSROOT}${EPREFIX}/usr/bin/krb5-config" )
50 60
	fi
51 61

  
52 62
	escons
Thank you!