gentoo auto-resync : 15:09:2022 - 23:13:44

4 files changed, 2 insertions, 99 deletions

diff --git a/net-libs/kdsoap/Manifest b/net-libs/kdsoap/Manifest
index b2d358786362..b0b573b1cff7 100644
--- a/net-libs/kdsoap/Manifest
+++ b/net-libs/kdsoap/Manifest
@@ -1,7 +1,5 @@
-AUX kdsoap-2.1.0-cmake.patch 1560 BLAKE2B c7f2d8bd3717e7c324a09a11a2840a427ec0e294962c12dd1b6a4a6b1693dbd92d7ee2da0471edfbc631d0ba3f6b1e787e567ed946ee517ad67bc1c7efc6a1f6 SHA512 187b329b18f147b66c4b7c5fe805ed3c45ed85509e0cdf3196a18afe1f5aa925ffee52ccad4c98a1832e53c72b709e5bf761da2f9eb17b3673f2c931005f56e4
-AUX kdsoap-2.1.0-fix-cppcheck-warnings.patch 2299 BLAKE2B f37369ad0f225b2f2fb7205dd590b847f3186cca6cd93e141ca1396567a894cdf4570114b46fe38e7227d8e420de569acbbdebf2ecea33ab010e64b27c687911 SHA512 741ecd8180666e8e02094e753082873d20c11d590844b2469f01f19046754cb219d9bcebca4117d3814e279ed9e1e95d726f200704ead9ca587a866dd99c8b46
 DIST kdsoap-2.0.0.tar.gz 2916527 BLAKE2B 7b9cf71b181b88180fb00cb2f0c2b84b5fd7d997531aa68957a84811959befd9c8909c8892d3b60d47a654916fa5b8841fa7b389a006a8ca6a2cdce98a433cfb SHA512 50305866595048e0ec6cd6dabba9e63a948f1e1263e7f03e9e3bc56f09a843bade944df95b5ff57d4fc3a62896e72f02b0d7b3d5cc2be2823da67001ca459428
-DIST kdsoap-2.1.0.tar.gz 948070 BLAKE2B 69f13fb394c0b6a568d5ee63f26d3384e1276a63084116ebd96b8a1b4b87ef70155aba9a3e84c9c5f7016166d6e1cfffcb98c96400fccac6c7d339f6f73fb41d SHA512 db4c0ba25ccef3c5dc90662fbfa14ee4cdc2e8079f132efebf71a10d9a26460070bf71d22cce478520ead0425488b79f52ea6a1ee651473e989d59dfd5053972
+DIST kdsoap-2.1.1.tar.gz 948277 BLAKE2B 6daec26426bb6becc78400877ad221b929f0c30e45755644258eca864617d20b9d1269d8a964d38d40e9f5eb93ae213a95e05deb0a34dd3817261096178815a2 SHA512 12224f664dcae7ceb7395a7c3de48a208ae81c10f6fba4d0db233613472c6b9cdbea6375297c27b58fe7338d7db27a4447844f4e8f40a24ec1b4dd3fa38d20bb
 EBUILD kdsoap-2.0.0.ebuild 965 BLAKE2B 711da17f4859234a1f552d62b8bab9f37f9701d53ecdd1454789ee985b7578d63a93493b809e6aabd250d326a9ec4d91512f3016add0067263767481dfbb53eb SHA512 9c6e12a4c38b12b4b21ab1fa8e11111b04db322296782100904d2d0352cae847d732b761a1afeb8edca7b9fdd3d520f215a055e48be0c3328742dcf2fbe6eb53
-EBUILD kdsoap-2.1.0.ebuild 1061 BLAKE2B a25926022b283c3a801572ee6264f4118bf0abd91d86c147c41ae39879d15559a330c6a6f6c4d3eb9cfc45683f3172863ce084225567b9a391dae88cc3b2d1c0 SHA512 485d7f1500e68fba8b264b5ebab9494e2fb4314524b510278aa65f494656e470a17c9f38e9fd9f37e374bc0069ad824dc9cdea37e9d0a1d25879f6e8bb62e6f3
+EBUILD kdsoap-2.1.1.ebuild 968 BLAKE2B 8e4f2eb74d0e62c96ddc728ee735e21597ce58690798581cca2784000bee5f714ba2b8c5cf6d35792dd3f8362466608cd8f022ea63bfc47aea928784741dbba6 SHA512 ae9f7f40ab5794d00bd98e6fbc3f9626d6740f78e0f386e6d2cdce1b4c5724c6b043d117a3dba5ae870e5839fc66a00ae79e530f507bc7114e477e35edb70238
 MISC metadata.xml 250 BLAKE2B f3e9395137ebb9adf46cd35c1b6156f82c04cfa94f964f6da24fe71eb560cf51b4f70ebfa10daaa4884400ec22782d819ab794dfd29e7a47559f07208397195d SHA512 78c4ff15eed76ba883b457be95dabd41e928a0e64a42b758b5eab4d8a95afca27d5ea6a7cfe0948de578b169153a05f08aadfce1ddd41a88732212a1e76e565f
diff --git a/net-libs/kdsoap/files/kdsoap-2.1.0-cmake.patch b/net-libs/kdsoap/files/kdsoap-2.1.0-cmake.patch
deleted file mode 100644
index f70e0bf062ce..000000000000
--- a/net-libs/kdsoap/files/kdsoap-2.1.0-cmake.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 0c7374b25464d2dca3728a9c1a59f577b978e211 Mon Sep 17 00:00:00 2001
-From: Allen Winter <allen.winter@kdab.com>
-Date: Mon, 12 Sep 2022 17:06:03 -0400
-Subject: [PATCH] KDSoapClient,KDSoapServer]/CMakeLists.txt - fix
- INSTALL_INTERFACES
-
-should not have the extra hierarchy for the library
----
- src/KDSoapClient/CMakeLists.txt | 2 +-
- src/KDSoapServer/CMakeLists.txt | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/KDSoapClient/CMakeLists.txt b/src/KDSoapClient/CMakeLists.txt
-index 563cb6df..44dc17cd 100644
---- a/src/KDSoapClient/CMakeLists.txt
-+++ b/src/KDSoapClient/CMakeLists.txt
-@@ -44,7 +44,7 @@ target_link_libraries(
- )
- target_include_directories(
-     kdsoap
--    INTERFACE "$<INSTALL_INTERFACE:${INSTALL_INCLUDE_DIR}/KDSoapClient${${PROJECT_NAME}_LIBRARY_QTID}>"
-+    INTERFACE "$<INSTALL_INTERFACE:${INSTALL_INCLUDE_DIR}>"
- )
- set_target_properties(kdsoap PROPERTIES SOVERSION ${${PROJECT_NAME}_SOVERSION} VERSION ${${PROJECT_NAME}_VERSION})
- 
-diff --git a/src/KDSoapServer/CMakeLists.txt b/src/KDSoapServer/CMakeLists.txt
-index 2c9ff893..a111dacb 100644
---- a/src/KDSoapServer/CMakeLists.txt
-+++ b/src/KDSoapServer/CMakeLists.txt
-@@ -39,7 +39,7 @@ target_link_libraries(
- )
- target_include_directories(
-     kdsoap-server
--    INTERFACE "$<INSTALL_INTERFACE:${INSTALL_INCLUDE_DIR}/KDSoapServer${${PROJECT_NAME}_LIBRARY_QTID}>"
-+    INTERFACE "$<INSTALL_INTERFACE:${INSTALL_INCLUDE_DIR}>"
- )
- set_target_properties(
-     kdsoap-server PROPERTIES SOVERSION ${${PROJECT_NAME}_SOVERSION} VERSION ${${PROJECT_NAME}_VERSION}
diff --git a/net-libs/kdsoap/files/kdsoap-2.1.0-fix-cppcheck-warnings.patch b/net-libs/kdsoap/files/kdsoap-2.1.0-fix-cppcheck-warnings.patch
deleted file mode 100644
index f0d56869729e..000000000000
--- a/net-libs/kdsoap/files/kdsoap-2.1.0-fix-cppcheck-warnings.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From e9df81fa01188371d2f62f29ebf0d08eb6e50ef2 Mon Sep 17 00:00:00 2001
-From: David Faure <david.faure@kdab.com>
-Date: Tue, 13 Sep 2022 09:50:52 +0200
-Subject: [PATCH] Fix cppcheck warnings
-
----
- src/KDSoapClient/KDSoapClientInterface.h       | 3 +++
- src/KDSoapServer/KDSoapServerObjectInterface.h | 3 +++
- unittests/serverlib/test_serverlib.cpp         | 2 +-
- 3 files changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/src/KDSoapClient/KDSoapClientInterface.h b/src/KDSoapClient/KDSoapClientInterface.h
-index e89d44f7..9c5450f0 100644
---- a/src/KDSoapClient/KDSoapClientInterface.h
-+++ b/src/KDSoapClient/KDSoapClientInterface.h
-@@ -79,6 +79,9 @@ class KDSOAP_EXPORT KDSoapClientInterface
-      */
-     ~KDSoapClientInterface();
- 
-+    KDSoapClientInterface(const KDSoapClientInterface &) = delete;
-+    KDSoapClientInterface &operator=(const KDSoapClientInterface &) = delete;
-+
-     /**
-      * Calls the method \p method on this interface and passes the arguments specified in \p message
-      * to the method.
-diff --git a/src/KDSoapServer/KDSoapServerObjectInterface.h b/src/KDSoapServer/KDSoapServerObjectInterface.h
-index 69c69100..0c881b63 100644
---- a/src/KDSoapServer/KDSoapServerObjectInterface.h
-+++ b/src/KDSoapServer/KDSoapServerObjectInterface.h
-@@ -68,6 +68,9 @@ class KDSOAPSERVER_EXPORT KDSoapServerObjectInterface
-      */
-     virtual ~KDSoapServerObjectInterface();
- 
-+    KDSoapServerObjectInterface(const KDSoapServerObjectInterface &) = delete;
-+    KDSoapServerObjectInterface &operator =(const KDSoapServerObjectInterface &) = delete;
-+
-     /**
-      * Handle \p request and return \p response.
-      * The default implementation in this base class is to simply return
-diff --git a/unittests/serverlib/test_serverlib.cpp b/unittests/serverlib/test_serverlib.cpp
-index f4d4818d..eb6af065 100644
---- a/unittests/serverlib/test_serverlib.cpp
-+++ b/unittests/serverlib/test_serverlib.cpp
-@@ -1450,7 +1450,7 @@ public Q_SLOTS:
-         return QString::fromUtf8("David Ä Faure France");
-     }
- 
--    void verifySocketResponse(ClientSocket &socket, const QByteArray employeeName)
-+    void verifySocketResponse(ClientSocket &socket, const QByteArray &employeeName)
-     {
-         QVERIFY(socket.waitForReadyRead());
-         const QByteArray response = socket.readAll();
diff --git a/net-libs/kdsoap/kdsoap-2.1.0.ebuild b/net-libs/kdsoap/kdsoap-2.1.1.ebuild
index 977a947a3156..c988db03bf07 100644
--- a/net-libs/kdsoap/kdsoap-2.1.0.ebuild
+++ b/net-libs/kdsoap/kdsoap-2.1.1.ebuild
@@ -29,11 +29,6 @@ DEPEND="${RDEPEND}
 	dev-libs/boost
 "
 
-PATCHES=(
-	"${FILESDIR}"/${P}-cmake.patch
-	"${FILESDIR}"/${P}-fix-cppcheck-warnings.patch
-)
-
 src_prepare() {
 	cmake_src_prepare
 	sed -e "/install.*INSTALL_DOC_DIR/d" -i CMakeLists.txt || die