summaryrefslogtreecommitdiff
path: root/net-libs/gsoap
diff options
context:
space:
mode:
Diffstat (limited to 'net-libs/gsoap')
-rw-r--r--net-libs/gsoap/Manifest17
-rw-r--r--net-libs/gsoap/files/gsoap-2.8.51-libressl-2.6-compatibility.patch38
-rw-r--r--net-libs/gsoap/files/gsoap-2.8.70-parallel.patch10
-rw-r--r--net-libs/gsoap/files/gsoap-2.8.70-shared_libs.patch (renamed from net-libs/gsoap/files/gsoap-2.7.40-shared_libs.patch)71
-rw-r--r--net-libs/gsoap/files/gsoap-2.8.70-xlocale_h.patch20
-rw-r--r--net-libs/gsoap/gsoap-2.8.51.ebuild85
-rw-r--r--net-libs/gsoap/gsoap-2.8.55.ebuild83
-rw-r--r--net-libs/gsoap/gsoap-2.8.59.ebuild83
-rw-r--r--net-libs/gsoap/gsoap-2.8.63.ebuild4
-rw-r--r--net-libs/gsoap/gsoap-2.8.70.ebuild (renamed from net-libs/gsoap/gsoap-2.8.58.ebuild)44
10 files changed, 96 insertions, 359 deletions
diff --git a/net-libs/gsoap/Manifest b/net-libs/gsoap/Manifest
index 017d6da106c7..9f83965e4723 100644
--- a/net-libs/gsoap/Manifest
+++ b/net-libs/gsoap/Manifest
@@ -1,15 +1,10 @@
AUX gsoap-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch 614 BLAKE2B b54c19d6a465c71d3f7e4ac42ccc0add193b4b50b0047450583ee7c22d652b620e72f218ec5f87048331bd61e232b5ad1d2298f1ffdc17079ccdcf1d8f300aae SHA512 7a63d83db669ea0eba5dd43fb7a65e8a8b6bf6d397bf3884ab84eb5661f2b4fb0f19a9aead2851772d3d84e6b2ec470b67a2589f82fa28f7a27cb9b59d7890d8
-AUX gsoap-2.7.40-shared_libs.patch 6866 BLAKE2B 829a06165291a7887b8dc72b450b38a6f28cce51a6cf55d7d2ba1129a2f96036b5cbcf1a5e3b7d00c63a94674c42ea0b647818b9000e67191a75cf1a5660e0b9 SHA512 289c09f08d5881232fe169d37a0a76b58f8ec823305dd24f62b4cc04d7d1801be5b475ccd87c1f4ec3779c7972cb962a8a196d80e5fff91755d9b76bae0ac941
-AUX gsoap-2.8.51-libressl-2.6-compatibility.patch 1394 BLAKE2B 738e50bf8b8aad35e21b2ac03d9ca18713cbc694c01916163f0f22b8e16c11b156a9c92a209da56016cdc23e0438d23dc99ca7efed1eaec892462e231c9b9cac SHA512 51e1419bb88bf9de32caeaf4f7507eec05a65b4cac9aa02715c933d66c3685c1e611a52dbd1e77219bfffc8bd99c838f3c1e9270520a9e7b46a1651f79f00bab
AUX gsoap-2.8.52-shared_libs.patch 6582 BLAKE2B beb15d19f782edd0fd0ac518001001f194fc26ef8e7964114809776d3b0dc5359f2cf39e0fe6813650afb7805ae389dc5e26ac4ac4bbe424e81135073ee7bd27 SHA512 7ddbd3c2597892357da0ced383b2286e057e5e3c44eec3fd96b2ecbb4759bb5624c047e77482c495d46796e20d0e587e637f7b3a0ca3a05ceeae40e63fd5049c
-DIST gsoap_2.8.51.zip 34505931 BLAKE2B 6f2d6ee2bd405054dc75105f42f6edeaa2300f1e7e6bea15f9e8f0dfcc2df56b36cddfc8f0a038b029f36a6dd1fd63f39eadb8d7f363335344eb142ec27be726 SHA512 491e31ce6be02c577b6184335672a0805e2287418a7e26d9b0f009aab8af462ddef7d7a1893dc867db5362c5f2a1e0022d0a45865d81e43286ce16c649da6910
-DIST gsoap_2.8.55.zip 32571850 BLAKE2B 6f262c0b65c7704fbf6c0973d766c0cff788745d0f6331afdffc6bbabbbeeea38222f8038d7a96eae63453a721f2b52b1623f4691e7c677489fb8a3c49d80bae SHA512 e0cb6809d5b8e4a068ed937f253844f88d8275e58f7590ca0dd52bede1ea74d5781d35664586f9e29f2e22c508167df8044d45101f0773c9b8d79b80aa188935
-DIST gsoap_2.8.58.zip 32931913 BLAKE2B ab6e1b9f1e3b866199236b471e638a80c3542ce709e5cca75df9b3d5cd06fc498d09e768078a6863c549e721f657723d50bf53274c7d6603da23f1ea7a887879 SHA512 019c428aee0309ac952af349738a062d4e6deae28f2c5d38178bcd2aa3ead76a7a43faf952ca61f15e8928600a46f1a865b7996ded1c32e1749d1036c5354e2b
-DIST gsoap_2.8.59.zip 33109898 BLAKE2B d05ddf0c1e24afc03a33592cf8abef6f0bb6c8a8a216aee9ce7614720a8e3cd015f1e03429113ac8bdc05e6b916fee022914db22d0c29b5c9c4d0fb60c549168 SHA512 d43320e6965c3f17d122ea7aeeecbc0b608dac52204e630c3254d32eadd3c93aaca446c92bb439b98207f8560b2ad6bff220c0502b75ebd18b99e37402570624
+AUX gsoap-2.8.70-parallel.patch 229 BLAKE2B 2fb3b972b8201dae35911065df1b7555cbe6dd7bb1dc933216a1770accc94c2d1ef02fe6a3ad7643cb7d748a54e55e9ba3591d48f107485c9b9e4306763f2634 SHA512 d49527ae34788f8bc1a74c9a59890bdc13eb343fb3293fcc756b7dd7259cc7cd544bafc58a0c271cf7268b0a9c986db36e587fdc7fcc520ea05ab559e292649e
+AUX gsoap-2.8.70-shared_libs.patch 6177 BLAKE2B d599e56a83a3dec5dc0e6470531081af3a5d5778f3ba7f231e41d4b95a8fbffe2f94ab41b422cff21df3c25dbe5976da4da0626735fe84877407a6f0fa925247 SHA512 46cc3733f1b25c3c5ac81ff340b4254d29bdd8c93f5cc4cb5aad4a997e253aed513eb466070ae1697a308fba5cf2bb22bdda0c04eecd0979debe2b38c68fab83
+AUX gsoap-2.8.70-xlocale_h.patch 660 BLAKE2B afe47e3394b7417defc0cf38a08f1d0c44dbbe445f6042ea361011d97af3b321681912e3cecff574e218804aaf954239ef8eccb6a8dfd2e6d50c14afa4d70e2f SHA512 c86e465752a90519317d61399f09925d5dfaa6ce11651e5013d63ceb49a92aa3728c880d6d57c50e830b1fcabf359cbc18f1b78c0fc2168d98acfb73c89bf57f
DIST gsoap_2.8.63.zip 32985252 BLAKE2B 6bedf06a98701dd63c13e805f865c3b84cae8c498a9ec1c4dd062e191f217c56cf9667046c5fbf0b33d94c5500e2eb4746eefa7cc909398a8ad891f2cb33e357 SHA512 1941aba9c4a7d5e57e8b8f4f2183ee3c24a9a5c3e93caedfd27a13cbc625dc06e3114f850f0dcddb87dd436a997e1157fb2c6fb20c28f1b0675e634c3d489d96
-EBUILD gsoap-2.8.51.ebuild 1793 BLAKE2B ac37c5aad219f159d1341f13d20ab187d70fd87619930ab13df8fd127f46ea15793c6d1f74def667c2a2f3384037193877d662eebdac7f73e530b8ebf7d9fe6b SHA512 45b0dc686746e51454340f1c8d59fb803e94666b50db4d2cc6b10ed31f0cb09daa3d1cd46f851b6fababb2363e1e14de5da6bf978a3b41b172170385d06db76f
-EBUILD gsoap-2.8.55.ebuild 1635 BLAKE2B 274bb41081cd7b6a7f9ab784be172b58bedba873f66f2a0896e86e353b72f9ec3c5e5eea3109cdbf2a26ad8cb02a8b7380220de365fe2ee6656f0cf039a737ce SHA512 9b7161fb76128c0ac50c29b8f3675e423bd24f5ca3e28d6923ab833594a8c13fe8fabc431ae7c9a00dd25f1222f6a50d7b50c411dae2d7e02dc5fb67e59fc4e2
-EBUILD gsoap-2.8.58.ebuild 1635 BLAKE2B 274bb41081cd7b6a7f9ab784be172b58bedba873f66f2a0896e86e353b72f9ec3c5e5eea3109cdbf2a26ad8cb02a8b7380220de365fe2ee6656f0cf039a737ce SHA512 9b7161fb76128c0ac50c29b8f3675e423bd24f5ca3e28d6923ab833594a8c13fe8fabc431ae7c9a00dd25f1222f6a50d7b50c411dae2d7e02dc5fb67e59fc4e2
-EBUILD gsoap-2.8.59.ebuild 1635 BLAKE2B 108f7d24270342c82c34c3ef000814a2af1de429230744aba9a819a988bc16619e79b3a59efd72939c57503698d3921b8ab8339a3c9ea7c2f1a5242c43ac8b7a SHA512 786bbd285e707c55acba1b1a357d51583cea9e1040673ebf35264d0d5d2ae8af1eb65e61123ce1b36865c57f20a942ed0e9deeab7c98ad2603a3bf7f730a9bc3
-EBUILD gsoap-2.8.63.ebuild 1635 BLAKE2B 108f7d24270342c82c34c3ef000814a2af1de429230744aba9a819a988bc16619e79b3a59efd72939c57503698d3921b8ab8339a3c9ea7c2f1a5242c43ac8b7a SHA512 786bbd285e707c55acba1b1a357d51583cea9e1040673ebf35264d0d5d2ae8af1eb65e61123ce1b36865c57f20a942ed0e9deeab7c98ad2603a3bf7f730a9bc3
+DIST gsoap_2.8.70.zip 32695627 BLAKE2B 6d803441804badf06b29cee8ca898dc864b9a0388f6f3fa58b84c1b237d77e22ab70e0cc5439915c715bdba7831b14f86d8003e1338b6184ddbfe845bb76ff75 SHA512 f7e9f85580c19bb390f1310bb47b690a5788b54c1e12c6fc0d9166039a84ae24ec5d3268cb67cd72b20e2eaa78689e175b975f07da44fd20e172a77ef37f4ae7
+EBUILD gsoap-2.8.63.ebuild 1630 BLAKE2B ec07675d8a315a780c4f43b617099aa6211ffb584ea3a3e718500ad34063f28e6498e62d6fd040a108aad36cfde3aa41ceb8b52181d22b4febcaf66de457649b SHA512 310be6db4ad09a75b5a61ea91cd82f648e21102ce783009f13f1a97d390ed9cca59db06d707c0e3635a18ca5a4c35a359479755b38f218440b729b73fa84e397
+EBUILD gsoap-2.8.70.ebuild 1875 BLAKE2B f3d471fc3467e7c88c470b48f1d242bf7483a133d6b668e1cfe39e36e54eaa508e678881943ad1b7aa7845dda3b3f667e863b5a34e517f1c562769337ecdd364 SHA512 024549d143921d38866924105ed0d93b8445d2ceef717506575d26b7070697bce57e18df8b24e8aab20257f35f4c328ccaef4bcd286a7ec665cd6fdc4914ac34
MISC metadata.xml 451 BLAKE2B e3d387b04ad001e38538f12cace5f97f2f3b9311ecbb212d018a481945b593b07236a828181709a4c8c1aa7dc8a679ff1ae37c46d1d2ec213603a0db5080edfa SHA512 ec9e11f668d654db228da6e81da0ac048df98a45f35ec3bf73b7f6b6c050c99f7f064c264e3dc79fa07fc7a713f715ad8836eef6a4984e3786be52c448822ba1
diff --git a/net-libs/gsoap/files/gsoap-2.8.51-libressl-2.6-compatibility.patch b/net-libs/gsoap/files/gsoap-2.8.51-libressl-2.6-compatibility.patch
deleted file mode 100644
index 8f13a39d32c6..000000000000
--- a/net-libs/gsoap/files/gsoap-2.8.51-libressl-2.6-compatibility.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/gsoap/plugin/smdevp.c 2018-04-20 15:45:25.112658174 +0000
-+++ b/gsoap/plugin/smdevp.c 2018-04-20 15:47:58.826360980 +0000
-@@ -479,7 +479,7 @@
- /* allocate and init the OpenSSL HMAC or EVP_MD context */
- if ((alg & SOAP_SMD_ALGO) == SOAP_SMD_HMAC)
- {
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER))
- data->ctx = (void*)SOAP_MALLOC(soap, sizeof(HMAC_CTX));
- if (data->ctx)
- HMAC_CTX_init((HMAC_CTX*)data->ctx);
-@@ -489,7 +489,7 @@
- }
- else
- {
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER))
- data->ctx = (void*)SOAP_MALLOC(soap, sizeof(EVP_MD_CTX));
- if (data->ctx)
- EVP_MD_CTX_init((EVP_MD_CTX*)data->ctx);
-@@ -642,7 +642,7 @@
- *len = (int)n;
- }
- /* cleanup */
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER))
- if ((data->alg & SOAP_SMD_ALGO) == SOAP_SMD_HMAC)
- HMAC_CTX_cleanup((HMAC_CTX*)data->ctx);
- else
-@@ -687,7 +687,7 @@
- }
- if (data->ctx)
- {
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER))
- if ((data->alg & SOAP_SMD_ALGO) == SOAP_SMD_HMAC)
- HMAC_CTX_cleanup((HMAC_CTX*)data->ctx);
- else
diff --git a/net-libs/gsoap/files/gsoap-2.8.70-parallel.patch b/net-libs/gsoap/files/gsoap-2.8.70-parallel.patch
new file mode 100644
index 000000000000..8abd36d937c9
--- /dev/null
+++ b/net-libs/gsoap/files/gsoap-2.8.70-parallel.patch
@@ -0,0 +1,10 @@
+--- gsoap-2.8/gsoap/src/Makefile.am
++++ gsoap-2.8/gsoap/src/Makefile.am
+@@ -5,6 +5,7 @@
+ ## you have all needed files, that a GNU package needs
+ AUTOMAKE_OPTIONS = foreign 1.4
+
++include MakefileManual
+
+ #LIBS=
+ AM_YFLAGS=-d -v
diff --git a/net-libs/gsoap/files/gsoap-2.7.40-shared_libs.patch b/net-libs/gsoap/files/gsoap-2.8.70-shared_libs.patch
index 829e0e45a58c..cb3f11ed129a 100644
--- a/net-libs/gsoap/files/gsoap-2.7.40-shared_libs.patch
+++ b/net-libs/gsoap/files/gsoap-2.8.70-shared_libs.patch
@@ -1,6 +1,5 @@
-diff -Naur a/configure.ac b/configure.ac
---- a/configure.ac 2016-12-11 04:12:26.000000000 +0000
-+++ b/configure.ac 2017-01-10 13:41:24.743162628 +0000
+--- gsoap-2.8/configure.ac
++++ gsoap-2.8/configure.ac
@@ -17,7 +17,7 @@
AC_PROG_YACC
AC_PROG_CPP
@@ -10,7 +9,7 @@ diff -Naur a/configure.ac b/configure.ac
AC_PROG_LN_S
AC_PROG_AWK
AC_PROG_INSTALL
-@@ -242,16 +242,18 @@
+@@ -278,15 +278,17 @@
WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} -lgnutls -lgcrypt -lgpg-error -lz"
SAMPLE_INCLUDES=
SAMPLE_SSL_LIBS="-lgnutls -lgcrypt -lgpg-error -lz"
@@ -20,10 +19,9 @@ diff -Naur a/configure.ac b/configure.ac
else
AC_MSG_RESULT(no)
WSDL2H_EXTRA_FLAGS="-DWITH_OPENSSL -DWITH_GZIP"
- # an ugly hack to get httpda and smdevp plugins to conditionally
# compile with wsdl2h when OPENSSL is available
-- WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} ../plugin/httpda.c ../plugin/smdevp.c ../plugin/threads.c -lssl -lcrypto -lz"
-+ WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} ../plugin/httpda.c ../plugin/smdevp.c ../plugin/threads.c -lcrypto"
+- WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} -lssl -lcrypto -lz"
++ WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} -lcrypto"
SAMPLE_INCLUDES=
SAMPLE_SSL_LIBS="-lssl -lcrypto -lz"
- WSDL2H_SOAP_CPP_LIB="libgsoapssl++.a"
@@ -32,15 +30,17 @@ diff -Naur a/configure.ac b/configure.ac
fi
if test -n "$ZLIB"; then
WSDL2H_EXTRA_FLAGS="-I${ZLIB}/include ${WSDL2H_EXTRA_FLAGS}"
-@@ -270,13 +272,15 @@
+@@ -305,7 +307,8 @@
WSDL2H_EXTRA_FLAGS=
SAMPLE_SSL_LIBS=
SAMPLE_INCLUDES=
- WSDL2H_SOAP_CPP_LIB="libgsoap++.a"
-+ WSDL2H_SOAP_CPP_STATIC_LIB="libgsoapssl++.a"
++ WSDL2H_SOAP_CPP_STATIC_LIB="libgsoap++.a"
+ WSDL2H_SOAP_CPP_SHARED_LIB="libgsoapssl++.la"
fi
- AC_SUBST(WSDL2H_EXTRA_FLAGS)
+ AM_CONDITIONAL(WITH_OPENSSL, test "x$with_openssl" = "xyes" -a "x$with_gnutls" != "xyes")
+ AC_SUBST(WITH_OPENSSL)
+@@ -313,7 +316,8 @@
AC_SUBST(WSDL2H_EXTRA_LIBS)
AC_SUBST(SAMPLE_INCLUDES)
AC_SUBST(SAMPLE_SSL_LIBS)
@@ -50,12 +50,11 @@ diff -Naur a/configure.ac b/configure.ac
# enable the compile of the samples
AC_ARG_ENABLE(samples,
-diff -Naur a/gsoap/Makefile.am b/gsoap/Makefile.am
---- a/gsoap/Makefile.am 2016-12-11 04:12:27.000000000 +0000
-+++ b/gsoap/Makefile.am 2017-01-10 13:41:36.487140423 +0000
+--- gsoap-2.8/gsoap/Makefile.am
++++ gsoap-2.8/gsoap/Makefile.am
@@ -49,6 +49,29 @@
libgsoapssl___a_SOURCES = stdsoap2_ssl_cpp.cpp dom_cpp.cpp
- libgsoapssl___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES
+ libgsoapssl___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_NO_C_LOCALE) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES
+lib_LTLIBRARIES = libgsoap.la libgsoap++.la libgsoapck.la libgsoapck++.la libgsoapssl.la libgsoapssl++.la
+SOVERSION = 0
@@ -83,18 +82,17 @@ diff -Naur a/gsoap/Makefile.am b/gsoap/Makefile.am
BUILT_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp stdsoap2_ck.c stdsoap2_ck_cpp.cpp stdsoap2_ssl.c stdsoap2_ssl_cpp.cpp
include_HEADERS = stdsoap2.h
-diff -Naur a/gsoap/samples/autotest/Makefile.am b/gsoap/samples/autotest/Makefile.am
---- a/gsoap/samples/autotest/Makefile.am 2016-12-11 04:12:27.000000000 +0000
-+++ b/gsoap/samples/autotest/Makefile.am 2017-01-10 13:44:39.954389922 +0000
+--- gsoap-2.8/gsoap/samples/autotest/Makefile.am
++++ gsoap-2.8/gsoap/samples/autotest/Makefile.am
@@ -14,7 +14,7 @@
- WSDLINPUT=$(srcdir)/examples.wsdl
- SOAPHEADER=$(srcdir)/examples.h
+ WSDLINPUT=$(top_srcdir)/gsoap/samples/autotest/examples.wsdl
+ SOAPHEADER=$(top_srcdir)/gsoap/samples/autotest/examples.h
SOAP_CPP_SRC=soapC.cpp soapServer.cpp
-SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.a
+SOAP_CPP_SHARED_LIB=$(top_builddir)/gsoap/libgsoap++.a
$(SOAP_CPP_SRC) : $(WSDLINPUT)
- $(WSDL) $(WSDL_FLAGS) $(WSDLINPUT)
+ $(WSDL) $(WSDL_FLAGS) $(WSDLINPUT)
@@ -40,6 +40,6 @@
autotest_CPPFLAGS=$(C_DEBUG_FLAGS) -D$(platform)
autotest_CXXFLAGS=$(WSDL2H_EXTRA_FLAGS)
@@ -103,18 +101,17 @@ diff -Naur a/gsoap/samples/autotest/Makefile.am b/gsoap/samples/autotest/Makefil
+autotest_LDADD=$(SOAP_CPP_SHARED_LIB) $(SAMPLE_EXTRA_LIBS)
CLEANFILES= *~ *.h *.cpp *.xml *.log *.nsmap
-diff -Naur a/gsoap/samples/databinding/Makefile.am b/gsoap/samples/databinding/Makefile.am
---- a/gsoap/samples/databinding/Makefile.am 2016-12-11 04:12:27.000000000 +0000
-+++ b/gsoap/samples/databinding/Makefile.am 2017-01-10 13:43:51.788258087 +0000
+--- gsoap-2.8/gsoap/samples/databinding/Makefile.am
++++ gsoap-2.8/gsoap/samples/databinding/Makefile.am
@@ -14,7 +14,7 @@
- WSDLINPUT=$(srcdir)/address.xsd
- SOAPHEADER=$(srcdir)/address.h
+ WSDLINPUT=$(top_srcdir)/gsoap/samples/databinding/address.xsd
+ SOAPHEADER=$(top_srcdir)/gsoap/samples/databinding/address.h
SOAP_CPP_SRC=addressC.cpp
-SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.a
-+SOAP_CPP_SHARED_LIB=$(top_builddir)/gsoap/libgsoap++.la
++SOAP_CPP_SHARED_LIB=$(top_builddir)/gsoap/libgsoap++.a
$(SOAP_CPP_SRC) : $(WSDLINPUT)
- $(WSDL) $(WSDL_FLAGS) $(WSDLINPUT)
+ $(WSDL) $(WSDL_FLAGS) $(WSDLINPUT)
@@ -28,6 +28,6 @@
address_CPPFLAGS=$(C_DEBUG_FLAGS) -D$(platform)
address_CXXFLAGS=$(WSDL2H_EXTRA_FLAGS)
@@ -123,24 +120,22 @@ diff -Naur a/gsoap/samples/databinding/Makefile.am b/gsoap/samples/databinding/M
+address_LDADD=$(SOAP_CPP_SHARED_LIB)
CLEANFILES= *~ address.h *C.cpp *H.h *Stub.h *.nsmap
-diff -Naur a/gsoap/wsdl/Makefile.am b/gsoap/wsdl/Makefile.am
---- a/gsoap/wsdl/Makefile.am 2016-12-11 04:12:28.000000000 +0000
-+++ b/gsoap/wsdl/Makefile.am 2017-01-10 13:42:08.991078959 +0000
+--- gsoap-2.8/gsoap/wsdl/Makefile.am
++++ gsoap-2.8/gsoap/wsdl/Makefile.am
@@ -10,7 +10,7 @@
- AM_LDFLAGS=-L$(srcdir) -I$(top_srcdir)/gsoap -I$(top_srcdir)/gsoap/plugin
+ AM_LDFLAGS=-L$(top_srcdir)/gsoap/wsdl -I$(top_srcdir)/gsoap -I$(top_srcdir)/gsoap/plugin
AM_CPPFLAGS=-I$(top_srcdir)/gsoap -I$(top_srcdir)/gsoap/plugin
SOAP=$(top_builddir)/gsoap/src/soapcpp2$(EXEEXT)
-SOAP_CPP_LIB=$(top_builddir)/gsoap/$(WSDL2H_SOAP_CPP_LIB)
+SOAP_CPP_SHARED_LIB=$(top_builddir)/gsoap/$(WSDL2H_SOAP_CPP_SHARED_LIB)
SOAP_CPP_SRC=wsdlC.cpp
- SOAPHEADER=$(srcdir)/wsdl.h
- SOAP_FLAGS=-SC -pwsdl -I$(srcdir) -I$(top_srcdir)/gsoap/import
-@@ -29,6 +29,6 @@
- wsdl2h_CXXFLAGS=$(C_DEBUG_FLAGS) $(WSDL2H_EXTRA_FLAGS) $(WSDL2H_IMPORTPATH)
- wsdl2h_CPPFLAGS=$(AM_CPPFLAGS) $(SOAPCPP2_NONAMESPACES) -D$(platform)
- 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)
+ SOAPHEADER=$(top_srcdir)/gsoap/wsdl/wsdl.h
+ SOAP_FLAGS=-SC -pwsdl -I$(top_srcdir)/gsoap/wsdl -I$(top_srcdir)/gsoap/import
+@@ -32,6 +32,6 @@
+ if WITH_OPENSSL
+ wsdl2h_SOURCES += $(top_srcdir)/gsoap/plugin/httpda.c $(top_srcdir)/gsoap/plugin/smdevp.c $(top_srcdir)/gsoap/plugin/threads.c
+ endif
-wsdl2h_LDADD=$(SOAP_CPP_LIB) $(WSDL2H_EXTRA_LIBS)
+wsdl2h_LDADD=$(SOAP_CPP_SHARED_LIB) $(WSDL2H_EXTRA_LIBS)
CLEANFILES= *~ *C.cpp *H.h *Stub.h *.nsmap
-
diff --git a/net-libs/gsoap/files/gsoap-2.8.70-xlocale_h.patch b/net-libs/gsoap/files/gsoap-2.8.70-xlocale_h.patch
new file mode 100644
index 000000000000..fd550dd2670d
--- /dev/null
+++ b/net-libs/gsoap/files/gsoap-2.8.70-xlocale_h.patch
@@ -0,0 +1,20 @@
+--- gsoap-2.8/configure.ac
++++ gsoap-2.8/configure.ac
+@@ -196,15 +196,15 @@
+ AC_ARG_ENABLE(xlocale,
+ [AC_HELP_STRING([--enable-xlocale],
+ [compile library with forced inclusion of xlocale.h])],
+- [with_xlocale="$enable_xl"],
++ [with_xlocale="$enableval"],
+ [with_xlocale="no"])
+
+ AC_MSG_CHECKING(for enable xlocale usage in library)
+ if test "x$with_xlocale" = "xyes"; then
+ AC_MSG_RESULT(yes)
++ SOAPCPP2_INCLUDE_XLOCALE="-DWITH_INCLUDE_XLOCALE_H"
+ else
+ AC_MSG_RESULT(no)
+- SOAPCPP2_INCLUDE_XLOCALE="-DWITH_INCLUDE_XLOCALE_H"
+ fi
+ AC_SUBST(SOAPCPP2_INCLUDE_XLOCALE)
+
diff --git a/net-libs/gsoap/gsoap-2.8.51.ebuild b/net-libs/gsoap/gsoap-2.8.51.ebuild
deleted file mode 100644
index 5dd67d3686ff..000000000000
--- a/net-libs/gsoap/gsoap-2.8.51.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils
-
-MY_P="${PN}-2.8"
-
-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 libressl gnutls +ssl"
-
-RDEPEND="
- sys-libs/zlib
- gnutls? ( net-libs/gnutls )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )
-"
-DEPEND="${RDEPEND}
- app-arch/unzip
- sys-devel/flex
- sys-devel/bison
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- default
-
- # Fix Pre-ISO headers
- eapply "${FILESDIR}/${PN}-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch"
-
- # enable shared libs https://bugs.gentoo.org/583398
- eapply "${FILESDIR}/${PN}-2.7.40-shared_libs.patch"
-
- # fix building with libressl-2.6.x. This will not be needed when 2.7.x goes stable
- eapply "${FILESDIR}/${PN}-2.8.51-libressl-2.6-compatibility.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 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.md
-
- 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.55.ebuild b/net-libs/gsoap/gsoap-2.8.55.ebuild
deleted file mode 100644
index 28cf845a3274..000000000000
--- a/net-libs/gsoap/gsoap-2.8.55.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils
-
-MY_P="${PN}-2.8"
-
-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 libressl gnutls +ssl"
-
-RDEPEND="
- sys-libs/zlib
- gnutls? ( net-libs/gnutls )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl )
- )
-"
-DEPEND="${RDEPEND}
- app-arch/unzip
- sys-devel/flex
- sys-devel/bison
-"
-
-PATCHES=(
- # Fix Pre-ISO headers
- "${FILESDIR}/${PN}-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch"
-
- # enable shared libs https://bugs.gentoo.org/583398
- "${FILESDIR}/${PN}-2.8.52-shared_libs.patch"
-)
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- default
- 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 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.md
-
- 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.59.ebuild b/net-libs/gsoap/gsoap-2.8.59.ebuild
deleted file mode 100644
index 84b2601d54ef..000000000000
--- a/net-libs/gsoap/gsoap-2.8.59.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils
-
-MY_P="${PN}-2.8"
-
-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 libressl gnutls +ssl"
-
-RDEPEND="
- sys-libs/zlib
- gnutls? ( net-libs/gnutls )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl )
- )
-"
-DEPEND="${RDEPEND}
- app-arch/unzip
- sys-devel/flex
- sys-devel/bison
-"
-
-PATCHES=(
- # Fix Pre-ISO headers
- "${FILESDIR}/${PN}-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch"
-
- # enable shared libs https://bugs.gentoo.org/583398
- "${FILESDIR}/${PN}-2.8.52-shared_libs.patch"
-)
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- default
- 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 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.md
-
- 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.63.ebuild b/net-libs/gsoap/gsoap-2.8.63.ebuild
index 84b2601d54ef..55a5b33b16db 100644
--- a/net-libs/gsoap/gsoap-2.8.63.ebuild
+++ b/net-libs/gsoap/gsoap-2.8.63.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/gsoap2/gsoap_${PV}.zip"
LICENSE="GPL-2 gSOAP"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="doc debug examples ipv6 libressl gnutls +ssl"
RDEPEND="
diff --git a/net-libs/gsoap/gsoap-2.8.58.ebuild b/net-libs/gsoap/gsoap-2.8.70.ebuild
index 28cf845a3274..f09037b2e0fd 100644
--- a/net-libs/gsoap/gsoap-2.8.58.ebuild
+++ b/net-libs/gsoap/gsoap-2.8.70.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-inherit autotools eutils
+inherit autotools
MY_P="${PN}-2.8"
@@ -35,7 +35,13 @@ PATCHES=(
"${FILESDIR}/${PN}-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch"
# enable shared libs https://bugs.gentoo.org/583398
- "${FILESDIR}/${PN}-2.8.52-shared_libs.patch"
+ "${FILESDIR}/${PN}-2.8.70-shared_libs.patch"
+
+ # Fix --enable-xlocale configure switch
+ "${FILESDIR}/${PN}-2.8.70-xlocale_h.patch"
+
+ # Fix parallel make
+ "${FILESDIR}/${PN}-2.8.70-parallel.patch"
)
S="${WORKDIR}/${MY_P}"
@@ -46,18 +52,16 @@ src_prepare() {
}
src_configure() {
- local myconf=()
- use ssl || myconf+=( --disable-ssl )
- use gnutls && myconf+=( --enable-gnutls )
- use ipv6 && myconf+=( --enable-ipv6 )
- econf \
- ${myconf[@]} \
- $(use_enable debug) \
+ local myeconfargs=(
+ # Don't include xlocale.h as it got removed in >=glibc-2.26
+ --disable-xlocale
+ $(use_enable debug)
$(use_enable examples samples)
-}
-
-src_compile() {
- emake -j1
+ $(usex gnutls --enable-gnutls '')
+ $(usex ipv6 --enable-ipv6 '')
+ $(usex ssl '' --disable-ssl)
+ )
+ econf "${myeconfargs[@]}"
}
src_install() {
@@ -67,17 +71,19 @@ src_install() {
# it contains info about how to apply the licenses
dodoc *.txt
- dohtml changelog.md
+ docinto html
+ dodoc changelog.md
- prune_libtool_files --all
+ find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
if use examples; then
- rm -rf gsoap/samples/Makefile* gsoap/samples/*/Makefile* gsoap/samples/*/*.o || die
+ rm -r 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/*
+ docinto html
+ dodoc -r gsoap/doc/*
fi
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-25 08:05:16 +0000