gentoo resync : 03.03.2021

3 files changed, 3 insertions, 86 deletions

diff --git a/sci-mathematics/cgal/Manifest b/sci-mathematics/cgal/Manifest
index 226dc53ad22e..a0cb80c469e1 100644
--- a/sci-mathematics/cgal/Manifest
+++ b/sci-mathematics/cgal/Manifest
@@ -1,11 +1,8 @@
 AUX cgal-4.11.1-fix-buildsystem.patch 840 BLAKE2B e1179b2721e52b2edf305e2cb434a914f0b46b6aa694fd1766a8622b65ed8e8209a06bc134bfab97f07b789af45f74605fc7ed2b6c45ed5f5574a0a801c479dd SHA512 5e6315dfa64c58ea88d473b3513ec0817e6d212c325dd70b523d2dca2817fed2cdb0791686b7353c410e42ff8b1ee228a045bd6f002b591672066b33ce6f09ad
-DIST CGAL-4.11.3-doc_html.tar.xz 30576756 BLAKE2B 6d32f3bca1c5aee4ed09eb96a35113a8a71bf14679e204683268ccee56f4a4799ef696bebd5ec0fd6add964e23273efc87167c122a5dc781c9cc7b2f5b938c29 SHA512 a729bea11a9b853a8197cc7ebb089005f98868e393e91142946d45a485e2e9ac9eacce1b230d91240080033b5c31bfd0195820ee5ae7f621bdd75f1abf19244f
-DIST CGAL-4.11.3.tar.xz 14657412 BLAKE2B a10457d255fcdd822f90419ff6af5389c50e88b254ed7f37471e24bb8523732b5aa6bd1ee5e67f14fcf0d8e79abf86e798ddeb3e0ce965dc2cde5667377bf5e0 SHA512 44cdd5fb313841d208ffeb9a96aa8db5111defd581b749c80f655390b5468f7c18b61df0ac2bdeb5259507341cc451fcd8cd50f7ff0571efdcb76eb920f92f7e
 DIST CGAL-5.1-doc_html.tar.xz 50630976 BLAKE2B 559287263b189ec5ac4a0b3445e1cc5862471285f28caca40f48b25b64eaef3426c42a178e4cb4db69a1e324963a9af665e84ca8f44da8b55ebb344f18f56fdc SHA512 ada944d73d3e6465a14d87ee87d1cabaee2c4848622b5360c14d6a9b5ff5ba3e19859943ecb7595b0dec7e950f214aa47b6ab389c23dd5f2794fc21a9e3a17db
 DIST CGAL-5.1.tar.xz 22850692 BLAKE2B 42320e07e222c3f69febe7dc478c74ef6cde0de723ea2d84c891b6e598d02c38026e9246edd467cadea8d66e527000a9b4af296ab026dd42c7876acea9824ccb SHA512 41085eeb113cec0eede2e21df05c9d2530db5988b4f9d0379f8de7c655cab09266620eebe017e0141c0ccdbcbafe8c074fd5bec46a40aaba95aa7521732e4423
 DIST CGAL-5.2-doc_html.tar.xz 51123300 BLAKE2B 748b94d199343402baf6aef298b352fc23b9b01995adbe2d5157d8a4d3d772f4e029f0f0ac5282cdb387e5e7b9191082154840e32cd503c97f56295a59419cf4 SHA512 4ffaa9b36c20e62a62bd77fb79d9d9d54cf2b20a1542aa1bef9f6d27f6d7c1412a5f843968ae400d42e8d4bc8ae1d7a16c197503d0fd43fc72592d73213c5c72
 DIST CGAL-5.2.tar.xz 23250240 BLAKE2B eb80a81dd01b2b2e30fe72f45cceee0861b36f47e395d1c905f8551e23d57c36dd9a7c66e32f6c2a0a2cfbd4c780fd5d5ae098709bfc1072e7ac7f761d328fd3 SHA512 8dddec18bd7e375ea3b18c636ddb2ca4f3a318e177305058f702206b830e2605837024e4b1265789f1bdc46dda80133d6fa8d61a036cda3c93a227f4c244cc1a
-EBUILD cgal-4.11.3.ebuild 1855 BLAKE2B 634dc890c3ae78d684f3ecd775558d2464015b0d05e2cd5711e2df9b6ffd3cf6612fc6639559850e0e79cfdf1499ed594da13db6c302b66a31175f418aa03730 SHA512 cfd6ef2caadb533102e29b2243f06a5cea0fd0f9e0bef4bb479fc1d43a4691ea991376dfe5756165f7b6844c2b614d3943294a14cd9edd4349cc87b693f08959
 EBUILD cgal-5.1.ebuild 1668 BLAKE2B 50a42e49445d31b98fcf87a949ce9eeb2aded5c0a3ded30efb401c9b199518b1bdabc1d51da607c21f7cfaad859ec72b46c5d0c249f61af7e6746cecdaec9fa5 SHA512 e5d289e5d3e79a46a876b51b8c319f6e1c4c1076c7a3b8c1b51374144947d3ebdca42579c90058896f50890be603573b7fe2d303ae936ad3173a76d3fb58a9da
-EBUILD cgal-5.2.ebuild 1668 BLAKE2B 636f696c5e36ef35db8ab95fe833c619a424bf3856e8d2af1f9dc7e1c8f14a7d69258b4c1c610c75e44624d1a8437e4526249c6bab7819dd3b10a8d7b0214892 SHA512 d6421c66fa55adc8ad6d6c9e51de130bb916237e6ca4aba56398e72475cbd5a7b0febe031ba8b43b49e0abe9f93c82bc6a95550341b9205a87367d413cf1a896
+EBUILD cgal-5.2.ebuild 1666 BLAKE2B 5cc82ca832411b175f72a72e68542ddacc21d9795c6067d9223b28b99da108eea63c7b3630c039e2679ad5649f270caea0b95a367c3309cbb69e4e8b48b2832b SHA512 80827eda045dcca0e2a8b145b21037979adae365caff09e88f7cbaa77bbaa43a5f59275e8deb237bca53783ad14da3bf29d201e4dad1786df39bf5a4c4b9a709
 MISC metadata.xml 1552 BLAKE2B f05f378f0343972d254851ddac6512761f36741106091b37d8e4fe216f4df6ebad12faea0d7e9323b999b5595d6d03a7b9848601fc83bf8bd8c35234c71e7301 SHA512 fc1bef0c6259b274716ad0c9bb50946268857fd8bd919d4fe2e4d6a89bbee518ef321f2fa4b43587ee61e40dcc96d12c5e152b39bdbbc39b440300c61039d4db
diff --git a/sci-mathematics/cgal/cgal-4.11.3.ebuild b/sci-mathematics/cgal/cgal-4.11.3.ebuild
deleted file mode 100644
index 21641dcffe41..000000000000
--- a/sci-mathematics/cgal/cgal-4.11.3.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils flag-o-matic
-
-MY_P=CGAL-${PV}
-
-DESCRIPTION="C++ library for geometric algorithms and data structures"
-HOMEPAGE="https://www.cgal.org/"
-SRC_URI="
-	https://github.com/CGAL/cgal/releases/download/releases%2F${MY_P}/${MY_P}.tar.xz
-	doc? ( https://github.com/CGAL/cgal/releases/download/releases%2F${MY_P}/${MY_P}-doc_html.tar.xz )"
-
-LICENSE="LGPL-3 GPL-3 Boost-1.0"
-SLOT="0/13"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples +gmp mpfi ntl qt5"
-
-RDEPEND="
-	dev-cpp/eigen
-	dev-libs/boost:=[threads]
-	dev-libs/mpfr:0=
-	sys-libs/zlib:=
-	x11-libs/libX11:=
-	virtual/glu:=
-	virtual/opengl:=
-	gmp? ( dev-libs/gmp:=[cxx] )
-	mpfi? ( sci-libs/mpfi )
-	ntl? ( dev-libs/ntl )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtopengl:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-	)"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.11.1-fix-buildsystem.patch"
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-	# modules provided by dev-util/cmake and dev-cpp/eigen
-	rm cmake/modules/Find{Eigen3,GLEW,OpenGL}.cmake || die
-	sed -e '/install(FILES AUTHORS/d' \
-		-i CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCGAL_INSTALL_LIB_DIR="$(get_libdir)"
-		-DCGAL_INSTALL_CMAKE_DIR="$(get_libdir)/cmake/CGAL"
-		-DWITH_LEDA=OFF
-		-DWITH_Eigen3=ON
-		-DWITH_ZLIB=ON
-		-DWITH_GMP="$(usex gmp)"
-		-DWITH_GMPXX="$(usex gmp)"
-		-DWITH_MPFI="$(usex mpfi)"
-		-DWITH_NTL="$(usex ntl)"
-		-DWITH_CGAL_Qt5="$(usex qt5)"
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( "${WORKDIR}"/doc_html/. )
-	cmake-utils_src_install
-	if use examples; then
-		dodoc -r examples demo
-		docompress -x /usr/share/doc/${PF}/{examples,demo}
-	fi
-}
diff --git a/sci-mathematics/cgal/cgal-5.2.ebuild b/sci-mathematics/cgal/cgal-5.2.ebuild
index 42d829dec900..2d3ea4c90a8c 100644
--- a/sci-mathematics/cgal/cgal-5.2.ebuild
+++ b/sci-mathematics/cgal/cgal-5.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=7
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-3 GPL-3 Boost-1.0"
 SLOT="0/14"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples +gmp mpfi ntl qt5"
 
 RDEPEND="