12 files changed, 146 insertions, 405 deletions
diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index 69310e1aea1c..ab5cc23619be 100644
--- a/sci-physics/Manifest.gz
+++ b/sci-physics/Manifest.gz
diff --git a/sci-physics/looptools/Manifest b/sci-physics/looptools/Manifest
index b813c71056d9..b1cfc5a95b3e 100644
--- a/sci-physics/looptools/Manifest
+++ b/sci-physics/looptools/Manifest
@@ -1,7 +1,4 @@
 AUX looptools-2.15-makefile.patch 2377 BLAKE2B 0a03ba2e281f2e01f9bd94ef8d3b2a56d8060603c15dae7c4a97d1265dc0e09a4e4f7300b1dc8ad156996ab59ea53be462dd3cebf57322ea33da9d37b2d851d4 SHA512 7df005959c485853363a47c5eb40d2de75ae8388fbd3b5015ff4821bc07a1656bd754f1ffd393c27a3d53d3c2965007d48124f555f11b85ce296119b8413a7a0
-AUX looptools-2.8-makefile.patch 2375 BLAKE2B 54ff7a4624f377cb12ebacede47ab048bd3c0872a403e499b3f5e28329a3d3240a6b066d79947b717fac8a82d2bd383b54a20d66b4de580f529534021b4a952f SHA512 e0f0f4fce94468f9b07deececb89c6e64250692b343ee1a8f29d85da724cf2cc443e6363414e5eb0af88f0135b9a7e2311e14d7d1001c9bd57e127c7ba808ae0
 DIST LoopTools-2.15.tar.gz 552635 BLAKE2B e93d2fccaaa920727d34ee98788bcc0c4b5ca646ca8e4361ed67e1a94095d576370b356d1dfe289d492dbe3c9af6ce7c6b89ec27bad45c947b7a30473cd0611a SHA512 77173cd9cc69ba3b999493ebfa51965610fe3d45dd5f6f85e1ca04d1374419f8687a0d41f8263abd6974790bb71e7800eb002199dffea37f546e56ed4f83751a
-DIST LoopTools-2.8.tar.gz 546810 BLAKE2B 3822aee60f36b074dc1e97381c97578873534bf8655b3af32e51cd6c2792286f9975b7bc513349e74294fac43f0bc67f42424f1683670b37d1c9201beebf8e82 SHA512 32211669fd092d2d5bb38e26a6471a95df0647d9e7ea0cc4e99ff4fd7c3e3fee107f6432ed9075e3102224f0041fac6f7075b1f0a91f7744ec3890b4b36d276e
 EBUILD looptools-2.15.ebuild 784 BLAKE2B b837189ac18a9d6c0dc42296e5867813f9a39093d8153260cd8ed1a9020a8fa8e746f910de8554a93324aff4db3eebc6b129735e9a1694de5ceae332da527f8f SHA512 c2ce49a7bcde898addcab0411651ff51812e15d590c7f4ec1069b0718eed8bfd0430b881cd49c7c816eb22fbb18f3a12c7878a29ce42cc13466e8212a0ca7ea2
-EBUILD looptools-2.8.ebuild 879 BLAKE2B e11f2124bc71ef1ca18af041a398f3ecee2e941504a3c4c89840a9c50f894d79157bcc3fb646a61e44cb0ef2b74f08f0e7275d5346d65cb0a776c86417afe2b9 SHA512 b4a21692121bdf97aa35d27245e19cdbaec755e392d27c8fbce122bc3c3e5733345d451afb1250461608a9cf4a00f5675ce72c558bf5bf4fe7c74ef36d663d7e
 MISC metadata.xml 610 BLAKE2B 6db8901f697f05a3fb0a507d9964c74e6b90e7694b1b15ba6e2dc95ffa6f16430751037ebaab8578d2f4dc15259119f74e1cbd651d0cc061bf97152e6dc10120 SHA512 2bd676b8205e286fcc590184ac94b4d460eb5aafc754410b26afcea4bd4825af6ba795e2974b2fb8fec5a921b5379418541fba045e987253e679f74e4b86b990
diff --git a/sci-physics/looptools/files/looptools-2.8-makefile.patch b/sci-physics/looptools/files/looptools-2.8-makefile.patch
deleted file mode 100644
index 5252c1de60c0..000000000000
--- a/sci-physics/looptools/files/looptools-2.8-makefile.patch
+++ /dev/null
@@ -1,96 +0,0 @@
---- makefile.in
-+++ makefile.in
-@@ -1,14 +1,17 @@
- BLD = build$(QUADSUFFIX)
- 
--LIBDIR = $(PREFIX)/lib$(LIBDIRSUFFIX)
--INCLUDEDIR = $(PREFIX)/include
--BINDIR = $(PREFIX)/bin
-+LIBDIR = $(DESTDIR)/$(PREFIX)/lib$(LIBDIRSUFFIX)
-+INCLUDEDIR = $(DESTDIR)/$(PREFIX)/include
-+BINDIR = $(DESTDIR)/$(PREFIX)/bin
- 
- LIB = libooptools$(QUADSUFFIX).a
- FE = lt$(QUADSUFFIX)$(EXE)
- MFE = LoopTools$(QUADSUFFIX)$(EXE)
- INCLUDE = $(BLD)/looptools.h $(BLD)/clooptools.h
- 
-+LIBRARY=libooptools.so
-+REALNAME=$(LIBRARY).$(VER)
-+
- ARGS = $(PARALLEL) \
-   LIB="$(LIB)" \
-   FE="$(FE)" \
-@@ -16,12 +19,12 @@
-   EXE="$(EXE)" \
-   DEF="$(DEF)" \
-   NOUNDERSCORE="$(NOUNDERSCORE)" \
--  XFC="$(FC$(QUADSUFFIX)) $(FFLAGS) $(FFLAGS-quad) -I." \
-+  XFC="$(FC$(QUADSUFFIX)) $(FFLAGS) $(FFLAGS-quad) -I. -fPIC" \
-   F90="$(F90)" \
-   CC="$(CC)" \
--  CFLAGS="$(CFLAGS) $(CFLAGS-quad)" \
-+  CFLAGS="$(CFLAGS) $(CFLAGS-quad) -fPIC" \
-   CXX="$(CXX)" \
--  CXXFLAGS="$(CXXFLAGS)" \
-+  CXXFLAGS="$(CXXFLAGS) -fPIC" \
-   ML="$(ML)" \
-   MCC="$(MCC)" \
-   MCFLAGS="$(MCFLAGS)" \
-@@ -31,20 +34,22 @@
-   DLLTOOL="$(DLLTOOL)" \
-   LDFLAGS="$(LDFLAGS)" \
-   LIBPATH="$(LIBPATH)" \
--  OBJS-quad="$(OBJS-quad)"
-+  OBJS-quad="$(OBJS-quad)" \
-+  REALNAME="$(REALNAME)"
- 
- 
--default all lib frontend mma: force
-+default all lib solib frontend mma: force
- 	cd $(BLD) && $(MAKE) $(ARGS) $@
- 
--install: lib frontend
--	-mkdir $(PREFIX)
-+install: lib solib frontend
-+	-mkdir $(DESTDIR)$(PREFIX)
- 	-mkdir $(LIBDIR) $(BINDIR) $(INCLUDEDIR)
- 	cp -p $(BLD)/$(LIB) $(LIBDIR)
- 	cp -p $(INCLUDE$(QUADSUFFIX)) $(INCLUDEDIR)
--	strip $(BLD)/$(FE)
- 	cp -p $(BLD)/fcc $(BLD)/$(FE) $(BINDIR)
--	test ! -f $(BLD)/$(MFE) || { strip $(BLD)/$(MFE) ; cp -p $(BLD)/$(MFE) $(BINDIR); }
-+	test ! -f $(BLD)/$(MFE) || { cp -p $(BLD)/$(MFE) $(BINDIR); }
-+	cp -p $(BLD)/$(REALNAME) $(LIBDIR)
-+	cd $(LIBDIR) && ln -s $(REALNAME) $(LIBRARY)
- 
- force: $(BLD)/timestamp
- 
---- src/makefile
-+++ src/makefile
-@@ -1,6 +1,6 @@
--default: frontend mma$(ML)
-+default: frontend mma$(ML) solib
- 
--all: frontend mma1
-+all: frontend mma1 solib
- 
- frontend: lib $(FE)
- 
-@@ -8,6 +8,7 @@
- 
- mma0 lib: $(LIB) clooptools.h fcc
- 
-+solib: $(REALNAME) fcc
- 
- .SUFFIXES:
- 
-@@ -247,6 +248,8 @@
- 	$(AR) cru $(LIB) $?
- 	-$(RANLIB) $(LIB)
- 
-+$(REALNAME): $(OBJS)
-+	$(XFC) $(LDFLAGS) -shared -Wl,--soname,$(REALNAME) -o $@ $?
- 
- $(FE): lt.F $(LTINC) $(LIB)
- 	$(XFC) -o $(FE) lt.F $(LIB)
diff --git a/sci-physics/looptools/looptools-2.8.ebuild b/sci-physics/looptools/looptools-2.8.ebuild
deleted file mode 100644
index db459a6afcfa..000000000000
--- a/sci-physics/looptools/looptools-2.8.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils fortran-2 multilib
-
-MYP=LoopTools-${PV}
-
-DESCRIPTION="Tools for evaluation of scalar and tensor one-loop integrals"
-HOMEPAGE="http://www.feynarts.de/looptools"
-SRC_URI="http://www.feynarts.de/looptools/${MYP}.tar.gz"
-
-LICENSE="LGPL-3"
-
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc static-libs"
-
-S="${WORKDIR}/${MYP}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.patch
-	export VER="${PV}"
-	# necessary fix for prefix
-	sed -i "s/lib\$(LIBDIRSUFFIX)/$(get_libdir)/" makefile.in || die
-}
-
-src_install() {
-	default
-	# another one of these package building archive with pic
-	# no: ooptools is not a typo
-	if use static-libs; then
-		rm "${ED}"/usr/$(get_libdir)/libooptools.a || die
-	fi
-	use doc && dodoc manual/*.pdf
-}
diff --git a/sci-physics/reduze/Manifest b/sci-physics/reduze/Manifest
index 64d5a9b439d9..4bf7fa9fa9b0 100644
--- a/sci-physics/reduze/Manifest
+++ b/sci-physics/reduze/Manifest
@@ -1,4 +1,5 @@
-AUX reduze-2.2-db.patch 815 BLAKE2B be6be6a6f84d63653dfcf04892421365d19ba53ea0e2ec8e81004d15bddb2df9d124601b780f2e02ec502a5734affb5a7dc88341931f83ef24c72c9d9811b245 SHA512 466414af3dcc00ba446b5790abf1eafbde622e9c4a744c2098e2dbd4bf4864656b2a1c3d9eb028c7889e6d9d998dbd3c7b5e64148375accee324466ae749f415
-DIST reduze-2.2.tar.gz 669858 BLAKE2B 52c48f5547055087dc2969fe5a7a42281519cf1d9a454a675ea54741f3d5912cd9b135816994241fa206585038d683ba5a3849308ff0403f1d3507ec9b77fe00 SHA512 ca4ed6f754fc75511b0916e8c2eea26a69e0e30c604a714af76995038a8e11dc3b129157bf1a170e639ea0fc39f9f5102bba4ad503874f044ac91855d9a95dab
-EBUILD reduze-2.2.ebuild 1429 BLAKE2B becbc74d69a1b2ebb9127938475e206901fa951bb68d66ec67bcbd19d98d44cbcc92cf9bf0c0a7454806fbb07a56afc061ae24efe78d4853c72e27bfccd28106 SHA512 f33ec0ef4b50770b81f0ae43812c9965fb0dd4094e58af965d0b6abdef34e2c9c99adfd80c90c62a17c7b82b7aa7ea0db7b471ae3f235c6698cc7385c3189c8a
+AUX reduze-2.2-db.patch 769 BLAKE2B ca63fda001317c010ebfe04a34276cf087971f8993cac2bdf2147c58fe2c91d1951ea347455eb4427468f7cab8ddb8aab43159c40ce633d06a9b9649f5814df1 SHA512 b558348d9895058fd4a1f4f1e4c536eca3cefc00fc392fe107ea609403704327cb2a70cdf53a53c7db618d0e6e63dc439e81a3c9d0ffb10df1d03814737b0ea1
+AUX reduze-2.4-cmake.patch 3026 BLAKE2B 534b17b84a4c4eb460877a011a3b1a276a75620c537907966b0f973b854000acd17323b9a7f762ed773a275e8617efec72ee145c0475d61b8902d76cee369fc2 SHA512 a896e86a99a285d86296140c574d28861e79c255a963b825edb7983cbdfc6504f60aed37b4ee149965df8a3dcdef18c192c3a97f09561876a9839f981dbc8e60
+DIST reduze-2.4.tar.gz 671780 BLAKE2B f401c9b50df0801b0b3305a8b77c3fd3f82b7f36419f4b76a28994c4db1f1a267dc40f91b42ee11ec5c911f6fab0a39eaf9f5cb2e099aa08e6489cea05760795 SHA512 06d5fbd371a4c5e88b6b77ddab5231438dae288c58122a6060e09c525deecf013b664a016d916b10e29373cefbc1f13af708a0a71a1f8da4204a63074424f6c1
+EBUILD reduze-2.4.ebuild 1226 BLAKE2B a2fc62f5ea65ca449eb0f890a20745e30433c5b92471cacb16ba0794317b915d627a7e7dc5e70a36463370ce9bb1902a906ff91ce369753bd1ae467af517745e SHA512 606779d1543f6d4aa86f20fedf7f3a56700ac6db30173ac78d24814fa772f25d98867c4ca9d5a35dad9756c290504b984072366836ec436d940f20cfd46ce23a
 MISC metadata.xml 364 BLAKE2B 7007e2d355688fc44ce145854bd64212bc14632a253c6fc8289eb777afb4abdb6b85ae2558465a59c3c83da71d17d4b058f641f7c650a2d593a3a63a42aa3e2e SHA512 2af1ad98025a28d4beb1081e81642f9a02c0139f94e76739c1a0b63a1fcd5aa6b6b34d39738361b14542252bee23189af24a43905409a6953ae369b40e4671ad
diff --git a/sci-physics/reduze/files/reduze-2.2-db.patch b/sci-physics/reduze/files/reduze-2.2-db.patch
index 671cd5565e0a..a43de911be7a 100644
--- a/sci-physics/reduze/files/reduze-2.2-db.patch
+++ b/sci-physics/reduze/files/reduze-2.2-db.patch
@@ -1,6 +1,6 @@
-diff -r -U2 reduze-2.2.orig/reduze/CMakeLists.txt reduze-2.2/reduze/CMakeLists.txt
---- reduze-2.2.orig/reduze/CMakeLists.txt	2017-11-17 14:11:58.000000000 +0700
-+++ reduze-2.2/reduze/CMakeLists.txt	2017-12-19 20:27:17.508528174 +0700
+diff -r -U2 a/reduze/CMakeLists.txt b/reduze/CMakeLists.txt
+--- a/reduze/CMakeLists.txt	2017-11-17 14:11:58.000000000 +0700
++++ b/reduze/CMakeLists.txt	2017-12-19 20:27:17.508528174 +0700
 @@ -84,9 +84,8 @@
  	message (STATUS "Building with Berkeley DB support")
  	find_path(DB_INCLUDE_PATH NAMES dbstl_common.h
diff --git a/sci-physics/reduze/files/reduze-2.4-cmake.patch b/sci-physics/reduze/files/reduze-2.4-cmake.patch
new file mode 100644
index 000000000000..d45af23374b5
--- /dev/null
+++ b/sci-physics/reduze/files/reduze-2.4-cmake.patch
@@ -0,0 +1,81 @@
+From a64b26c6e5c6c49e5842280a8690ec0d31832ce8 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sun, 7 Mar 2021 18:20:11 +0100
+Subject: [PATCH] Use GNUInstallDirs, add ENABLE_EXAMPLES option
+
+---
+ CMakeLists.txt                  | 17 +++++++++++------
+ reduze/CMakeLists.txt           |  2 +-
+ tools/reduze1to2/CMakeLists.txt |  2 +-
+ 3 files changed, 13 insertions(+), 8 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e6207bd..a0cab4b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -29,11 +29,10 @@
+ # - 'make package_source' creates the source tarball
+ # - 'make doc'            creates the source code documentation using Doxygen
+ 
+-message (STATUS "Configuring package Reduze")
+-cmake_minimum_required (VERSION 2.6)
++cmake_minimum_required (VERSION 2.8.12)
+ 
+ project (Reduze)
+-list (APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake-modules")
++set (CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake-modules")
+ include (GetGitRevisionDescription)
+ #git_describe_new (GIT_TAG)
+ git_describe(GIT_TAG)
+@@ -76,6 +75,9 @@ if (NOT HAVE_TUTORIAL_PDF)
+    message (FATAL_ERROR "File ${TUTORIAL_PDF} not found")
+ endif (NOT HAVE_TUTORIAL_PDF)
+ 
++include(GNUInstallDirs)
++
++option (ENABLE_EXAMPLES "Install tools, examples" ON)
+ 
+ # include configured file with git tag in source package
+ # NOTE1: make sure to build before pack (make; make package_source) !
+@@ -89,9 +91,12 @@ add_subdirectory ("reduze")
+ add_subdirectory ("tools/reduze1to2")
+ add_subdirectory ("check")
+ add_subdirectory ("doc/code")
+-install (FILES "doc/tutorial/reduze2-tutorial.pdf" DESTINATION share/reduze/tutorial)
+-install (FILES "tools/reduze-mma.m" DESTINATION share/reduze/tools)
+-install (DIRECTORY "example" DESTINATION share/reduze PATTERN ".git" EXCLUDE)
++install (FILES "doc/tutorial/reduze2-tutorial.pdf" DESTINATION ${CMAKE_INSTALL_DOCDIR})
++
++if (ENABLE_EXAMPLES)
++  install (FILES "tools/reduze-mma.m" DESTINATION ${CMAKE_INSTALL_DOCDIR}/examples)
++  install (DIRECTORY "example" DESTINATION ${CMAKE_INSTALL_DOCDIR}/examples PATTERN ".git" EXCLUDE)
++endif ()
+ 
+ include (CPack)
+ 
+diff --git a/reduze/CMakeLists.txt b/reduze/CMakeLists.txt
+index b296081..a76c307 100644
+--- a/reduze/CMakeLists.txt
++++ b/reduze/CMakeLists.txt
+@@ -201,5 +201,5 @@ target_link_libraries (reduze yaml-cpp)
+ # installation
+ #------------------------------------------------------------------------------
+ 
+-install (TARGETS reduze DESTINATION bin)
++install (TARGETS reduze DESTINATION ${CMAKE_INSTALL_BINDIR})
+ 
+diff --git a/tools/reduze1to2/CMakeLists.txt b/tools/reduze1to2/CMakeLists.txt
+index d1d4bd5..4822910 100644
+--- a/tools/reduze1to2/CMakeLists.txt
++++ b/tools/reduze1to2/CMakeLists.txt
+@@ -9,6 +9,6 @@ add_executable (reduze1to2 ${reduze1to2_SOURCES})
+ 
+ set (CMAKE_CXX_FLAGS "-Wall -pedantic -Wno-long-long")
+ 
+-install (TARGETS reduze1to2 DESTINATION bin)
++install (TARGETS reduze1to2 DESTINATION ${CMAKE_INSTALL_BINDIR})
+ 
+ message (STATUS "Added build target 'reduze1to2'")
+-- 
+2.30.1
+
diff --git a/sci-physics/reduze/reduze-2.2.ebuild b/sci-physics/reduze/reduze-2.2.ebuild
deleted file mode 100644
index 7e8241f3c736..000000000000
--- a/sci-physics/reduze/reduze-2.2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Program for reducing Feynman integrals"
-HOMEPAGE="http://reduze.hepforge.org/"
-SRC_URI="http://reduze.hepforge.org/download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="berkdb doc mpi"
-
-RDEPEND=">=sci-mathematics/ginac-1.4.1
-	berkdb? ( sys-libs/db:6.0[cxx] )
-	mpi? ( virtual/mpi )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-PATCHES=( "${FILESDIR}"/${P}-db.patch )
-
-src_prepare() {
-	cmake-utils_src_prepare
-	# gentoo doc directory
-	sed -i \
-		-e "s:share/reduze:share/doc/${PF}:g" \
-		CMakeLists.txt || die
-	if ! use doc ; then
-		sed -i -e '/share/d' CMakeLists.txt || die
-	fi
-	# prefix fix
-	sed -i \
-		-e "s:/usr:${EPREFIX}/usr:g" \
-		reduze/CMakeLists.txt  || die
-
-	# remove bundled yaml-cpp
-	# no: it does not build. is it patched?
-	# sed -i -e '/add_subdirectory ("yaml")/d' CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_HASH_TABLE=ON
-		-DUSE_DATABASE=$(usex berkdb)
-		-DUSE_MPI=$(usex mpi)
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile all $(usev doc)
-}
-
-src_test() {
-	cmake-utils_src_compile check
-	use mpi && cmake-utils_src_compile check_mpi
-}
-
-src_install() {
-	use doc && HTML_DOCS+=( "${BUILD_DIR}"/doc/code/html/. )
-	cmake-utils_src_install
-}
diff --git a/sci-physics/reduze/reduze-2.4.ebuild b/sci-physics/reduze/reduze-2.4.ebuild
new file mode 100644
index 000000000000..c7ea66e3ee54
--- /dev/null
+++ b/sci-physics/reduze/reduze-2.4.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Program for reducing Feynman integrals"
+HOMEPAGE="https://reduze.hepforge.org/"
+SRC_URI="https://reduze.hepforge.org/download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="berkdb doc examples mpi"
+
+RDEPEND="
+	>=sci-mathematics/ginac-1.4.1
+	berkdb? ( sys-libs/db:6.0[cxx] )
+	mpi? ( virtual/mpi )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-cmake.patch
+	"${FILESDIR}"/${PN}-2.2-db.patch
+)
+
+# remove bundled yaml-cpp
+# no: it does not build. is it patched?
+# sed -i -e '/add_subdirectory ("yaml")/d' CMakeLists.txt || die
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_Git=ON # no thanks
+		-DUSE_HASH_TABLE=ON
+		-DUSE_DATABASE=$(usex berkdb)
+		-DENABLE_EXAMPLES=$(usex examples)
+		-DUSE_MPI=$(usex mpi)
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile all $(usev doc)
+}
+
+src_test() {
+	cmake_build check
+	use mpi && cmake_build check_mpi
+}
+
+src_install() {
+	use doc && local HTML_DOCS+=( "${BUILD_DIR}"/doc/code/html/. )
+	cmake_src_install
+}
diff --git a/sci-physics/thepeg/Manifest b/sci-physics/thepeg/Manifest
index 08b71bd4391c..d1da2624debb 100644
--- a/sci-physics/thepeg/Manifest
+++ b/sci-physics/thepeg/Manifest
@@ -2,12 +2,8 @@ AUX thepeg-1.8.3-java.patch 922 BLAKE2B 6ecd71735f8fd13c3a8220290ee0eb7b78e66ae4
 AUX thepeg-2.0.4-gcc6.patch 252 BLAKE2B 4503804e2d5f25fdc81e05bbc960e873c9f7d70d25ed6fdf1425658b2fadbf39e7d537afedf365ec1659ad268d450f5a36649726ec692fd0bb8c8cecf36f5ffb SHA512 741dc3a52fdd040b2fc0ba21c778b4e2427abd55977f3858ef8f8acedc2c3a4007a38fe0903cf89eb1c305ebbc31f527f04d52da794ac85563864c53d50c4363
 DIST GRV98nlo.LHgrid 221908 BLAKE2B 01af851928bbcfae110f3f5bc2b7599f86c25adb54e979c19625cf44ce7b633639f4ab99e068f8ae5ce3d9e72289265101ec40882e4af4b4a62abb152644890d SHA512 fce5226a6eb56c9cc970d2d2bb23c5a0cde3afbb1f463e3e062825c2379213100a2d149ff6b25d9726e80ee817f9ae74eafcc85b2b30419aa7f095847dbcd8b6
 DIST MRST2001nlo.LHgrid 719692 BLAKE2B 67a58bcf19857a5cee3eeac29bd2aa236f63c96acbf69b944ed14a94422a986e1579549172a2444b109f5bcfe6fd2fea4acc148c78e2e4f7258a836891ba0648 SHA512 126461ec2358e61221445483074a804c915b94be4a4dfd0330a9cf71feff9a9b981c5594a9d2a1efd236122f44891dd25182649803dccb3b383d03e85e96f930
-DIST ThePEG-1.9.2.tar.bz2 1870577 BLAKE2B cbc46698390d84e41a0f788af0ae160ba00428cb2b1c5ae11905029b2fd58b16ccf76248ab5d600206262ddd922587f19798734e80a71e2728f2335627997c77 SHA512 bc43606c79bb15938969b9d444db49c6af5c8ba21072a879a502086a77fe18b13fec44691046b4e0772b260b83ea7ef29b906027eadda6a8ea004ace9318379c
-DIST ThePEG-2.0.0.tar.bz2 1938251 BLAKE2B 8f9403a7f442da6b3bf753f3b45fbddfe339eb8b8398fe52d23a6c3d57a1e9a8838b8f808540cae78b1099f4f92e2d3c182d392538ee82aadf402ff3f355f21d SHA512 a3e9a4ab90b126ea67187e2adc5b64480e5afd49ac58d6f3a3855003251d5c7b6ab67fa35b0380684e39f38cf8d4bc8e0ccd9dc4cb7d7b900e90b3448d6182a9
 DIST ThePEG-2.0.4.tar.bz2 1921082 BLAKE2B f27dd81b51c28eac547351a7c732969d79abd6c1885a2e52319b6e5807bb4c1824e35e303e3d23b80b7da07a3c7c9e9f5470d538728362a4398bb66e42a00325 SHA512 5c037033daa89748267691df644209f62f46ccdff6865cfeceeda6909cff3de0c474c5ced067db6c5659ba6ebe5a51fc9b8fee46a36886278f8d29e13de2a81c
 DIST cteq5l.LHgrid 134797 BLAKE2B 1e222631ff00979abf64e95ffa3133d29eacd819325fcdf9d4065a1ce85db5704f0a43c646f9a9a3ee7b1905603e9060fc279405435d412bf06ee14ba9121f32 SHA512 1ba41fd773104a933af6f37745dcb6f8422e1aece74ba2b1e15a5fb69fdaf694336c0ec1dc6fbc964d2cf3fe363d17ca0c01a6c2ba6def0afa4389cb4083f34b
 DIST cteq6ll.LHpdf 1461 BLAKE2B 66a8ebd404849a14c1240ff1c7b06e758a78ae47cc4e7818b8b7fcb6faecbb17fd8810279e54c70623a048f78e6f89706bcecca4d4b8174468ff52481da37640 SHA512 b89a87d1c1c7cc910aa4af53abc3cc6550670a5a6332989232d33c7da1ba01ce49bbbf9f3bb454e673312fb5bc1679f86eea18f95a1443d1c80d3a622e2b8728
-EBUILD thepeg-1.9.2.ebuild 2318 BLAKE2B ff23549389bfbec09217448d6a3d802965291e25a3251d4316049d0b19e8070434dcd5935ec5bb85fca44ffa8ae2dee6b542ffe44700e2ec7ddb7020a18b7edb SHA512 3e82f3c7cac0ba6e84883ae909ab37fc10db688ee842ece8b7a7125b25c43c1234f45710a843e8fd61db92090d0fd2872608a48a6c9e991c47db571de270e53b
-EBUILD thepeg-2.0.0.ebuild 2318 BLAKE2B 6a3c5df9bb82afcd0ee0beb063a5e37aae6f1ab50e923fb4cfc3befc87f2ee71105db578e90d81ad350bc25b3c25407e7536821364c7e71b7dd6a14d8be781cb SHA512 5950b51024e40b4b0a3908792b5fddd2cad4ddfbc7347f38faaeb21a159b63429137f8c4cb8a481addc0ee81df17a161fcaae6832549491bb2de45ba516c992a
 EBUILD thepeg-2.0.4.ebuild 2239 BLAKE2B e52748a673196c5b1415a0fe1d0ea05a89c11e13a867f5ff01004d6e9fd5350e27a8af77a628d8c0ffa4c00605b48053d15e87ad0f75f5e282495b451a6449fe SHA512 a52226c1d7a4c2170048f783470fb9bc1c8107eb21816540a52ec9a581ce3179e209828cf53243c8dd1e4b69f6fa9713ebf5f9d5c8f520498136a90db82dfe48
 MISC metadata.xml 992 BLAKE2B 2c3d61f64d4f24d1cf68d1663ac9ab75fd711de6f851d462226aed95551a6daa4b19287dc4ccef303178a085e756dd9ce5cf2555d965260d8b7b86a4d771ddb5 SHA512 c6412d6cc97da21ba7774d03f4bbc69d53d9bc82fab4d45940f61a318fb67bb58dc4e4668e831b4e2b18efac5d19898229a4e5ce515cd7722372e5aa18685e01
diff --git a/sci-physics/thepeg/thepeg-1.9.2.ebuild b/sci-physics/thepeg/thepeg-1.9.2.ebuild
deleted file mode 100644
index dfe097cf8ca0..000000000000
--- a/sci-physics/thepeg/thepeg-1.9.2.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit autotools-utils elisp-common eutils java-pkg-opt-2
-
-MYP=ThePEG-${PV}
-
-DESCRIPTION="Toolkit for High Energy Physics Event Generation"
-HOMEPAGE="http://home.thep.lu.se/ThePEG/"
-
-TEST_URI="http://www.hepforge.org/archive/lhapdf/pdfsets/current"
-SRC_URI="http://www.hepforge.org/archive/thepeg/${MYP}.tar.bz2
-	test? ( hepmc? (
-	   ${TEST_URI}/cteq6ll.LHpdf
-	   ${TEST_URI}/cteq5l.LHgrid
-	   ${TEST_URI}/GRV98nlo.LHgrid
-	   ${TEST_URI}/MRST2001nlo.LHgrid ) )"
-LICENSE="GPL-2"
-
-SLOT="0/18"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="c++11 emacs fastjet hepmc java lhapdf static-libs test zlib"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sci-libs/gsl:0=
-	emacs? ( >=app-editors/emacs-23.1:* )
-	fastjet? ( sci-physics/fastjet:0= )
-	hepmc? ( sci-physics/hepmc:0= )
-	java? ( >=virtual/jre-1.5:* )
-	lhapdf? ( sci-physics/lhapdf:0= )
-	zlib? ( sys-libs/zlib:0= )"
-DEPEND="${RDEPEND}
-	test? ( sys-process/time )"
-
-S="${WORKDIR}/${MYP}"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.8.3-java.patch )
-
-src_prepare() {
-	find -name 'Makefile.am' -exec \
-		sed -i -e '1ipkgdatadir=$(datadir)/thepeg' {} \; || die
-	# trick to force c++ linking
-	sed -i \
-		-e '1inodist_EXTRA_libThePEG_la_SOURCES = dummy.cxx' \
-		-e '/dist_pkgdata_DATA = ThePEG.el/d' \
-		lib/Makefile.am || die
-	autotools-utils_src_prepare
-	java-pkg-opt-2_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable c++11 stdcxx11)
-		$(use_with fastjet fastjet "${EPREFIX}"/usr)
-		$(use_with hepmc hepmc "${EPREFIX}"/usr)
-		$(use_with java javagui)
-		$(use_with lhapdf lhapdf "${EPREFIX}"/usr)
-		--without-rivet
-		$(use_with zlib zlib "${EPREFIX}"/usr)
-	)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile
-	use emacs && elisp-compile lib/ThePEG.el
-}
-
-src_test() {
-	emake LHAPATH="${DISTDIR}" -C "${BUILD_DIR}" check
-}
-
-src_install() {
-	autotools-utils_src_install
-	use emacs && elisp-install ${PN} lib/ThePEG.el{,c}
-	use java && java-pkg_newjar java/ThePEG.jar
-
-	cat <<-EOF > "${T}"/50${PN}
-	LDPATH="${EPREFIX}/usr/$(get_libdir)/ThePEG"
-	EOF
-	doenvd "${T}"/50${PN}
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sci-physics/thepeg/thepeg-2.0.0.ebuild b/sci-physics/thepeg/thepeg-2.0.0.ebuild
deleted file mode 100644
index 22c553e8f5dd..000000000000
--- a/sci-physics/thepeg/thepeg-2.0.0.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit autotools-utils elisp-common eutils java-pkg-opt-2
-
-MYP=ThePEG-${PV}
-
-DESCRIPTION="Toolkit for High Energy Physics Event Generation"
-HOMEPAGE="http://home.thep.lu.se/ThePEG/"
-
-TEST_URI="http://www.hepforge.org/archive/lhapdf/pdfsets/current"
-SRC_URI="http://www.hepforge.org/archive/thepeg/${MYP}.tar.bz2
-	test? ( hepmc? (
-	   ${TEST_URI}/cteq6ll.LHpdf
-	   ${TEST_URI}/cteq5l.LHgrid
-	   ${TEST_URI}/GRV98nlo.LHgrid
-	   ${TEST_URI}/MRST2001nlo.LHgrid ) )"
-LICENSE="GPL-2"
-
-SLOT="0/20"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="c++11 emacs fastjet hepmc java lhapdf static-libs test zlib"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sci-libs/gsl:0=
-	emacs? ( >=app-editors/emacs-23.1:* )
-	fastjet? ( sci-physics/fastjet:0= )
-	hepmc? ( sci-physics/hepmc:0= )
-	java? ( >=virtual/jre-1.5:* )
-	lhapdf? ( sci-physics/lhapdf:0= )
-	zlib? ( sys-libs/zlib:0= )"
-DEPEND="${RDEPEND}
-	test? ( sys-process/time )"
-
-S="${WORKDIR}/${MYP}"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.8.3-java.patch )
-
-src_prepare() {
-	find -name 'Makefile.am' -exec \
-		sed -i -e '1ipkgdatadir=$(datadir)/thepeg' {} \; || die
-	# trick to force c++ linking
-	sed -i \
-		-e '1inodist_EXTRA_libThePEG_la_SOURCES = dummy.cxx' \
-		-e '/dist_pkgdata_DATA = ThePEG.el/d' \
-		lib/Makefile.am || die
-	autotools-utils_src_prepare
-	java-pkg-opt-2_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable c++11 stdcxx11)
-		$(use_with fastjet fastjet "${EPREFIX}"/usr)
-		$(use_with hepmc hepmc "${EPREFIX}"/usr)
-		$(use_with java javagui)
-		$(use_with lhapdf lhapdf "${EPREFIX}"/usr)
-		--without-rivet
-		$(use_with zlib zlib "${EPREFIX}"/usr)
-	)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile
-	use emacs && elisp-compile lib/ThePEG.el
-}
-
-src_test() {
-	emake LHAPATH="${DISTDIR}" -C "${BUILD_DIR}" check
-}
-
-src_install() {
-	autotools-utils_src_install
-	use emacs && elisp-install ${PN} lib/ThePEG.el{,c}
-	use java && java-pkg_newjar java/ThePEG.jar
-
-	cat <<-EOF > "${T}"/50${PN}
-	LDPATH="${EPREFIX}/usr/$(get_libdir)/ThePEG"
-	EOF
-	doenvd "${T}"/50${PN}
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}