Add net-libs/neon-0.30.1-r1, update net-libs/neon-0.30.1

3 files changed, 115 insertions, 2 deletions

diff --git a/net-libs/neon/Manifest b/net-libs/neon/Manifest
index 35814460..553df4ef 100644
--- a/net-libs/neon/Manifest
+++ b/net-libs/neon/Manifest
@@ -1,3 +1,4 @@
 AUX neon-0.30.1-xml2-config.patch 587 SHA256 e40bd6f27d10dfee5c8a2ed2b03497660cc0acda063dde0477b32030be394634 SHA512 a2572be00e592686d30a114c862454b817b7494b90234fd77b154ca0b50117ac2788c2ecdd471a90d88710079137fe3e1ab8f2d02bde108223c30547718eab79 WHIRLPOOL d171135cddf71520ac583adc2cbee46d35ab730dcabdf3703bc1d657ef2eaabfbe7004930ad9e26f8b1e8bd94ecd9a9c9fa27410e5616dc33c35fb93164360bb
 DIST neon-0.30.1.tar.gz 911414 SHA256 00c626c0dc18d094ab374dbd9a354915bfe4776433289386ed489c2ec0845cdd SHA512 4a9e45c886e04c5e1a1c781f7c2544b73724e09745097b1e8dc9adf9acd79af1762d668d4f18c295d7b4148d57af797834dd3c1203f2529089f7d1972ca71e63 WHIRLPOOL 747385544f0fbacc6c39fa5911ee5a21654ac21ecea89f297c17b43c21a7a649ae47b08b155733e9da0286a24024f4e54dcff3c9c2d678d9abe27f83054d718b
-EBUILD neon-0.30.1.ebuild 3090 SHA256 9fa3eac5bd840cae1149629a16d71821883eeff9c8aea7d30d78f026dd515e39 SHA512 6244de519f8c1f0a35bb18aa7066435e16ccabbd0efbfb2dca1032eec94bf209b5f0083080b08cf06b77ce0aef68342b4e322f37dad45ed5c89b6ba088d9aacc WHIRLPOOL 06427be5d3938a8368d7e3c2ed19e65afec2f5c32834b616c6d923d88ac353bfdefbe799a2ac9b73da7f83fbfa0d189e7db4471f4708696d4f93d8855004931c
+EBUILD neon-0.30.1-r1.ebuild 3186 SHA256 1fcad8faf7c2fb6e61b40fc790d89ee9114ca2040475d5feb5950d4c1d8927ba SHA512 a6649b735ed1bd297717f3f8173d39a86f8b9dfdcfba04881e513e0f7f09c41cda250853512395d9bfef8c84d27bb06542a4f027660d05de620dfddb210bfa45 WHIRLPOOL 29777dbbe4468e077565400a4731514e175819636b73fa783aba0dedea868e81d85ecfa9512bf6c47bff5c76f358882f872124702f44ed6baef83f62ec75a633
+EBUILD neon-0.30.1.ebuild 3097 SHA256 cd59cdb98497e796675571e4c61f11369f1041e3246ff8f41b485930550e6980 SHA512 beb1f68b54f3890558543fe23e02aff9817a0c9dcc45830fdd4bb2152f87b901e9810fd431f74d5c1b7ec0c933e3fd919abb108cc17f4ca9d4969274da6ca2da WHIRLPOOL 2e9a39264b57ec59df969d70b6953c875d4ed1a68961f1f75b3304bb5b32ea646da24a3b0698c75100f6e1fb5aafd5cb630d04c80dd06cf001244968f8e8f419
diff --git a/net-libs/neon/neon-0.30.1-r1.ebuild b/net-libs/neon/neon-0.30.1-r1.ebuild
new file mode 100644
index 00000000..07f53d4c
--- /dev/null
+++ b/net-libs/neon/neon-0.30.1-r1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id: c2b7f79bcbfbe30f06cf278fa65b07c014a4c6d6 $
+
+EAPI="5"
+
+inherit autotools libtool multilib-minimal
+
+DESCRIPTION="HTTP and WebDAV client library"
+HOMEPAGE="http://www.webdav.org/neon/"
+SRC_URI="http://www.webdav.org/neon/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/27"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc expat gnutls kerberos libproxy libressl nls pkcs11 ssl static-libs zlib"
+IUSE_LINGUAS="cs de fr ja nn pl ru tr zh_CN"
+for lingua in ${IUSE_LINGUAS}; do
+	IUSE+=" linguas_${lingua}"
+done
+unset lingua
+RESTRICT="test"
+
+RDEPEND="expat? ( dev-libs/expat:0=[${MULTILIB_USEDEP}] )
+	!expat? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
+	gnutls? (
+		app-misc/ca-certificates
+		net-libs/gnutls:0=[${MULTILIB_USEDEP}]
+		pkcs11? ( dev-libs/pakchois:0=[${MULTILIB_USEDEP}] )
+	)
+	!gnutls? ( ssl? (
+		!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
+		pkcs11? ( dev-libs/pakchois:0=[${MULTILIB_USEDEP}] )
+	) )
+	kerberos? ( virtual/krb5:0=[${MULTILIB_USEDEP}] )
+	libproxy? ( net-libs/libproxy:0=[${MULTILIB_USEDEP}] )
+	nls? ( virtual/libintl:0=[${MULTILIB_USEDEP}] )
+	zlib? ( sys-libs/zlib:0=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig[${MULTILIB_USEDEP}]"
+RDEPEND="${RDEPEND}
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140508-r8
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/neon-config
+)
+
+src_prepare() {
+	local lingua linguas
+	for lingua in ${IUSE_LINGUAS}; do
+		use linguas_${lingua} && linguas+=" ${lingua}"
+	done
+	sed -e "s/ALL_LINGUAS=.*/ALL_LINGUAS=\"${linguas}\"/" -i configure.ac || die
+	sed -e '/^#ifdef HAVE_SYS_UIO_h$/s/h$/H/' -i src/ne_socket.c || die
+
+	epatch "${FILESDIR}"/${P}-xml2-config.patch
+	AT_M4DIR="macros" eautoreconf
+
+	elibtoolize
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local myconf=()
+
+	if has_version sys-libs/glibc; then
+		einfo "Enabling SSL library thread-safety using POSIX threads..."
+		myconf+=(--enable-threadsafe-ssl=posix)
+	fi
+
+	if use expat; then
+		myconf+=(--with-expat)
+	else
+		myconf+=(--with-libxml2)
+	fi
+
+	if use gnutls; then
+		myconf+=(--with-ssl=gnutls --with-ca-bundle="${EPREFIX}/etc/ssl/certs/ca-certificates.crt")
+	elif use ssl; then
+		myconf+=(--with-ssl=openssl)
+	fi
+
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--enable-shared \
+		$(use_with kerberos gssapi) \
+		$(use_with libproxy) \
+		$(use_enable nls) \
+		$(use_with pkcs11 pakchois) \
+		$(use_enable static-libs static) \
+		$(use_with zlib) \
+		"${myconf[@]}"
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install-{config,headers,lib,man,nls}
+
+	if multilib_is_native_abi && use doc; then
+		dohtml -r doc/html/
+	fi
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name "*.la" -delete
+
+	dodoc AUTHORS BUGS NEWS README THANKS TODO
+}
diff --git a/net-libs/neon/neon-0.30.1.ebuild b/net-libs/neon/neon-0.30.1.ebuild
index 09f2b10f..22f2dff1 100644
--- a/net-libs/neon/neon-0.30.1.ebuild
+++ b/net-libs/neon/neon-0.30.1.ebuild
@@ -54,7 +54,7 @@ src_prepare() {
 		use linguas_${lingua} && linguas+=" ${lingua}"
 	done
 	sed -e "s/ALL_LINGUAS=.*/ALL_LINGUAS=\"${linguas}\"/" -i configure.ac || die
-	sed -e '/^#ifdef HAVE_SYS_UIO_h$/s/h$/H/' -i src/ne_socket.c
+	sed -e '/^#ifdef HAVE_SYS_UIO_h$/s/h$/H/' -i src/ne_socket.c || die
 
 	epatch "${FILESDIR}"/${P}-xml2-config.patch
 	AT_M4DIR="macros" eautoreconf