gentoo resync : 28.04.2021

4 files changed, 2 insertions, 79 deletions

diff --git a/media-libs/qhull/Manifest b/media-libs/qhull/Manifest
index 55b81c8b3ef1..222e48947e56 100644
--- a/media-libs/qhull/Manifest
+++ b/media-libs/qhull/Manifest
@@ -1,7 +1,4 @@
-AUX qhull-2012.1-64bit.patch 1509 BLAKE2B d5f50bfb5229109f13ac88f46eff36d130830339c43265981b00a8e5defaf3229cd50870e379e13a2726312efd8a15e99a2683c3b3a9b1eb9bf1503b7f6b1fbe SHA512 e23c7bb4d6fb64a77647980e045b36df4f596eb64a32b27d7d6462cb2f5f7a35e0fa9985e885ed58222ec1741b2a2d1806bba155f1042bd470dcd5c721ac48c5
 AUX qhull-2020.2-deprecated-pkgconfig.patch 473 BLAKE2B 5fbc2b1b9a4cd5a6c5cff46484b943b36de2f327c051b9badc32c952373b7f250eb751b46c8884e1dcd1c23b4bd2c50e4d5b1af7129ee477e1e75aab55d1f7be SHA512 a688943f6e0210ef170cfe9a8b3f186460bd2654c30cd0b0ca30b71f3245189be76dfa3648fcb9cbfe8daee27e11bec23a7a6016abf0213f0ce418f1fb3c5654
-DIST qhull-2015.2.tar.gz 1010153 BLAKE2B 854d1897ad5a92b2e13f6b2304d707b21023a47d60fcc7065b487c24dad06fa016536311e224155b879ad699c046f15991a840f5f04283ffdeef8a68dfbf7c15 SHA512 a544f88b5fbabc592fdc4c5533ba58a8f856e018b85128f43d0532a1143123ceb0d5ca9ae1d27722efa5d08092c017bf7715c157d1019f447e6746f23f02dcd4
 DIST qhull-2020.2.tar.gz 1307213 BLAKE2B db11d4b83124da3ceed95e1eb81c280ac55c871c83acd4c371f9716b57a1777105891a073282789c7a80b5d74e85164996fbe4f2140c8371bca5926eab4adbc2 SHA512 88f50c2a968f56deec61772490617cc877b0ca2d804954ade08297b9bab826076db6b960d6f1feb21c6851e5328cb11c6dd565666517fa78a3d65b901848ff36
-EBUILD qhull-2015.2.ebuild 1021 BLAKE2B c123f9b2fbf062da2aedd57bda3610dd13a48d772944082a5f56dcb2b9337ddc9a824587240ee52e237d990182ffa7a1d255534ee7c1e692ddecae5001e8c3c0 SHA512 bb1fae2412eb9359ae384019ab0388b951f0a3cd97ae9e7520a219fe41c417828edc30f2d8fb519b10e994f5ed199eb6d94dee89db65207274302351cb9af8de
-EBUILD qhull-2020.2-r3.ebuild 1494 BLAKE2B 9c5e2a9725f73662bf65582703e287a730a2fa297a4e09a1805b8edcdf0f06e3830f24d31c8e9771c3dbd07672a2103c76e2bc43d5003c8cb5735de5b628c6e2 SHA512 fc8e794675a2c5c513956ef39e60747f996f4f7018f82962e7434f1df45cc29e3a5c243aa5dfa8306110a7aef948a71bd0cb056cbe20e83944ba872ba2ee709a
+EBUILD qhull-2020.2-r3.ebuild 1489 BLAKE2B 2698c5f32d2a75e77e958db40ef85b241dd774880886c00536dd05b1f8f427ead00429d5fc4f10b56357a12444589151413716845ce56871748eb4b4141fc5f2 SHA512 2424ab6c611b9b5966ccdeeb01fd3aa87a544efa4e200768bffee3c3b11c96832aba8ce4f20edb38e3d8e27c45f8ed14547ec559038439eedb44cedc732479a4
 MISC metadata.xml 1094 BLAKE2B 9667f9f89fc9717129401070888401f0db493c01e4fe73eb8168efae9c1c2d7f1a7aa234fe72f3beea7feb385dc920418a6affe4d99679736cc6a1aef212e4eb SHA512 b1e13904fe69b4535806a871cdda79fadbf294c30654fe119e7e3be0ed481dc926a9dfaffd75c2849e3eb91ebad671a6b7eca293b40a249c8ccbee6264cfdaf9
diff --git a/media-libs/qhull/files/qhull-2012.1-64bit.patch b/media-libs/qhull/files/qhull-2012.1-64bit.patch
deleted file mode 100644
index 4c909c28c8f2..000000000000
--- a/media-libs/qhull/files/qhull-2012.1-64bit.patch
+++ /dev/null
@@ -1,32 +0,0 @@
- src/libqhull/io.c   | 4 ++--
- src/libqhull/stat.c | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/libqhull/io.c b/src/libqhull/io.c
-index 09a0079..7ad4b35 100644
---- a/src/libqhull/io.c
-+++ b/src/libqhull/io.c
-@@ -68,8 +68,8 @@ void qh_produce_output2(void) {
-     qh_memstatistics(qh ferr);
-     d_1= sizeof(setT) + (qh hull_dim - 1) * SETelemsize;
-     qh_fprintf(qh ferr, 8040, "\
--    size in bytes: merge %d ridge %d vertex %d facet %d\n\
--         normal %d ridge vertices %d facet vertices or neighbors %d\n",
-+    size in bytes: merge %zd ridge %zd vertex %zd facet %zd\n\
-+         normal %d ridge vertices %d facet vertices or neighbors %zd\n",
-             (int)sizeof(mergeT), (int)sizeof(ridgeT),
-             (int)sizeof(vertexT), (int)sizeof(facetT),
-             qh normal_size, d_1, d_1 + SETelemsize);
-diff --git a/src/libqhull/stat.c b/src/libqhull/stat.c
-index 7dc60b9..5721130 100644
---- a/src/libqhull/stat.c
-+++ b/src/libqhull/stat.c
-@@ -472,7 +472,7 @@ void qh_initstatistics(void) {
-   qh_allstatI();
-   if (qhstat next > (int)sizeof(qhstat id)) {
-     qh_fprintf(qhmem.ferr, 6184, "qhull error (qh_initstatistics): increase size of qhstat.id[].\n\
--      qhstat.next %d should be <= sizeof(qhstat id) %d\n", qhstat next, (int)sizeof(qhstat id));
-+      qhstat.next %d should be <= sizeof(qhstat id) %zd\n", qhstat next, (int)sizeof(qhstat id));
- #if 0 /* for locating error, Znumridges should be duplicated */
-     for(i=0; i < ZEND; i++) {
-       int j;
diff --git a/media-libs/qhull/qhull-2015.2.ebuild b/media-libs/qhull/qhull-2015.2.ebuild
deleted file mode 100644
index 667e3483d460..000000000000
--- a/media-libs/qhull/qhull-2015.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils flag-o-matic
-
-DESCRIPTION="Geometry library"
-HOMEPAGE="http://www.qhull.org"
-SRC_URI="http://www.qhull.org/download/${PN}-2015-src-7.2.0.tgz -> ${P}.tar.gz"
-
-SLOT="0/7"
-LICENSE="BSD"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="doc static-libs"
-
-DOCS=( Announce.txt File_id.diz README.txt REGISTER.txt )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2012.1-64bit.patch
-	)
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-	mycmakeargs+=(
-		-DLIB_INSTALL_DIR="${EPREFIX}"/usr/$(get_libdir)
-		-DDOC_INSTALL_DIR="${EPREFIX}"/usr/share/doc/${P}/html
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	# compatibility with previous installs
-	dosym libqhull /usr/include/qhull
-	if ! use doc; then
-		rm -rf "${ED}"/usr/share/doc/${P}/html || die
-	fi
-	if ! use static-libs; then
-		rm -f "${ED}"/usr/$(get_libdir)/lib*.a || die
-	fi
-}
diff --git a/media-libs/qhull/qhull-2020.2-r3.ebuild b/media-libs/qhull/qhull-2020.2-r3.ebuild
index 59f96d53709c..839985c989cb 100644
--- a/media-libs/qhull/qhull-2020.2-r3.ebuild
+++ b/media-libs/qhull/qhull-2020.2-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/qhull/qhull/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0/8"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="doc static-libs"
 
 DOCS=( Announce.txt File_id.diz README.txt REGISTER.txt )