Fixing failure in some of the examples. Patch by Alessio Cassibba (X-Drum). Fixes #261042

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

4 files changed, 166 insertions, 2 deletions

diff --git a/net-libs/gsoap/ChangeLog b/net-libs/gsoap/ChangeLog
index f2066633c893..e5506ae38793 100644
--- a/net-libs/gsoap/ChangeLog
+++ b/net-libs/gsoap/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/gsoap
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gsoap/ChangeLog,v 1.2 2009/03/04 06:34:48 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gsoap/ChangeLog,v 1.3 2009/03/05 20:30:07 patrick Exp $
+
+*gsoap-2.7.12-r1 (05 Mar 2009)
+
+  05 Mar 2009; Patrick Lauer <patrick@gentoo.org>
+  +files/gsoap-2.7.12-fix-pre-iso-headers.patch, +gsoap-2.7.12-r1.ebuild:
+  Fixing failure in some of the examples. Patch by Alessio Cassibba
+  (X-Drum). Fixes #261042
 
   04 Mar 2009; Patrick Lauer <patrick@gentoo.org> gsoap-2.7.9f.ebuild,
   gsoap-2.7.12.ebuild:
diff --git a/net-libs/gsoap/Manifest b/net-libs/gsoap/Manifest
index 063ce4160c35..f7fac1cc0b67 100644
--- a/net-libs/gsoap/Manifest
+++ b/net-libs/gsoap/Manifest
@@ -1,6 +1,8 @@
+AUX gsoap-2.7.12-fix-pre-iso-headers.patch 3599 RMD160 156c6dab53794b97df7dbff3994ef1c30e76618f SHA1 682460d8aa20c7f01dc214f8c8a19042aa568822 SHA256 bcf80dcd8746b65fcc5aeef9898cc0e94f2f1796fae782157163861ced2d0581
 DIST gsoap_2.7.12.tar.gz 6537268 RMD160 18aeed686ee71b65abd6035a6dda46d5579cb972 SHA1 ea72438f751702d366fd066ce878c7f43874a07f SHA256 69a81c0c329bb8dbd8f117321879b5c38e1731cc937373953d8b66b0ea0712f6
 DIST gsoap_2.7.9f.tar.gz 4014018 RMD160 45ec36f746febf13180a8409d2de25b8db94e7bb SHA1 45d720de52b016f8e854025ea2ca853c57160755 SHA256 c2a57839cc72e355ad1cd10947ff8458703dfec4fa37a995ae41c9a822472baf
+EBUILD gsoap-2.7.12-r1.ebuild 1268 RMD160 45f7bcd9f7a7b79daf47b0dc2052260e0788b2bd SHA1 2c9eee77e1964f6033eff0ac7cf5aad8beb6e9e3 SHA256 447f106f69e558bc9e2eb41b4774cda1ee5fd3477902013f0c3b231d475e274c
 EBUILD gsoap-2.7.12.ebuild 1168 RMD160 aa9696d7caede7b18410c4059dd55bedff4ca467 SHA1 eb7a292038b821a656e872178882129b2d206edb SHA256 36cbee9fa3a8e0c3e2d7665bdb194b61c17558f14b6ab568bd61c997130eee5e
 EBUILD gsoap-2.7.9f.ebuild 993 RMD160 0a4cd0c46d67b94485e7b1886ae47959ce083745 SHA1 3e994e9ea7dfa8378f65cec10ad35d753a8ea5b8 SHA256 32d020632fdd543b1428583c8cbd0da035d12fa79c2277a791a1348be14076bf
-MISC ChangeLog 592 RMD160 36c70a1f6a5aed3a4856508ea20658db08846889 SHA1 0a4203c4d586cf5f3bbf50b6ee8ab1470f849c12 SHA256 0fa6d9012a81575745d7207eb7ab5bd45ba2ba770e4b8540204fa43513687801
+MISC ChangeLog 843 RMD160 2a7c75e2a30dca445c6776446577c939e0c806d3 SHA1 a22c083900a39c6dd7e32f527aae7af460db463d SHA256 62ed44256048194b18febc39d6491f728a05f70ca2ca93d72d3d4c35d3309e2c
 MISC metadata.xml 436 RMD160 f8388e7286f9816635a696226795260c75654259 SHA1 bf123d3c72ad78a50473289a0c1a0313d20c30b6 SHA256 06bb57fd8ea7ea748a574e014bbd1ac10f308975486fd4244ddd0b6f1cd21816
diff --git a/net-libs/gsoap/files/gsoap-2.7.12-fix-pre-iso-headers.patch b/net-libs/gsoap/files/gsoap-2.7.12-fix-pre-iso-headers.patch
new file mode 100644
index 000000000000..5762d5282211
--- /dev/null
+++ b/net-libs/gsoap/files/gsoap-2.7.12-fix-pre-iso-headers.patch
@@ -0,0 +1,98 @@
+--- gsoap/samples/factorytest/factorytest.cpp.orig	2009-03-04 01:16:22.300484305 +0100
++++ gsoap/samples/factorytest/factorytest.cpp	2009-03-04 01:15:47.656485143 +0100
+@@ -49,7 +49,7 @@
+ #include "soapH.h"
+ #include "factorytest.nsmap"
+ 
+-#include <iostream.h>
++#include <iostream>
+ 
+ // default factory service endpoint:
+ const char *factory = "http://localhost:18085";
+@@ -167,7 +167,7 @@
+ int main(int argc, char **argv)
+ { if (argc > 1)
+     factory = argv[1];			// use factory from command line arg by default
+-  cout << "Connecting to factory " << factory << endl;
++  std::cout << "Connecting to factory " << factory << std::endl;
+   Adder adder;				// create unique new remote adder object
+   Counter counter1("myCounter");	// new counter object "myCounter" (created if not exists)
+   Counter counter2("myCounter");	// lookup and use counter "myCounter" (this is an alias to counter1!)
+@@ -175,22 +175,22 @@
+   counter1.set(adder.get());
+   adder.add(3.0);
+   counter1.inc();
+-  cout << "Adder=" << adder.get() << endl;
+-  cout << "Counter=" << counter2.get() << endl;		// counter2 is an alias for counter1 so this prints the value of counter1
+-  cout << "Sleep for 90 seconds to test factory server purging objects:" << endl;
++  std::cout << "Adder=" << adder.get() << std::endl;
++  std::cout << "Counter=" << counter2.get() << std::endl;		// counter2 is an alias for counter1 so this prints the value of counter1
++  std::cout << "Sleep for 90 seconds to test factory server purging objects:" << std::endl;
+   // counter is periodically incremented which keeps it alive
+   sleep(30);
+   counter1.inc();
+-  cout << "Counter=" << counter2.get() << endl;
++  std::cout << "Counter=" << counter2.get() << std::endl;
+   sleep(30);
+   counter1.inc();
+-  cout << "Counter=" << counter2.get() << endl;
++  std::cout << "Counter=" << counter2.get() << std::endl;
+   sleep(30);
+   counter1.inc();
+-  cout << "Counter=" << counter2.get() << endl;
++  std::cout << "Counter=" << counter2.get() << std::endl;
+   // after 90 secs, the adder should be gone
+-  cout << "Adder is no longer available:" << endl;
++  std::cout << "Adder is no longer available:" << std::endl;
+   adder.add(3.0);
+-  cout << "Adder status = " << adder.status << endl;
++  std::cout << "Adder status = " << adder.status << std::endl;
+   return 0;
+ }
+--- gsoap/samples/lu/luclient.cpp.orig	2009-03-04 01:16:48.632483467 +0100
++++ gsoap/samples/lu/luclient.cpp	2009-03-04 01:17:54.550483188 +0100
+@@ -32,7 +32,7 @@
+ */
+ 
+ #include "soapH.h"
+-#include <iostream.h>
++#include <iostream>
+ 
+ const char luserver[] = "http://websrv.cs.fsu.edu/~engelen/luserver.cgi";
+ 
+@@ -51,14 +51,14 @@
+   a[3].resize(2,3); // 2-element vector indexed from 2 to 3
+   a[3][2] = 1;
+   a[3][3] = 2;
+-  cout << "* Demonstration example *" << endl;
+-  cout << "Matrix:" << endl;
++  std::cout << "* Demonstration example *" << std::endl;
++  std::cout << "Matrix:" << std::endl;
+   a.print();
+   vector b(soap, 3);
+   b[1] = 1;
+   b[2] = 2;
+   b[3] = 3;
+-  cout << "Vector:" << endl;
++  std::cout << "Vector:" << std::endl;
+   b.print();
+   vector x(soap);
+   if (argc < 2)
+@@ -71,7 +71,7 @@
+     soap_print_fault_location(soap, stderr);
+   }
+   else
+-  { cout << "Solution vector from service:" << endl;
++  { std::cout << "Solution vector from service:" << std::endl;
+     x.print();
+   }
+   matrix a1(soap);
+@@ -80,7 +80,7 @@
+     soap_print_fault_location(soap, stderr);
+   }
+   else
+-  { cout << "Inverse matrix matrix from service:" << endl;
++  { std::cout << "Inverse matrix matrix from service:" << std::endl;
+     a1.print();
+   }
+   soap_destroy(soap);
diff --git a/net-libs/gsoap/gsoap-2.7.12-r1.ebuild b/net-libs/gsoap/gsoap-2.7.12-r1.ebuild
new file mode 100644
index 000000000000..3c3546d1080e
--- /dev/null
+++ b/net-libs/gsoap/gsoap-2.7.12-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gsoap/gsoap-2.7.12-r1.ebuild,v 1.1 2009/03/05 20:30:07 patrick Exp $
+
+EAPI=2
+
+inherit eutils
+
+MY_P="${PN}-2.7"
+DESCRIPTION="A cross-platform open source C and C++ SDK to ease the development of SOAP/XML Web services"
+HOMEPAGE="http://gsoap2.sourceforge.net"
+SRC_URI="mirror://sourceforge/gsoap2/gsoap_${PV}.tar.gz"
+
+LICENSE="GPL-2 gSOAP"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc debug examples +ssl"
+
+DEPEND="sys-devel/flex
+	sys-devel/bison
+	sys-libs/zlib
+	ssl? ( dev-libs/openssl )"
+RDEPEND=""
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+		# Fix Pre-ISO headers
+		epatch "${FILESDIR}/${P}-fix-pre-iso-headers.patch"
+}
+
+src_compile() {
+	econf $(use_enable ssl openssl) \
+	$(use_enable examples samples) \
+	$(use_enable debug) \
+	|| die "econf failed"
+
+	emake -j1 || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Install failed"
+
+	dodir /usr/share/doc/${P}
+	dodoc LICENSE.txt NOTES.txt README.txt
+	dohtml changelog.html
+
+	if use examples; then
+		insinto /usr/share/${PN}
+		rm -rf gsoap/samples/Makefile* README.txt
+		doins -r gsoap/samples
+	fi
+
+	if use doc; then
+		dohtml -r gsoap/doc/
+	fi
+}