gentoo resync : 03.03.2021

4 files changed, 101 insertions, 62 deletions

diff --git a/dev-libs/quazip/Manifest b/dev-libs/quazip/Manifest
index 323339e2506c..b0d8d3037ecd 100644
--- a/dev-libs/quazip/Manifest
+++ b/dev-libs/quazip/Manifest
@@ -1,8 +1,8 @@
 AUX quazip-0.9.1-gnuinstalldirs.patch 3853 BLAKE2B cf20bde0e7231a64756d1a05b09f7683c4b4b3e8ff0699b8bfb284cd37b05574244f7d4ec18b6b8df0eae1550fc10f6d99891e8241dfaddeac18080ce8ea11a6 SHA512 b84fdf3d79d47bb18fdafc7652df6f8f705a8bfc63628eb748ee0c94e7ad955074cfdf03c6321d58cd3ef0f04238958cfe24264e785b38f583085cf49042b321
 AUX quazip-0.9.1-no-static-lib.patch 2228 BLAKE2B 7cee7fefbca5696d3862ec475ef34bbd7ae3fca2b3463933b9750081090d0608e1eac095bba53a33a40458fbea6487fb6bde06d652a8417325b2adeb6bed6d76 SHA512 cf9c09b016c3a37158eeb840ef58e1cf65fbc7f98d083489e3dc47b09f22221822c0546341e7410a77428f07ff8d98c168d8ee09d07b8b37c47df6790beeb119
-AUX quazip-1.1-conditional-tests.patch 1816 BLAKE2B b7500d3300e4934fbba0256b992f7455e2d1fcb3f5e01ac26980319e41005bba814bad89f8df28cd15ae52376316fd4a73467d77b8000523918ddac3ffac0a25 SHA512 9989f879afa32d1f13dc6b49b607dac142d18dfa96727d7d621d29161fac49698ab5c2e99adfb87da2719f5f66aedad8187c00563b51decc54f55a7f5c899f57
+AUX quazip-1.1-cmake.patch 3279 BLAKE2B 5b596da742e87c00c742881a8585d4f48955d99dfd868451ad2eacde64b7f035dfcf38efeb21335ee8c2e68a6aa0606a7d18e2a23198efc5e1d3f3068a93261d SHA512 5c28adf3e6ae96c3be89dab18092be2089e2b622a9c88e9423abdd505db306680c97abc861d4b90829efeca6b3a85907ad927512e95da575eaec39bd231a8b5a
 DIST quazip-0.9.1.tar.gz 155775 BLAKE2B 76710f94d055e86e1885f74b85f3e6b25f053eedbb73b4b11163e243d003ea3bad50cf1568fd2dbd37bc5db05fd0a6f8d49f48bd5df22d30b1aad3747e8ab780 SHA512 db31f3c7e3d7e95c25090ceb8379643e0b49ed69ece009dd015bee120b2b60f42e73408f580caed3138fa19ca64dcd23a05f16435abb54e2b8df21105c7b42c0
 DIST quazip-1.1.tar.gz 153870 BLAKE2B c784d21d7c9623472fabf9bbf68c9d191dd0765f6b7114f0ea0b2597bbb31a9957feaea4d0325f98116d71acc4a7057f5c28ce5b84c6317cd25fdade30a279da SHA512 418516759e993c2e5636422c6a14e2caf95f836698b91d2188df5ef9b97879ee326255273793fc802325e14f378cbe2baad7e6ec2e1732e19bf238f70891f22c
 EBUILD quazip-0.9.1.ebuild 831 BLAKE2B 7c9fae6be60bbca4abccfaa1f9fe33ae87071e576365ecf9f2197f0cba6d4fa3a134004d93f07cb16ef6a1136d7b39ec61c1c12aaa5e56bcf6f0871a18a9f3e9 SHA512 c2e3152d2f13f9bad676af409ec288ab49771d54f17fd6891effbc025d1cb5aab1c524647817d97bfce1ec766a73813553759669dcc19d5c624722011677b276
-EBUILD quazip-1.1.ebuild 1227 BLAKE2B 15516f8b848b80e73426d3334f1e5a25cb662fee58827aec6614e7273b51a5c6cea4546c60cee7c55776958963cdf419a0881d9e90ef0673f7bc751ebc156b47 SHA512 ae431d45a562a7c43d955d90116bcb41e2ed30293efe8fc7eb98979f6e1c12e6aa5a8ecc24a25082805b6e73bc158f035e6d908ca53195dd865bf953b599cb4d
+EBUILD quazip-1.1-r1.ebuild 950 BLAKE2B 3dec02c01fb48908d0e3cd6d88c89c10845087387b3f3a6d2b4733ae3d5937758a5a6cecbcf17fb9e69522426f9d90d3eb041e76731f78ad3cc872c4d3cf7bf4 SHA512 8abd1d854f14803cd4952bbc63f09b6058b4be30949dce8df03f7dd7e1e9b8cff39355cf662d170dec76a8293319a649ebf02330f60a8fc6e4ffdcd7a109f4ca
 MISC metadata.xml 347 BLAKE2B 1e86912a83f631c37ead72278d84fd3cefbce9971290275d83b4bc610739a3ec8dc87f5e7013719f8c39009ea671b0ba4ecc5da35c9cb4b9ae9222f0a19063f3 SHA512 48c3f44c6414f236058d4e3ee963b24ce5852d5742ab7ab4038b6e56a63250fbb4975064ce1f57c0a93084aa836e2c465da57170d55d7208b8032031eac19638
diff --git a/dev-libs/quazip/files/quazip-1.1-cmake.patch b/dev-libs/quazip/files/quazip-1.1-cmake.patch
new file mode 100644
index 000000000000..1355f6c13d39
--- /dev/null
+++ b/dev-libs/quazip/files/quazip-1.1-cmake.patch
@@ -0,0 +1,84 @@
+From cb46ae4bc4c9684010b433eec3a35fc4fa1ebc5d Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sat, 20 Feb 2021 22:53:46 +0100
+Subject: [PATCH] Use CTest module provided BUILD_TESTING (default: ON)
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 38 +++++++++++++++++---------------------
+ 1 file changed, 17 insertions(+), 21 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c314fe1..bac3699 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -16,7 +16,7 @@ if(NOT CMAKE_BUILD_TYPE)
+ 	set(CMAKE_BUILD_TYPE RELEASE)
+ endif()
+ 
+-enable_testing()
++include(CTest)
+ set(CMAKE_AUTOMOC ON)
+ set(CMAKE_INCLUDE_CURRENT_DIR ON)
+ set(CMAKE_DEBUG_POSTFIX d)
+@@ -27,33 +27,29 @@ set(QUAZIP_LIB_FILE_NAME quazip${QuaZip_VERSION_MAJOR}-qt${QUAZIP_QT_MAJOR_VERSI
+ set(QUAZIP_LIB_TARGET_NAME QuaZip)
+ set(QUAZIP_DIR_NAME QuaZip-Qt${QUAZIP_QT_MAJOR_VERSION}-${QUAZIP_LIB_VERSION})
+ set(QUAZIP_PACKAGE_NAME QuaZip-Qt${QUAZIP_QT_MAJOR_VERSION})
+-set(QUAZIP_ENABLE_TESTS OFF)
+ if(QUAZIP_QT_MAJOR_VERSION EQUAL 6)
+-	find_package(Qt6 REQUIRED COMPONENTS Core Core5Compat
+-                         OPTIONAL_COMPONENTS Network Test)
++    find_package(Qt6 REQUIRED COMPONENTS Core Core5Compat)
+ 	set(QUAZIP_LIB_QT_LIBRARIES Qt6::Core Qt6::Core5Compat)
+-	set(QUAZIP_TEST_QT_LIBRARIES Qt6::Core Qt6::Core5Compat Qt6::Network Qt6::Test)
+ 	set(QUAZIP_PKGCONFIG_REQUIRES Qt6Core)
+-	if (Qt6Network_FOUND AND Qt6Test_FOUND)
+-                set(QUAZIP_ENABLE_TESTS ON)
+-        endif()
++    if (BUILD_TESTING)
++        find_package(Qt6 REQUIRED COMPONENTS Network Test)
++        set(QUAZIP_TEST_QT_LIBRARIES Qt6::Core Qt6::Core5Compat Qt6::Network Qt6::Test)
++    endif()
+ elseif(QUAZIP_QT_MAJOR_VERSION EQUAL 5)
+-	find_package(Qt5 REQUIRED COMPONENTS Core
+-                         OPTIONAL_COMPONENTS Network Test)
++    find_package(Qt5 REQUIRED COMPONENTS Core)
+ 	set(QUAZIP_LIB_QT_LIBRARIES Qt5::Core)
+-	set(QUAZIP_TEST_QT_LIBRARIES Qt5::Core Qt5::Network Qt5::Test)
+ 	set(QUAZIP_PKGCONFIG_REQUIRES Qt5Core)
+-        if (Qt5Network_FOUND AND Qt5Test_FOUND)
+-                set(QUAZIP_ENABLE_TESTS ON)
+-        endif()
++    if (BUILD_TESTING)
++        find_package(Qt5 REQUIRED COMPONENTS Network Test)
++        set(QUAZIP_TEST_QT_LIBRARIES Qt5::Core Qt5::Network Qt5::Test)
++    endif()
+ elseif(QUAZIP_QT_MAJOR_VERSION EQUAL 4)
+-	find_package(Qt4 4.5.0 REQUIRED COMPONENTS QtCore
+-                           OPTIONAL_COMPONENTS QtNetwork QtTest)
++    find_package(Qt4 4.5.0 REQUIRED COMPONENTS QtCore)
+ 	set(QUAZIP_LIB_QT_LIBRARIES Qt4::QtCore)
+-	set(QUAZIP_TEST_QT_LIBRARIES Qt4::QtCore Qt4::QtNetwork Qt4::QtTest)
+ 	set(QUAZIP_PKGCONFIG_REQUIRES QtCore)
+-    if (QT_QTNETWORK_FOUND AND QT_QTTEST_FOUND)
+-            set(QUAZIP_ENABLE_TESTS ON)
++    if (BUILD_TESTING)
++        find_package(Qt4 REQUIRED COMPONENTS Network Test)
++        set(QUAZIP_TEST_QT_LIBRARIES Qt4::QtCore Qt4::QtNetwork Qt4::QtTest)
+     endif()
+ else()
+ 	message(FATAL_ERROR "Qt version ${QUAZIP_QT_MAJOR_VERSION} is not supported")
+@@ -69,7 +65,7 @@ endif()
+ 
+ add_subdirectory(quazip)
+ 
+-if(QUAZIP_ENABLE_TESTS)
+-        add_subdirectory(qztest EXCLUDE_FROM_ALL)
++if(BUILD_TESTING)
++    add_subdirectory(qztest EXCLUDE_FROM_ALL)
+ endif()
+ 
+-- 
+2.30.1
+
diff --git a/dev-libs/quazip/files/quazip-1.1-conditional-tests.patch b/dev-libs/quazip/files/quazip-1.1-conditional-tests.patch
deleted file mode 100644
index 68520a4b3b9d..000000000000
--- a/dev-libs/quazip/files/quazip-1.1-conditional-tests.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 14230a6..22c1421 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -26,34 +26,25 @@ set(QUAZIP_LIB_FILE_NAME quazip${QuaZip_VERSION_MAJOR}-qt${QUAZIP_QT_MAJOR_VERSI
- set(QUAZIP_LIB_TARGET_NAME QuaZip)
- set(QUAZIP_DIR_NAME QuaZip-Qt${QUAZIP_QT_MAJOR_VERSION}-${QUAZIP_LIB_VERSION})
- set(QUAZIP_PACKAGE_NAME QuaZip-Qt${QUAZIP_QT_MAJOR_VERSION})
--set(QUAZIP_ENABLE_TESTS OFF)
-+option(QUAZIP_ENABLE_TESTS "" OFF)
- if(QUAZIP_QT_MAJOR_VERSION EQUAL 6)
- 	find_package(Qt6 REQUIRED COMPONENTS Core Core5Compat
-                          OPTIONAL_COMPONENTS Network Test)
- 	set(QUAZIP_LIB_QT_LIBRARIES Qt6::Core Qt6::Core5Compat)
- 	set(QUAZIP_TEST_QT_LIBRARIES Qt6::Core Qt6::Core5Compat Qt6::Network Qt6::Test)
- 	set(QUAZIP_PKGCONFIG_REQUIRES Qt6Core)
--	if (Qt6Network_FOUND AND Qt6Test_FOUND)
--                set(QUAZIP_ENABLE_TESTS ON)
--        endif()
- elseif(QUAZIP_QT_MAJOR_VERSION EQUAL 5)
- 	find_package(Qt5 REQUIRED COMPONENTS Core
-                          OPTIONAL_COMPONENTS Network Test)
- 	set(QUAZIP_LIB_QT_LIBRARIES Qt5::Core)
- 	set(QUAZIP_TEST_QT_LIBRARIES Qt5::Core Qt5::Network Qt5::Test)
- 	set(QUAZIP_PKGCONFIG_REQUIRES Qt5Core)
--        if (Qt5Network_FOUND AND Qt5Test_FOUND)
--                set(QUAZIP_ENABLE_TESTS ON)
--        endif()
- elseif(QUAZIP_QT_MAJOR_VERSION EQUAL 4)
- 	find_package(Qt4 4.5.0 REQUIRED COMPONENTS QtCore
-                            OPTIONAL_COMPONENTS QtNetwork QtTest)
- 	set(QUAZIP_LIB_QT_LIBRARIES Qt4::QtCore)
- 	set(QUAZIP_TEST_QT_LIBRARIES Qt4::QtCore Qt4::QtNetwork Qt4::QtTest)
- 	set(QUAZIP_PKGCONFIG_REQUIRES QtCore)
--    if (QT_QTNETWORK_FOUND AND QT_QTTEST_FOUND)
--            set(QUAZIP_ENABLE_TESTS ON)
--    endif()
- else()
- 	message(FATAL_ERROR "Qt version ${QUAZIP_QT_MAJOR_VERSION} is not supported")
- endif()
diff --git a/dev-libs/quazip/quazip-1.1.ebuild b/dev-libs/quazip/quazip-1.1-r1.ebuild
index 491c9969ee34..6a18b5ce23ed 100644
--- a/dev-libs/quazip/quazip-1.1.ebuild
+++ b/dev-libs/quazip/quazip-1.1-r1.ebuild
@@ -5,48 +5,43 @@ EAPI=7
 
 inherit cmake flag-o-matic
 
-# Note: Please check if upstream want 2.x and so on to be slotted when released.
-if ver_test ${PV} -ge 2.0 ; then
-	# Sanity check to avoid naive copy-bumps
-	# Upstream expect parallel installation of 0.x/1.x/2.x/...
-	# https://github.com/stachenov/quazip/blob/master/QuaZip-1.x-migration.md
-	die "Upstream want 0.x, 1.x, 2.x, ... to be slotted"
-fi
-
 DESCRIPTION="Simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package"
 HOMEPAGE="https://stachenov.github.io/quazip/"
 SRC_URI="https://github.com/stachenov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="1"
+SLOT="0/1"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
+
 RESTRICT="!test? ( test )"
 
-RDEPEND="
+COMMON_DEPEND="
 	dev-qt/qtcore:5
-	dev-qt/qtnetwork:5
 	sys-libs/zlib[minizip]
 "
-DEPEND="
-	${RDEPEND}
-	test? ( dev-qt/qttest:5 )
+DEPEND="${COMMON_DEPEND}
+	test? (
+		dev-qt/qtnetwork:5
+		dev-qt/qttest:5
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	!=dev-libs/quazip-1.1-r0:1
 "
 
-PATCHES=(
-	"${FILESDIR}/${PN}-1.1-conditional-tests.patch"
-)
+PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
 
 src_configure() {
 	local mycmakeargs=(
-		-DQUAZIP_ENABLE_TESTS=$(usex test)
+		-DQUAZIP_QT_MAJOR_VERSION=5
+		-DBUILD_TESTING=$(usex test)
 	)
-
 	cmake_src_configure
 }
 
 src_compile() {
 	cmake_src_compile
 
-	use test && cmake_src_compile qztest
+	use test && cmake_build qztest
 }