gentoo resync : 28.04.2021

5 files changed, 4 insertions, 171 deletions

diff --git a/dev-libs/quazip/Manifest b/dev-libs/quazip/Manifest
index b0d8d3037ecd..ece077553afa 100644
--- a/dev-libs/quazip/Manifest
+++ b/dev-libs/quazip/Manifest
@@ -1,8 +1,4 @@
-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-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-r1.ebuild 950 BLAKE2B 3dec02c01fb48908d0e3cd6d88c89c10845087387b3f3a6d2b4733ae3d5937758a5a6cecbcf17fb9e69522426f9d90d3eb041e76731f78ad3cc872c4d3cf7bf4 SHA512 8abd1d854f14803cd4952bbc63f09b6058b4be30949dce8df03f7dd7e1e9b8cff39355cf662d170dec76a8293319a649ebf02330f60a8fc6e4ffdcd7a109f4ca
+EBUILD quazip-1.1-r1.ebuild 934 BLAKE2B 3bf86d7872c881b8bce8b141e6f6c807e37d396ad54f103e240bb167d22e48ba62124700bcc2438e9ddcf242cc52e9490a839a77cec69f866ed987ced5d476af SHA512 5373be3092940b55575cca3f28645ee8726cc066a71a546964d50e5d9945ddb28f6674eba3ca636178c70b50cf5f3a3ebccc70c309e2553bc961ad8f88b35c32
 MISC metadata.xml 347 BLAKE2B 1e86912a83f631c37ead72278d84fd3cefbce9971290275d83b4bc610739a3ec8dc87f5e7013719f8c39009ea671b0ba4ecc5da35c9cb4b9ae9222f0a19063f3 SHA512 48c3f44c6414f236058d4e3ee963b24ce5852d5742ab7ab4038b6e56a63250fbb4975064ce1f57c0a93084aa836e2c465da57170d55d7208b8032031eac19638
diff --git a/dev-libs/quazip/files/quazip-0.9.1-gnuinstalldirs.patch b/dev-libs/quazip/files/quazip-0.9.1-gnuinstalldirs.patch
deleted file mode 100644
index c8dc5b6e3ad8..000000000000
--- a/dev-libs/quazip/files/quazip-0.9.1-gnuinstalldirs.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From 3b1bf010e6f19908c90fdd51f01797dedb62fd53 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Thu, 9 Jul 2020 23:08:22 +0200
-Subject: [PATCH] Use GNUInstallDirs, fix pkgconfig libdir/includedir
-
-Dropping LIB_SUFFIX.
----
- CMakeLists.txt        | 16 ++++++++--------
- quazip.pc.cmakein     |  6 +++---
- quazip/CMakeLists.txt |  4 ++--
- 3 files changed, 13 insertions(+), 13 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ed96b33..c3cce42 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,4 +1,4 @@
--cmake_minimum_required(VERSION 2.6)
-+cmake_minimum_required(VERSION 2.8.5)
- project(QuaZip)
- 
- # CMP0042: Explicitly acknowledge MACOSX_RPATH
-@@ -11,6 +11,8 @@ set(QUAZIP_LIB_SOVERSION 1)
- 
- option(BUILD_WITH_QT4 "Build QuaZip with Qt4 no matter if Qt5 was found" OFF)
- 
-+include(GNUInstallDirs)
-+
- if(NOT BUILD_WITH_QT4)
-     # try Qt5 first, and prefer that if found
-     find_package(Qt5Core QUIET)
-@@ -48,18 +50,16 @@ find_package(ZLIB REQUIRED)
- # All build libraries are moved to this directory
- set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR})
- 
--set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)")
--set(LIB_DESTINATION "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE STRING "Library directory name" FORCE)
--set(INSTALL_PKGCONFIG_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig" CACHE STRING "Installation directory for pkgconfig (.pc) files" FORCE)
- set(QUAZIP_LIB_TARGET_NAME quazip${QUAZIP_LIB_VERSION_SUFFIX} CACHE
-     INTERNAL "Target name of libquazip" FORCE)
- 
- add_subdirectory(quazip)
- 
- if(UNIX AND NOT APPLE)
--	configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/quazip.pc.cmakein
--			${CMAKE_CURRENT_BINARY_DIR}/quazip.pc @ONLY)
--	install(FILES ${CMAKE_CURRENT_BINARY_DIR}/quazip.pc DESTINATION "${INSTALL_PKGCONFIG_DIR}")
-+	configure_file(quazip.pc.cmakein quazip.pc @ONLY)
-+	install(FILES ${CMAKE_CURRENT_BINARY_DIR}/quazip.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
- endif()
- 
--install(FILES QuaZipConfig.cmake DESTINATION ${LIB_DESTINATION}/cmake/QuaZip${QUAZIP_LIB_VERSION_SUFFIX} RENAME QuaZip${QUAZIP_LIB_VERSION_SUFFIX}Config.cmake)
-+install(FILES QuaZipConfig.cmake
-+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/QuaZip${QUAZIP_LIB_VERSION_SUFFIX}
-+        RENAME QuaZip${QUAZIP_LIB_VERSION_SUFFIX}Config.cmake)
-diff --git a/quazip.pc.cmakein b/quazip.pc.cmakein
-index e46d4c6..50d280e 100644
---- a/quazip.pc.cmakein
-+++ b/quazip.pc.cmakein
-@@ -1,12 +1,12 @@
- prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=${prefix}
--libdir=${prefix}/lib@LIB_SUFFIX@
--includedir=${prefix}/include
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@/quazip@QUAZIP_LIB_VERSION_SUFFIX@
- 
- 
- Name: Quazip
- Description: Quazip Library
- Version: @QUAZIP_LIB_VERSION@
- Libs: -lquazip@QUAZIP_LIB_VERSION_SUFFIX@
--Cflags:
-+Cflags: -I${includedir}
- Requires: Qt5Core
-diff --git a/quazip/CMakeLists.txt b/quazip/CMakeLists.txt
-index 84607f6..74e02fe 100644
---- a/quazip/CMakeLists.txt
-+++ b/quazip/CMakeLists.txt
-@@ -18,5 +18,5 @@ set_target_properties(${QUAZIP_LIB_TARGET_NAME} PROPERTIES VERSION ${QUAZIP_LIB_
- # Link against ZLIB_LIBRARIES if needed (on Windows this variable is empty)
- target_link_libraries(${QUAZIP_LIB_TARGET_NAME} ${QT_QTMAIN_LIBRARY} ${QTCORE_LIBRARIES} ${ZLIB_LIBRARIES})
- 
--install(FILES ${PUBLIC_HEADERS} DESTINATION include/quazip${QUAZIP_LIB_VERSION_SUFFIX})
--install(TARGETS ${QUAZIP_LIB_TARGET_NAME} LIBRARY DESTINATION ${LIB_DESTINATION} ARCHIVE DESTINATION ${LIB_DESTINATION} RUNTIME DESTINATION ${LIB_DESTINATION})
-+install(FILES ${PUBLIC_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/quazip${QUAZIP_LIB_VERSION_SUFFIX})
-+install(TARGETS ${QUAZIP_LIB_TARGET_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR})
--- 
-2.27.0
-
diff --git a/dev-libs/quazip/files/quazip-0.9.1-no-static-lib.patch b/dev-libs/quazip/files/quazip-0.9.1-no-static-lib.patch
deleted file mode 100644
index f0ce3e6e392f..000000000000
--- a/dev-libs/quazip/files/quazip-0.9.1-no-static-lib.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From c061634452fe259dc5eb62395fbdb9159d4c9e09 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Thu, 9 Jul 2020 22:54:59 +0200
-Subject: [PATCH] Disable static lib
-
----
- quazip/CMakeLists.txt | 13 ++-----------
- 1 file changed, 2 insertions(+), 11 deletions(-)
-
-diff --git a/quazip/CMakeLists.txt b/quazip/CMakeLists.txt
-index 1efb5e2..84607f6 100644
---- a/quazip/CMakeLists.txt
-+++ b/quazip/CMakeLists.txt
-@@ -11,21 +11,12 @@ qt_wrap_cpp(MOC_SRCS ${PUBLIC_HEADERS})
- set(SRCS ${SRCS} ${MOC_SRCS})
- 
- add_library(${QUAZIP_LIB_TARGET_NAME} SHARED ${SRCS})
--add_library(quazip_static STATIC ${SRCS})
-- 
--# Windows uses .lib extension for both static and shared library
--# *nix systems use different extensions for SHARED and STATIC library and by convention both libraries have the same name
--if (NOT WIN32)
--	set_target_properties(quazip_static PROPERTIES OUTPUT_NAME quazip${QUAZIP_LIB_VERSION_SUFFIX})
--endif ()
- 
- target_include_directories(${QUAZIP_LIB_TARGET_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${ZLIB_INCLUDE_DIRS})
--target_include_directories(quazip_static PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${ZLIB_INCLUDE_DIRS})
--set_target_properties(${QUAZIP_LIB_TARGET_NAME} quazip_static PROPERTIES VERSION ${QUAZIP_LIB_VERSION} SOVERSION ${QUAZIP_LIB_SOVERSION} DEBUG_POSTFIX d)
-+set_target_properties(${QUAZIP_LIB_TARGET_NAME} PROPERTIES VERSION ${QUAZIP_LIB_VERSION} SOVERSION ${QUAZIP_LIB_SOVERSION} DEBUG_POSTFIX d)
- 
- # Link against ZLIB_LIBRARIES if needed (on Windows this variable is empty)
- target_link_libraries(${QUAZIP_LIB_TARGET_NAME} ${QT_QTMAIN_LIBRARY} ${QTCORE_LIBRARIES} ${ZLIB_LIBRARIES})
--target_link_libraries(quazip_static ${QT_QTMAIN_LIBRARY} ${QTCORE_LIBRARIES} ${ZLIB_LIBRARIES})
- 
- install(FILES ${PUBLIC_HEADERS} DESTINATION include/quazip${QUAZIP_LIB_VERSION_SUFFIX})
--install(TARGETS ${QUAZIP_LIB_TARGET_NAME} quazip_static LIBRARY DESTINATION ${LIB_DESTINATION} ARCHIVE DESTINATION ${LIB_DESTINATION} RUNTIME DESTINATION ${LIB_DESTINATION})
-+install(TARGETS ${QUAZIP_LIB_TARGET_NAME} LIBRARY DESTINATION ${LIB_DESTINATION} ARCHIVE DESTINATION ${LIB_DESTINATION} RUNTIME DESTINATION ${LIB_DESTINATION})
--- 
-2.27.0
-
diff --git a/dev-libs/quazip/quazip-0.9.1.ebuild b/dev-libs/quazip/quazip-0.9.1.ebuild
deleted file mode 100644
index e1cde21e0b7f..000000000000
--- a/dev-libs/quazip/quazip-0.9.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic qmake-utils
-
-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="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtnetwork:5
-	sys-libs/zlib[minizip]
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-no-static-lib.patch"
-	"${FILESDIR}/${P}-gnuinstalldirs.patch"
-)
-
-src_install() {
-	cmake_src_install
-
-	# compatibility with not yet fixed rdeps (Gentoo bug #598136)
-	dosym libquazip5.so /usr/$(get_libdir)/libquazip.so
-}
diff --git a/dev-libs/quazip/quazip-1.1-r1.ebuild b/dev-libs/quazip/quazip-1.1-r1.ebuild
index 6a18b5ce23ed..069d025af9ad 100644
--- a/dev-libs/quazip/quazip-1.1-r1.ebuild
+++ b/dev-libs/quazip/quazip-1.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake flag-o-matic
+inherit cmake
 
 DESCRIPTION="Simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package"
 HOMEPAGE="https://stachenov.github.io/quazip/"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/stachenov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
@@ -37,6 +37,7 @@ src_configure() {
 		-DQUAZIP_QT_MAJOR_VERSION=5
 		-DBUILD_TESTING=$(usex test)
 	)
+
 	cmake_src_configure
 }