gentoo resync : 29.12.2022

7 files changed, 6 insertions, 243 deletions

diff --git a/sci-physics/clhep/Manifest b/sci-physics/clhep/Manifest
index 95d05a2f6602..473d37eb92d4 100644
--- a/sci-physics/clhep/Manifest
+++ b/sci-physics/clhep/Manifest
@@ -1,11 +1,5 @@
-AUX clhep-fix-testThreaded.patch 3044 BLAKE2B 7465888366bcb5d8dcec5dcbe9b81ec2e812a601d53f5e97b5a6874fe495cfa2687a7d17d07899cef1eacb77a3020f01a8823b97f70edfedd7cb2a1e0d89d57f SHA512 a6bb6da8ce3ec7b2b0a20ec98ee9b2c280aaa5f79c9e79828285cfb42fe0f202400071252cb323c48829e6781042b795a001ece62257e2e454a686710a95c84c
-AUX clhep-modulemap.patch 883 BLAKE2B 174bd4827da32982b77052ab09f36d84e3035c7a0916add4fc8aebde819468c36e7f2e6236fdf1109d2a7fab3349c3e6deb17302c8593e9a3666afc7648ce33e SHA512 d616d25c187baeb19f46419698e92760e762454f85f50248f93aecb02b059ec2bee336e160f0f9519a0e4920a89fb54511272699bea8731cb0f8d073ebaa382a
-DIST clhep-2.4.1.3.tgz 1537908 BLAKE2B 92fd1fcc415b01d8efa44be67c3bf9e58af2b4d18b6e7ee2161fbc20312428a6f17eacc09150ccff7fefb1686161518042f5c2f7558ff00b4d5696d002432ece SHA512 f7a52b353dc2c6d30cb7d307af71a028838ec674af2a50fe0199335d0b0f7fb4b84489ccfd12f21ecb7b1327acbc87065e7e87363308fd0caad5748a657aac13
-DIST clhep-2.4.4.0.tgz 1541722 BLAKE2B 077048ea3ce94de88f08a1ae51ab9af892385d6747ed9f875e13b5aacc725e85f723031d42f526ca53050c07dad621053008c71d0f255f32893724f3e8189e52 SHA512 3ae88c8f31877c6e2cac7f7612946e9989186876c66015e6bfeab19260814c8a8bfb21fa28dd251cd2c43e4e3f63f336249c430c984f84810441603e949ecb5d
-DIST clhep-2.4.4.2.tgz 1541867 BLAKE2B 69f23c298db57fbd23a505facd993725f4f21b410463069570e98826dc96d54f309b010df27a5fe910c756bfb1dcdffdb9b47452ef5ddadd5a91ed81a1d9566e SHA512 c267e113111c139f4048db774c81167e53a70d4911f8106c3fabf5980935dfc9b451108385e9d8b8dccace99b4732a21ec0ea2fb86004bb85d04c02cfa54a619
 DIST clhep-2.4.5.1.tgz 1551358 BLAKE2B e428946163dd525291643e9cdb4921dea64feacf4281aaa4b1466bed021e123ac29fa654e115efa3bb1d154869b4c04196f562850b5e6e162e98001a3d901727 SHA512 68612004a92c6dc036471f440bc00605b611a6f2f9f46ab7343c1f83357498bb7518c4dd2e44d0aef754188d5efbc3ac9187c2371bc6bd46ca076ab4ff13afae
-EBUILD clhep-2.4.1.3-r2.ebuild 1255 BLAKE2B 3a0fa1d273defe2175fbb959b86b0ad9412c249a99eab148305c80e6385c7120166ef9e1d3e62f0f92626ec1127ac74da05e2904d57fdc8499457b18152ac113 SHA512 2dd80b6afd922e83f4cdaf3813aded58347d91e50e21480d727cb0d6e22b271357ae18d083a85a9a80b2f413bf6056a3045853e928bbdd95aa93475b97a4392a
-EBUILD clhep-2.4.4.0.ebuild 1293 BLAKE2B bd9ecf7d692afd6dde230d5dc93f5eeecfd987c6c1f5f5dfa049d577ef6d694618f77d4b2b7f0c439142bb2443ffbeae1b1a8894e3dd4785d903d4fe5590c985 SHA512 d19bca83b3567dc009482c819d27930f2fc66e3ec776e79c10f6a136bd0242c6b08922d99b5632ddeaa5446677fbf1e62fff1a13485085a28e63af518362deb1
-EBUILD clhep-2.4.4.2.ebuild 1201 BLAKE2B 6c160820ebaecdb9b0be25a0ee4ee623d6a3e3167f6da24efe9507771d5b2388eb1662a0dec9dea410176c5f96b6dd06d91f45c14a77f2595c287e857397c2a0 SHA512 9dcda8ed96899c2cf8e88d3b1bc1cb355fb5480a67b54d0b746cd919e2e0d41c44f1c66b1a3b18f29639e05d88bbbde654db57a32b239ee1750ac0cfd9c10331
-EBUILD clhep-2.4.5.1.ebuild 1201 BLAKE2B 6c160820ebaecdb9b0be25a0ee4ee623d6a3e3167f6da24efe9507771d5b2388eb1662a0dec9dea410176c5f96b6dd06d91f45c14a77f2595c287e857397c2a0 SHA512 9dcda8ed96899c2cf8e88d3b1bc1cb355fb5480a67b54d0b746cd919e2e0d41c44f1c66b1a3b18f29639e05d88bbbde654db57a32b239ee1750ac0cfd9c10331
+DIST clhep-2.4.5.3.tgz 1552597 BLAKE2B a2edcbe133af98c817982f9d9f787fbbc76a1e8a10a29c890cbdd223670ee2e9d6dec872de80880e5d286790ee0168501cd3270bdbed04f9781554ee35f6eb1a SHA512 f677c93bb53047167fe0f22cbf1f5d97f27476b64566817a799240bfce8e9fe7fd658a168c25fad76a35c6eb92e1e42ec7b88960facb6632279367f0606282c8
+EBUILD clhep-2.4.5.1.ebuild 1199 BLAKE2B f665541db0eb7c9ee4228e50ffe58377791c4e562904a46f2b48aa83c58a328e5aad2131433b5b19d5ca072c6f635c0ddd9cd57b91c178fc6feb4a7a10482b5d SHA512 c93e9ab497162f6b53fe4220a5cc6adb90aba2a3061126681f88265e2a739b24b5b27381c52fce8ffbd889e8a7d8c483227ed2115c3293ef74f3ecdc37ceea5b
+EBUILD clhep-2.4.5.3.ebuild 1201 BLAKE2B 8eb32e23a223bfcdb1f0df4579552a34880f37874e1669fbb148dc672d0ad97d5da366831a5fa3472a4577ca60974042d9a20d52bec628096054dc52f54638c8 SHA512 f9f12db370d94fd0698ce060d60141d439405ba3010e85ff169af16a49a0b80f02db58278315baddeb5a1b2fc6522b0e72c13e2de3c047db9e5620928ce29c61
 MISC metadata.xml 497 BLAKE2B 9f68cecc9a1a96ebbc0f8408a2124a47414e987bf458f979548b458676ad45644d9fa3c690200be93aa01ef1d205e5bc3e7596b18d48a1b8a85455e2fc84fe8a SHA512 9ef1d630cfd0214dc7fb0c8021560d974cebf717c3eecd27f7abc7ee634edcaf2cc128a808b21a8676fc7bed2bf93d927cd682d4b37ef9f9c34041b0c8a06a2d
diff --git a/sci-physics/clhep/clhep-2.4.1.3-r2.ebuild b/sci-physics/clhep/clhep-2.4.1.3-r2.ebuild
deleted file mode 100644
index ea1591ede033..000000000000
--- a/sci-physics/clhep/clhep-2.4.1.3-r2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="High Energy Physics C++ library"
-HOMEPAGE="http://proj-clhep.web.cern.ch/proj-clhep/"
-SRC_URI="http://proj-clhep.web.cern.ch/proj-clhep/dist1/${P}.tgz"
-LICENSE="GPL-3 LGPL-3"
-SLOT="2/${PV}"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-IUSE="doc test threads"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	doc? (
-		app-doc/doxygen
-		dev-texlive/texlive-bibtexextra
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-fontutils
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-	)
-"
-
-PATCHES=( "${FILESDIR}"/clhep-fix-testThreaded.patch )
-
-S="${WORKDIR}/${PV}/CLHEP"
-
-src_prepare() {
-	cmake_src_prepare
-
-	# respect flags
-	sed -i -e 's:-O::g' cmake/Modules/ClhepVariables.cmake || die
-	# dont build test if not asked
-	if ! use test; then
-		cmake_comment_add_subdirectory test
-	fi
-	# gentoo doc directory
-	if use doc; then
-		grep -rl 'share/doc/CLHEP' |
-		xargs sed -i \
-			-e "s:share/doc/CLHEP:share/doc/${PF}:" \
-			{.,*}/CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCLHEP_BUILD_DOCS=$(usex doc)
-		-DCLHEP_SINGLE_THREAD=$(usex threads no yes)
-	)
-	cmake_src_configure
-}
diff --git a/sci-physics/clhep/clhep-2.4.4.0.ebuild b/sci-physics/clhep/clhep-2.4.4.0.ebuild
deleted file mode 100644
index 770db67ea689..000000000000
--- a/sci-physics/clhep/clhep-2.4.4.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="High Energy Physics C++ library"
-HOMEPAGE="http://proj-clhep.web.cern.ch/proj-clhep/"
-SRC_URI="http://proj-clhep.web.cern.ch/proj-clhep/dist1/${P}.tgz"
-LICENSE="GPL-3 LGPL-3"
-SLOT="2/${PV}"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-IUSE="doc test threads"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	doc? (
-		app-doc/doxygen
-		dev-texlive/texlive-bibtexextra
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-fontutils
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/clhep-fix-testThreaded.patch
-	"${FILESDIR}"/clhep-modulemap.patch
-)
-
-S="${WORKDIR}/${PV}/CLHEP"
-
-src_prepare() {
-	cmake_src_prepare
-
-	# respect flags
-	sed -i -e 's:-O::g' cmake/Modules/ClhepVariables.cmake || die
-	# dont build test if not asked
-	if ! use test; then
-		cmake_comment_add_subdirectory test
-	fi
-	# gentoo doc directory
-	if use doc; then
-		grep -rl 'share/doc/CLHEP' |
-		xargs sed -i \
-			-e "s:share/doc/CLHEP:share/doc/${PF}:" \
-			{.,*}/CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCLHEP_BUILD_DOCS=$(usex doc)
-		-DCLHEP_SINGLE_THREAD=$(usex threads no yes)
-	)
-	cmake_src_configure
-}
diff --git a/sci-physics/clhep/clhep-2.4.5.1.ebuild b/sci-physics/clhep/clhep-2.4.5.1.ebuild
index ab61250e0377..bae7df5849e2 100644
--- a/sci-physics/clhep/clhep-2.4.5.1.ebuild
+++ b/sci-physics/clhep/clhep-2.4.5.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
@@ -10,7 +10,7 @@ HOMEPAGE="http://proj-clhep.web.cern.ch/proj-clhep/"
 SRC_URI="http://proj-clhep.web.cern.ch/proj-clhep/dist1/${P}.tgz"
 LICENSE="GPL-3 LGPL-3"
 SLOT="2/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 IUSE="doc test threads"
 RESTRICT="!test? ( test )"
diff --git a/sci-physics/clhep/clhep-2.4.4.2.ebuild b/sci-physics/clhep/clhep-2.4.5.3.ebuild
index ab61250e0377..57eb9a57fa2c 100644
--- a/sci-physics/clhep/clhep-2.4.4.2.ebuild
+++ b/sci-physics/clhep/clhep-2.4.5.3.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-physics/clhep/files/clhep-fix-testThreaded.patch b/sci-physics/clhep/files/clhep-fix-testThreaded.patch
deleted file mode 100644
index 58010dc726da..000000000000
--- a/sci-physics/clhep/files/clhep-fix-testThreaded.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From 849f0250076ac3cce672e925c232bd6b96a018e0 Mon Sep 17 00:00:00 2001
-From: Guilherme Amadio <amadio@cern.ch>
-Date: Wed, 18 Nov 2020 17:33:17 +0100
-Subject: [PATCH] Fix testThreaded on x86
-
----
- Random/test/testThreaded.cc | 53 ++++++++++++++++++++++++++-----------
- 1 file changed, 38 insertions(+), 15 deletions(-)
-
-diff --git a/Random/test/testThreaded.cc b/Random/test/testThreaded.cc
-index a835ce19..0a6352c3 100644
---- a/Random/test/testThreaded.cc
-+++ b/Random/test/testThreaded.cc
-@@ -65,23 +65,38 @@ void testRandGauss(std::vector<double> const& reference, bool& result) {
- 
-   result = true;
- 
-+  std::vector<double> v;
-+  v.push_back(dist.fire());
-+  v.push_back(dist.fire());
-+  v.push_back(dist.fire());
-+  v.push_back(dist.fire());
-+  v.push_back(dist.fire());
-+
-   // Just a sanity check first. The fire method reproduces
-   // itself.
--  if (reference[0] != dist.fire() ||
--      reference[1] != dist.fire() ||
--      reference[2] != dist.fire() ||
--      reference[3] != dist.fire() ||
--      reference[4] != dist.fire()) {
-+  if (reference[0] != v[0] ||
-+      reference[1] != v[1] ||
-+      reference[2] != v[2] ||
-+      reference[3] != v[3] ||
-+      reference[4] != v[4]) {
-     result = false;
-   }
- 
-   // check the shoot method where we pass in an engine
-   CLHEP::HepJamesRandom engine1(seedL1);
--  if (reference[0] != CLHEP::RandGauss::shoot(&engine1) ||
--      reference[1] != CLHEP::RandGauss::shoot(&engine1) ||
--      reference[2] != CLHEP::RandGauss::shoot(&engine1) ||
--      reference[3] != CLHEP::RandGauss::shoot(&engine1) ||
--      reference[4] != CLHEP::RandGauss::shoot(&engine1)) {
-+
-+  v.clear();
-+  v.push_back(CLHEP::RandGauss::shoot(&engine1));
-+  v.push_back(CLHEP::RandGauss::shoot(&engine1));
-+  v.push_back(CLHEP::RandGauss::shoot(&engine1));
-+  v.push_back(CLHEP::RandGauss::shoot(&engine1));
-+  v.push_back(CLHEP::RandGauss::shoot(&engine1));
-+
-+  if (reference[0] != v[0] ||
-+      reference[1] != v[1] ||
-+      reference[2] != v[2] ||
-+      reference[3] != v[3] ||
-+      reference[4] != v[4]) {
-     result = false;
-   }
- 
-@@ -93,11 +108,19 @@ void testRandGauss(std::vector<double> const& reference, bool& result) {
-   // setFlag causes it to not use the cached value
-   // and generate a new pair of random numbers
-   CLHEP::RandGauss::setFlag(false);
--  if (reference[0] != CLHEP::RandGauss::shoot() ||
--      reference[1] != CLHEP::RandGauss::shoot() ||
--      reference[2] != CLHEP::RandGauss::shoot() ||
--      reference[3] != CLHEP::RandGauss::shoot() ||
--      reference[4] != CLHEP::RandGauss::shoot()) {
-+
-+  v.clear();
-+  v.push_back(CLHEP::RandGauss::shoot());
-+  v.push_back(CLHEP::RandGauss::shoot());
-+  v.push_back(CLHEP::RandGauss::shoot());
-+  v.push_back(CLHEP::RandGauss::shoot());
-+  v.push_back(CLHEP::RandGauss::shoot());
-+
-+  if (reference[0] != v[0] ||
-+      reference[1] != v[1] ||
-+      reference[2] != v[2] ||
-+      reference[3] != v[3] ||
-+      reference[4] != v[4]) {
-     result = false;
-   }
-   CLHEP::HepRandom::setTheEngine(savedEngine);
--- 
-2.29.2
-
diff --git a/sci-physics/clhep/files/clhep-modulemap.patch b/sci-physics/clhep/files/clhep-modulemap.patch
deleted file mode 100644
index 31b1eda620a7..000000000000
--- a/sci-physics/clhep/files/clhep-modulemap.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From ade5d82b54d2c72660b6b2c478323ac741ea7c01 Mon Sep 17 00:00:00 2001
-From: Guilherme Amadio <amadio@cern.ch>
-Date: Thu, 19 Nov 2020 09:55:12 +0100
-Subject: [PATCH] Install modulemap along with other header files
-
----
- cmake/Modules/ClhepCopyHeaders.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmake/Modules/ClhepCopyHeaders.cmake b/cmake/Modules/ClhepCopyHeaders.cmake
-index bd38b8a2..c6483c3a 100644
---- a/cmake/Modules/ClhepCopyHeaders.cmake
-+++ b/cmake/Modules/ClhepCopyHeaders.cmake
-@@ -49,6 +49,6 @@ macro (clhep_copy_headers )
-   # handle the module.modulemap file
-   CONFIGURE_FILE( ${CLHEP_SOURCE_DIR}/module.modulemap ${CLHEP_BINARY_DIR}/module.modulemap COPYONLY )
-   INSTALL (FILES ${CLHEP_BINARY_DIR}/module.modulemap
--           DESTINATION include )
-+           DESTINATION include/CLHEP )
-   
- endmacro (clhep_copy_headers)
--- 
-2.29.2
-