Merge remote-tracking branch 'github/pr/535'.

6 files changed, 112 insertions, 23 deletions

diff --git a/net-libs/gsoap/Manifest b/net-libs/gsoap/Manifest
index 62d56ac3ebcc..825f812c1bb7 100644
--- a/net-libs/gsoap/Manifest
+++ b/net-libs/gsoap/Manifest
@@ -1,5 +1,4 @@
 DIST gsoap_2.7.17.zip 10224444 SHA256 d3af1ce9464b28cacdf1dfbe09b689f8927cbcf3948479996aef52a39afa2c16 SHA512 efb5332e90cbed6013ac2f16b940404cc4de9e84bc85e671cb3588bc6620cd86c8db646a4f3cd77bb3b866dfcc8a793186736ab2241bb8cbaca8d313345d14ac WHIRLPOOL 955e845b5a8b9af1697ca8bcdbb77813f149f7ff162ec51e680c398dab9934c36418572004b7bd24200476b6d45b623f294053b932da2fce94f415becd369af7
-DIST gsoap_2.8.12.zip 19974348 SHA256 51eef118544fa846f4d2dea2eedf91c84c46a1abeafc5eee3dcff783f4015a00 SHA512 7f162936d8d331d94b0aa52042c512167198a8de5a279747f49494b0f17442feb4db2ac5abff54e46350562e774b6bdddc577049f7cb59807cab29b12d797a87 WHIRLPOOL 7557396a154405606b2b2a962ac5f19d4853a792c8f96333576e6229506c9fedd8c5652cc1560566dfb51203362063566d2780becb1e1bb0ca2714fabe0a0330
 DIST gsoap_2.8.23.zip 22482000 SHA256 e1c30743f1c2cf40b2760568127e14af1b2a00c3026b2e5f0750e8c33d94c061 SHA512 cc90aadfe09aa6406172c9ffa07696851ff594ca7c5b40819494badd8ce978d908d66de63a5831e7aec1bca18ee8b51ed02187057688a3b36eb0a21fe6e0f5a4 WHIRLPOOL e5cfc9c5758847d1fc94cbd38108b80c7548abc0316fe201b58604a3b22d30b9748c81d4aec13f53356593f3ddc2dcba14170a53d63795eab9229ec49d4bc585
 DIST gsoap_2.8.26.zip 22605211 SHA256 bfe42848d324be1f7313fd01c1e953caf5ee28fbb640cbf2fa004d32123683d6 SHA512 eee9f4f34c62114f400d644fbb5f1b93dfd12e524746f8dc74d459b993ac170d09598fc254a0471d6dacf26e31298ba93b5e95381c5d9c24445acea2b6957ff5 WHIRLPOOL fecd08fcaf736d573688c643109149a75d2a64ecef15af79e13a74b4da9bad6a80278e4adeaee682c7bb0cdc37402362bb497e20e9f40104dff21d21e589d383
 DIST gsoap_2.8.27.zip 22643224 SHA256 cdd9188f3a00caf14fae54d7cc975227128118e818036e5b6bd6e87550e1dc35 SHA512 45c2a653ef588acf41b23c14fdfe2524b37b3324d9ca332a1f8c7ec37fd6e1cf297c798dc7eeb2f90aaa2dd3a72a87f5cde1daf0a513b0259e08a89e386846ad WHIRLPOOL b82a7e9e4ff7b1042ef0c3346ea9cdeb343232d0cc23ec96845adcc44a4b4d773df42fe72a1eaeadb4e33cc63d5458d7bcb0dc97184ab6d0f5e82682eaaba8ad
diff --git a/net-libs/gsoap/files/gsoap-2.7-fix-missing-cookie-support.patch b/net-libs/gsoap/files/gsoap-2.7-fix-missing-cookie-support.patch
new file mode 100644
index 000000000000..7f3ad8d283b9
--- /dev/null
+++ b/net-libs/gsoap/files/gsoap-2.7-fix-missing-cookie-support.patch
@@ -0,0 +1,24 @@
+From: Gokturk Yuksek <gokturk@binghamton.edu>
+Subject: [PATCH] Backport missing cookie support
+
+For <gsoap-2.8.24, successful compilation results in missing cookie
+support due to undefined compilation flag. This is fixed in the later
+versions by upstream.
+
+Upstream-URL: https://sourceforge.net/p/gsoap2/code/85/tree//gsoap/Makefile.am?diff=51af4d3f5fcbc945b53d89a4:84
+Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=340647
+
+--- a/gsoap/Makefile.am
++++ b/gsoap/Makefile.am
+@@ -42,9 +42,9 @@
+ libgsoapck___a_SOURCES = stdsoap2_ck_cpp.cpp
+ libgsoapck___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) -DWITH_COOKIES
+ libgsoapssl_a_SOURCES = stdsoap2_ssl.c
+-libgsoapssl_a_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) -DWITH_OPENSSL -DWITH_DOM -DWITH_GZIP
++libgsoapssl_a_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) -DWITH_OPENSSL -DWITH_DOM -DWITH_GZIP -DWITH_COOKIES
+ libgsoapssl___a_SOURCES = stdsoap2_ssl_cpp.cpp
+-libgsoapssl___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) -DWITH_OPENSSL -DWITH_DOM -DWITH_GZIP
++libgsoapssl___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) -DWITH_OPENSSL -DWITH_DOM -DWITH_GZIP -DWITH_COOKIES
+ 
+ BUILT_SOURCES = stdsoap2_cpp.cpp $(lib_LIBRARIES)
+ 
diff --git a/net-libs/gsoap/gsoap-2.8.12.ebuild b/net-libs/gsoap/gsoap-2.7.17-r1.ebuild
index 923f02d8c311..999aba704f1a 100644
--- a/net-libs/gsoap/gsoap-2.8.12.ebuild
+++ b/net-libs/gsoap/gsoap-2.7.17-r1.ebuild
@@ -1,50 +1,45 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=4
+EAPI=5
 
 inherit autotools eutils
 
-MY_P="${PN}-2.8"
+MY_P="${PN}-2.7"
 
-DESCRIPTION="A cross-platform open source C and C++ SDK to ease the development of SOAP/XML Web services"
+DESCRIPTION="A cross-platform open source C and C++ SDK for SOAP/XML Web services"
 HOMEPAGE="http://gsoap2.sourceforge.net"
 SRC_URI="mirror://sourceforge/gsoap2/gsoap_${PV}.zip"
 
 LICENSE="GPL-2 gSOAP"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc debug examples ipv6 gnutls +ssl"
+IUSE="doc debug examples +ssl"
 
 DEPEND="app-arch/unzip
 	sys-devel/flex
-	sys-devel/bison
-	sys-libs/zlib
-	gnutls? ( net-libs/gnutls )
-	ssl? ( dev-libs/openssl )"
-RDEPEND=""
+	sys-devel/bison"
+RDEPEND="sys-libs/zlib
+	ssl? ( dev-libs/openssl:0= )"
 
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
 	# Fix Pre-ISO headers
+	epatch "${FILESDIR}/${PN}-2.7-fix-pre-iso-headers.patch"
 	epatch "${FILESDIR}/${PN}-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch"
 
-	# Fix configure.in for >=automake-1.13
-	sed 's@AM_CONFIG_HEADER@AC_CONFIG_HEADERS@' -i configure.in || die
+	# causes compilation of app-emulation/virtualbox-ose[vboxwebsrv] to
+	# break (bug #320901):
+	#epatch "${FILESDIR}/${PN}-2.7.15-use_libtool.patch"
 
 	eautoreconf
 }
 
 src_configure() {
-	local myconf=
-	use ssl || myconf+="--disable-ssl "
-	use gnutls && myconf+="--enable-gnutls "
-	use ipv6 && myconf+="--enable-ipv6 "
 	econf \
-		${myconf} \
-		$(use_enable debug) \
+		$(use_enable ssl openssl) \
 		$(use_enable examples samples)
 }
 
@@ -61,10 +56,10 @@ src_install() {
 
 	dohtml changelog.html
 
-	find "${D}"/usr/ -name "*.la" -exec rm {} \;
+	prune_libtool_files --all
 
 	if use examples; then
-		rm -rf gsoap/samples/Makefile* gsoap/samples/*/Makefile* gsoap/samples/*/*.o
+		rm -rf gsoap/samples/Makefile* gsoap/samples/*/Makefile* gsoap/samples/*/*.o || die
 		insinto /usr/share/doc/${PF}/examples
 		doins -r gsoap/samples/*
 	fi
diff --git a/net-libs/gsoap/gsoap-2.7.17-r2.ebuild b/net-libs/gsoap/gsoap-2.7.17-r2.ebuild
new file mode 100644
index 000000000000..a6a3adf82314
--- /dev/null
+++ b/net-libs/gsoap/gsoap-2.7.17-r2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils
+
+MY_P="${PN}-2.7"
+
+DESCRIPTION="A cross-platform open source C and C++ SDK for SOAP/XML Web services"
+HOMEPAGE="http://gsoap2.sourceforge.net"
+SRC_URI="mirror://sourceforge/gsoap2/gsoap_${PV}.zip"
+
+LICENSE="GPL-2 gSOAP"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc debug examples +ssl"
+
+DEPEND="app-arch/unzip
+	sys-devel/flex
+	sys-devel/bison"
+RDEPEND="sys-libs/zlib
+	ssl? ( dev-libs/openssl:0= )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# Fix Pre-ISO headers
+	epatch "${FILESDIR}/${PN}-2.7-fix-pre-iso-headers.patch"
+	epatch "${FILESDIR}/${PN}-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch"
+	epatch "${FILESDIR}/${PN}-2.7-fix-missing-cookie-support.patch" # 340647
+
+	# causes compilation of app-emulation/virtualbox-ose[vboxwebsrv] to
+	# break (bug #320901):
+	#epatch "${FILESDIR}/${PN}-2.7.15-use_libtool.patch"
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable ssl openssl) \
+		$(use_enable examples samples)
+}
+
+src_compile() {
+	emake -j1
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# yes, we also install the license-file since
+	# it contains info about how to apply the licenses
+	dodoc *.txt
+
+	dohtml changelog.html
+
+	prune_libtool_files --all
+
+	if use examples; then
+		rm -rf gsoap/samples/Makefile* gsoap/samples/*/Makefile* gsoap/samples/*/*.o || die
+		insinto /usr/share/doc/${PF}/examples
+		doins -r gsoap/samples/*
+	fi
+
+	if use doc; then
+		dohtml -r gsoap/doc/*
+	fi
+}
diff --git a/net-libs/gsoap/gsoap-2.8.26.ebuild b/net-libs/gsoap/gsoap-2.8.26.ebuild
index a565476706c1..2bce2bd11efd 100644
--- a/net-libs/gsoap/gsoap-2.8.26.ebuild
+++ b/net-libs/gsoap/gsoap-2.8.26.ebuild
@@ -67,7 +67,7 @@ src_install() {
 	prune_libtool_files --all
 
 	if use examples; then
-		rm -rf gsoap/samples/Makefile* gsoap/samples/*/Makefile* gsoap/samples/*/*.o
+		rm -rf gsoap/samples/Makefile* gsoap/samples/*/Makefile* gsoap/samples/*/*.o || die
 		insinto /usr/share/doc/${PF}/examples
 		doins -r gsoap/samples/*
 	fi
diff --git a/net-libs/gsoap/gsoap-2.8.27.ebuild b/net-libs/gsoap/gsoap-2.8.27.ebuild
index a565476706c1..2bce2bd11efd 100644
--- a/net-libs/gsoap/gsoap-2.8.27.ebuild
+++ b/net-libs/gsoap/gsoap-2.8.27.ebuild
@@ -67,7 +67,7 @@ src_install() {
 	prune_libtool_files --all
 
 	if use examples; then
-		rm -rf gsoap/samples/Makefile* gsoap/samples/*/Makefile* gsoap/samples/*/*.o
+		rm -rf gsoap/samples/Makefile* gsoap/samples/*/Makefile* gsoap/samples/*/*.o || die
 		insinto /usr/share/doc/${PF}/examples
 		doins -r gsoap/samples/*
 	fi