gentoo resync : 17.02.2021

4 files changed, 30 insertions, 71 deletions

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
 }