gentoo resync : 25.11.2020

7 files changed, 134 insertions, 130 deletions

diff --git a/sci-physics/clhep/Manifest b/sci-physics/clhep/Manifest
index 337a17a3c3c8..530955554c96 100644
--- a/sci-physics/clhep/Manifest
+++ b/sci-physics/clhep/Manifest
@@ -1,9 +1,7 @@
-DIST clhep-2.2.0.5.tgz 1847046 BLAKE2B 8dddc6b9acbf41abdd849ef1aa1087d93f48fc83937ee67e687e28c421d290683e5381c2b9f8034e2651e3ccec2fd2e0ba8bee73dc55618e22c0e4df7ce3a378 SHA512 07d9359604196344fe3b13cc103727693fd70818c22849e54507530221812843a943cb8ed66eea421e498edcc9c0f584826823ea7939cbf53b90b17d412aed1a
-DIST clhep-2.4.0.4.tgz 1536520 BLAKE2B 7ab58aeab685950393c8059f77e95cbbf7bf61f04e8113c6fd7b09200cce497716d5a0e023143dde395db895f48848a78e579e38968d9f27a50769034003e11e SHA512 349c1225713a3bc91fe94e27f938e919b434e6466df94dcde915c7e8ed313b9b2e7186e67a9b580ede21aec0050507a070c279920590148ebbec0ac5733fb008
-DIST clhep-2.4.1.2.tgz 1537636 BLAKE2B ad6cc94e1147747d2875c3f630155527fc428cf2b6dc3236824c0f70712eea9416006b127ff0dbb5c4f0c853618cc2c3f6f8e57e5a833d7d6e1e4328d161212b SHA512 e79139682f9955ff4cb79846cca5823c70b6710e7b8e227218346c05205a346d9dfee9f03736f8d1833379ba880239babdb3398cde776318550451d284269974
+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
-EBUILD clhep-2.2.0.5.ebuild 1347 BLAKE2B 90a2000635f4be1d1aaceecc9abe05e5e3c0da3b1ec41e09e08685f7eaf01a1738b38bde6eeab5c6aa15f67e31fca89deddd68e2d7be888d93d97bca4665a05f SHA512 8e8818288544e5f36487ef4903f8dbd5c95e32d9b7266250e7f7ba05b4e7a2c3d29898b654d0ee9a6801b79d8dd8899deffa1042ee543df3923e569fe98d6c3b
-EBUILD clhep-2.4.0.4.ebuild 1286 BLAKE2B eefcd15e6d91547411fce7a35f45902bb82237141487f30763f1e58e8572ca0e71e12991a5cba98a550e5769ecc47d43c377e3b307725b7d88100b100a3c720c SHA512 526c396df82466dd0f18043e38f00cc79e85a9bbc5fe66181fb2c0f2922a0f1340eb9d1513720a815caf85786edc4e317656aa39d05ce760d1339b20e2817fb0
-EBUILD clhep-2.4.1.2.ebuild 1271 BLAKE2B 94ccb40d51b6b377180cda403282dfbfa81cbc2b16b51d97240fe93bf43f902f987e3a454a24d37fa5bb3854824dee4ff4c61af80004edbb513b91f86b298d02 SHA512 a6e7c5a80a1b9a3f21a6de83e435788289a1cf16155b4402315b206a7db9bf9abde4464dd483f935b8e2a97ed77328406488e53bdf20928b54ecb207d0a33667
-EBUILD clhep-2.4.1.3-r1.ebuild 1235 BLAKE2B f5ca0f478ccbf511a40e23c62ab3fde5bc611936c47a7cc40e3740b8e178b01dffbb1072c48f89db4b639dd74d0278eea8189af4d033ad25adf0cdae96bb47ae SHA512 37496d7cdaacfc75107583567132eb7721e2d5434c15cb71c19d9ebe3f4edc6f7c6d053ddde41e18f52856dd6d13bbe738d4fcdc5837ea29ad6f27ea4f60532d
+DIST clhep-2.4.4.0.tgz 1541722 BLAKE2B 077048ea3ce94de88f08a1ae51ab9af892385d6747ed9f875e13b5aacc725e85f723031d42f526ca53050c07dad621053008c71d0f255f32893724f3e8189e52 SHA512 3ae88c8f31877c6e2cac7f7612946e9989186876c66015e6bfeab19260814c8a8bfb21fa28dd251cd2c43e4e3f63f336249c430c984f84810441603e949ecb5d
+EBUILD clhep-2.4.1.3-r2.ebuild 1271 BLAKE2B d070515ebe0baa80f4e9c4d190b937d325edf7cc48dcdc8cf3c2accad7b4e179ed49a92cc31903fe4e210242bb3570b3e853f96eeccb4f78cec80e2ab80e7a7b SHA512 834fd313a28ebd154edf8a75e091a32971370f7ad3e4edc1a04872802701d87d5ee4224754740870607da8f53ff6943ffedba380ad173a613c555e4043c19481
+EBUILD clhep-2.4.4.0.ebuild 1311 BLAKE2B 4586f30adbfcf26f05b29d69db5b0001100d6a94b4a2c935311819b153f4d3daa37487d0e167447bb26227bac5629a3d35d7d98d69884e45d54e776e34789ef8 SHA512 506a79ed3e549a857e037f60fbe4b2e8ab5e4364f642e1c736c3882fafb4108f2d7c30f92d3f597662a563e5e1b9dc2d3b5063b12549e5308cfe020aaf994651
 MISC metadata.xml 496 BLAKE2B 60254470fbb21294249dd75b34aebb0d29d090aba3a41f75e02950ccd77fe1ca0043eec460844f2de4b2a9b4bd4e34f2faa6c00b81daf8e615b78d92f503ade3 SHA512 768aeefc23a2ea89eb63b0eb6fd084c253243b6d67b822702dffc8f49a7170d30e55ebc08875ff238e618639882f93fe6e1390e3d8456f3850d75d5a98bf3b96
diff --git a/sci-physics/clhep/clhep-2.2.0.5.ebuild b/sci-physics/clhep/clhep-2.2.0.5.ebuild
deleted file mode 100644
index 2c12b7fa1861..000000000000
--- a/sci-physics/clhep/clhep-2.2.0.5.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-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/DISTRIBUTION/tarFiles/${P}.tgz"
-LICENSE="GPL-3 LGPL-3"
-SLOT="2/${PV}"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-IUSE="doc static-libs test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="doc? ( virtual/latex-base )"
-
-S="${WORKDIR}/${PV}/CLHEP"
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# respect flags
-	sed -i -e 's:-O::g' cmake/Modules/ClhepVariables.cmake || die
-	# no batch mode to allow parallel building (bug #437482)
-	sed -i \
-		-e 's:-interaction=batchmode::g' \
-		cmake/Modules/ClhepBuildTex.cmake || die
-	# gentoo doc directory
-	sed -i \
-		-e "/DESTINATION/s:doc:share/doc/${PF}:" \
-		cmake/Modules/ClhepBuildTex.cmake */doc/CMakeLists.txt || die
-	# dont build test if not asked
-	if ! use test; then
-		sed -i \
-			-e '/add_subdirectory(test)/d' \
-			*/CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCLHEP_BUILD_DOCS=$(usex doc)
-	)
-	DESTDIR="${ED}" cmake-utils_src_configure
-	use doc && MAKEOPTS+=" -j1"
-}
-
-src_install() {
-	cmake-utils_src_install
-	if ! use static-libs; then
-		rm "${ED}"/usr/$(get_libdir)/*.a || die
-	fi
-}
diff --git a/sci-physics/clhep/clhep-2.4.0.4.ebuild b/sci-physics/clhep/clhep-2.4.0.4.ebuild
deleted file mode 100644
index b72155c7a620..000000000000
--- a/sci-physics/clhep/clhep-2.4.0.4.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-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/DISTRIBUTION/tarFiles/${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
-	)
-"
-
-S="${WORKDIR}/${PV}/CLHEP"
-
-src_prepare() {
-	cmake-utils_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
-		sed -i \
-			-e '/add_subdirectory(test)/d' \
-			*/CMakeLists.txt || die
-	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)
-	)
-	DESTDIR="${ED}" cmake-utils_src_configure
-}
diff --git a/sci-physics/clhep/clhep-2.4.1.2.ebuild b/sci-physics/clhep/clhep-2.4.1.3-r2.ebuild
index d1e22595d8af..d2ec26241032 100644
--- a/sci-physics/clhep/clhep-2.4.1.2.ebuild
+++ b/sci-physics/clhep/clhep-2.4.1.3-r2.ebuild
@@ -3,14 +3,14 @@
 
 EAPI=7
 
-inherit cmake-utils
+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"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 IUSE="doc test threads"
 RESTRICT="!test? ( test )"
@@ -26,18 +26,18 @@ BDEPEND="
 	)
 "
 
+PATCHES=( "${FILESDIR}"/clhep-fix-testThreaded.patch )
+
 S="${WORKDIR}/${PV}/CLHEP"
 
 src_prepare() {
-	cmake-utils_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
-		sed -i \
-			-e '/add_subdirectory(test)/d' \
-			*/CMakeLists.txt || die
+		cmake_comment_add_subdirectory test
 	fi
 	# gentoo doc directory
 	if use doc; then
@@ -53,5 +53,5 @@ src_configure() {
 		-DCLHEP_BUILD_DOCS=$(usex doc)
 		-DCLHEP_SINGLE_THREAD=$(usex threads no yes)
 	)
-	DESTDIR="${ED}" cmake-utils_src_configure
+	DESTDIR="${ED}" cmake_src_configure
 }
diff --git a/sci-physics/clhep/clhep-2.4.1.3-r1.ebuild b/sci-physics/clhep/clhep-2.4.4.0.ebuild
index 817da604300f..1938b34ce53a 100644
--- a/sci-physics/clhep/clhep-2.4.1.3-r1.ebuild
+++ b/sci-physics/clhep/clhep-2.4.4.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="High Energy Physics C++ library"
 HOMEPAGE="http://proj-clhep.web.cern.ch/proj-clhep/"
@@ -26,10 +26,15 @@ BDEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}"/clhep-fix-testThreaded.patch
+	"${FILESDIR}"/clhep-modulemap.patch
+)
+
 S="${WORKDIR}/${PV}/CLHEP"
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# respect flags
 	sed -i -e 's:-O::g' cmake/Modules/ClhepVariables.cmake || die
@@ -51,5 +56,5 @@ src_configure() {
 		-DCLHEP_BUILD_DOCS=$(usex doc)
 		-DCLHEP_SINGLE_THREAD=$(usex threads no yes)
 	)
-	DESTDIR="${ED}" cmake-utils_src_configure
+	DESTDIR="${ED}" cmake_src_configure
 }
diff --git a/sci-physics/clhep/files/clhep-fix-testThreaded.patch b/sci-physics/clhep/files/clhep-fix-testThreaded.patch
new file mode 100644
index 000000000000..58010dc726da
--- /dev/null
+++ b/sci-physics/clhep/files/clhep-fix-testThreaded.patch
@@ -0,0 +1,90 @@
+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
new file mode 100644
index 000000000000..31b1eda620a7
--- /dev/null
+++ b/sci-physics/clhep/files/clhep-modulemap.patch
@@ -0,0 +1,24 @@
+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
+