gentoo resync : 08.01.2021

4 files changed, 76 insertions, 21 deletions

diff --git a/media-libs/qhull/Manifest b/media-libs/qhull/Manifest
index fb070692fc94..139d9b28499f 100644
--- a/media-libs/qhull/Manifest
+++ b/media-libs/qhull/Manifest
@@ -1,4 +1,6 @@
 AUX qhull-2012.1-64bit.patch 1509 BLAKE2B d5f50bfb5229109f13ac88f46eff36d130830339c43265981b00a8e5defaf3229cd50870e379e13a2726312efd8a15e99a2683c3b3a9b1eb9bf1503b7f6b1fbe SHA512 e23c7bb4d6fb64a77647980e045b36df4f596eb64a32b27d7d6462cb2f5f7a35e0fa9985e885ed58222ec1741b2a2d1806bba155f1042bd470dcd5c721ac48c5
 DIST qhull-2015.2.tar.gz 1010153 BLAKE2B 854d1897ad5a92b2e13f6b2304d707b21023a47d60fcc7065b487c24dad06fa016536311e224155b879ad699c046f15991a840f5f04283ffdeef8a68dfbf7c15 SHA512 a544f88b5fbabc592fdc4c5533ba58a8f856e018b85128f43d0532a1143123ceb0d5ca9ae1d27722efa5d08092c017bf7715c157d1019f447e6746f23f02dcd4
-EBUILD qhull-2015.2.ebuild 1030 BLAKE2B 1ebd62b67e88bbb50f13a5db2b6d95e81520bc420ea1e48fb7b022f2a7b6ea90d0f7256f84072dd8c854e5d8aed0e5edab723323e60f498e6235551b70e84837 SHA512 56e25c635906fe3a7c03403cbbcc716b230166b7ad1a7b1570ae6bf1c99f9461a4b5e15e062731a081a93da39f4e0dcf1ff227a18d0d8227d2bd87b9f4475ea7
-MISC metadata.xml 977 BLAKE2B 57a86855387223c875830b8d60eb02f89f469dc4949f094255f43e0251cb537049d0a99a0eb9500c639730f6a0db518ec2b3a4ae050e3c9ea2f508cdbe790e98 SHA512 6e676d2faff561e67e077869a61747c834131ea67acb098497153c98d3bca38032ffa2ab57d6b612cfa4f1fbdb8b05b0c9a9132ab0cdeae5579bdac236b9a1f2
+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-r2.ebuild 993 BLAKE2B 4ed1de690460bd343503f1086b5e624f61a882d839d4f9dcd114bb74032e464dbbbbee150ed0759807bdd6eca8f264faef9efc85115bf727527400ad5948fe34 SHA512 8c20dc26b55b436409857a2d992d432de5045917171c72ef0659104a274db78c32407ee4362596f38d9e8fa1e6889f599ed3bbf01f697c2bbde4b81858d7e0eb
+MISC metadata.xml 1094 BLAKE2B 9667f9f89fc9717129401070888401f0db493c01e4fe73eb8168efae9c1c2d7f1a7aa234fe72f3beea7feb385dc920418a6affe4d99679736cc6a1aef212e4eb SHA512 b1e13904fe69b4535806a871cdda79fadbf294c30654fe119e7e3be0ed481dc926a9dfaffd75c2849e3eb91ebad671a6b7eca293b40a249c8ccbee6264cfdaf9
diff --git a/media-libs/qhull/metadata.xml b/media-libs/qhull/metadata.xml
index c6a69293d768..429d8032e635 100644
--- a/media-libs/qhull/metadata.xml
+++ b/media-libs/qhull/metadata.xml
@@ -1,20 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>sci-mathematics@gentoo.org</email>
-    <name>Gentoo Mathematics Project</name>
-  </maintainer>
-  <longdescription lang="en">
-  Qhull computes the convex hull, Delaunay triangulation, Voronoi
-  diagram, halfspace intersection about a point, furthest-site
-  Delaunay triangulation, and furthest-site Voronoi diagram. The
-  source code runs in 2-d, 3-d, 4-d, and higher dimensions. Qhull
-  implements the Quickhull algorithm for computing the convex hull. It
-  handles roundoff errors from floating point arithmetic. It computes
-  volumes, surface areas, and approximations to the convex hull. 
-  Qhull does not support constrained Delaunay triangulations,
-  triangulation of non-convex surfaces, mesh generation of non-convex
-  objects, or medium-sized inputs in 9-D and higher. 
-</longdescription>
+	<maintainer type="project">
+		<email>sci-mathematics@gentoo.org</email>
+		<name>Gentoo Mathematics Project</name>
+	</maintainer>
+	<longdescription>
+		Qhull computes the convex hull, Delaunay triangulation, Voronoi
+		diagram, halfspace intersection about a point, furthest-site
+		Delaunay triangulation, and furthest-site Voronoi diagram. The
+		source code runs in 2-d, 3-d, 4-d, and higher dimensions. Qhull
+		implements the Quickhull algorithm for computing the convex hull. It
+		handles roundoff errors from floating point arithmetic. It computes
+		volumes, surface areas, and approximations to the convex hull.
+		Qhull does not support constrained Delaunay triangulations,
+		triangulation of non-convex surfaces, mesh generation of non-convex
+		objects, or medium-sized inputs in 9-D and higher.
+	</longdescription>
+	<upstream>
+		<bugs-to>https://github.com/qhull/qhull/issues</bugs-to>
+		<remote-id type="github">qhull/qhull</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-libs/qhull/qhull-2015.2.ebuild b/media-libs/qhull/qhull-2015.2.ebuild
index 4539170beac6..667e3483d460 100644
--- a/media-libs/qhull/qhull-2015.2.ebuild
+++ b/media-libs/qhull/qhull-2015.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,9 +9,9 @@ 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"
+SLOT="0/7"
 LICENSE="BSD"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 )
diff --git a/media-libs/qhull/qhull-2020.2-r2.ebuild b/media-libs/qhull/qhull-2020.2-r2.ebuild
new file mode 100644
index 000000000000..1c60a003a251
--- /dev/null
+++ b/media-libs/qhull/qhull-2020.2-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Geometry library"
+HOMEPAGE="http://www.qhull.org"
+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"
+IUSE="doc"
+
+DOCS=( Announce.txt File_id.diz README.txt REGISTER.txt )
+
+src_prepare() {
+	if ! use doc ; then
+		sed -i \
+			-e '/^install(DIRECTORY html/d' \
+			-e '/^[[:blank:]]*index.htm/d' \
+			CMakeLists.txt || die
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_STATIC_LIBS=OFF
+		-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
+	cmake_src_compile libqhull
+}
+
+src_install() {
+	cmake_src_install
+	dolib.so "${BUILD_DIR}"/libqhull.so*
+}