From 29c8481b079a4ed873c2a1a2855ae9b6ddd5eb77 Mon Sep 17 00:00:00 2001
From: Sergey Popov <admin@pinkbyte.ru>
Date: Wed, 28 Apr 2021 11:07:20 +0300
Subject: [PATCH] net-misc/wsdlpull: port to EAPI 7, get rid of autotools-utils
 eclass

---
 net-misc/wsdlpull/Manifest                    |  2 +-
 .../files/wsdlpull-1.24-buildsystem.patch     | 23 +++++++++++++--
 net-misc/wsdlpull/metadata.xml                |  2 +-
 net-misc/wsdlpull/wsdlpull-1.24.ebuild        | 28 +++++++++++--------
 4 files changed, 40 insertions(+), 15 deletions(-)

diff --git a/net-misc/wsdlpull/Manifest b/net-misc/wsdlpull/Manifest
index f024b99..f72c6e5 100644
--- a/net-misc/wsdlpull/Manifest
+++ b/net-misc/wsdlpull/Manifest
@@ -1 +1 @@
-DIST wsdlpull-1.24.tar.gz 1080317 SHA256 9577491e23914d7f84531616ffbe609216f56f263f3a4c9b1f7cafb7f3ebb8a8 SHA512 8e79ca60a0c4a2ef94b162a18382dc10f62764c0a0e6db701a8e5a83eb11f9adb37a2b0d508971c5fe671997a211fcf8a0b7c9f47bbe4fbabdd486128265c3ab WHIRLPOOL bf3ec16d5644ca53809818fb458995f1de375244cdb2794f1779259a59efba9c4b5c232cf857724182b7033464930fcc17fa1eb00b2900fbe44358e6ea6e5028
+DIST wsdlpull-1.24.tar.gz 1080317 BLAKE2B bda290d836abfca1d5dc8817b0d714fdc89bc13148a6a2a609439e31776d0fcf4671194663a46c213dd235aa8ca265e555989139611dc2890371be23bf4f41a7 SHA512 8e79ca60a0c4a2ef94b162a18382dc10f62764c0a0e6db701a8e5a83eb11f9adb37a2b0d508971c5fe671997a211fcf8a0b7c9f47bbe4fbabdd486128265c3ab
diff --git a/net-misc/wsdlpull/files/wsdlpull-1.24-buildsystem.patch b/net-misc/wsdlpull/files/wsdlpull-1.24-buildsystem.patch
index 93f7f78..ce7bee0 100644
--- a/net-misc/wsdlpull/files/wsdlpull-1.24-buildsystem.patch
+++ b/net-misc/wsdlpull/files/wsdlpull-1.24-buildsystem.patch
@@ -1,5 +1,5 @@
---- Makefile.am.orig	2013-09-25 17:35:08.835773000 +0400
-+++ Makefile.am	2013-09-25 17:35:34.407773000 +0400
+--- a/Makefile.am	2013-09-25 17:35:08.835773000 +0400
++++ b/Makefile.am	2013-09-25 17:35:34.407773000 +0400
 @@ -9,15 +9,12 @@
  			src/config-h.in config/stamp-h.in
  
@@ -19,3 +19,22 @@
  
  #pkginclude_HEADERS = src/config.h
  pkgincludedir= $(includedir)
+
+--- a/src/xmlpull/Makefile.am	2021-04-28 10:58:15.452021204 +0300
++++ b/src/xmlpull/Makefile.am	2021-04-28 10:58:25.003020502 +0300
+@@ -13,5 +13,5 @@
+ libwsdlpullxml_la_LDFLAGS = -lpthread -version-info $(GENERIC_LIBRARY_VERSION)
+ 
+ pkginclude_HEADERS = $(xmlpull_h_sources)
+-pkgincludedir= $(includedir)/wsdlpull/xml
++pkgincludedir= $(includedir)/wsdlpull/xmlpull
+ 
+--- a/src/wsdlparser/Makefile.am	2021-04-28 11:00:45.428010184 +0300
++++ b/src/wsdlparser/Makefile.am	2021-04-28 11:00:55.995009408 +0300
+@@ -15,5 +15,5 @@
+ 	-version-info $(GENERIC_LIBRARY_VERSION)
+ 
+ # Header files to be exported
+-pkginclude_HEADERS = $(schema_h_sources)
++pkginclude_HEADERS = $(schema_h_sources) $(wsdl_cc_sources)
+ pkgincludedir= $(includedir)/wsdlpull/wsdlparser
diff --git a/net-misc/wsdlpull/metadata.xml b/net-misc/wsdlpull/metadata.xml
index 461f335..ae4fa19 100644
--- a/net-misc/wsdlpull/metadata.xml
+++ b/net-misc/wsdlpull/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>admin@pinkbyte.ru</email>
 		<name>Sergey Popov</name>
 	</maintainer>
diff --git a/net-misc/wsdlpull/wsdlpull-1.24.ebuild b/net-misc/wsdlpull/wsdlpull-1.24.ebuild
index 6ec08c6..acb3e65 100644
--- a/net-misc/wsdlpull/wsdlpull-1.24.ebuild
+++ b/net-misc/wsdlpull/wsdlpull-1.24.ebuild
@@ -1,12 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
 
-EAPI=5
+EAPI=7
 
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-inherit autotools-utils eutils
+inherit autotools
 
 DESCRIPTION="C++ web services client library and utilities"
 HOMEPAGE="http://wsdlpull.sourceforge.net"
@@ -25,15 +22,24 @@ DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-buildsystem.patch"
-
-	sed -i -e '/^pkgincludedir=/s/xml/xmlpull/' src/xmlpull/Makefile.am || die
-	sed -i -e '/^pkginclude_HEADERS/s/$(schema_h_sources)/$(schema_h_sources) $(wsdl_cc_sources)/' src/wsdlparser/Makefile.am || die
+	eapply "${FILESDIR}/${P}-buildsystem.patch"
 
 	if ! use doc; then
 		sed -i -e '/SUBDIRS/s/docs //' Makefile.am || die
 	fi
 
+	mv configure.in configure.ac || die
 	rm -r config || die
-	autotools-utils_src_prepare
+
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
 }