commit:     54e8206a73b4900d55b28424720f95640a3d8850
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Jan 26 07:14:41 2021 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Wed Jan 27 18:22:36 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54e8206a

net-libs/gsoap: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/19219
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 net-libs/gsoap/files/gsoap-2.8.70-parallel.patch   |  10 --
 .../gsoap/files/gsoap-2.8.70-shared_libs.patch     | 141 ---------------------
 .../files/gsoap-2.8.93-fix-parallel-build.patch    |  17 ---
 3 files changed, 168 deletions(-)

diff --git a/net-libs/gsoap/files/gsoap-2.8.70-parallel.patch 
b/net-libs/gsoap/files/gsoap-2.8.70-parallel.patch
deleted file mode 100644
index 8abd36d937c..00000000000
--- a/net-libs/gsoap/files/gsoap-2.8.70-parallel.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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.8.70-shared_libs.patch 
b/net-libs/gsoap/files/gsoap-2.8.70-shared_libs.patch
deleted file mode 100644
index cb3f11ed129..00000000000
--- a/net-libs/gsoap/files/gsoap-2.8.70-shared_libs.patch
+++ /dev/null
@@ -1,141 +0,0 @@
---- gsoap-2.8/configure.ac
-+++ gsoap-2.8/configure.ac
-@@ -17,7 +17,7 @@
- AC_PROG_YACC
- AC_PROG_CPP
- AC_PROG_RANLIB
--#AM_PROG_LIBTOOL
-+AM_PROG_LIBTOOL
- AC_PROG_LN_S
- AC_PROG_AWK
- AC_PROG_INSTALL
-@@ -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"
--    WSDL2H_SOAP_CPP_LIB="libgsoapssl++.a"
-+    WSDL2H_SOAP_CPP_STATIC_LIB="libgsoapssl++.a"
-+    WSDL2H_SOAP_CPP_SHARED_LIB="libgsoapssl++.la"
-   else
-     AC_MSG_RESULT(no)
-     WSDL2H_EXTRA_FLAGS="-DWITH_OPENSSL -DWITH_GZIP"
-     # compile with wsdl2h when OPENSSL is available
--    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"
-+    WSDL2H_SOAP_CPP_STATIC_LIB="libgsoapssl++.a"
-+    WSDL2H_SOAP_CPP_SHARED_LIB="libgsoapssl++.la"
-   fi
-   if test -n "$ZLIB"; then
-     WSDL2H_EXTRA_FLAGS="-I${ZLIB}/include ${WSDL2H_EXTRA_FLAGS}"
-@@ -305,7 +307,8 @@
-   WSDL2H_EXTRA_FLAGS=
-   SAMPLE_SSL_LIBS=
-   SAMPLE_INCLUDES=
--  WSDL2H_SOAP_CPP_LIB="libgsoap++.a"
-+  WSDL2H_SOAP_CPP_STATIC_LIB="libgsoap++.a"
-+  WSDL2H_SOAP_CPP_SHARED_LIB="libgsoapssl++.la"
- fi
- 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)
--AC_SUBST(WSDL2H_SOAP_CPP_LIB)
-+AC_SUBST(WSDL2H_SOAP_CPP_SHARED_LIB)
-+AC_SUBST(WSDL2H_SOAP_CPP_STATIC_LIB)
- 
- # enable the compile of the samples
- AC_ARG_ENABLE(samples,
---- 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_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
-+libgsoap_la_SOURCES = stdsoap2.c dom.c
-+libgsoap_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) 
$(SOAPCPP2_IPV6) -D$(platform)
-+libgsoap_la_LDFLAGS = -version-info $(SOVERSION)
-+libgsoap___la_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp
-+libgsoap___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) 
$(SOAPCPP2_IPV6) -D$(platform)
-+libgsoap___la_LDFLAGS = -version-info $(SOVERSION)
-+libgsoapck_la_SOURCES = stdsoap2_ck.c dom.c
-+libgsoapck_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) 
$(SOAPCPP2_IPV6) -D$(platform) -DWITH_COOKIES
-+libgsoapck_la_LDFLAGS = -version-info $(SOVERSION)
-+libgsoapck___la_SOURCES = stdsoap2_ck_cpp.cpp dom_cpp.cpp
-+libgsoapck___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) 
$(SOAPCPP2_IPV6) -D$(platform) -DWITH_COOKIES
-+libgsoapck___la_LDFLAGS = -version-info $(SOVERSION)
-+libgsoapssl_la_SOURCES = stdsoap2_ssl.c dom.c
-+libgsoapssl_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) 
$(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES
-+libgsoapssl_la_LDFLAGS = -version-info $(SOVERSION)
-+libgsoapssl_la_LIBADD = -lssl -lcrypto -lz
-+libgsoapssl___la_SOURCES = stdsoap2_ssl_cpp.cpp dom_cpp.cpp
-+libgsoapssl___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) 
$(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES
-+libgsoapssl___la_LDFLAGS = -version-info $(SOVERSION)
-+libgsoapssl___la_LIBADD = -lssl -lcrypto -lz
-+
- 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
---- gsoap-2.8/gsoap/samples/autotest/Makefile.am
-+++ gsoap-2.8/gsoap/samples/autotest/Makefile.am
-@@ -14,7 +14,7 @@
- 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)
-@@ -40,6 +40,6 @@
- autotest_CPPFLAGS=$(C_DEBUG_FLAGS) -D$(platform)
- autotest_CXXFLAGS=$(WSDL2H_EXTRA_FLAGS)
- autotest_SOURCES=$(SOAP_CPP_SRC) soapTester.cpp duration.cpp long_time.cpp 
struct_tm.cpp struct_tm_date.cpp
--autotest_LDADD=$(SOAP_CPP_LIB) $(SAMPLE_EXTRA_LIBS)
-+autotest_LDADD=$(SOAP_CPP_SHARED_LIB) $(SAMPLE_EXTRA_LIBS)
- 
- CLEANFILES= *~ *.h *.cpp *.xml *.log *.nsmap
---- gsoap-2.8/gsoap/samples/databinding/Makefile.am
-+++ gsoap-2.8/gsoap/samples/databinding/Makefile.am
-@@ -14,7 +14,7 @@
- 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++.a
- 
- $(SOAP_CPP_SRC) : $(WSDLINPUT)
-       $(WSDL) $(WSDL_FLAGS) $(WSDLINPUT)
-@@ -28,6 +28,6 @@
- address_CPPFLAGS=$(C_DEBUG_FLAGS) -D$(platform)
- address_CXXFLAGS=$(WSDL2H_EXTRA_FLAGS)
- address_SOURCES=$(SOAP_CPP_SRC) address.cpp
--address_LDADD=$(SOAP_CPP_LIB)
-+address_LDADD=$(SOAP_CPP_SHARED_LIB)
- 
- CLEANFILES= *~ address.h *C.cpp *H.h *Stub.h *.nsmap
---- gsoap-2.8/gsoap/wsdl/Makefile.am
-+++ gsoap-2.8/gsoap/wsdl/Makefile.am
-@@ -10,7 +10,7 @@
- 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=$(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.93-fix-parallel-build.patch 
b/net-libs/gsoap/files/gsoap-2.8.93-fix-parallel-build.patch
deleted file mode 100644
index 27e2a94d14e..00000000000
--- a/net-libs/gsoap/files/gsoap-2.8.93-fix-parallel-build.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/gsoap/src/Makefile.am
-+++ b/gsoap/src/Makefile.am
-@@ -10,11 +10,13 @@ AUTOMAKE_OPTIONS = foreign 1.4
- AM_YFLAGS=-d -v
- AM_LFLAGS=$(LEX_FLAGS)
- 
-+BUILT_SOURCES = soapcpp2_yacc.h
-+
- bin_PROGRAMS=soapcpp2
- 
- soapcpp2_CFLAGS=$(BISON_DEFINE) $(LEX_DEFINE) $(C_DEBUG_FLAGS) 
$(SOAPCPP2_IMPORTPATH) -D$(platform)
- soapcpp2_LDADD=$(YACC_LIB) $(LEXLIB)
--soapcpp2_SOURCES= soapcpp2_yacc.y soapcpp2_yacc.h soapcpp2_lex.l symbol2.c 
error2.c init2.c soapcpp2.c
-+soapcpp2_SOURCES= soapcpp2_yacc.y soapcpp2_lex.l symbol2.c error2.c init2.c 
soapcpp2.c
- 
- CLEANFILES= *~ soapcpp2_lex.c soapcpp2_yacc.c soapcpp2_yacc.h 
soapcpp2_yacc.output
- 

Reply via email to