gentoo resync : 29.12.2022

5 files changed, 7 insertions, 169 deletions

diff --git a/sci-mathematics/cgal/Manifest b/sci-mathematics/cgal/Manifest
index ef1fb6eb506d..6e0e64f41bbd 100644
--- a/sci-mathematics/cgal/Manifest
+++ b/sci-mathematics/cgal/Manifest
@@ -1,14 +1,8 @@
 AUX cgal-4.11.1-fix-buildsystem.patch 840 BLAKE2B e1179b2721e52b2edf305e2cb434a914f0b46b6aa694fd1766a8622b65ed8e8209a06bc134bfab97f07b789af45f74605fc7ed2b6c45ed5f5574a0a801c479dd SHA512 5e6315dfa64c58ea88d473b3513ec0817e6d212c325dd70b523d2dca2817fed2cdb0791686b7353c410e42ff8b1ee228a045bd6f002b591672066b33ce6f09ad
-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.1-doc_html.tar.xz 47740788 BLAKE2B 5b18210fdff768c3cc3fed5bcbe8f41c7fd89592120ba9dc540ae2d1e3952676f9bb86150dac2f3e185ba0f9e92fe3fc3a240ca42d3f20a76a76810b7d45a03c SHA512 d013c4aacd031040e55aebe6de15c7ad232ccf70ff5fedfeda12435a2929b57d81183d8cac9ad2130cd3e164901a26b73748d44139ea4eb77f3a1df7d583c05d
-DIST CGAL-5.2.1.tar.xz 23256952 BLAKE2B a6a720011dde4df80a6ec74e2ee4658cf3239aefcceafdfa764d42478b1c2a7b24da135dc22a74db9ea41c624bed6768c71a19d1f7f03aa541a17a6236184309 SHA512 b1eb40a6b3231bc707fdbc43325dd88655cb6faad5d001caf891f7f5f3890b316c439b762540afcf702f87442b2b96e4e30ae7c06a1bada8cca9ee76f1f83bd5
-DIST CGAL-5.2.2-doc_html.tar.xz 47748668 BLAKE2B 063c46cd3277411ccda7121cb181b9e9534e5f463404df5d4c9848e31ef0c1ae1739885b4eb6ecfcf63088ad57cd3601a2765a18c64204eaf808759be9bdc791 SHA512 2f763698fdf99156636e02c95fd677360daca5c0b51e6a2f92b7a226583760e9eb19ba8adb0451709407bb4582edaee4a2b529f60bd2c467324e9ce222f78647
-DIST CGAL-5.2.2.tar.xz 23260652 BLAKE2B b615d74e8fb9f93dece8d7e88051d6f7f010b8d93de92c540d7c7f4f10a9b99d3ab42ccffebf3ee4b92dcdef443b1a75008d7261ab1e8caa7514fe373a44f053 SHA512 e51a0c82dc39f3c1c5245570f6f5d443ee9056e8aa58d0aeccbe6419323be52528477c9b339a8a071336da432eeca2bbf5322c06a7d0e27ef31c7aeded68c7ec
 DIST CGAL-5.2.tar.xz 23250240 BLAKE2B eb80a81dd01b2b2e30fe72f45cceee0861b36f47e395d1c905f8551e23d57c36dd9a7c66e32f6c2a0a2cfbd4c780fd5d5ae098709bfc1072e7ac7f761d328fd3 SHA512 8dddec18bd7e375ea3b18c636ddb2ca4f3a318e177305058f702206b830e2605837024e4b1265789f1bdc46dda80133d6fa8d61a036cda3c93a227f4c244cc1a
-EBUILD cgal-5.1-r2.ebuild 1676 BLAKE2B 0cf776ec3975dd081ea09e200ec920aee26a1735229ef80406a136a933fde69508e4d17a58b151cbe3dd9e0953aa70bdf7055b72d58d35d1f80db9ab39665d1f SHA512 8b024e072f13de1399341cef016babbde013a1c3a39b127347957759369cace58feda41e5bea3e09c74feac7280d8a802c4036556189f688aab3e76f532a68e3
-EBUILD cgal-5.2-r2.ebuild 1674 BLAKE2B 48c4bce712df40a9d9f5a105c84724233c6e001b5a5017d37c129576a2c800c46f7ad08303e102916cda08c6906f301dac09db8613655a2924836b475de286ac SHA512 475a747f8a3a6cd040b902df9e2eac6b357c75b528857ed56808a3af00fc623d2f91295cc2aef99cd41d35da59a7fcba03195593d09291b6dd4ab67006427cd9
-EBUILD cgal-5.2.1-r2.ebuild 1701 BLAKE2B c3fe6d68ec09db9c182dda3851cb429d47eb085ff313b589d5db74e074df6b43b1497b71d00c4ba2f06f53f0933a346879760259d56102d5b79f73bb04c94ce5 SHA512 baaf085725a7a26e4e0b87f557b758ef8c977462cab0b6cad32d9784f5e6dc6b33b8681a4d74c14d2278d2b39b016211aee92a21113136c5906b3e5fec2dbd4d
-EBUILD cgal-5.2.2-r1.ebuild 1696 BLAKE2B bc92a6f33cb9fdfa12adadf9205ef6861a3ad9bbd71e5e1b392aefe10a93c8857320df5e31d756eb99aeb8996d4769f16fda1bd29dc53df665cf6837fa5fded1 SHA512 d1023cc35bdff8ad375de67d844de5052c23ab581089ee1929b1483ab237b7d58d59717a6c2cc84cdf2f3ab0e5c0d5052af21462c749abaab7d115f077374c6c
+DIST CGAL-5.4.1-doc_html.tar.xz 50436088 BLAKE2B 9f293349f054094ecdce7a04ca1f276c56e824b4c9edd7ef82b9c450e3bde5ae26c9e6d06c5feea370c345d2b419cd426427ce34f329ea9a88ad5fa5931a0446 SHA512 5167a0fb0e390ab72c7d6106bc7d34e4a6c927f9634b02f71b675f8456d17cdcbc4a5d944c5ebf5ba1d6b635f469ee474c484913b768bff8a7c8ba52669373e8
+DIST CGAL-5.4.1.tar.xz 24110884 BLAKE2B 2d01404333fdaa00d66028decbaa522d6767290e2f5be5c2b7d0323d16b9b44cd00fe58fb7d20cb02b2731893bc251bcdd4de7013107bc1d4c086e999bbf240d SHA512 751871952173c31b356284e12f3cd0840863dad51c8dad5eb8894f8285470d0e23b6b09d97d60c4ffe6eb93b14ff141a18e381eab07ea29cb48923e90f9b657b
+EBUILD cgal-5.2-r2.ebuild 1674 BLAKE2B 2c9ce25313006e087ab352fc8d296ef7b2d9aebb0d4c07341dbac914fc66ac15ee7802e36773e108286f4ca1f89a670efdc58a19ca0f1ee0b37fdfc57a01e914 SHA512 bec84e99aab09791d872dc2708d981e33d7170c1aa56a35a34b9119f53f4da34ba4d67fc6453e6c8b02b58b3d95cf7b672abe53eb93abdb80261fcd33afd152b
+EBUILD cgal-5.4.1.ebuild 1697 BLAKE2B 59864ae06e3af97aec9e129ee4752ed241f09409c0ebfa90f4b2695401295c4571e032e1125fddd588fef98a906be1b4a5a6dc649015bbfef48c65729e0f6c26 SHA512 c1e75ae5ebdce4d4001585984e9e952b96b53dc3a6a3e9a692faff633e9e833cd7ad235c2dbe3b03c61bd86fe522c5bfd245bb8aa0996c8769cdbfbb69e092a1
 MISC metadata.xml 1373 BLAKE2B 7e3ecb8f36476edb32f20a03775f01f916fa82ab2c7a6e0554066a4b47019d3a13350e442ba4f9e6f184eb7678707a683339f223d5c86e18c08e9de5b359218c SHA512 a99c724624e7cdd71c65424adef18966dc6a88bd8e56e38fa5ba0ad4c40010481548d6d7f3e51044f62597096fdbf9e52a361d3c71d0ab870753526df664f7d2
diff --git a/sci-mathematics/cgal/cgal-5.1-r2.ebuild b/sci-mathematics/cgal/cgal-5.1-r2.ebuild
deleted file mode 100644
index 37647b5559eb..000000000000
--- a/sci-mathematics/cgal/cgal-5.1-r2.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-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/v${PV}/${MY_P}.tar.xz
-	doc? ( https://github.com/CGAL/cgal/releases/download/v${PV}/${MY_P}-doc_html.tar.xz )"
-
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="LGPL-3 GPL-3 Boost-1.0"
-SLOT="0/14"
-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:=
-	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}"
-BDEPEND="
-	app-arch/xz-utils
-	virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-4.11.1-fix-buildsystem.patch )
-
-src_prepare() {
-	cmake_src_prepare
-	# modules provided by dev-cpp/eigen
-	rm cmake/modules/FindEigen3.cmake || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCGAL_INSTALL_LIB_DIR="$(get_libdir)"
-		-DCGAL_INSTALL_CMAKE_DIR="$(get_libdir)/cmake/CGAL"
-		-DCGAL_HEADER_ONLY=OFF
-		-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_src_configure
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( "${WORKDIR}"/doc_html/. )
-	cmake_src_install
-	if use examples; then
-		dodoc -r examples demo
-	fi
-}
diff --git a/sci-mathematics/cgal/cgal-5.2-r2.ebuild b/sci-mathematics/cgal/cgal-5.2-r2.ebuild
index 75a0a7bbadd8..739a6e67534d 100644
--- a/sci-mathematics/cgal/cgal-5.2-r2.ebuild
+++ b/sci-mathematics/cgal/cgal-5.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/sci-mathematics/cgal/cgal-5.2.1-r2.ebuild b/sci-mathematics/cgal/cgal-5.2.1-r2.ebuild
deleted file mode 100644
index 81dbb6147e6e..000000000000
--- a/sci-mathematics/cgal/cgal-5.2.1-r2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-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/v${PV}/${MY_P}.tar.xz
-	doc? ( https://github.com/CGAL/cgal/releases/download/v${PV}/${MY_P}-doc_html.tar.xz )"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="LGPL-3 GPL-3 Boost-1.0"
-SLOT="0/14"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples +gmp mpfi ntl qt5 shared"
-
-RDEPEND="
-	dev-cpp/eigen
-	dev-libs/boost:=[threads(+)]
-	dev-libs/mpfr:=
-	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}"
-BDEPEND="
-	app-arch/xz-utils
-	virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-4.11.1-fix-buildsystem.patch )
-
-src_prepare() {
-	cmake_src_prepare
-	# modules provided by dev-cpp/eigen
-	rm cmake/modules/FindEigen3.cmake || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCGAL_INSTALL_LIB_DIR="$(get_libdir)"
-		-DCGAL_INSTALL_CMAKE_DIR="$(get_libdir)/cmake/CGAL"
-		-DCGAL_HEADER_ONLY=$(usex shared OFF ON)
-		-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_src_configure
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( "${WORKDIR}"/doc_html/. )
-	cmake_src_install
-	if use examples; then
-		dodoc -r examples demo
-	fi
-}
diff --git a/sci-mathematics/cgal/cgal-5.2.2-r1.ebuild b/sci-mathematics/cgal/cgal-5.4.1.ebuild
index 599cffa47c6b..100c964916d0 100644
--- a/sci-mathematics/cgal/cgal-5.2.2-r1.ebuild
+++ b/sci-mathematics/cgal/cgal-5.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="LGPL-3 GPL-3 Boost-1.0"
 SLOT="0/14"
 KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples +gmp mpfi ntl qt5 shared"
+IUSE="doc examples +gmp mpfi ntl qt5 +shared"
 
 RDEPEND="
 	dev-cpp/eigen