commit: 47428f3d5faaf674d8da12366bbaea692b6d5d90 Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org> AuthorDate: Mon May 30 12:50:41 2022 +0000 Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org> CommitDate: Tue May 31 06:53:32 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47428f3d
sci-physics/clhep: drop old Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org> sci-physics/clhep/Manifest | 3 - sci-physics/clhep/clhep-2.4.1.3-r2.ebuild | 57 -------------- sci-physics/clhep/clhep-2.4.4.0.ebuild | 60 --------------- sci-physics/clhep/clhep-2.4.4.2.ebuild | 55 ------------- .../clhep/files/clhep-fix-testThreaded.patch | 90 ---------------------- sci-physics/clhep/files/clhep-modulemap.patch | 24 ------ 6 files changed, 289 deletions(-) diff --git a/sci-physics/clhep/Manifest b/sci-physics/clhep/Manifest index 303f3a4541cd..56e400e6853a 100644 --- a/sci-physics/clhep/Manifest +++ b/sci-physics/clhep/Manifest @@ -1,4 +1 @@ -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 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.4.2.ebuild b/sci-physics/clhep/clhep-2.4.4.2.ebuild deleted file mode 100644 index ab61250e0377..000000000000 --- a/sci-physics/clhep/clhep-2.4.4.2.ebuild +++ /dev/null @@ -1,55 +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 - ) -" - -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/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 <[email protected]> -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 <[email protected]> -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 -
