gentoo resync : 24.12.2018

4 files changed, 26 insertions, 172 deletions

diff --git a/net-libs/gsoap/Manifest b/net-libs/gsoap/Manifest
index 6f00acf2e7dd..86a3e8fa2ed0 100644
--- a/net-libs/gsoap/Manifest
+++ b/net-libs/gsoap/Manifest
@@ -1,12 +1,11 @@
 AUX gsoap-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch 614 BLAKE2B b54c19d6a465c71d3f7e4ac42ccc0add193b4b50b0047450583ee7c22d652b620e72f218ec5f87048331bd61e232b5ad1d2298f1ffdc17079ccdcf1d8f300aae SHA512 7a63d83db669ea0eba5dd43fb7a65e8a8b6bf6d397bf3884ab84eb5661f2b4fb0f19a9aead2851772d3d84e6b2ec470b67a2589f82fa28f7a27cb9b59d7890d8
-AUX gsoap-2.8.52-shared_libs.patch 6582 BLAKE2B beb15d19f782edd0fd0ac518001001f194fc26ef8e7964114809776d3b0dc5359f2cf39e0fe6813650afb7805ae389dc5e26ac4ac4bbe424e81135073ee7bd27 SHA512 7ddbd3c2597892357da0ced383b2286e057e5e3c44eec3fd96b2ecbb4759bb5624c047e77482c495d46796e20d0e587e637f7b3a0ca3a05ceeae40e63fd5049c
 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
 DIST gsoap_2.8.70.zip 32695627 BLAKE2B 6d803441804badf06b29cee8ca898dc864b9a0388f6f3fa58b84c1b237d77e22ab70e0cc5439915c715bdba7831b14f86d8003e1338b6184ddbfe845bb76ff75 SHA512 f7e9f85580c19bb390f1310bb47b690a5788b54c1e12c6fc0d9166039a84ae24ec5d3268cb67cd72b20e2eaa78689e175b975f07da44fd20e172a77ef37f4ae7
-DIST gsoap_2.8.71.zip 32395469 BLAKE2B 47038e70e297408f5599319b229d2bd15136d43646fe082480ae6cc29316a7f45c056e6c5859e9bfafcb24f5b10455d2209a3505c801d02299493c3b5435d06f SHA512 3e4494681b2669ea7eebaee19aa23fd31a339966f7af106258eb1bd676aff42f1069d55e6c80ae09fd60b2d48e456b0cb788d5d54829301ee62a2ef64742ddea
-EBUILD gsoap-2.8.63.ebuild 1630 BLAKE2B ec07675d8a315a780c4f43b617099aa6211ffb584ea3a3e718500ad34063f28e6498e62d6fd040a108aad36cfde3aa41ceb8b52181d22b4febcaf66de457649b SHA512 310be6db4ad09a75b5a61ea91cd82f648e21102ce783009f13f1a97d390ed9cca59db06d707c0e3635a18ca5a4c35a359479755b38f218440b729b73fa84e397
+DIST gsoap_2.8.73.zip 32303580 BLAKE2B 1484fb2df66627db12e52459091e163affcb2a73913657467503501423bbdf2da12651567cae517b3f7d0d632f997a37c0b244b1cda811046d078477c990d581 SHA512 171214b285e9d89108271da52c010cde81fc6f54de5aaa678e10b273857f91e6afb301fdc6e91fa836b6aa609fb75131c2247dd5f4b79f41158db2f4917b55bc
+DIST gsoap_2.8.74.zip 32304642 BLAKE2B cca698d25c837fe70969379a63f849e7623b7bb3c6e4f1fd4e22b159f03a17214981eaf6d9f632a85a6cbff87b4f1ac6411896bb86c083720a94d2bbfd8501ac SHA512 85284b88a94f07f433ffaeb9031c24d4c9c3eb82f8c590fa257cf9392fa0382cdcde5b3d5c7df903c6ddec41b876643b21ea24d18186b03db9dc8a4d6e8477ad
 EBUILD gsoap-2.8.70.ebuild 1873 BLAKE2B 470be90c7eff0997b921d6ef7814437d9f98e4320c5f11dd4bfe310be23448b1bc4bdf621d47f17c34b19ac29941b080e4b765b63eb0d1e05ff1c788d552147c SHA512 6394da6872a8e2ca0755a35814809f79b669386ee871abb3b42466001ac87cdba366e00d83171cf50f7ae12d196efbd8ee64d424f0940c78734e0afaa2e4de27
-EBUILD gsoap-2.8.71.ebuild 1876 BLAKE2B fd95d1228e01e40e6be151a59f47bfef79550d690c8640736ca0f3eabff8f2eda1f924254aec7420c792cf92dc215ed79813ad83bbf9a24c380a71db9c1571eb SHA512 8694c4a63556b64077464ec09819711aa1f44eca00de3f9d049876866c229c57e38eba72842e737b6820ff6ba83902e9a8f1d0339266ed7a60043961c479c60d
+EBUILD gsoap-2.8.73.ebuild 1789 BLAKE2B 923bac516c7b3640f758c73e40d77459905a44eb123a48988d52d34785ebf7b1f81980003ee77bda640915f9f915101cc5fdd1960314efd6268d986d55d822ab SHA512 c1aedb4c6f0d4aad1b22e49e3ac203b99e7f0060942b96569b4d3797811bd1a0325880140f5bbc961b5a34d3d6e497d33aeaa18ead81241da7350f141e07d756
+EBUILD gsoap-2.8.74.ebuild 1789 BLAKE2B 923bac516c7b3640f758c73e40d77459905a44eb123a48988d52d34785ebf7b1f81980003ee77bda640915f9f915101cc5fdd1960314efd6268d986d55d822ab SHA512 c1aedb4c6f0d4aad1b22e49e3ac203b99e7f0060942b96569b4d3797811bd1a0325880140f5bbc961b5a34d3d6e497d33aeaa18ead81241da7350f141e07d756
 MISC metadata.xml 451 BLAKE2B e3d387b04ad001e38538f12cace5f97f2f3b9311ecbb212d018a481945b593b07236a828181709a4c8c1aa7dc8a679ff1ae37c46d1d2ec213603a0db5080edfa SHA512 ec9e11f668d654db228da6e81da0ac048df98a45f35ec3bf73b7f6b6c050c99f7f064c264e3dc79fa07fc7a713f715ad8836eef6a4984e3786be52c448822ba1
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
deleted file mode 100644
index 9437de86f61f..000000000000
--- a/net-libs/gsoap/files/gsoap-2.8.52-shared_libs.patch
+++ /dev/null
@@ -1,145 +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
-@@ -259,15 +259,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}"
-@@ -286,7 +288,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)
-@@ -294,7 +297,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
-@@ -30,9 +30,9 @@
- 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)
- if WITH_OPENSSL
--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)
-+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)
- else
--wsdl2h_LDADD=$(SOAP_CPP_LIB) $(WSDL2H_EXTRA_LIBS)
-+wsdl2h_LDADD=$(SOAP_CPP_SHARED_LIB) $(WSDL2H_EXTRA_LIBS)
- endif
- 
- CLEANFILES= *~ *C.cpp *H.h *Stub.h *.nsmap
diff --git a/net-libs/gsoap/gsoap-2.8.71.ebuild b/net-libs/gsoap/gsoap-2.8.73.ebuild
index 4f3a99893774..c0cdf5ada9c2 100644
--- a/net-libs/gsoap/gsoap-2.8.71.ebuild
+++ b/net-libs/gsoap/gsoap-2.8.73.ebuild
@@ -37,9 +37,6 @@ PATCHES=(
 	# enable shared libs https://bugs.gentoo.org/583398
 	"${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"
 )
diff --git a/net-libs/gsoap/gsoap-2.8.63.ebuild b/net-libs/gsoap/gsoap-2.8.74.ebuild
index 55a5b33b16db..c0cdf5ada9c2 100644
--- a/net-libs/gsoap/gsoap-2.8.63.ebuild
+++ b/net-libs/gsoap/gsoap-2.8.74.ebuild
@@ -1,9 +1,9 @@
 # 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"
 
@@ -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="
@@ -35,7 +35,10 @@ 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 parallel make
+	"${FILESDIR}/${PN}-2.8.70-parallel.patch"
 )
 
 S="${WORKDIR}/${MY_P}"
@@ -46,18 +49,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 +68,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
 }