commit: 07b9d9307760ac40657dc1453fe8d89a697d3898 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Mon Oct 20 15:58:10 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Mon Oct 20 18:34:34 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07b9d930
media-libs/qhull: drop 2020.2-r3, 2020.2.8.1_alpha4 Bug: https://bugs.gentoo.org/963618 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> media-libs/qhull/Manifest | 2 - ...l-2020.2.8.1_alpha4-update-version-alpha3.patch | 55 ---------------- media-libs/qhull/qhull-2020.2-r3.ebuild | 65 ------------------ media-libs/qhull/qhull-2020.2.8.1_alpha4.ebuild | 77 ---------------------- 4 files changed, 199 deletions(-) diff --git a/media-libs/qhull/Manifest b/media-libs/qhull/Manifest index 861719666432..34eca3947a23 100644 --- a/media-libs/qhull/Manifest +++ b/media-libs/qhull/Manifest @@ -1,3 +1 @@ -DIST qhull-2020.2.tar.gz 1307213 BLAKE2B db11d4b83124da3ceed95e1eb81c280ac55c871c83acd4c371f9716b57a1777105891a073282789c7a80b5d74e85164996fbe4f2140c8371bca5926eab4adbc2 SHA512 88f50c2a968f56deec61772490617cc877b0ca2d804954ade08297b9bab826076db6b960d6f1feb21c6851e5328cb11c6dd565666517fa78a3d65b901848ff36 -DIST qhull-8.1_alpha4.tar.gz 1310396 BLAKE2B 40cc44440e5ce5a02a227c5674624858d312295a77e00eab53af299b25a8d26a83711fa79959f0e2458cb389844b1c12b95fcdf289ffe8a4c15bb284d9e2452c SHA512 96f2c395e7259f7698f54a7d6c0e0101a8d5d2fc739de3634aa320890cd77cad716305ddf5802c7032b3e9b0b3ef18cd4ecc27ebb6a9a1ad0b308ddf6a0ceacb DIST qhull-8.1_alpha6.tar.gz 1311804 BLAKE2B 8aee59b510bdbf620c99c44585696007392134aafb8e357fa5d0748aba5e09a4bbde63f31d7b9357505edd9ce1bc44bab2e472b8eb7449598528e9f2cdb0f53d SHA512 66131b46d24ba726bba28f55a9f45fd2c8166f018846d91111da4465c9940bf11b27c331e4a063e5bfe49f0606df04310bc31fb00461dafcd0c581accdc2aa4b diff --git a/media-libs/qhull/files/qhull-2020.2.8.1_alpha4-update-version-alpha3.patch b/media-libs/qhull/files/qhull-2020.2.8.1_alpha4-update-version-alpha3.patch deleted file mode 100644 index 0d649bcb27ee..000000000000 --- a/media-libs/qhull/files/qhull-2020.2.8.1_alpha4-update-version-alpha3.patch +++ /dev/null @@ -1,55 +0,0 @@ -From de434688d500204b979c0bcc6703a9cfb589c9a9 Mon Sep 17 00:00:00 2001 -From: Paul Zander <[email protected]> -Date: Tue, 8 Apr 2025 17:48:40 +0200 -Subject: [PATCH] update version alpha3 - -Signed-off-by: Paul Zander <[email protected]> - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index bd556a0..1690b96 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -74,8 +74,8 @@ project(qhull) - # Define qhull_VERSION in README.txt, Announce.txt, qh-get.htm, CMakeLists.txt - # qhull-zip.sh (twice), qhull-wiki.md, qhull-news.htm, File_id.diz, index.htm - # qhull-warn.pri (VERSION), qhull-exports.def (VERSION), qhull_p-exports.def, qhull_r-exports.def --set(qhull_VERSION2 "2020.2 2023/01/02") # not used, See global.c, global_r.c, rbox.c, rbox_r.c --set(qhull_VERSION "8.1-alpha3") # Advance every release -+set(qhull_VERSION2 "2020.2 2024/07/22") # not used, See global.c, global_r.c, rbox.c, rbox_r.c -+set(qhull_VERSION "8.1-alpha4") # Advance every release - - # SOVERSION -- qhull 2003 = empty, 2009 = 5, 2010-2012 = 6, 2015-2019 = 7, 2020 = 8.0 - # Increase SOVERSION if ABI breaks (abi-compliance-checker) -diff --git a/src/libqhull/global.c b/src/libqhull/global.c -index a3ded46..fef32f4 100644 ---- a/src/libqhull/global.c -+++ b/src/libqhull/global.c -@@ -47,8 +47,8 @@ qhT qh_qh; /* all global variables. - recompile user_eg.c, rbox.c, libqhull.c, qconvex.c, qdelaun.c qvoronoi.c, qhalf.c, testqset.c - */ - --const char qh_version[]= "2020.2 2023/01/02"; --const char qh_version2[]= "qhull 8.1-alpha3 (2020.2 2023/01/02)"; -+const char qh_version[]= "2020.2 2024/07/22"; -+const char qh_version2[]= "qhull 8.1-alpha4 (2020.2 2024/07/22)"; - - /*-<a href="qh-globa.htm#TOC" - >-------------------------------</a><a name="appendprint">-</a> -diff --git a/src/libqhull_r/global_r.c b/src/libqhull_r/global_r.c -index 3a5c7c7..889585a 100644 ---- a/src/libqhull_r/global_r.c -+++ b/src/libqhull_r/global_r.c -@@ -39,8 +39,8 @@ - recompile user_eg_r.c, rbox_r.c, libqhull_r.c, qconvex_r.c, qdelaun_r.c qvoronoi_r.c, qhalf_r.c, testqset_r.c - */ - --const char qh_version[]= "2020.2.r 2023/01/02"; --const char qh_version2[]= "qhull_r 8.1-alpha3 (2020.2.r 2023/01/02)"; -+const char qh_version[]= "2020.2.r 2024/07/22"; -+const char qh_version2[]= "qhull_r 8.1-alpha4 (2020.2.r 2024/07/22)"; - - /*-<a href="qh-globa_r.htm#TOC" - >-------------------------------</a><a name="appendprint">-</a> --- -2.49.0 - diff --git a/media-libs/qhull/qhull-2020.2-r3.ebuild b/media-libs/qhull/qhull-2020.2-r3.ebuild deleted file mode 100644 index 5917691beb99..000000000000 --- a/media-libs/qhull/qhull-2020.2-r3.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake multilib - -DESCRIPTION="Geometry library" -HOMEPAGE="http://www.qhull.org"; -SRC_URI="https://github.com/qhull/qhull/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/8" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos" -IUSE="doc static-libs" - -DOCS=( Announce.txt File_id.diz README.txt REGISTER.txt ) - -PATCHES=( - "${FILESDIR}/${PN}-2020.2-deprecated-pkgconfig.patch" -) - -src_prepare() { - if ! use doc ; then - sed -i \ - -e '/^install(DIRECTORY html/d' \ - -e '/^[[:blank:]]*index.htm/d' \ - CMakeLists.txt || die - fi - - sed -i \ - -e "s@lib/pkgconfig@$(get_libdir)/pkgconfig@" \ - -e "s@lib/cmake/Qhull@$(get_libdir)/cmake/Qhull@" \ - CMakeLists.txt || die - - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DBUILD_STATIC_LIBS=$(usex static-libs) - -DLINK_APPS_SHARED=ON - -DDOC_INSTALL_DIR="${EPREFIX}/usr/share/doc/${PF}" - -DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)" - ) - - cmake_src_configure -} - -src_compile() { - cmake_src_compile all libqhull -} - -src_install() { - cmake_src_install - dolib.so "${BUILD_DIR}"/libqhull{$(get_libname),$(get_libname "*")} - - # fix double prefix in pc files - sed -i "/^libdir/s@/.*@/$(get_libdir)@" "${ED}/usr/$(get_libdir)/pkgconfig/"*.pc || die - - if ! use static-libs; then - rm "${ED}/usr/$(get_libdir)/pkgconfig/qhull"{static,static_r,cpp}.pc || die - rm -r "${ED}/usr/include/libqhullcpp" || die - fi -} diff --git a/media-libs/qhull/qhull-2020.2.8.1_alpha4.ebuild b/media-libs/qhull/qhull-2020.2.8.1_alpha4.ebuild deleted file mode 100644 index 0e82b669ed30..000000000000 --- a/media-libs/qhull/qhull-2020.2.8.1_alpha4.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="Geometry library" -HOMEPAGE="http://www.qhull.org"; -MY_PV="$(ver_cut 3-)" -SRC_URI="https://github.com/qhull/qhull/archive/v${MY_PV/_/.}.tar.gz -> ${PN}-${MY_PV}.tar.gz" -S="${WORKDIR}/${PN}-${MY_PV//_/.}" - -LICENSE="BSD" -SLOT="0/$(ver_cut 1-2 "${MY_PV}")" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos" -IUSE="doc static-libs tools test" -RESTRICT="!test? ( test )" -REQUIRED_USE="test? ( tools )" - -DOCS=( - Announce.txt - File_id.diz - README.txt - REGISTER.txt -) - -PATCHES=( - "${FILESDIR}/${PN}-2020.2-deprecated-pkgconfig.patch" - "${FILESDIR}/${PF}-update-version-alpha3.patch" # version string wasn't bumped in in alpha4 -) - -src_prepare() { - if ! use doc ; then - sed -i \ - -e '/^install(DIRECTORY html/d' \ - -e '/^[[:blank:]]*index.htm/d' \ - CMakeLists.txt || die - fi - - sed -i \ - -e "s@lib/pkgconfig@$(get_libdir)/pkgconfig@" \ - -e "s@lib/cmake/Qhull@$(get_libdir)/cmake/Qhull@" \ - CMakeLists.txt || die - - cmake_src_prepare -} - -src_configure() { - # cmake-4 workaround - local -x CMAKE_POLICY_VERSION_MINIMUM="${CMAKE_POLICY_VERSION_MINIMUM:-3.10}" - - local mycmakeargs=( - -DDOC_INSTALL_DIR="${EPREFIX}/usr/share/doc/${PF}" - -DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)" - -DLINK_APPS_SHARED="yes" - - -DBUILD_APPLICATIONS="$(usex tools)" - -DBUILD_STATIC_LIBS="$(usex static-libs)" - -DQHULL_ENABLE_TESTING="$(usex test)" - ) - - cmake_src_configure -} - -src_install() { - cmake_src_install - - # fix double prefix in pc files - sed -i "/^libdir/s@/.*@/$(get_libdir)@" "${ED}/usr/$(get_libdir)/pkgconfig/"*.pc || die - - rm "${ED}/usr/$(get_libdir)/pkgconfig/qhull.pc" || die - - if ! use static-libs; then - rm "${ED}/usr/$(get_libdir)/pkgconfig/qhull"{static,static_r,cpp}.pc || die - fi -}
