Version bump. Ebuild and patch by Arfrever.

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)

3 files changed, 80 insertions, 1 deletions

diff --git a/net-libs/serf/ChangeLog b/net-libs/serf/ChangeLog
index 6b1190166fbd..538f361d2a6d 100644
--- a/net-libs/serf/ChangeLog
+++ b/net-libs/serf/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/serf
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/serf/ChangeLog,v 1.108 2013/10/17 23:00:00 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/serf/ChangeLog,v 1.109 2013/10/17 23:25:13 floppym Exp $
+
+*serf-1.3.2 (17 Oct 2013)
+
+  17 Oct 2013; Mike Gilbert <floppym@gentoo.org>
+  +files/serf-1.3.2-disable_linking_against_unneeded_libraries.patch,
+  +serf-1.3.2.ebuild:
+  Version bump. Ebuild and patch by Arfrever.
 
   17 Oct 2013; Mike Gilbert <floppym@gentoo.org> -serf-0.7.2.ebuild,
   -serf-1.1.1.ebuild, -serf-1.2.0.ebuild:
diff --git a/net-libs/serf/files/serf-1.3.2-disable_linking_against_unneeded_libraries.patch b/net-libs/serf/files/serf-1.3.2-disable_linking_against_unneeded_libraries.patch
new file mode 100644
index 000000000000..f86646a28d89
--- /dev/null
+++ b/net-libs/serf/files/serf-1.3.2-disable_linking_against_unneeded_libraries.patch
@@ -0,0 +1,13 @@
+--- SConstruct
++++ SConstruct
+@@ -345,8 +345,8 @@
+   ### there is probably a better way to run/capture output.
+   ### env.ParseConfig() may be handy for getting this stuff into the build
+   if CALLOUT_OKAY:
+-    apr_libs = os.popen(env.subst('$APR --link-libtool --libs')).read().strip()
+-    apu_libs = os.popen(env.subst('$APU --link-libtool --libs')).read().strip()
++    apr_libs = os.popen(env.subst('$APR --link-ld')).read().strip()
++    apu_libs = os.popen(env.subst('$APU --link-ld')).read().strip()
+   else:
+     apr_libs = ''
+     apu_libs = ''
diff --git a/net-libs/serf/serf-1.3.2.ebuild b/net-libs/serf/serf-1.3.2.ebuild
new file mode 100644
index 000000000000..7d21bf1a147a
--- /dev/null
+++ b/net-libs/serf/serf-1.3.2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/serf/serf-1.3.2.ebuild,v 1.1 2013/10/17 23:25:13 floppym Exp $
+
+EAPI="5"
+
+inherit eutils scons-utils toolchain-funcs
+
+DESCRIPTION="HTTP client library"
+HOMEPAGE="http://code.google.com/p/serf/"
+SRC_URI="http://serf.googlecode.com/files/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos"
+IUSE="kerberos"
+
+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"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.3.2-disable_linking_against_unneeded_libraries.patch"
+
+	# http://code.google.com/p/serf/issues/detail?id=133
+	sed -e "/env.Append(CCFLAGS='-O2')/d" -i SConstruct
+}
+
+src_compile() {
+	local myesconsargs=(
+		PREFIX="${EPREFIX}/usr"
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+		APR="${EPREFIX}/usr/bin/apr-1-config"
+		APU="${EPREFIX}/usr/bin/apu-1-config"
+		OPENSSL="${EPREFIX}/usr"
+		CC="$(tc-getCC)"
+		CPPFLAGS="${CPPFLAGS}"
+		CFLAGS="${CFLAGS}"
+		LINKFLAGS="${LDFLAGS}"
+	)
+
+	if use kerberos; then
+		myesconsargs+=(GSSAPI="${EPREFIX}/usr/bin/krb5-config")
+	fi
+
+	escons
+}
+
+src_test() {
+	escons check
+}
+
+src_install() {
+	escons install --install-sandbox="${D}"
+}