commit: 10a6599c653658a2edab1b62094559bc4a098bb4 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Apr 6 11:44:31 2021 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Apr 6 11:48:21 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10a6599c
sci-physics/herwig++: Remove last-rited package Closes: https://bugs.gentoo.org/697870 Closes: https://bugs.gentoo.org/705236 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> profiles/package.mask | 6 -- sci-physics/herwig++/Manifest | 1 - .../herwig++/files/herwig++-2.6.3-looptools.patch | 64 -------------------- .../files/herwig++-2.7.1-fix-boost-1.67.patch | 42 ------------- sci-physics/herwig++/herwig++-2.7.1-r1.ebuild | 68 ---------------------- sci-physics/herwig++/metadata.xml | 20 ------- 6 files changed, 201 deletions(-) diff --git a/profiles/package.mask b/profiles/package.mask index 4b391b86fef..b6d871c5202 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -310,12 +310,6 @@ dev-ruby/i18n:0.7 dev-ruby/pcaprub:0.12 dev-ruby/pg:0 -# Andreas Sturmlechner <[email protected]> (2021-03-07) -# Unresolved build issue since 2019, QA issues, bugs #697870 and #705236 -# Blocks cleanup of equally broken sci-physics/looptools-2.8, bug #770796 -# Masked for removal on 2021-04-06. -sci-physics/herwig++ - # Andreas K. Hüttel <[email protected]> (2021-03-06) # Fails to build, multiple bugs, outdated, nontrival, unmaintained # Bug 729876 and several others; removal in 30days diff --git a/sci-physics/herwig++/Manifest b/sci-physics/herwig++/Manifest deleted file mode 100644 index 88ec547313f..00000000000 --- a/sci-physics/herwig++/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST Herwig++-2.7.1.tar.bz2 3388956 BLAKE2B 20aa085d9b3e7bf3246a6431240141f027ac666d85679cb093b4d76c89d04cac3913cb8cdb6eac050bcd0da6f7ba78c97dea46ca7fd6ad578c5d8a42ed6c633e SHA512 643f389f13f22b30d0adb4ca601a11c2686f6db4746af51136601954af2ec20eb0af7b45981e764d8b71cb7206bfe310beea1fee069972868955b1f024b8d5e3 diff --git a/sci-physics/herwig++/files/herwig++-2.6.3-looptools.patch b/sci-physics/herwig++/files/herwig++-2.6.3-looptools.patch deleted file mode 100644 index 0c802977db6..00000000000 --- a/sci-physics/herwig++/files/herwig++-2.6.3-looptools.patch +++ /dev/null @@ -1,64 +0,0 @@ ---- Looptools/Makefile.am -+++ Looptools/Makefile.am -@@ -1,58 +1,12 @@ --noinst_LTLIBRARIES = libHwLooptoolsXFC.la libHwLooptoolsCFC.la --noinst_LTLIBRARIES += libHwLooptools.la -- --EXTRA_DIST = include/lt.h include/ftypes.h include/ff.h include/ffwarn.h \ -- include/fferr.h include/defs.h include/looptools.h include/ffperm5.h \ -- include/clooptools.h include/cexternals.h include/externals.h \ -- util/solve-LU.F util/solve-LU.h util/solve-Eigen.F -- --theXFCSOURCES = \ --A/A0.F A/A00.F A/ffxa0.F A/ffca0.F B/Bget.F \ --B/Bcoeff.F B/BcoeffC.F B/Bcoeffa.F B/Bcoeffb.F B/ffxb0.F \ --B/ffcb0.F B/ffxb1.F B/ffcb1.F B/ffxb2p.F B/ffcb2p.F \ --B/ffxdb0.F B/ffcdb0.F B/ffxdb1.F B/ffdel2.F B/ffcel2.F \ --C/C0.F C/C0C.F C/Cget.F C/ffxc0.F C/ffcc0.F \ --C/ffxc0i.F C/ffxc0p.F C/ffxc0p0.F C/ffcc0p.F C/ffdxc0.F \ --C/ffdel3.F C/ffcel3.F D/D0.F D/D0C.F D/Dget.F \ --D/ffxd0.F D/ffxd0h.F D/ffxd0i.F D/ffxd0p.F D/ffxd0m0.F \ --D/ffxd0tra.F D/ffxdbd.F D/ffdcc0.F D/ffdel4.F D/ffd0c.F \ --D/ffTn.F D/ffT13.F D/ffS2.F D/ffS3n.F D/ffRn.F \ --E/E0.F E/Eget.F E/Ecoeffa.F E/Ecoeffb.F E/ffxe0.F \ --E/ffdel5.F util/ini.F util/auxCD.F util/solve.F util/Dump.F \ --util/Li2.F util/ffinit.F util/ffxli2.F util/ffcli2.F util/ffxxyz.F \ --util/ffcxyz.F util/ffcrr.F util/ffcxr.F util/fftran.F util/ffabcd.F \ --util/ff2dl2.F util/ffcxs3.F util/ffcxs4.F util/ffdcxs.F util/ffbndc.F -- --## the following need -DCOMPLEXPARA --theCFCSOURCES = \ --A/A0.F A/A00.F B/Bget.F B/Bcoeffa.F C/Cget.F D/Dget.F E/E0.F \ --E/Eget.F E/Ecoeffa.F E/Ecoeffb.F util/solve.F util/Dump.F util/Li2.F -+noinst_LTLIBRARIES = libHwLooptools.la - - commonCPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/include - --libHwLooptoolsXFC_la_SOURCES = $(theXFCSOURCES) --libHwLooptoolsXFC_la_CPPFLAGS = $(commonCPPFLAGS) --libHwLooptoolsXFC_la_FCFLAGS = $(AM_FCFLAGS) -ffixed-line-length-none --libHwLooptoolsXFC_la_FFLAGS = $(AM_FFLAGS) -ffixed-line-length-none -- --libHwLooptoolsCFC_la_SOURCES = $(theCFCSOURCES) --libHwLooptoolsCFC_la_CPPFLAGS = $(commonCPPFLAGS) -DCOMPLEXPARA --libHwLooptoolsCFC_la_FCFLAGS = $(AM_FCFLAGS) -ffixed-line-length-none --libHwLooptoolsCFC_la_FFLAGS = $(AM_FFLAGS) -ffixed-line-length-none -- --## installed already from "include/Makefile.am" --## noinst_HEADERS = include/clooptools.h -- --##if NEED_APPLE_FIXES --##libHwLooptoolsXFC_la_LDFLAGS = -Wl,-single_module --##libHwLooptoolsCFC_la_LDFLAGS = -Wl,-single_module --##endif -- --libHwLooptools_la_SOURCES = util/cache.c clooptools.cc -+libHwLooptools_la_SOURCES = clooptools.cc - libHwLooptools_la_CXXFLAGS = $(AM_CXXFLAGS) -Wno-strict-aliasing - libHwLooptools_la_CPPFLAGS = $(commonCPPFLAGS) - libHwLooptools_la_CFLAGS = $(AM_CFLAGS) -std=c99 --libHwLooptools_la_LIBADD = libHwLooptoolsXFC.la libHwLooptoolsCFC.la -+libHwLooptools_la_LIBADD = -looptools - - - ## libHwLooptoolsHelper2_la_SOURCES = clooptools.cc diff --git a/sci-physics/herwig++/files/herwig++-2.7.1-fix-boost-1.67.patch b/sci-physics/herwig++/files/herwig++-2.7.1-fix-boost-1.67.patch deleted file mode 100644 index bd4579b575a..00000000000 --- a/sci-physics/herwig++/files/herwig++-2.7.1-fix-boost-1.67.patch +++ /dev/null @@ -1,42 +0,0 @@ -https://bugs.gentoo.org/672250 - ---- a/DipoleShower/Base/DipoleChain.cc -+++ b/DipoleShower/Base/DipoleChain.cc -@@ -15,6 +15,7 @@ - #include "Herwig++/DipoleShower/Utility/DipolePartonSplitter.h" - - #include <boost/utility.hpp> -+#include <boost/next_prior.hpp> - - using namespace Herwig; - ---- a/DipoleShower/Base/DipoleEventRecord.cc -+++ b/DipoleShower/Base/DipoleEventRecord.cc -@@ -19,6 +19,7 @@ - #include "ThePEG/PDF/PartonExtractor.h" - - #include <boost/utility.hpp> -+#include <boost/next_prior.hpp> - - #include <algorithm> - ---- a/Exsample2/BinnedStatistics.h -+++ b/Exsample2/BinnedStatistics.h -@@ -16,6 +16,7 @@ - #include "ThePEG/Repository/UseRandom.h" - - #include <boost/utility.hpp> -+#include <boost/next_prior.hpp> - - namespace Herwig { - ---- a/Exsample2/exsample/config.h -+++ b/Exsample2/exsample/config.h -@@ -25,6 +25,7 @@ - #include <limits> - - #include <boost/utility.hpp> -+#include <boost/next_prior.hpp> - #include <boost/scoped_array.hpp> - #include <boost/scoped_ptr.hpp> - diff --git a/sci-physics/herwig++/herwig++-2.7.1-r1.ebuild b/sci-physics/herwig++/herwig++-2.7.1-r1.ebuild deleted file mode 100644 index 8f7bfafc054..00000000000 --- a/sci-physics/herwig++/herwig++-2.7.1-r1.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools flag-o-matic - -MYP=Herwig++-${PV} - -DESCRIPTION="High-Energy Physics event generator" -HOMEPAGE="https://herwig.hepforge.org/"; -SRC_URI="https://www.hepforge.org/archive/herwig/${MYP}.tar.bz2"; -S="${WORKDIR}/${MYP}" - -SLOT="0/15" -LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="c++11 fastjet static-libs" - -# >sci-physics/looptools-2.8 leads to misoperation -# and failing tests (it lacks some symbols) -RDEPEND=" - dev-libs/boost:0= - sci-libs/gsl:0= - <=sci-physics/looptools-2.8:0= - ~sci-physics/thepeg-1.9.2:0= - fastjet? ( sci-physics/fastjet:0= )" -DEPEND=" - ${RDEPEND} - >=sys-devel/boost-m4-0.4_p20160328 -" - -src_prepare() { - default - - eapply -p0 "${FILESDIR}"/${PN}-2.6.3-looptools.patch - eapply "${FILESDIR}"/${PN}-2.7.1-fix-boost-1.67.patch - - # fixes bug 570458, which is due to an outdated bundled boost.m4 - rm m4/boost.m4 || die - - find -name 'Makefile.am' -exec \ - sed -i -e '1ipkgdatadir=$(datadir)/herwig++' {} \; || die - - eautoreconf -} - -src_configure() { - if use prefix ; then - append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/ThePEG" - fi - - local myeconfargs=( - --with-boost="${EPREFIX}"/usr - --with-thepeg="${EPREFIX}"/usr - $(use_enable c++11 stdcxx11) - $(use_with fastjet fastjet "${EPREFIX}"/usr) - ) - - econf "${myeconfargs[@]}" -} - -src_install() { - default - - sed -i -e "s|${ED}||g" "${ED}"/usr/share/herwig++/defaults/PDF.in || die - sed -i -e "s|${ED}||g" "${ED}"/usr/share/herwig++/HerwigDefaults.rpo || die -} diff --git a/sci-physics/herwig++/metadata.xml b/sci-physics/herwig++/metadata.xml deleted file mode 100644 index 23f7c30990f..00000000000 --- a/sci-physics/herwig++/metadata.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="project"> - <email>[email protected]</email> - <name>Gentoo Physics Project</name> - </maintainer> - <longdescription> - Herwig++ is a completely new event generator, written in C++. - It is built on the experience gained with the well-known - event generator HERWIG. The aim is to provide a multi purpose - event generator with similar or improved capabilities (like angular - ordered parton evolution and the cluster hadronization model). -</longdescription> - <use> - <flag name="c++11">Build Herwig++ using the C++11 standard. - Experimental feature, not for production use.</flag> - <flag name="fastjet">Adds support for <pkg>sci-physics/fastjet</pkg></flag> - </use> -</pkgmetadata>
