diff options
Diffstat (limited to 'dev-libs/quazip')
| -rw-r--r-- | dev-libs/quazip/Manifest | 5 | ||||
| -rw-r--r-- | dev-libs/quazip/files/quazip-1.1-cmake.patch | 84 | ||||
| -rw-r--r-- | dev-libs/quazip/quazip-1.1-r1.ebuild | 48 | ||||
| -rw-r--r-- | dev-libs/quazip/quazip-1.2.ebuild | 4 |
4 files changed, 3 insertions, 138 deletions
diff --git a/dev-libs/quazip/Manifest b/dev-libs/quazip/Manifest index 3e965bda5b1d..a60db2ba28c3 100644 --- a/dev-libs/quazip/Manifest +++ b/dev-libs/quazip/Manifest @@ -1,7 +1,4 @@ -AUX quazip-1.1-cmake.patch 3279 BLAKE2B 5b596da742e87c00c742881a8585d4f48955d99dfd868451ad2eacde64b7f035dfcf38efeb21335ee8c2e68a6aa0606a7d18e2a23198efc5e1d3f3068a93261d SHA512 5c28adf3e6ae96c3be89dab18092be2089e2b622a9c88e9423abdd505db306680c97abc861d4b90829efeca6b3a85907ad927512e95da575eaec39bd231a8b5a AUX quazip-1.2-cmake.patch 2978 BLAKE2B 3125b2b84e9316f3db9afbbfc91b379933dec602e288cbfffbc58cd422ea3f26653075d9bce731671e375127c937c6fcc2ff9cf217884be67057c9ecdd43115d SHA512 033c63a46ec0b1ea82f713dc807faf30c266e4bf385b4e9c0b1e6320c12f7c2093d1388a06e65ea32cfe27374324f00eb08baca9a2648bac8d0801a783b19fa7 -DIST quazip-1.1.tar.gz 153870 BLAKE2B c784d21d7c9623472fabf9bbf68c9d191dd0765f6b7114f0ea0b2597bbb31a9957feaea4d0325f98116d71acc4a7057f5c28ce5b84c6317cd25fdade30a279da SHA512 418516759e993c2e5636422c6a14e2caf95f836698b91d2188df5ef9b97879ee326255273793fc802325e14f378cbe2baad7e6ec2e1732e19bf238f70891f22c DIST quazip-1.2.tar.gz 155878 BLAKE2B cfd5505509863dfdfcc88cf9f50aeff0ee0c1391412dc8aeb34ab020debd8a29279563323a0ca13a8d3b8b026518f5d079b8fa989aca20a9bec083c6dd4e3695 SHA512 3f4b1a4194ca286163b1c17880ea471a341dcc05d758ee8f3d1e540d0f6aed7ac18200450187034c46b4fab1da39111dca534d75859701259406a6dd50205386 -EBUILD quazip-1.1-r1.ebuild 941 BLAKE2B 19855983f1cfcfd549bfbd4e183c570d663492e507ff1daed5821d76c75dc9bf18b55697cb4e555091e8f2e538111d400979d4cc175556269dbd6ff46d1b0ae8 SHA512 d8545a52bd5ec70501514f3fe45808190c393c892b8a8e3abe0810bbd1d091378ef4d397a8239413f075d4f0453a9ef2a9ef57379180ec13808a3172f6f16eb1 -EBUILD quazip-1.2.ebuild 945 BLAKE2B 8a864f56c7b722b9b196b470df69cfcb14eba0dec5f7e8d1713750835442e5767956f0669d182dbe34831120b7c4f0144f78e73a98ceec422511c05d71156419 SHA512 f670036990d26bab46c4440e972a331b6f0b0274d058fd2d4d23a8555e01aa83ce5b4e38ed86f23ff53e37d42a4c812ff26f7a922a29b665f21063ccfc8c639e +EBUILD quazip-1.2.ebuild 941 BLAKE2B fdfbd8cc0cb2a17409081c4de485bd573a1ff3145778c71d57e618dcf860638b8bc85923a624e3ef36b1f865b576c65183ed82229dc0cd378f159372b8c80fb6 SHA512 bde570eb2fd7d7944db9cad35fe888044c26c602ddbf31ce4782161e85620db781b46ba951d499519409a00464fdcb84e63c4e6c1e76818ad886fced3fddf46c MISC metadata.xml 348 BLAKE2B 756252686a3a4888fa4466e59594dc39bd40675d1a9b4b98124ec014d6fdaa14ad5dfd0659712fe5c2e7d338753d7b101fa3183831964764f68e67bb7b950ac7 SHA512 e10894c3e476992491b0692fcce8091450deee9782c7b580e2b956276b000a851844f9a0c408708c9508be607e3744be4f6849162ee362ac818a2e6ad05eb9a7 diff --git a/dev-libs/quazip/files/quazip-1.1-cmake.patch b/dev-libs/quazip/files/quazip-1.1-cmake.patch deleted file mode 100644 index 1355f6c13d39..000000000000 --- a/dev-libs/quazip/files/quazip-1.1-cmake.patch +++ /dev/null @@ -1,84 +0,0 @@ -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/quazip-1.1-r1.ebuild b/dev-libs/quazip/quazip-1.1-r1.ebuild deleted file mode 100644 index 29a58b0ea105..000000000000 --- a/dev-libs/quazip/quazip-1.1-r1.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -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/1" -KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux" -IUSE="test" - -RESTRICT="!test? ( test )" - -COMMON_DEPEND=" - dev-qt/qtcore:5 - sys-libs/zlib[minizip] -" -DEPEND="${COMMON_DEPEND} - test? ( - dev-qt/qtnetwork:5 - dev-qt/qttest:5 - ) -" -RDEPEND="${COMMON_DEPEND} - !=dev-libs/quazip-1.1-r0:1 -" - -PATCHES=( "${FILESDIR}/${P}-cmake.patch" ) - -src_configure() { - local mycmakeargs=( - -DQUAZIP_QT_MAJOR_VERSION=5 - -DBUILD_TESTING=$(usex test) - ) - - cmake_src_configure -} - -src_compile() { - cmake_src_compile - - use test && cmake_build qztest -} diff --git a/dev-libs/quazip/quazip-1.2.ebuild b/dev-libs/quazip/quazip-1.2.ebuild index b118be537348..e0d53de5bc70 100644 --- a/dev-libs/quazip/quazip-1.2.ebuild +++ b/dev-libs/quazip/quazip-1.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -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 ~riscv ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux" IUSE="test" RESTRICT="!test? ( test )" |