Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/gsoap/files/, net-libs/gsoap/
Date: Wed, 21 Nov 2018 13:46:17
Message-Id: 1542807967.2a51b8c58c8bfc4df57f48ca867c78baab6484ab.polynomial-c@gentoo
1 commit: 2a51b8c58c8bfc4df57f48ca867c78baab6484ab
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Wed Nov 21 13:30:14 2018 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Wed Nov 21 13:46:07 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a51b8c5
7
8 net-libs/gsoap: Removed old.
9
10 Package-Manager: Portage-2.3.52, Repoman-2.3.12
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 net-libs/gsoap/Manifest | 1 -
14 .../gsoap/files/gsoap-2.8.52-shared_libs.patch | 145 ---------------------
15 net-libs/gsoap/gsoap-2.8.63.ebuild | 83 ------------
16 3 files changed, 229 deletions(-)
17
18 diff --git a/net-libs/gsoap/Manifest b/net-libs/gsoap/Manifest
19 index 02685fa4906..707bd74e109 100644
20 --- a/net-libs/gsoap/Manifest
21 +++ b/net-libs/gsoap/Manifest
22 @@ -1,3 +1,2 @@
23 -DIST gsoap_2.8.63.zip 32985252 BLAKE2B 6bedf06a98701dd63c13e805f865c3b84cae8c498a9ec1c4dd062e191f217c56cf9667046c5fbf0b33d94c5500e2eb4746eefa7cc909398a8ad891f2cb33e357 SHA512 1941aba9c4a7d5e57e8b8f4f2183ee3c24a9a5c3e93caedfd27a13cbc625dc06e3114f850f0dcddb87dd436a997e1157fb2c6fb20c28f1b0675e634c3d489d96
24 DIST gsoap_2.8.70.zip 32695627 BLAKE2B 6d803441804badf06b29cee8ca898dc864b9a0388f6f3fa58b84c1b237d77e22ab70e0cc5439915c715bdba7831b14f86d8003e1338b6184ddbfe845bb76ff75 SHA512 f7e9f85580c19bb390f1310bb47b690a5788b54c1e12c6fc0d9166039a84ae24ec5d3268cb67cd72b20e2eaa78689e175b975f07da44fd20e172a77ef37f4ae7
25 DIST gsoap_2.8.71.zip 32395469 BLAKE2B 47038e70e297408f5599319b229d2bd15136d43646fe082480ae6cc29316a7f45c056e6c5859e9bfafcb24f5b10455d2209a3505c801d02299493c3b5435d06f SHA512 3e4494681b2669ea7eebaee19aa23fd31a339966f7af106258eb1bd676aff42f1069d55e6c80ae09fd60b2d48e456b0cb788d5d54829301ee62a2ef64742ddea
26
27 diff --git a/net-libs/gsoap/files/gsoap-2.8.52-shared_libs.patch b/net-libs/gsoap/files/gsoap-2.8.52-shared_libs.patch
28 deleted file mode 100644
29 index 9437de86f61..00000000000
30 --- a/net-libs/gsoap/files/gsoap-2.8.52-shared_libs.patch
31 +++ /dev/null
32 @@ -1,145 +0,0 @@
33 ---- gsoap-2.8/configure.ac
34 -+++ gsoap-2.8/configure.ac
35 -@@ -17,7 +17,7 @@
36 - AC_PROG_YACC
37 - AC_PROG_CPP
38 - AC_PROG_RANLIB
39 --#AM_PROG_LIBTOOL
40 -+AM_PROG_LIBTOOL
41 - AC_PROG_LN_S
42 - AC_PROG_AWK
43 - AC_PROG_INSTALL
44 -@@ -259,15 +259,17 @@
45 - WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} -lgnutls -lgcrypt -lgpg-error -lz"
46 - SAMPLE_INCLUDES=
47 - SAMPLE_SSL_LIBS="-lgnutls -lgcrypt -lgpg-error -lz"
48 -- WSDL2H_SOAP_CPP_LIB="libgsoapssl++.a"
49 -+ WSDL2H_SOAP_CPP_STATIC_LIB="libgsoapssl++.a"
50 -+ WSDL2H_SOAP_CPP_SHARED_LIB="libgsoapssl++.la"
51 - else
52 - AC_MSG_RESULT(no)
53 - WSDL2H_EXTRA_FLAGS="-DWITH_OPENSSL -DWITH_GZIP"
54 - # compile with wsdl2h when OPENSSL is available
55 -- WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} -lssl -lcrypto -lz"
56 -+ WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} -lcrypto"
57 - SAMPLE_INCLUDES=
58 - SAMPLE_SSL_LIBS="-lssl -lcrypto -lz"
59 -- WSDL2H_SOAP_CPP_LIB="libgsoapssl++.a"
60 -+ WSDL2H_SOAP_CPP_STATIC_LIB="libgsoapssl++.a"
61 -+ WSDL2H_SOAP_CPP_SHARED_LIB="libgsoapssl++.la"
62 - fi
63 - if test -n "$ZLIB"; then
64 - WSDL2H_EXTRA_FLAGS="-I${ZLIB}/include ${WSDL2H_EXTRA_FLAGS}"
65 -@@ -286,7 +288,8 @@
66 - WSDL2H_EXTRA_FLAGS=
67 - SAMPLE_SSL_LIBS=
68 - SAMPLE_INCLUDES=
69 -- WSDL2H_SOAP_CPP_LIB="libgsoap++.a"
70 -+ WSDL2H_SOAP_CPP_STATIC_LIB="libgsoap++.a"
71 -+ WSDL2H_SOAP_CPP_SHARED_LIB="libgsoapssl++.la"
72 - fi
73 - AM_CONDITIONAL(WITH_OPENSSL, test "x$with_openssl" = "xyes" -a "x$with_gnutls" != "xyes")
74 - AC_SUBST(WITH_OPENSSL)
75 -@@ -294,7 +297,8 @@
76 - AC_SUBST(WSDL2H_EXTRA_LIBS)
77 - AC_SUBST(SAMPLE_INCLUDES)
78 - AC_SUBST(SAMPLE_SSL_LIBS)
79 --AC_SUBST(WSDL2H_SOAP_CPP_LIB)
80 -+AC_SUBST(WSDL2H_SOAP_CPP_SHARED_LIB)
81 -+AC_SUBST(WSDL2H_SOAP_CPP_STATIC_LIB)
82 -
83 - # enable the compile of the samples
84 - AC_ARG_ENABLE(samples,
85 ---- gsoap-2.8/gsoap/Makefile.am
86 -+++ gsoap-2.8/gsoap/Makefile.am
87 -@@ -49,6 +49,29 @@
88 - libgsoapssl___a_SOURCES = stdsoap2_ssl_cpp.cpp dom_cpp.cpp
89 - libgsoapssl___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_NO_C_LOCALE) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES
90 -
91 -+lib_LTLIBRARIES = libgsoap.la libgsoap++.la libgsoapck.la libgsoapck++.la libgsoapssl.la libgsoapssl++.la
92 -+SOVERSION = 0
93 -+libgsoap_la_SOURCES = stdsoap2.c dom.c
94 -+libgsoap_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform)
95 -+libgsoap_la_LDFLAGS = -version-info $(SOVERSION)
96 -+libgsoap___la_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp
97 -+libgsoap___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform)
98 -+libgsoap___la_LDFLAGS = -version-info $(SOVERSION)
99 -+libgsoapck_la_SOURCES = stdsoap2_ck.c dom.c
100 -+libgsoapck_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) -DWITH_COOKIES
101 -+libgsoapck_la_LDFLAGS = -version-info $(SOVERSION)
102 -+libgsoapck___la_SOURCES = stdsoap2_ck_cpp.cpp dom_cpp.cpp
103 -+libgsoapck___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) -DWITH_COOKIES
104 -+libgsoapck___la_LDFLAGS = -version-info $(SOVERSION)
105 -+libgsoapssl_la_SOURCES = stdsoap2_ssl.c dom.c
106 -+libgsoapssl_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES
107 -+libgsoapssl_la_LDFLAGS = -version-info $(SOVERSION)
108 -+libgsoapssl_la_LIBADD = -lssl -lcrypto -lz
109 -+libgsoapssl___la_SOURCES = stdsoap2_ssl_cpp.cpp dom_cpp.cpp
110 -+libgsoapssl___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES
111 -+libgsoapssl___la_LDFLAGS = -version-info $(SOVERSION)
112 -+libgsoapssl___la_LIBADD = -lssl -lcrypto -lz
113 -+
114 - BUILT_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp stdsoap2_ck.c stdsoap2_ck_cpp.cpp stdsoap2_ssl.c stdsoap2_ssl_cpp.cpp
115 -
116 - include_HEADERS = stdsoap2.h
117 ---- gsoap-2.8/gsoap/samples/autotest/Makefile.am
118 -+++ gsoap-2.8/gsoap/samples/autotest/Makefile.am
119 -@@ -14,7 +14,7 @@
120 - WSDLINPUT=$(top_srcdir)/gsoap/samples/autotest/examples.wsdl
121 - SOAPHEADER=$(top_srcdir)/gsoap/samples/autotest/examples.h
122 - SOAP_CPP_SRC=soapC.cpp soapServer.cpp
123 --SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.a
124 -+SOAP_CPP_SHARED_LIB=$(top_builddir)/gsoap/libgsoap++.a
125 -
126 - $(SOAP_CPP_SRC) : $(WSDLINPUT)
127 - $(WSDL) $(WSDL_FLAGS) $(WSDLINPUT)
128 -@@ -40,6 +40,6 @@
129 - autotest_CPPFLAGS=$(C_DEBUG_FLAGS) -D$(platform)
130 - autotest_CXXFLAGS=$(WSDL2H_EXTRA_FLAGS)
131 - autotest_SOURCES=$(SOAP_CPP_SRC) soapTester.cpp duration.cpp long_time.cpp struct_tm.cpp struct_tm_date.cpp
132 --autotest_LDADD=$(SOAP_CPP_LIB) $(SAMPLE_EXTRA_LIBS)
133 -+autotest_LDADD=$(SOAP_CPP_SHARED_LIB) $(SAMPLE_EXTRA_LIBS)
134 -
135 - CLEANFILES= *~ *.h *.cpp *.xml *.log *.nsmap
136 ---- gsoap-2.8/gsoap/samples/databinding/Makefile.am
137 -+++ gsoap-2.8/gsoap/samples/databinding/Makefile.am
138 -@@ -14,7 +14,7 @@
139 - WSDLINPUT=$(top_srcdir)/gsoap/samples/databinding/address.xsd
140 - SOAPHEADER=$(top_srcdir)/gsoap/samples/databinding/address.h
141 - SOAP_CPP_SRC=addressC.cpp
142 --SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.a
143 -+SOAP_CPP_SHARED_LIB=$(top_builddir)/gsoap/libgsoap++.a
144 -
145 - $(SOAP_CPP_SRC) : $(WSDLINPUT)
146 - $(WSDL) $(WSDL_FLAGS) $(WSDLINPUT)
147 -@@ -28,6 +28,6 @@
148 - address_CPPFLAGS=$(C_DEBUG_FLAGS) -D$(platform)
149 - address_CXXFLAGS=$(WSDL2H_EXTRA_FLAGS)
150 - address_SOURCES=$(SOAP_CPP_SRC) address.cpp
151 --address_LDADD=$(SOAP_CPP_LIB)
152 -+address_LDADD=$(SOAP_CPP_SHARED_LIB)
153 -
154 - CLEANFILES= *~ address.h *C.cpp *H.h *Stub.h *.nsmap
155 ---- gsoap-2.8/gsoap/wsdl/Makefile.am
156 -+++ gsoap-2.8/gsoap/wsdl/Makefile.am
157 -@@ -10,7 +10,7 @@
158 - AM_LDFLAGS=-L$(top_srcdir)/gsoap/wsdl -I$(top_srcdir)/gsoap -I$(top_srcdir)/gsoap/plugin
159 - AM_CPPFLAGS=-I$(top_srcdir)/gsoap -I$(top_srcdir)/gsoap/plugin
160 - SOAP=$(top_builddir)/gsoap/src/soapcpp2$(EXEEXT)
161 --SOAP_CPP_LIB=$(top_builddir)/gsoap/$(WSDL2H_SOAP_CPP_LIB)
162 -+SOAP_CPP_SHARED_LIB=$(top_builddir)/gsoap/$(WSDL2H_SOAP_CPP_SHARED_LIB)
163 - SOAP_CPP_SRC=wsdlC.cpp
164 - SOAPHEADER=$(top_srcdir)/gsoap/wsdl/wsdl.h
165 - SOAP_FLAGS=-SC -pwsdl -I$(top_srcdir)/gsoap/wsdl -I$(top_srcdir)/gsoap/import
166 -@@ -30,9 +30,9 @@
167 - wsdl2h_CPPFLAGS=$(AM_CPPFLAGS) $(SOAPCPP2_NONAMESPACES) -D$(platform)
168 - wsdl2h_SOURCES=wsdl2h.cpp wsdl.cpp wadl.cpp schema.cpp types.cpp service.cpp soap.cpp mime.cpp wsp.cpp bpel.cpp $(SOAP_CPP_SRC)
169 - if WITH_OPENSSL
170 --wsdl2h_LDADD=$(SOAP_CPP_LIB) $(top_srcdir)/gsoap/plugin/httpda.c $(top_srcdir)/gsoap/plugin/smdevp.c $(top_srcdir)/gsoap/plugin/threads.c $(WSDL2H_EXTRA_LIBS)
171 -+wsdl2h_LDADD=$(SOAP_CPP_SHARED_LIB) $(top_srcdir)/gsoap/plugin/httpda.c $(top_srcdir)/gsoap/plugin/smdevp.c $(top_srcdir)/gsoap/plugin/threads.c $(WSDL2H_EXTRA_LIBS)
172 - else
173 --wsdl2h_LDADD=$(SOAP_CPP_LIB) $(WSDL2H_EXTRA_LIBS)
174 -+wsdl2h_LDADD=$(SOAP_CPP_SHARED_LIB) $(WSDL2H_EXTRA_LIBS)
175 - endif
176 -
177 - CLEANFILES= *~ *C.cpp *H.h *Stub.h *.nsmap
178
179 diff --git a/net-libs/gsoap/gsoap-2.8.63.ebuild b/net-libs/gsoap/gsoap-2.8.63.ebuild
180 deleted file mode 100644
181 index 55a5b33b16d..00000000000
182 --- a/net-libs/gsoap/gsoap-2.8.63.ebuild
183 +++ /dev/null
184 @@ -1,83 +0,0 @@
185 -# Copyright 1999-2018 Gentoo Authors
186 -# Distributed under the terms of the GNU General Public License v2
187 -
188 -EAPI=6
189 -
190 -inherit autotools eutils
191 -
192 -MY_P="${PN}-2.8"
193 -
194 -DESCRIPTION="A cross-platform open source C and C++ SDK for SOAP/XML Web services"
195 -HOMEPAGE="http://gsoap2.sourceforge.net"
196 -SRC_URI="mirror://sourceforge/gsoap2/gsoap_${PV}.zip"
197 -
198 -LICENSE="GPL-2 gSOAP"
199 -SLOT="0"
200 -KEYWORDS="amd64 x86"
201 -IUSE="doc debug examples ipv6 libressl gnutls +ssl"
202 -
203 -RDEPEND="
204 - sys-libs/zlib
205 - gnutls? ( net-libs/gnutls )
206 - ssl? (
207 - !libressl? ( dev-libs/openssl:0= )
208 - libressl? ( dev-libs/libressl )
209 - )
210 -"
211 -DEPEND="${RDEPEND}
212 - app-arch/unzip
213 - sys-devel/flex
214 - sys-devel/bison
215 -"
216 -
217 -PATCHES=(
218 - # Fix Pre-ISO headers
219 - "${FILESDIR}/${PN}-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch"
220 -
221 - # enable shared libs https://bugs.gentoo.org/583398
222 - "${FILESDIR}/${PN}-2.8.52-shared_libs.patch"
223 -)
224 -
225 -S="${WORKDIR}/${MY_P}"
226 -
227 -src_prepare() {
228 - default
229 - eautoreconf
230 -}
231 -
232 -src_configure() {
233 - local myconf=()
234 - use ssl || myconf+=( --disable-ssl )
235 - use gnutls && myconf+=( --enable-gnutls )
236 - use ipv6 && myconf+=( --enable-ipv6 )
237 - econf \
238 - ${myconf[@]} \
239 - $(use_enable debug) \
240 - $(use_enable examples samples)
241 -}
242 -
243 -src_compile() {
244 - emake -j1
245 -}
246 -
247 -src_install() {
248 - emake DESTDIR="${D}" install
249 -
250 - # yes, we also install the license-file since
251 - # it contains info about how to apply the licenses
252 - dodoc *.txt
253 -
254 - dohtml changelog.md
255 -
256 - prune_libtool_files --all
257 -
258 - if use examples; then
259 - rm -rf gsoap/samples/Makefile* gsoap/samples/*/Makefile* gsoap/samples/*/*.o || die
260 - insinto /usr/share/doc/${PF}/examples
261 - doins -r gsoap/samples/*
262 - fi
263 -
264 - if use doc; then
265 - dohtml -r gsoap/doc/*
266 - fi
267 -}