From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/quazip/, dev-libs/quazip/files/
Date: Thu, 02 Jan 2025 21:48:43 +0000 (UTC) [thread overview]
Message-ID: <1735854486.de1be5090f7b02b2ee2fcb9febf3106c05c0c207.asturm@gentoo> (raw)
commit: de1be5090f7b02b2ee2fcb9febf3106c05c0c207
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 2 20:21:05 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jan 2 21:48:06 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de1be509
dev-libs/quazip: drop 1.3-r2, 1.3-r3, 1.4
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-libs/quazip/Manifest | 1 -
dev-libs/quazip/files/quazip-1.3-cmake.patch | 84 --------------------------
dev-libs/quazip/quazip-1.3-r2.ebuild | 83 --------------------------
dev-libs/quazip/quazip-1.3-r3.ebuild | 85 ---------------------------
dev-libs/quazip/quazip-1.4.ebuild | 88 ----------------------------
5 files changed, 341 deletions(-)
diff --git a/dev-libs/quazip/Manifest b/dev-libs/quazip/Manifest
index d8ac2a86ded3..7cc50b7cd451 100644
--- a/dev-libs/quazip/Manifest
+++ b/dev-libs/quazip/Manifest
@@ -1,3 +1,2 @@
DIST quazip-1.2.tar.gz 155878 BLAKE2B cfd5505509863dfdfcc88cf9f50aeff0ee0c1391412dc8aeb34ab020debd8a29279563323a0ca13a8d3b8b026518f5d079b8fa989aca20a9bec083c6dd4e3695 SHA512 3f4b1a4194ca286163b1c17880ea471a341dcc05d758ee8f3d1e540d0f6aed7ac18200450187034c46b4fab1da39111dca534d75859701259406a6dd50205386
-DIST quazip-1.3.tar.gz 156138 BLAKE2B a9002bdfab39fc1516160b0073fd3d59a65a66eda98240b9a2936d4423b21b40dd9360122950a54dc18236bc2aaf4e1e2d761ba145f6dbd5014cf72a287fbb3b SHA512 3861a9084059576ff2690e8b911394b0286a60542ab021a4cc588537a60ea3a186ed7903c76544698001fa383dfd0de96bdfed433abaefc44158d3b30ab16fe2
DIST quazip-1.4.tar.gz 157819 BLAKE2B bb0ec2ebd31d6ce5e2a19fc1b13570d57aa1438ff192621543ab6aec4e85f76677863d37efbe0bc59e3530ce023586440081cd47f069b4dcbac55118d12f8668 SHA512 38ce3aa77df1fd92229454e56b7290c066d1e319afa36a9f8ec8477004ae94df682e8f454f13cdaf586a1d0b0e033fe698081033a19536ecd53dd1e4b0204af9
diff --git a/dev-libs/quazip/files/quazip-1.3-cmake.patch b/dev-libs/quazip/files/quazip-1.3-cmake.patch
deleted file mode 100644
index 016bd97f1dc0..000000000000
--- a/dev-libs/quazip/files/quazip-1.3-cmake.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From 9d9e4e7c2076f0ab1a482ae32203aa336dc4ba9b Mon Sep 17 00:00:00 2001
-From: Thiago Donato Ferreira <flowlnlnln@gmail.com>
-Date: Mon, 18 Apr 2022 12:08:55 -0300
-Subject: [PATCH] Add CTest patch
-
-Signed-off-by: Thiago Donato Ferreira <flowlnlnln@gmail.com>
----
- CMakeLists.txt | 32 +++++++++++++++++++-------------
- 1 file changed, 19 insertions(+), 13 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a3eaf1a..71f2748 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -11,7 +11,6 @@ set(QUAZIP_LIB_SOVERSION 1.3.0)
- option(BUILD_SHARED_LIBS "" ON)
- option(QUAZIP_INSTALL "" ON)
- option(QUAZIP_USE_QT_ZLIB "" OFF)
--option(QUAZIP_ENABLE_TESTS "Build QuaZip tests" OFF)
-
- # Set the default value of `${QUAZIP_QT_MAJOR_VERSION}`.
- # We search quietly for Qt6, Qt5 and Qt4 in that order.
-@@ -34,6 +33,8 @@ endif()
-
- set(QUAZIP_QT_MAJOR_VERSION ${QT_VERSION_MAJOR} CACHE STRING "Qt version to use (4, 5 or 6), defaults to ${QT_VERSION_MAJOR}")
-
-+include(CTest)
-+
- if(NOT CMAKE_BUILD_TYPE)
- set(CMAKE_BUILD_TYPE RELEASE)
- endif()
-@@ -50,23 +51,29 @@ set(QUAZIP_DIR_NAME QuaZip-Qt${QUAZIP_QT_MAJOR_VERSION}-${QUAZIP_LIB_VERSION})
- set(QUAZIP_PACKAGE_NAME QuaZip-Qt${QUAZIP_QT_MAJOR_VERSION})
-
- 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_LIBRARIES Qt6::Core Qt6::Core5Compat)
-- set(QUAZIP_TEST_QT_LIBRARIES Qt6::Core Qt6::Core5Compat Qt6::Network Qt6::Test)
- set(QUAZIP_PKGCONFIG_REQUIRES "zlib, Qt6Core")
-+ 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_LIBRARIES Qt5::Core)
-- set(QUAZIP_TEST_QT_LIBRARIES Qt5::Core Qt5::Network Qt5::Test)
-- set(QUAZIP_PKGCONFIG_REQUIRES "zlib, Qt5Core")
-+ set(QUAZIP_PKGCONFIG_REQUIRES "zlib, Qt5Core")
-+ 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_LIBRARIES Qt4::QtCore)
-- set(QUAZIP_TEST_QT_LIBRARIES Qt4::QtCore Qt4::QtNetwork Qt4::QtTest)
- set(QUAZIP_PKGCONFIG_REQUIRES "zlib, QtCore")
-+ 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")
- endif()
-@@ -88,8 +95,7 @@ endif()
-
- add_subdirectory(quazip)
-
--if(QUAZIP_ENABLE_TESTS)
-+if(BUILD_TESTING)
- message(STATUS "Building QuaZip tests")
-- enable_testing()
- add_subdirectory(qztest)
- endif()
---
-2.35.1
-
diff --git a/dev-libs/quazip/quazip-1.3-r2.ebuild b/dev-libs/quazip/quazip-1.3-r2.ebuild
deleted file mode 100644
index e329c1fc93d9..000000000000
--- a/dev-libs/quazip/quazip-1.3-r2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake multibuild
-
-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"
-# SONAME of libquazip1-qt5.so, check QUAZIP_LIB_SOVERSION in CMakeLists.txt
-SLOT="0/1.3"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-IUSE="+qt5 qt6 test"
-REQUIRED_USE="|| ( qt5 qt6 )"
-
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
- qt5? ( dev-qt/qtcore:5 )
- qt6? ( dev-qt/qtbase:6 )
- sys-libs/zlib[minizip]
-"
-DEPEND="${COMMON_DEPEND}
- test? (
- qt5? (
- dev-qt/qtnetwork:5
- dev-qt/qttest:5
- )
- qt6? (
- dev-qt/qtbase:6[gui,network]
- dev-qt/qt5compat:6
- )
- )
-"
-RDEPEND="${COMMON_DEPEND}
- !=dev-libs/quazip-1.1-r0:1
-"
-
-PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
-
-pkg_setup() {
- MULTIBUILD_VARIANTS=( $(usev qt5) $(usev qt6) )
-}
-
-src_configure() {
- my_src_configure() {
- local mycmakeargs=(
- -DBUILD_TESTING=$(usex test)
- )
- if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then
- mycmakeargs+=(
- -DQUAZIP_QT_MAJOR_VERSION=5
- )
- elif [[ ${MULTIBUILD_VARIANT} = qt6 ]]; then
- mycmakeargs+=(
- -DQUAZIP_QT_MAJOR_VERSION=6
- )
- fi
- cmake_src_configure
- }
-
- multibuild_foreach_variant my_src_configure
-}
-
-src_compile() {
- my_src_compile() {
- cmake_src_compile
- use test && cmake_build qztest
- }
-
- multibuild_foreach_variant my_src_compile
-}
-
-src_test() {
- multibuild_foreach_variant cmake_src_test
-}
-
-src_install() {
- multibuild_foreach_variant cmake_src_install
-}
diff --git a/dev-libs/quazip/quazip-1.3-r3.ebuild b/dev-libs/quazip/quazip-1.3-r3.ebuild
deleted file mode 100644
index d67c1fb6e2f6..000000000000
--- a/dev-libs/quazip/quazip-1.3-r3.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake multibuild
-
-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"
-# SONAME of libquazip1-qt5.so, check QUAZIP_LIB_SOVERSION in CMakeLists.txt
-SLOT="0/1.3"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-IUSE="+qt5 qt6 test"
-REQUIRED_USE="|| ( qt5 qt6 )"
-
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
- qt5? ( dev-qt/qtcore:5 )
- qt6? (
- dev-qt/qtbase:6
- dev-qt/qt5compat:6
- )
- sys-libs/zlib[minizip]
-"
-DEPEND="${COMMON_DEPEND}
- test? (
- qt5? (
- dev-qt/qtnetwork:5
- dev-qt/qttest:5
- )
- qt6? (
- dev-qt/qtbase:6[network]
- )
- )
-"
-RDEPEND="${COMMON_DEPEND}
- !=dev-libs/quazip-1.1-r0:1
-"
-
-PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
-
-pkg_setup() {
- MULTIBUILD_VARIANTS=( $(usev qt5) $(usev qt6) )
-}
-
-src_configure() {
- my_src_configure() {
- local mycmakeargs=(
- -DBUILD_TESTING=$(usex test)
- )
- if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then
- mycmakeargs+=(
- -DQUAZIP_QT_MAJOR_VERSION=5
- )
- elif [[ ${MULTIBUILD_VARIANT} = qt6 ]]; then
- mycmakeargs+=(
- -DQUAZIP_QT_MAJOR_VERSION=6
- )
- fi
- cmake_src_configure
- }
-
- multibuild_foreach_variant my_src_configure
-}
-
-src_compile() {
- my_src_compile() {
- cmake_src_compile
- use test && cmake_build qztest
- }
-
- multibuild_foreach_variant my_src_compile
-}
-
-src_test() {
- multibuild_foreach_variant cmake_src_test
-}
-
-src_install() {
- multibuild_foreach_variant cmake_src_install
-}
diff --git a/dev-libs/quazip/quazip-1.4.ebuild b/dev-libs/quazip/quazip-1.4.ebuild
deleted file mode 100644
index 8ad656566a6c..000000000000
--- a/dev-libs/quazip/quazip-1.4.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake multibuild
-
-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"
-# SONAME of libquazip1-qt5.so, check QUAZIP_LIB_SOVERSION in CMakeLists.txt
-SLOT="0/1.4"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 +qt5 qt6 test"
-REQUIRED_USE="|| ( qt5 qt6 )"
-
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
- bzip2? ( app-alternatives/bzip2 )
- qt5? ( dev-qt/qtcore:5 )
- qt6? (
- dev-qt/qtbase:6
- dev-qt/qt5compat:6
- )
- sys-libs/zlib[minizip]
-"
-DEPEND="${COMMON_DEPEND}
- test? (
- qt5? (
- dev-qt/qtnetwork:5
- dev-qt/qttest:5
- )
- qt6? (
- dev-qt/qtbase:6[network]
- )
- )
-"
-RDEPEND="${COMMON_DEPEND}"
-
-PATCHES=(
- # Use CTest module provided BUILD_TESTING
- "${FILESDIR}/${P}-cmake.patch"
-)
-
-pkg_setup() {
- MULTIBUILD_VARIANTS=( $(usev qt5) $(usev qt6) )
-}
-
-src_configure() {
- my_src_configure() {
- local mycmakeargs=(
- -DBUILD_TESTING=$(usex test)
- -DQUAZIP_BZIP2=$(usex bzip2)
- )
- if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then
- mycmakeargs+=(
- -DQUAZIP_QT_MAJOR_VERSION=5
- )
- elif [[ ${MULTIBUILD_VARIANT} = qt6 ]]; then
- mycmakeargs+=(
- -DQUAZIP_QT_MAJOR_VERSION=6
- )
- fi
- cmake_src_configure
- }
-
- multibuild_foreach_variant my_src_configure
-}
-
-src_compile() {
- my_src_compile() {
- cmake_src_compile
- use test && cmake_build qztest
- }
-
- multibuild_foreach_variant my_src_compile
-}
-
-src_test() {
- multibuild_foreach_variant cmake_src_test
-}
-
-src_install() {
- multibuild_foreach_variant cmake_src_install
-}
next reply other threads:[~2025-01-02 21:48 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-02 21:48 Andreas Sturmlechner [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-03-01 16:33 [gentoo-commits] repo/gentoo:master commit in: dev-libs/quazip/, dev-libs/quazip/files/ Andreas Sturmlechner
2022-04-20 10:16 Andrew Ammerlaan
2022-01-25 16:11 Andreas Sturmlechner
2021-12-24 18:35 Andreas Sturmlechner
2021-04-10 16:29 Andreas Sturmlechner
2021-02-15 3:30 Sam James
2020-07-19 22:13 Andreas Sturmlechner
2020-07-13 0:30 Andreas Sturmlechner
2019-05-27 18:35 Andreas Sturmlechner
2017-02-25 20:42 Justin Lecher
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1735854486.de1be5090f7b02b2ee2fcb9febf3106c05c0c207.asturm@gentoo \
--to=asturm@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox