gentoo resync : 17.02.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-02-17 10:35:54 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-02-17 10:35:54 +0000
commit: 463397cf1e064185110fe57c568d73f99a06f5d1 (patch)
tree: 9aa75eefc5154eaf0e3c33658b830fc54dc68052 /sci-physics
parent: c8d60dada2ec8eb48b2d2b290cd6683ccec40e39 (diff)
24 files changed, 246 insertions, 268 deletions
diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index 89b579ea192e..4b35ed22b1e6 100644
--- a/sci-physics/Manifest.gz
+++ b/sci-physics/Manifest.gz
diff --git a/sci-physics/espresso/Manifest b/sci-physics/espresso/Manifest
index 7c6541710bb6..75e2f4a7c5ab 100644
--- a/sci-physics/espresso/Manifest
+++ b/sci-physics/espresso/Manifest
@@ -1,4 +1,4 @@
 DIST espresso-4.1.3.tar.gz 16947336 BLAKE2B 14d3513eda87f62a8473a0cac0c273b3590bf78ed48b96e76d10c106713f7bbd7d37de951bd3d9210062b34c02bd83a68f3aaf1ca8215ed1dcde590e4e99b113 SHA512 1fe82683eddb7bfd9bae6e446b0f42a50087d755995963905cd419473ad17b204f20049d0cf4af9264898dd6fee36f02744b38fa45cd0e33086374cf2aebd934
-EBUILD espresso-4.1.3.ebuild 2725 BLAKE2B fda59226e12c8b077a32e1736d244e4ae3ceecc88ce38d3f1a7eaf715e507e1fcf5b06dd9c1627981e8d99cd68d93c2129fb9d560f003f2079e5c300390fef6c SHA512 15b539b21a8755864988d483ac1b3fd437a44c0646c48a9e6b3151941154a03f757efaae657f53534079dc332cbce1bde75355a40477aeec86fe837418765aff
-EBUILD espresso-9999.ebuild 2725 BLAKE2B fda59226e12c8b077a32e1736d244e4ae3ceecc88ce38d3f1a7eaf715e507e1fcf5b06dd9c1627981e8d99cd68d93c2129fb9d560f003f2079e5c300390fef6c SHA512 15b539b21a8755864988d483ac1b3fd437a44c0646c48a9e6b3151941154a03f757efaae657f53534079dc332cbce1bde75355a40477aeec86fe837418765aff
+EBUILD espresso-4.1.3.ebuild 2712 BLAKE2B 254bd16353e3918209c484b03eee9b3c61df568e70b77955d16cec04b3af17dec49c2968570eb82c0d0401fb6640f5a50f3317bfb31b15435db3985e7ce5d41a SHA512 d30b9892b4852f0727f860ca4c7ad3469d701ed01aff024749153a218124d7c80738e3c571932a944603cd1c2edc7f39ebc928c129aaa2e28b3c9da18893c50a
+EBUILD espresso-9999.ebuild 2712 BLAKE2B 254bd16353e3918209c484b03eee9b3c61df568e70b77955d16cec04b3af17dec49c2968570eb82c0d0401fb6640f5a50f3317bfb31b15435db3985e7ce5d41a SHA512 d30b9892b4852f0727f860ca4c7ad3469d701ed01aff024749153a218124d7c80738e3c571932a944603cd1c2edc7f39ebc928c129aaa2e28b3c9da18893c50a
 MISC metadata.xml 476 BLAKE2B f76690b14e947d107cab9c5601cbdc62fc3160e03114ceeca6b45f6d29960691bbdf2d740694198d88cbb31311e5bf0ef0d2b225d276da71030e643188394cf8 SHA512 be0595e319ca81b2293857b6365e8ec9397548a8f30ff5b39f8b267c51dd0a1c08835b2880bdc0714ae7c6264066c88ee9f6ac053c54c4419cdabe5808678184
diff --git a/sci-physics/espresso/espresso-4.1.3.ebuild b/sci-physics/espresso/espresso-4.1.3.ebuild
index 66c2b9a4c69f..1ef336f2ab40 100644
--- a/sci-physics/espresso/espresso-4.1.3.ebuild
+++ b/sci-physics/espresso/espresso-4.1.3.ebuild
@@ -15,7 +15,6 @@ if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}md/${PN}.git"
 	EGIT_BRANCH="python"
 	inherit git-r3
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/${PN}md/${PN}/releases/download/${PV}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86 ~amd64-linux"
diff --git a/sci-physics/espresso/espresso-9999.ebuild b/sci-physics/espresso/espresso-9999.ebuild
index 66c2b9a4c69f..1ef336f2ab40 100644
--- a/sci-physics/espresso/espresso-9999.ebuild
+++ b/sci-physics/espresso/espresso-9999.ebuild
@@ -15,7 +15,6 @@ if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}md/${PN}.git"
 	EGIT_BRANCH="python"
 	inherit git-r3
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/${PN}md/${PN}/releases/download/${PV}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86 ~amd64-linux"
diff --git a/sci-physics/lhapdf/Manifest b/sci-physics/lhapdf/Manifest
index b028d7f7e490..14dfaf043a93 100644
--- a/sci-physics/lhapdf/Manifest
+++ b/sci-physics/lhapdf/Manifest
@@ -1,3 +1,5 @@
 DIST LHAPDF-6.2.3.tar.gz 750659 BLAKE2B a16f67c69f41e96cdb5434cc53658c6b085b94c9ad06443fdfb49aa1de50eeb2a59aa41442a032c29b361bad4f749cef42499f3d16f2774efb0b399f889576e4 SHA512 167064a141f46e5c834d950690a989330b940acec62377b8b4c40e14665503cf7b4ddb79e05c71ebe1f801231192d951e294bec3944ec37b2bca484b2e5ce894
+DIST LHAPDF-6.3.0.tar.gz 770744 BLAKE2B 02b9fe3507b87c6f0c635ceb203304eb9b3ee8ac4d17c8b83578f8c05b78b17035b63b6d3d9a0b9fe3505a3daf8e9376fe25040b8826ea4976d2a717b1447eb9 SHA512 4a5aca6e2f06b59a44acc23ef76f1fae747f38e425803e7625cc68130da0c76d1e0d534b7b1867f09c86ee838d4f769d5097257170740db704c966d91c41f94b
 EBUILD lhapdf-6.2.3.ebuild 1631 BLAKE2B b986649bf0ddcb1935c27e41acc9c75f72495a712a91f4777c2d93da8c2389a7d6f969bc98dcdd07415e61133927733f749972b835ae3fb63a81360af23e36e5 SHA512 7b80b0a71f21bb3dc4cb9b5a36de573e5ed58dac0b55ee82d272912c78ea2dbc467cf625c4b805de268b1d9571368f505d91332c4bee2f159a7a8e63bd3c82f3
+EBUILD lhapdf-6.3.0.ebuild 1632 BLAKE2B ea77cd0a47e8bc892cea35cef98010683c0fd0febcb6b73e33264d45f449300bc38ae1d1a0bfd57a5e2ecf786bea4462bb42797f0cfbd3e57fc86aeb4e561943 SHA512 4db027732302448a0b87f70482306642ef381ef2aa58c74586f763096875f56d2035b9fa1af0c44b5a019ffed6bf4ef23377acac7dc843a79995b80aa6989343
 MISC metadata.xml 996 BLAKE2B 97df1e778a0e4fdd20faeffcc992c5c76d203c35f9916a15c823bd10d8914cea7b2b6c7b58cca1e6af50ff4a134db8c5cf40db345520cd6f4d16a58d02fda822 SHA512 0c5f089f8428dfbf3e6151f2d9052409dbf7dc64af40fe28664df3e6ba014c8ec4c3e6ae2958c0f0b13ee7edc59f038dab14272622119cc5cb5d6f7fc43637cc
diff --git a/sci-physics/lhapdf/lhapdf-6.3.0.ebuild b/sci-physics/lhapdf/lhapdf-6.3.0.ebuild
new file mode 100644
index 000000000000..f28072c4f40d
--- /dev/null
+++ b/sci-physics/lhapdf/lhapdf-6.3.0.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=no
+inherit distutils-r1
+
+MY_PV=$(ver_cut 1-3)
+MY_PF=LHAPDF-${MY_PV}
+
+DESCRIPTION="Les Houches Parton Density Function unified library"
+HOMEPAGE="http://lhapdf.hepforge.org/"
+SRC_URI="http://www.hepforge.org/archive/lhapdf/${MY_PF}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	dev-libs/boost:0=
+	python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}"
+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}/${MY_PF}"
+
+src_configure() {
+	econf \
+		--disable-static \
+		$(use_enable python)
+
+	if use python; then
+		cd "${S}"/wrappers/python || die
+		distutils-r1_src_prepare
+	fi
+}
+
+src_compile() {
+	emake all $(use doc && echo doxy)
+
+	if use python; then
+		cd "${S}"/wrappers/python || die
+		distutils-r1_src_compile
+	fi
+}
+
+src_test() {
+	emake -C tests
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	use doc && dodoc -r doc/doxygen/.
+	use examples && doins examples/*.cc
+
+	if use python; then
+		cd "${S}"/wrappers/python || die 
+		distutils-r1_src_install
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	elog "Download data files from:"
+	elog "http://www.hepforge.org/archive/${PN}/pdfsets/$(ver_cut 1-2)"
+	elog "and untar them into ${EPREFIX}/usr/share/LHAPDF"
+}
diff --git a/sci-physics/looptools/Manifest b/sci-physics/looptools/Manifest
index 4f85435fc8ed..b813c71056d9 100644
--- a/sci-physics/looptools/Manifest
+++ b/sci-physics/looptools/Manifest
@@ -1,9 +1,7 @@
-AUX looptools-2.10-makefile.patch 2441 BLAKE2B dc19374c9af86bc7b42be5fc15c165b98bb17fde0a68b418210025ecfcf72c6201b546c8610587e724ad9245c835a25a299119d8f43e95d6b92814b1a238692c SHA512 2fefd3ccce9568481871166befffd0cfe08e9dcb5c9498eb6acdcfcf35d94148832ec23f33e258279a8e3a152e0a7c265be8ef3e3f349259ef2e7e2640381280
+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.12.tar.gz 545153 BLAKE2B 4e798a589ec7d3e2eda31ab75486096350d8efb01a14490b39df67501a38c42bcee5bcae6308dca6cdb8616b561a96648449d5e63e972f6cdcf092287b80b7c5 SHA512 70726493bd138fb80b85a46955fbe28b7f1432d9b67a100fe3ff74c2fa22232a07e461a6742745b0ead81793bb64b81cc4265d09b91fa048e7bdd32cf6956b27
-DIST LoopTools-2.13.tar.gz 549005 BLAKE2B 17313d926f86bac2b15af4fe71155ef0a2704d22712d4bb0ef653213c1b8ee1972293f4f0d419b0618666c100fc5f8349338b8a66fcf729757c6264edbdcae82 SHA512 eadde36d8bf340061f5b50c9928bce055ef098d0cee11abe9a834c158a7758b09f4290dddbba922a41b0281fbdaecc80ba877cb6968b0448f3487324e220ec62
+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.12.ebuild 885 BLAKE2B c0c9ff8313ba1dc1f00a3b3a37d136269fa453df397a12e9a03e09ddf8d85f3189b3a4c4e1817c247ef7c49efe358132bd7fe4b6f8c24dcf0b92165ff9caf66d SHA512 9839812ae955f6d7c4709e43c03f689f222d6caec4a65ad4ad13fde85c8bba9a6915f026ff6dd5136499839e0505db754f006f9e0275390f62e4fd7c91c2bae4
-EBUILD looptools-2.13.ebuild 892 BLAKE2B 67c5f9a7d7f995338a54c8b2ccf320af8230c817dbb85efe734f26df4bb4c7a52819d92a5f334804602831b69f0348b122b386cc939072a58c1441cdf63f7ea1 SHA512 63425495632f67b951c945756a3d443f47ba12ae1e01592106e5baa49a32cf2c1ac5326ad18ece334e653c79a0d45190e7b513e039e6b4fb4ab042befb658267
+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.10-makefile.patch b/sci-physics/looptools/files/looptools-2.15-makefile.patch
index bf0df2e03bb5..807aacdc8ecb 100644
--- a/sci-physics/looptools/files/looptools-2.10-makefile.patch
+++ b/sci-physics/looptools/files/looptools-2.15-makefile.patch
@@ -21,28 +21,28 @@
  ARGS = $(PARALLEL) \
    LIB="$(LIB)" \
    FE="$(FE)" \
-@@ -16,12 +19,12 @@
+@@ -16,12 +19,12 @@ ARGS = $(PARALLEL) \
    EXE="$(EXE)" \
    DEF="$(DEF)" \
    NOUNDERSCORE="$(NOUNDERSCORE)" \
--  XFC="$(FC$(QUADSUFFIX)) $(FFLAGS) $(FFLAGS-quad) -I." \
-+  XFC="$(FC$(QUADSUFFIX)) $(FFLAGS) $(FFLAGS-quad) -I. -fPIC" \
+-  XFC="$(FC) $(FFLAGS) -I." \
++  XFC="$(FC$(QUADSUFFIX)) $(FFLAGS) -I. -fPIC" \
    F90="$(F90)" \
    CC="$(CC)" \
--  CFLAGS="$(CFLAGS) $(CFLAGS-quad)" \
-+  CFLAGS="$(CFLAGS) $(CFLAGS-quad) -fPIC" \
+-  CFLAGS="$(CFLAGS)" \
++  CFLAGS="$(CFLAGS) -fPIC" \
    CXX="$(CXX)" \
 -  CXXFLAGS="$(CXXFLAGS)" \
 +  CXXFLAGS="$(CXXFLAGS) -fPIC" \
    ML="$(ML)" \
    MCC="$(MCC)" \
    MCFLAGS="$(MCFLAGS)" \
-@@ -32,22 +35,24 @@
+@@ -31,24 +34,23 @@ ARGS = $(PARALLEL) \
+   NM="$(NM)" \
    DLLTOOL="$(DLLTOOL)" \
    LDFLAGS="$(LDFLAGS)" \
-   LIBPATH="$(LIBPATH)" \
--  OBJS-quad="$(OBJS-quad)"
-+  OBJS-quad="$(OBJS-quad)" \
+-  LIBPATH="$(LIBPATH)"
++  LIBPATH="$(LIBPATH)" \
 +  REALNAME="$(REALNAME)"
  
  
@@ -56,17 +56,16 @@
 +	-mkdir $(DESTDIR)$(PREFIX)
  	-mkdir $(LIBDIR) $(BINDIR) $(INCLUDEDIR)
  	cp -p $(BLD)/$(LIB) $(LIBDIR)
- 	cp -p $(INCLUDE$(QUADSUFFIX)) $(INCLUDEDIR)
+ 	cp -p $(INCLUDE) $(INCLUDEDIR)
 -	strip $(BLD)/$(FE)
  	cp -p $(BLD)/fcc $(BLD)/$(FE) $(BINDIR)
  	rm -f $(BINDIR)/f++
  	ln -s fcc $(BINDIR)/f++
--	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
+ 	test ! -f $(BLD)/$(MFE) || { \
+ 	  test -z "$(EXE)" || ldd $(BLD)/$(MFE) | awk '/\/usr\/bin\/cyg/ { system("cp -p " $$3 " $(BINDIR)/"); }' ; \
+-	  strip $(BLD)/$(MFE) ; \
+ 	  cp -p $(BLD)/$(MFE) $(BINDIR); \
+ 	}
  
 --- a/src/makefile
 +++ b/src/makefile
@@ -79,20 +78,22 @@
  
  frontend: lib $(FE)
  
-@@ -8,6 +8,7 @@
+@@ -8,6 +8,8 @@ mma1: lib $(MFE)
  
  mma0 lib: $(LIB) clooptools.h fcc
  
 +solib: $(REALNAME) fcc
++
  
  .SUFFIXES:
  
-@@ -243,6 +244,8 @@
- 	$(AR) cru $(LIB) $?
+@@ -245,6 +247,9 @@ $(LIB): $(OBJS)
+ 	$(AR) $(ARFLAGS) $(LIB) $?
  	-$(RANLIB) $(LIB)
  
 +$(REALNAME): $(OBJS)
 +	$(XFC) $(LDFLAGS) -shared -Wl,--soname,$(REALNAME) -o $@ $?
++
  
  $(FE): lt.F $(LTINC) $(LIB)
- 	$(XFC) -o $(FE) lt.F $(LIB) -lpthread
+ 	$(XFC) -o $(FE) lt.F $(LIB) $(LDFLAGS)
diff --git a/sci-physics/looptools/looptools-2.12.ebuild b/sci-physics/looptools/looptools-2.12.ebuild
deleted file mode 100644
index 3727a66da958..000000000000
--- a/sci-physics/looptools/looptools-2.12.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}"/${PN}-2.10-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/looptools/looptools-2.13.ebuild b/sci-physics/looptools/looptools-2.15.ebuild
index 752cba285c8f..2cd0f8957666 100644
--- a/sci-physics/looptools/looptools-2.13.ebuild
+++ b/sci-physics/looptools/looptools-2.15.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit fortran-2
 
@@ -15,9 +15,9 @@ LICENSE="LGPL-3"
 
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc static-libs"
+IUSE="doc"
 
-PATCHES=( "${FILESDIR}"/${PN}-2.10-makefile.patch )
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
 
 S="${WORKDIR}/${MY_P}"
 
@@ -32,10 +32,7 @@ src_prepare() {
 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
+	dolib.so build/libooptools.so.2.15
+	rm "${ED}"/usr/$(get_libdir)/libooptools.a || die
 	use doc && dodoc manual/*.pdf
 }
diff --git a/sci-physics/pythia/Manifest b/sci-physics/pythia/Manifest
index 9a0a3a47ac45..3e5d58a46c3b 100644
--- a/sci-physics/pythia/Manifest
+++ b/sci-physics/pythia/Manifest
@@ -1,6 +1,6 @@
+AUX pythia-6.4.28-fno-common.patch 1899 BLAKE2B b05c2f147ec34fa334b830c1105d682dd45ba80f824ed706de12cf2bf5767808a1ac698f57d6a9ea78e6cbcb39ab4fc25a8d5c1e3f7ccc50ac54d81bb1faa678 SHA512 41005cfdc1766541c1336c1d0c2e1acb606496feb4fbd75fc3ef38d5ccb2010d095c927e615d6e33b7533dbe02a876608a7d789e58bcc03de59b233efcbfe814
 AUX pythia-8.2.26-run-tests.patch 1044 BLAKE2B e97cf79874004b0ec99ef19b2b4af39ae96a1f115206d1ddb912bacc895d144162f62156cf92bc876d27a976a1465a6509393b0b50230f1990fe95b8d068d2ed SHA512 37297dbf852b402adc03f9a60ca2f9108d192dc005de1c6dfd9a9725220a50da322267938a91cfe082301942059a9b4caf91a85e41179becee6e9889881c9b57
 AUX pythia8209-root-noninteractive.patch 500 BLAKE2B 7af9e7375cac38d87ae8935e712ac9b2a5109984a4c7111c59033adf46f0d133b94eb8dccb663683302ff0529e56b819c9f667e2d1253e4b4f1c585dcd1a4eff SHA512 9dad44ee084b5edea6560ba639e562c6ddc56cd7170ec21628176aeaec11d535de2813599b9c45b49511ad3d0ad9cb0540d9052179c9e9907d10d81ea55bdea2
-AUX pythia8209-run-tests.patch 962 BLAKE2B e3b2f20fca58e7c51eaea9c11a76dd1320bfb555adfbe4254ad0bc2f81c4aee1bb451366c092ccfe70eda758e3106274cadceea9c907dad45e453c3afccfdafa SHA512 e0629ca9016fc77cef78d81ed84d4a54171d7497488e8c1a2b60adef0e32f18a96353e55d9d08789ebc144dee209844f8f7cb8215347c7ed943725fff21921b0
 DIST CT10.tar.gz 10246366 BLAKE2B f0daf0a3ca6cd2f178f993944cdc29de5deb1f441d197e47c8b1c285a56abc0fdb1cd53ec5a8e7736e200397bea9ec9cf4d04420ce206e5c396b85b63f695d00 SHA512 90406bd102ab54b683fa3e6f3fc759febea2454a0b96c6a8d373cdec297f5d652097057a015c7d87241792ed9b5d9ac658a33155cdd7362f59110f8f06ecce73
 DIST MRST2004qed.tar.gz 185079 BLAKE2B 62e0371de965698100755b14b0c282095b84b40800a58cd6776c458b03982f032f3b2464eb76174084dd22de9fd962e202a4896327b0a00579c3a632dac24ccc SHA512 404aacf0e241f572cc42ad4cf963deef1acd3d365fa68cfa3518878f921858046377ea39caf663fdced2cdde07af2f6ce695737f7fea229489df3d3f38283c95
 DIST MRST2007lomod.tar.gz 56685 BLAKE2B 8515b6f77302621f4b37f550840f07f0351e7ea98de16a37ceb4cb0f2ea64aa4b027462ffc442f34d1f4c349d67fac7b35353606d8920f17621c7187e508c689 SHA512 8e55627a01c85d90a62e4fb11b115c2faac2220479b6d558d3d6f1b801fc5c3e88abc377cd5437ccaeedd34b2ca42d6e833014566b796e5e1eebcf4d620e5dc0
@@ -13,10 +13,8 @@ DIST pythia-6.4.18-examples.tar.bz2 36366 BLAKE2B ec655014d3904b66da4a1e748a37c3
 DIST pythia-6.4.28.tar.xz 490248 BLAKE2B aff9006a4d3a0536d39a5b5161329f058b980554046a57979cc72c80067be96f00b5056dee29fc7f0039ddae074560823427c3a0e24e59f69662f08524fbdcd4 SHA512 f9db72658f2132ce08d31c8a9f7fe727466b184ef41cc4b762fe2bde48dbdfd7b5df19b21a869e20a1f107c96e9daec115c980e11592968eb2cad666b7c96bdc
 DIST pythia6-20160413.tar.gz 567976 BLAKE2B 92ee81e41db46d49706599ee387a650f67d54a0ea165648de0d09d6cec811c2a4b22903c15cca0abaf5f34cf28333d70315a2c71f4ce0ec0bc48757c20114ae7 SHA512 2a9ea2ae299e8d49bd9750f8c68f0b7f534fb91254c2eebc60ef40828400bdf5e5c4e0956d61807e773a51db873ab4a036c3ac264f904d0bb2b85f4860e538d3
 DIST pythia6.tar.gz 567451 BLAKE2B c32a67d87fc6f22027d3d9551256af5a0151e494fbae02c5d14ccf08595f1ebf49b638a1c33f7a52214e8bbb510756a72ef0f68f5dc8037e2a6acd3fbf290cfd SHA512 baa18023de22c3e90f14d2a5a39efa171905f507a31a90f87c65dca271b3be4c9f0d1a56282f5a04b3efabe0b5b15c964e4569d1f9994a75750e52e0be4360b1
-DIST pythia8186.tgz 8921248 BLAKE2B 9e753a04c2dbc5362a24b06d40c238e5fcc5ac700dd20b9bc47b1a68604fdb87808018593c28a1d6dcb06a212bdec1146431f1096db70f4c934413a0c3b20fa0 SHA512 84729004abbdf522183c27918ae35db037a8954af761a2b452dcff54f82076b1e3bfc7fe9ea0a7cb2c0b6499aedb1c25cc13768d47b24edaa08d631b55d0b86b
 DIST pythia8226.tgz 17639842 BLAKE2B b80d7c10bd5ccc45fbb2db0df0eff679236b9911958f58987517b475e055959aa494a2199f64117631baedd90c8e2753f996e5d64552e39e54859bfe77274dad SHA512 85db807264f99c27dd87ad0572b98f4ac8d37fed818c3dd1ac89f0ac124ae0a5ee13b290727e515cb04269a6e0be8b386d954bed62309f26d1e60b431f952ca0
-EBUILD pythia-6.4.28-r1.ebuild 1908 BLAKE2B cc2ddb262eea5a646d38c983e22f3ff46f60621b73aa9c469a7afb67455ec3935d89826d3633d2401ada405ae9df09e823f263c57d1ccad5829eb492af71f17c SHA512 dcbf3226adf25fb2c738f0825cd70aef70d3c1d77d123bb765db2f9666b7fe23e06f469ed2ee285dd1a315731ddc7a90d798e53b88723b72586a0dfe11ad7863
+EBUILD pythia-6.4.28-r2.ebuild 2020 BLAKE2B b97090e1474f9a260aa9d5ce0502e8640f9ea723bdceb31feb153dc50e74e7f27267e17e7fd396768f8abe9a2b5ad8243599c5acddb0a08f93fb882bba6d5139 SHA512 c856e72b4a243f88dbc2cdffc87d03e5675bbc871a4b67988bb2f33e5d9b39412e5c862fec6a431bbea93ab8d39e68cb878c29a93090f6b5eb9d6ca1f6d16df7
 EBUILD pythia-6.4.28.ebuild 1864 BLAKE2B c89b5effbe414331507c920841617698affb57152a721be748a336cdd26e1cb492d273e9f43e60e485d4ad7407fbda88c2578b72f2c56789026c7e0bccf76999 SHA512 9e3fa32d791672b3aec15f779700fd33a6a83488ca315e365e3fdc7eb88ee3a8405dffcc6eda705d3334c79e8a726c1130ba97b2baf0d91004c881b1e922a2af
-EBUILD pythia-8.1.86-r1.ebuild 2618 BLAKE2B 28b0db0d7168c731eb627deebe5542426bb3969f76a8135ebd4dc02d5e710f68ff268c65b3c9fd7ea78246bc5d428041e22984959b9f62921dc2fc1a0a479f7b SHA512 0b07f2d9d85cc46a04cd79d9363bb044f80494c20ace27411d9593d4847932c79453129a158fc20ddf616f63a0965be165c1e68c61994919f0fb17e13a14af1c
-EBUILD pythia-8.2.26.ebuild 5847 BLAKE2B 7c62a7b2d2f1623af2b30350a84af3843430c0b25af45b46d1c2d5beb79c93d05f1d06042ddcd151ce5bd9c2ef015fd49bc6ae6df2c938fa9fed0df63748a4bf SHA512 727d1f977d5425544512b2c9fa76a3c5229641f2c01e45ab27f1e8262ab7585421ac29b10ffe77225a5fe27092595de2c2c759e4bde2325d6be1eaefc983087c
+EBUILD pythia-8.2.26-r1.ebuild 5732 BLAKE2B e93959f6db754f19d410abf4b4c4b25723857a768106cea744374d7195a6fcad6534f683414fbbe3c1512732e4a1353a1f5f136d672aa9e98d1fa6e29ddd0644 SHA512 ff3805db1893b4204f2d6de709b48bb6105ef23c535ecd7c53018a754b56d2f1a319b6ffec7cfca1ba3c10752a6deeb84272f50d00a62e3cd4a85a69f784b571
 MISC metadata.xml 1298 BLAKE2B 3a8448cffc50ab81baf30e783a7d30387f4cd61be3f1a35ccdc9277dbb33d7178bbe9e103d189dd78a6775fcfa563480363448308a583ab2d9b513eb6e6f2b46 SHA512 b991381193c62d05d01ea82c74a2fabe3968683b4a1e0914027768dbbc3d2b52a85584b77b1b7274e77222e10da0aaa1a55d3982b423bc7c2b5deb4d775e6389
diff --git a/sci-physics/pythia/files/pythia-6.4.28-fno-common.patch b/sci-physics/pythia/files/pythia-6.4.28-fno-common.patch
new file mode 100644
index 000000000000..3ee9bc7c0f7a
--- /dev/null
+++ b/sci-physics/pythia/files/pythia-6.4.28-fno-common.patch
@@ -0,0 +1,54 @@
+https://bugs.gentoo.org/766306
+--- a/pythia6_common_address.c
++++ b/pythia6_common_address.c
+@@ -48,28 +48,28 @@
+ # define pybins PYBINS
+ #endif
+ 
+-int pyjets[2+5*4000+2*2*5*4000];
+-int pydat1[200+2*200+200+2*200];
+-int pydat2[4*500+2*4*500+2*2000+2*4*4];
+-int pydat3[3*500+2*8000+2*8000+5*8000];  /* KNDCAY=8000 */
+-char pydat4[2*500*16];
+-int pydatr[6+2*100];
+-int pysubs[2+500+81*2+2*200];
+-int pypars[200+2*200+200+2*200];
+-int pyint1[400+2*400];
+-int pyint2[500+2*500+2*20*500+2*4*40];
+-int pyint3[2*81*2+3*1000+2*1000];
+-int pyint4[500+2*5*500];
+-int pyint5[1+3*501+2*3*501];
+-char pyint6[501*28];
+-int pyint7[2*6*7*7];
+-int pyint8[2*5*13];
+-int pyint9[2*4*13];
+-int pyuppr[1+7*20+1+2*10+2*5*20+2*11]; /* PYUPPR DOES NOT EXIST IN PYTHIA6 AT ALL!!! */
+-int pymssm[100+2*100];
+-int pyssmt[2*4*4+2*2*2+2*2*2+2*4+2*2+2*4*16+2*4*4+2*2*2+2*2*2];
+-int pyints[2*20];
+-int pybins[4+1000+2*20000];
++extern int pyjets[2+5*4000+2*2*5*4000];
++extern int pydat1[200+2*200+200+2*200];
++extern int pydat2[4*500+2*4*500+2*2000+2*4*4];
++extern int pydat3[3*500+2*8000+2*8000+5*8000];  /* KNDCAY=8000 */
++extern char pydat4[2*500*16];
++extern int pydatr[6+2*100];
++extern int pysubs[2+500+81*2+2*200];
++extern int pypars[200+2*200+200+2*200];
++extern int pyint1[400+2*400];
++extern int pyint2[500+2*500+2*20*500+2*4*40];
++extern int pyint3[2*81*2+3*1000+2*1000];
++extern int pyint4[500+2*5*500];
++extern int pyint5[1+3*501+2*3*501];
++extern char pyint6[501*28];
++extern int pyint7[2*6*7*7];
++extern int pyint8[2*5*13];
++extern int pyint9[2*4*13];
++extern int pyuppr[1+7*20+1+2*10+2*5*20+2*11]; /* PYUPPR DOES NOT EXIST IN PYTHIA6 AT ALL!!! */
++extern int pymssm[100+2*100];
++extern int pyssmt[2*4*4+2*2*2+2*2*2+2*4+2*2+2*4*16+2*4*4+2*2*2+2*2*2];
++extern int pyints[2*20];
++extern int pybins[4+1000+2*20000];
+ 
+ void *pythia6_common_address(const char* name) {
+    if      (!strcmp(name,"PYJETS")) return pyjets;
diff --git a/sci-physics/pythia/files/pythia8209-run-tests.patch b/sci-physics/pythia/files/pythia8209-run-tests.patch
deleted file mode 100644
index d1edc8393726..000000000000
--- a/sci-physics/pythia/files/pythia8209-run-tests.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- pythia8209/examples/Makefile.orig	2015-06-04 22:21:53.000000000 +0300
-+++ pythia8209/examples/Makefile	2015-06-05 05:35:25.324262331 +0300
-@@ -139,3 +139,17 @@
- 	rm -f test[0-9][0-9][0-9]; rm -f out[0-9][0-9][0-9];\
- 	rm -f weakbosons.lhe; rm -f Pythia8.promc; rm -f hist.root;\
- 	rm -f *~; rm -f \#*; rm -f core*; rm -f *Dct.*
-+	rm -f main*out *.dat
-+
-+# Run tests, inject test-specific arguments when needed
-+main%.out: main%
-+	./$< \
-+	    $(if $(findstring $*,16 42 43 $(shell seq 81 89)), main$*.cmnd) \
-+	    $(if $(findstring $*,         $(shell seq 81 83)), w+_production_lhc_0.lhe) \
-+	    $(if $(findstring $*,                         84), hepmcout84.dat 2 w+_production_lhc) \
-+	    $(if $(findstring $*,         $(shell seq 85 88)), w_production) \
-+	    $(if $(findstring $*,   42 43 $(shell seq 81 89)), histout$*.dat) \
-+	    > $@
-+
-+main89.out: main89
-+	$(foreach cmd, $(wildcard main89*.cmnd), ./$< $(cmd) histout-$(cmd).dat >> $@ || exit;)
diff --git a/sci-physics/pythia/pythia-6.4.28-r1.ebuild b/sci-physics/pythia/pythia-6.4.28-r2.ebuild
index 92d4af7849ac..86fbe7d4358e 100644
--- a/sci-physics/pythia/pythia-6.4.28-r1.ebuild
+++ b/sci-physics/pythia/pythia-6.4.28-r2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit autotools fortran-2 versionator
+inherit autotools fortran-2
 
-MV=$(get_major_version)
+MV=$(ver_cut 1)
 MY_PN=${PN}${MV}
 DOC_PV=0613
 EX_PV=6.4.18
@@ -27,12 +27,16 @@ SRC_URI="
 SLOT="6"
 LICENSE="public-domain"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples static-libs"
+IUSE="doc examples"
+
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
 
 src_prepare() {
 	cp ../pythia6/tpythia6_called_from_cc.F .
 	cp ../pythia6/pythia6_common_address.c .
-	cat > configure.ac <<-EOF
+	default
+
+	cat > configure.ac <<-EOF || die
 		AC_INIT(${PN},${PV})
 		AM_INIT_AUTOMAKE
 		AC_PROG_F77
@@ -41,20 +45,21 @@ src_prepare() {
 		AC_CONFIG_FILES(Makefile)
 		AC_OUTPUT
 	EOF
-	echo >> Makefile.am "lib_LTLIBRARIES = libpythia6.la"
-	echo >> Makefile.am "libpythia6_la_SOURCES = \ "
+	echo >> Makefile.am "lib_LTLIBRARIES = libpythia6.la" || die
+	echo >> Makefile.am "libpythia6_la_SOURCES = \ " || die
 	# replace wildcard from makefile to ls in shell
 	local f
 	for f in py*.f struct*.f up*.f fh*.f; do
-		echo  >> Makefile.am "  ${f} \\"
+		echo  >> Makefile.am "  ${f} \\" || die
 	done
-	echo  >> Makefile.am "  ssmssm.f sugra.f visaje.f pdfset.f \\"
-	echo  >> Makefile.am "  tpythia6_called_from_cc.F pythia6_common_address.c"
+	echo  >> Makefile.am "  ssmssm.f sugra.f visaje.f pdfset.f \\" || die
+	echo  >> Makefile.am "  tpythia6_called_from_cc.F pythia6_common_address.c" || die
+
 	eautoreconf
 }
 
 src_configure() {
-	econf $(use_enable static-libs static)
+	econf --disable-static
 }
 
 src_install() {
@@ -62,7 +67,9 @@ src_install() {
 	dodoc update_notes.txt
 	use doc && dodoc "${DISTDIR}"/lutp${DOC_PV}man2.pdf
 	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r "${WORKDIR}"/examples
+		dodoc -r "${WORKDIR}"/examples
+		docompress -x /usr/share/doc/${PF}/examples
 	fi
+
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/sci-physics/pythia/pythia-8.1.86-r1.ebuild b/sci-physics/pythia/pythia-8.1.86-r1.ebuild
deleted file mode 100644
index 60aca11c2471..000000000000
--- a/sci-physics/pythia/pythia-8.1.86-r1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils versionator toolchain-funcs multilib
-
-MV=$(get_major_version)
-MY_P=${PN}$(replace_all_version_separators "" ${PV})
-
-DESCRIPTION="Lund Monte Carlo high-energy physics event generator"
-HOMEPAGE="http://pythia8.hepforge.org/"
-SRC_URI="http://home.thep.lu.se/~torbjorn/${PN}${MV}/${MY_P}.tgz"
-
-SLOT="8"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples gzip +hepmc static-libs"
-
-DEPEND="
-	gzip? ( dev-libs/boost sys-libs/zlib )
-	hepmc? ( sci-physics/hepmc:0= )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	PYTHIADIR="${EPREFIX}/usr/share/pythia8"
-	# set datadir for xmldor in include file
-	sed -i \
-		-e "s:../xmldoc:${PYTHIADIR}/xmldoc:" \
-		include/Pythia8/Pythia.h || die
-	# respect libdir, prefix, flags
-	sed -i \
-		-e "s:/lib:/$(get_libdir):g" \
-		-e "s:/usr:${EPREFIX}/usr:g" \
-		-e "s:-O2::g" \
-		configure || die
-	sed -i \
-		-e "s:LIBDIR=.*:LIBDIR=$(get_libdir):" \
-		-e "s:LIBDIRARCH=.*:LIBDIRARCH=$(get_libdir):" \
-		-e "s:cp -r lib:cp -r $(get_libdir):" \
-		-e '/ln -fs/d' \
-		Makefile examples/Makefile || die
-}
-
-src_configure() {
-	export USRCXXFLAGS="${CXXFLAGS}"
-	export USRLDFLAGSSHARED="${LDFLAGS}"
-	tc-export CC CXX
-	# homemade configure script
-	./configure \
-		--installdir="${EPREFIX}/usr" \
-		--datadir="${PYTHIADIR}" \
-		--enable-shared \
-		$(usex gzip "--enable-gzip=yes" "") \
-		$(usex hepmc "--with-hepmcversion=2 --with-hepmc=${EPREFIX}/usr" "") \
-		|| die
-	if ! use static-libs; then
-		sed -i \
-			-e '/targets.*=$(LIBDIR.*\.a$/d' \
-			-e 's/+=\(.*libpythia8\.\)/=\1/' \
-			Makefile || die
-		sed -i \
-			-e 's:\.a:\.so:g' \
-			-e 's:$(LIBDIRARCH):$(LIBDIR):g' \
-			examples/Makefile || die
-	fi
-}
-
-src_test() {
-	cd examples || die
-	# use emake for parallel instead of long runmains
-	local tests="$(echo main0{1..8})" t
-	use hepmc && tests="${tests} main31"
-	emake ${tests}
-	for t in ${tests}; do
-		LD_LIBRARY_PATH="${S}/$(get_libdir):${LD_LIBRARY_PATH}" \
-			bin/${t}.exe > ${t}.out || die "test ${t} failed"
-	done
-	emake clean && rm main*out
-}
-
-src_install() {
-	emake INSTALLDIR="${ED}/usr" DATADIR="${D}/${PYTHIADIR}" install
-	rm -r "${D}"/${PYTHIADIR}/{html,php}doc || die
-	echo "PYTHIA8DATA=${PYTHIADIR}/xmldoc" >> 99pythia8
-	doenvd 99pythia8
-
-	dodoc GUIDELINES AUTHORS README
-	if use doc; then
-		dodoc worksheet.pdf htmldoc/pythia8100.pdf
-		dohtml -r htmldoc/*
-	fi
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples rootexamples
-		docompress -x /usr/share/doc/${PF}/{root,}examples
-	fi
-}
diff --git a/sci-physics/pythia/pythia-8.2.26.ebuild b/sci-physics/pythia/pythia-8.2.26-r1.ebuild
index 5adb37c9e6d5..3c735682cf15 100644
--- a/sci-physics/pythia/pythia-8.2.26.ebuild
+++ b/sci-physics/pythia/pythia-8.2.26-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils multilib toolchain-funcs versionator
+inherit toolchain-funcs
 
-MV=$(get_major_version)
-MY_P=${PN}$(replace_all_version_separators "" ${PV})
+MV=$(ver_cut 1)
+MY_P="${PN}${PV//./}"
 LHA_VER="6.1"
 
 DESCRIPTION="Lund Monte Carlo high-energy physics event generator"
@@ -25,19 +25,24 @@ SRC_URI="http://home.thep.lu.se/~torbjorn/${PN}${MV}/${MY_P}.tgz
 SLOT="8"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples gzip +hepmc fastjet lhapdf root static-libs test"
+IUSE="doc examples fastjet gzip +hepmc lhapdf root test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	fastjet? ( >=sci-physics/fastjet-3 )
+	fastjet? ( sci-physics/fastjet )
 	gzip? ( sys-libs/zlib )
 	hepmc? ( sci-physics/hepmc:0= )
-	lhapdf? ( >=sci-physics/lhapdf-6:= )
-"
+	lhapdf? ( sci-physics/lhapdf:= )"
 # ROOT is used only when building related tests
 DEPEND="${RDEPEND}
-	test? ( root? ( sci-physics/root:= ) )
-"
+	test? (
+		root? ( sci-physics/root:= )
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-run-tests.patch
+	"${FILESDIR}"/${PN}8209-root-noninteractive.patch
+)
 
 S="${WORKDIR}/${MY_P}"
 
@@ -51,6 +56,8 @@ pkg_pretend() {
 src_prepare() {
 	PYTHIADIR="/usr/share/pythia8"
 	EPYTHIADIR="${EPREFIX}${PYTHIADIR}"
+
+	default
 	# set datadir for xmldor in include file
 	sed -i \
 		-e "s:../share/Pythia8/xmldoc:${EPYTHIADIR}/xmldoc:" \
@@ -84,18 +91,13 @@ src_prepare() {
 		examples/main54.cc || die
 	# ask cflags from root
 	sed -i "s:root-config:root-config --cflags:g" examples/Makefile || die
-	if ! use static-libs; then
-		sed -i \
-			-e '/TARGETS=$(LOCAL_LIB)\/libpythia8\.a/d' \
-			-e 's:libpythia8\.a$:libpythia8$(LIB_SUFFIX):g' \
-			Makefile || die
-		sed -i 's:libpythia8\.a:libpythia8$(LIB_SUFFIX):g' \
-			examples/Makefile || die
-	fi
 
-	eapply "${FILESDIR}/${PF}-run-tests.patch"
-	eapply "${FILESDIR}/${PN}8209-root-noninteractive.patch"
-	eapply_user
+	sed -i \
+		-e '/TARGETS=$(LOCAL_LIB)\/libpythia8\.a/d' \
+		-e 's:libpythia8\.a$:libpythia8$(LIB_SUFFIX):g' \
+		Makefile || die
+	sed -i 's:libpythia8\.a:libpythia8$(LIB_SUFFIX):g' \
+		examples/Makefile || die
 }
 
 # TODO: the following optional packages are out of Gentoo tree:
@@ -157,17 +159,18 @@ src_install() {
 	# make install is too broken, much easier to install manually
 	dobin bin/pythia8-config
 	doheader -r include/*
-	dolib lib/*
+	dolib.so lib/libpythia8.so
 	insinto "${PYTHIADIR}"
 	doins -r share/Pythia8/xmldoc examples/Makefile.inc
 
-	echo "PYTHIA8DATA=${EPYTHIADIR}/xmldoc" >> 99pythia8
-	doenvd 99pythia8
+	newenvd - 99pythia8 <<- _EOF_
+		PYTHIA8DATA=${EPYTHIADIR}/xmldoc
+	_EOF_
 
 	dodoc AUTHORS GUIDELINES README
 	if use doc; then
-		dodoc share/Pythia8/pdfdoc/*
-		dohtml -r share/Pythia8/htmldoc/*
+		dodoc -r share/Pythia8/pdfdoc/.
+		dodoc -r share/Pythia8/htmldoc/.
 	fi
 	if use examples; then
 		# reuse system Makefile.inc
@@ -175,7 +178,7 @@ src_install() {
 		sed -i "s:include Makefile.inc:include ${EPYTHIADIR}:" \
 			examples/Makefile || die
 
-		insinto /usr/share/doc/${PF}
+		insinto /usr/share/${PN}
 		doins -r examples
 		docompress -x /usr/share/doc/${PF}/examples
 	fi
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index 88b827abb015..fc83f9cb46ed 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -3,5 +3,5 @@ DIST root_v6.20.08.source.tar.gz 168218062 BLAKE2B 79b1eb89f1003c140a60d47e9d447
 DIST root_v6.22.06.source.tar.gz 173073959 BLAKE2B 3db5e5ff73509a87d00aaba5a394c96aaddebac210ce692d10b9174f0bdff5dc5862c25c9ff66e481b9fda96684cfca45ab49824166404f59ad76edb3fbdddde SHA512 39b330f0cd594f06e30e33dd4b0fc86cfd076b006e5287ff61e577deaf76e63f2e5780b72f53c0770b7d2e28e6f61133ff54b5d905ec2ad845c8f00b10be6fb7
 EBUILD root-6.20.08.ebuild 7562 BLAKE2B ef8e9a781cf8a46a90d97eeeb866d2d5e1467cef3b747c81e52be15d13794445228e9ec57d5e5702f79998276d599d2f9f5e82b492f12ec0126fe4c52947c9d5 SHA512 a52fc4c820b1763003ef7208e0ac52837f50a2cedcd65b2ad7f80458d6ac5ece961fa783eedc444045496b0d30b381d84edb1b1a399dbc576d73e6b4971f11c4
 EBUILD root-6.22.06.ebuild 7525 BLAKE2B ee3341e24f9970c9fbe2358b2859148ccac84cb67fa96b56e21741f10d43bb26cff200437509ef9d7a084594d0b22b0d0866441a31352f10600d77772cfb5e87 SHA512 4d5f483eb06144a1a52b905e8012abc2563db862c7b6fa78d6ea8c329749e179985d676226214a165f94a72e2533ac6bc776bd980157c7430a80ab4f0df7fb0a
-EBUILD root-9999.ebuild 8007 BLAKE2B 477e8b13d81dcd76f80a7dc2c62da88a52ae444c81189824b2924c7124f2d63fddee9d95dca8803ddc8d35e449aeca36e2b5ee8bb684be46af5c59551410228f SHA512 3ac683defb812b1126748590858a6afea8f61cf9d3903d876f0da7601b96aaee07f1a0c4c33ff0e367861633755c4603c9b7b4d85c8e3ac1b4a834f28c9bda06
+EBUILD root-9999.ebuild 7994 BLAKE2B c5cc6646627394518614ecc5b6c399fec63c89e69dc8e9cf8335b06be47bbb034806509580e9e57081e05da02523fe04932ff29d39754c709e954ef748fc589b SHA512 6b7cbbbe2395c8ff32ff0003d4b7d26d9e30bec26a1d5affe6ecb17e14c77ec427d923c469d733d2f41d302d6387ab3e8c777cc1b141e8efb3608857d0b2c66f
 MISC metadata.xml 3060 BLAKE2B a08c5d2c54daba2c05984d23d1a912929ab94e40e0b72b17a804b442f7c5b2a2a1039485d529d14953c25261c7a8179d67c6790dab733cc7cee6c1ce0fb0d509 SHA512 6ca7f1940a92053a2c12412882a6b4e478758af94fae422e1ace6cc55cc25dea8117cb042f034a98db6993afba3726d4f4d9d983513ada940c14bc9d988abc26
diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index 061d66cd1d17..ea14149330d7 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,7 +22,6 @@ RESTRICT="!test? ( test )"
 
 if [[ ${PV} =~ "9999" ]] ; then
 	inherit git-r3
-	KEYWORDS=""
 	EGIT_REPO_URI="https://github.com/root-project/root.git"
 	if [[ ${PV} == "9999" ]]; then
 		SLOT="0"
diff --git a/sci-physics/siscone/Manifest b/sci-physics/siscone/Manifest
index ac0e95acfd58..3970bd79c33a 100644
--- a/sci-physics/siscone/Manifest
+++ b/sci-physics/siscone/Manifest
@@ -1,3 +1,3 @@
-DIST siscone-3.0.3.tar.gz 540939 BLAKE2B dfb9c9fab91f4faf8d8aa8a44fca505a83cdd02d2a9b659bacf6487e505159ef61bf2ed8db08a304328effdd6aac8c4a593b630954898aceb985a3a270a5aeb6 SHA512 dccbb872c897b8c0c28dff593d7f015b396923a0bd885182930d74e5115b901875a89565244a33fad0329fdfb5a83d6cc570152d0085c45c24bc427de075e559
-EBUILD siscone-3.0.3.ebuild 676 BLAKE2B b715f9679770e557b75165a1b6afbf0d2bb84929ce7144212e1709128a978ee810a40a2b340d097d7186d38ae7902fcae4dd06654bc74bd868c66777236dbc20 SHA512 0fecdbeb640f389b60de9bfd5738c9bc252d811bbf72d4e1aa717858cb205df94604566cc0ff7bf5a95b88539c6a101a1de54a9f1ab7d04bc7a1f5fd06fcbc46
+DIST siscone-3.0.5.tar.gz 544738 BLAKE2B 7136acfc46d9414831d4e07cc428ad3858c1da02bdcd66817eb6406b9ae1d9d582800412dfcfae5477a720b7893ba070c9ef84816a517992be1762d356840bf8 SHA512 fb9f5e6b6677968e77eb9476abe8345711c69213209c153932adacd69b3c1219abe79655238fec1c0ca4e8ca91795c7693c68e2a48ec41a6afff1f046a781a61
+EBUILD siscone-3.0.5.ebuild 658 BLAKE2B 2530e30c27155c36e34d530cc2c13e5b5820c61715807d4efd14e96b4562a4897f6127b421434ede51ad7a7de125be78b1100cfdd93044778bb1847bf15b0f58 SHA512 4c3a87e81df0909fe88d4a9f09c53490bd148715497813bb82747ca187b0c93c95a7e339e21a72535dedfca09a3991a6a225250c9bd9b49388d885c365a7f337
 MISC metadata.xml 486 BLAKE2B 78449852e87d6566e8b168cff4d5431a8576b8e5fb28c80d355648ebd20b7e4d4ddd74c4b5ce6fcba3a921a55339007cc316218f9a2920b797ed2f3d0a058278 SHA512 104eb63b263c5ae7aae4f31851427996b3ca84a2d72304184bcc66bbbeb245a662ea79d6b188f79ce8ff8ce87c9c3cbf1a0c1171a0266ac70f755868234c6b91
diff --git a/sci-physics/siscone/siscone-3.0.3.ebuild b/sci-physics/siscone/siscone-3.0.5.ebuild
index 0d54e124cd9e..d66ff8180740 100644
--- a/sci-physics/siscone/siscone-3.0.3.ebuild
+++ b/sci-physics/siscone/siscone-3.0.5.ebuild
@@ -1,22 +1,19 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="Hadron Seedless Infrared-Safe Cone jet algorithm"
-HOMEPAGE="http://siscone.hepforge.org/"
-SRC_URI="http://www.hepforge.org/archive/${PN}/${P}.tar.gz"
+HOMEPAGE="https://siscone.hepforge.org/"
+SRC_URI="https://siscone.hepforge.org/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples static-libs"
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
+IUSE="examples"
 
 src_configure() {
-	econf $(use_enable static-libs static)
+	econf --disable-static
 }
 
 src_install() {
@@ -28,4 +25,6 @@ src_install() {
 		dodoc examples/events/*.dat
 		docompress -x /usr/share/doc/${PF}/examples
 	fi
+
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/sci-physics/vgm/Manifest b/sci-physics/vgm/Manifest
index 16ac3c2b694d..6f74cef04c88 100644
--- a/sci-physics/vgm/Manifest
+++ b/sci-physics/vgm/Manifest
@@ -1,7 +1,7 @@
 AUX vgm-copy-test-seed.patch 341 BLAKE2B 0a3fdc57a76e5ee27ccea0221acd3742e4f00d6e9592d73a0f7083c172b6a4ce822eb6f78f45d9b0be756ba12950d446828cbbe896f32279b9979ff656cc7e7f SHA512 26a6df0823495a86322b32d55fde0b25d471687425d69fc48f4937e3bb7546f7c15b24373c324aa168cb764ce79ad16bc8b16eae6a587c58fe7088d71bddd957
 DIST vgm-4.8.tar.gz 3661965 BLAKE2B 29f878fb6716e261c27d60b2c9081d66313591a053d80f78501973f131aff88bbcee743ff9767836883dcb28d3ce5aeee3759a5890d7c8811a6a61503417284f SHA512 8b7cabc5796649c4014ccbdf1c6d209d2e7c2b4b06258716a72cadd997a9f6f51c4f9cb5870fd10abfd1ee133766876523c84441a69c7242bc2002687ca0ce58
 DIST vgm-4.9.tar.gz 3881029 BLAKE2B 596a8df12f0dcd813a0d84e8c33eaa92dd2d332d9accf2fc38992f385748a2bd3579fee2af6cc00b878fe5491af4996d80775aa630120507ccc665f102f63b11 SHA512 90845d75a7ff0022f5fba15b7f621efd588251060c0d8e715fcc2e28bb6b4b01ddd83420dbd233cc0dd437ee6b8b5390bb1f84571ed12e696ee8c1dfc4bd8fd9
-EBUILD vgm-4.8.ebuild 1752 BLAKE2B fc304e1dd772b40743cfa906668136e99eae34e1ea2ead012ea5bdceacf15495c0f02669b13c2617ea4c67952859dfd6bf9e4698298d76e461994c39b35f967d SHA512 82ad2b67ea5d703af84a1c8fbc338a6ffb582492758ff2560fdbf9109bb30424ac32f032db466fc3b08dc419d7a1b49c8d34f7daa127b5e335bfd104686aadb9
+EBUILD vgm-4.8.ebuild 1739 BLAKE2B 8ba21d496ed4fbf22f6eb1e80a14b5296322368279183b990f2c646f7885e3193b48d85eaa2e6a7df89859091b6ec65bd0fec88729222040dbec50e75c945fff SHA512 fde3fc17b02aa7a69fd975f0a1791e47ee6e2d4e9ab4b319220714e245656a12615854b7878f67ea0a963896f1f13a22f8dad6cae1b41363687d02d273e1bd31
 EBUILD vgm-4.9.ebuild 2004 BLAKE2B fbc00bf7ae3cca7b8fcd867123ebc2b4d83a0e7b8426a26f4310130763d57c5ceedf4dc93d39834f80935975eb35c8c8021111b6090471ec4576e5b56fd8f2ee SHA512 8561eb343bb08b3d013c36de7295794af5dc3b84899e6a3719d23dc5ac08a20866546652ed4438b8e51474999e82d8daf4c364e991fff7d1638fb23fbe7711a9
 EBUILD vgm-9999.ebuild 1948 BLAKE2B 136002894861b03e058dcde44d56a41ddac671b760bab9f447afd8b79d1643a7691a79fcd5caf6136a7ecbb8e2f1304482ca93bbcbe017457c98ef3def792928 SHA512 3a9b3b52f07a2fd98dcd402a7b7a81190906407dd0ada486959c5e77b6849cfada0eaf01074a6d4aea741ac41063943054c9937a20821c342f5b3082723dcc9e
 MISC metadata.xml 971 BLAKE2B 76e1255814eea59a44c610d3fc9c2a304909610bfd77a847fa5fd05974b9d0d4db1081b5dd32db9e860213204c6272ea14c7dc6dc717472f5de7c5ab42211335 SHA512 30d69c4518b7a69bf458eaa2ba894b3690e2af8bb2b1a63ecb28b7e531c26843f688152f6f102faf2a033ab1424078047cbeb9bad4a0dba5e39c3d2456575259
diff --git a/sci-physics/vgm/vgm-4.8.ebuild b/sci-physics/vgm/vgm-4.8.ebuild
index 659728a149ea..c99ae4840d23 100644
--- a/sci-physics/vgm/vgm-4.8.ebuild
+++ b/sci-physics/vgm/vgm-4.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,6 @@ inherit cmake
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/vmc-project/${PN}.git"
-	KEYWORDS=""
 else
 	MY_PV=$(ver_rs 1- -)
 	SRC_URI="https://github.com/vmc-project/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
diff --git a/sci-physics/yoda/Manifest b/sci-physics/yoda/Manifest
index 86793c5e6fb9..336dd9fcc566 100644
--- a/sci-physics/yoda/Manifest
+++ b/sci-physics/yoda/Manifest
@@ -1,3 +1,3 @@
-DIST YODA-1.7.0.tar.bz2 949964 BLAKE2B 44063500b95e6a089adac0a28eb0165c6d91f09642dcba7eae994a8b2dd9c4cc5cff40d63cbb481f41e023193632b9b2c17c4304bc03afa4ad2c6010b52c15da SHA512 de4eff3fdd7f8f031745152907eadfe4687c6c8597772d8aba628e58e7d6f203bbe55ba030a77990b2441a9b046a4d7e2bce1fb29ba9a631c1cff17acd95b1e5
-EBUILD yoda-1.7.0-r2.ebuild 846 BLAKE2B f3dc73cb7ee52315ff40b6a4cb0162e50c01022e2e614aea217e9118aee9b02573b39493341b6fdc70780b5cd6673e3235c5c5bb9f70d2ce8ae4535055e7d034 SHA512 d3f31ca3a517874f43af46ab3b0c6908eb87b77a067c74c8c722839544b839088e03ca9684a18cd496bc170062ed7cd94c9b9543551e597b79623e13a3752278
+DIST YODA-1.8.5.tar.bz2 1057576 BLAKE2B 3c6abb680afcfb8250c3ae340a1b1307cb5498b726199ecf9afe593fc49c4099fd2b4ac881568c303abd10c22fcf91ffae4283021443fc6230456376617f0de1 SHA512 d1fffa55af069f894b3c88bcd105f77a3105095281febf9c06c0cea2fadea6c63d69df5bde4aa96646d2d560bd83cade6802d9ed19d5a30553cd003ace19dfc8
+EBUILD yoda-1.8.5.ebuild 841 BLAKE2B 451e469bbca5da56c96177719bb2766ddae3a7302f31dd7461df5a2190736bd2953e82e0da02730dd65568abb9748d781796460f78a029bd9cdb66251d6ec6fa SHA512 e50f47d5664dd5e5888bb40fa7355081ad04cea31ebcfcb0501e445239c19cf426aa996494fd64610eaada2bcc3d683dc642d546683b65c17661985215ecd30b
 MISC metadata.xml 659 BLAKE2B 460df9dfdf485eb860ba7eb737ee9cc715e823b4961894a99e51e9bbdb98ce14a87639ddb0774aeed11d111ed21ddc4e1804f41fcb4cd72c5b0b456402588f6f SHA512 ad6899122310e6e4ecb0e72737362379cc180524dd7e60c6dbacbd7d2a0eab5c633eb5ecf8b6731ed40b12e0e186eba8ce6def539c1c0969974e75467250b7b7
diff --git a/sci-physics/yoda/yoda-1.7.0-r2.ebuild b/sci-physics/yoda/yoda-1.8.5.ebuild
index a17c010c34b1..5e3646209677 100644
--- a/sci-physics/yoda/yoda-1.7.0-r2.ebuild
+++ b/sci-physics/yoda/yoda-1.8.5.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit bash-completion-r1
 
@@ -12,10 +12,9 @@ SRC_URI="https://www.hepforge.org/archive/${PN}/${P^^}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="root static-libs"
+IUSE="root"
 
-RDEPEND="
-	root? ( sci-physics/root:= )"
+RDEPEND="root? ( sci-physics/root:= )"
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${P^^}"
@@ -23,8 +22,8 @@ S="${WORKDIR}/${P^^}"
 src_configure() {
 	econf \
 		--disable-pyext \
-		$(use_enable root) \
-		$(use_enable static-libs static)
+		--disable-static \
+		$(use_enable root)
 }
 
 src_test() {
@@ -34,6 +33,7 @@ src_test() {
 
 src_install() {
 	default
-	newbashcomp "${ED%/}"/usr/share/YODA/yoda-completion ${PN}
-	rm "${ED%/}"/usr/share/YODA/yoda-completion || die
+	newbashcomp "${ED}"/usr/share/YODA/yoda-completion yoda
+	rm "${ED}"/usr/share/YODA/yoda-completion || die
+	rm -r "${ED}"/usr/etc || die
 }
author	V3n3RiX <venerix@redcorelinux.org>	2021-02-17 10:35:54 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-02-17 10:35:54 +0000
commit	463397cf1e064185110fe57c568d73f99a06f5d1 (patch)
tree	9aa75eefc5154eaf0e3c33658b830fc54dc68052 /sci-physics
parent	c8d60dada2ec8eb48b2d2b290cd6683ccec40e39 (diff)