gentoo resync : 18.12.2017

5 files changed, 26 insertions, 41 deletions

diff --git a/sci-chemistry/tinker/Manifest b/sci-chemistry/tinker/Manifest
index 35f7a27e12aa..cf7d425fd094 100644
--- a/sci-chemistry/tinker/Manifest
+++ b/sci-chemistry/tinker/Manifest
@@ -1,5 +1,4 @@
-AUX 7.1.2-openmp.patch 400 BLAKE2B e5baaa263b5312b18fcaf22f911b80012ee61b85024db009b71cee79912249a31bf5734ab6904a576f2c67c38f60624743b6b47c5ef5f0eb33c6c49c7f5c981e SHA512 1af405acc753d602501589725374e88964a55e5954cb77eb1f3c0156fa73936552be9ce5fc4f36c855dfbd4043f12749dfc95aa9b946d80d0e5e6e8100e84ad4
-AUX tinker-7.1.2-build.patch 360 BLAKE2B 89fb7ec8c8d02ce43b9882afe7b33fef86118e381be44395fc60d36ecbda69fc39eb9390efedb5ed010774a471be81e2eae9e4322f71a7d24f4b14d7840e4410 SHA512 b20a4d8e75a781cd9c769dd0b5ae4e1039ea54d7ac61fc3605543b796afa2f4f3957be439f338fd47090a17e9153a466c2f76b364f4d9b7a2705b746f6cefbd3
-DIST tinker-7.1.2.tar.gz 28468683 SHA256 fdee18915cff9044fd083bb2271083c221db6d05de2cb98fc111b136e23e6899 SHA512 4524259754b0f11d7e2e8997ebd85eae7d28f8dbb1edb2d9818aa0a96640de0049aa4937236694f1a11743dee187d612f775b233a73cc96c2708d620457a7dc2 WHIRLPOOL f3e29eaf67d25ae6d4f3c4e3546798e66bd626929fddd45b9d1ff9f2143cd57dcc5079226f3ceaa142f4c6a168c4a150a51be1336a5ca13384338795ef3a6d46
-EBUILD tinker-7.1.2.ebuild 2275 BLAKE2B a1dc5de1493731ba73d38f5f66c7318985bb1be56e09f52de1d3242b95e1dbde7242faa8427762999881371057aac64930f8f01a9a7a6c9f61ae723d418b7a5e SHA512 d617f08cf03f35e78f0561214dcc0c7c4af0fedce69214a302ca8dee2c2a3577ba002671f4cce8a86cb3ca76084ce99eff6a2e90ecfc940c7aa56fd588edda2c
+AUX 8.2.1-openmp.patch 559 BLAKE2B 254a7b5d5d40bec938420527ad77e4ec96b9cee50392137eab3370df35a00a00b9488b5cd95c4e3c52d4904a6093216a782f52c82c2141cd913c6cf10f2fbcc7 SHA512 799b488ddba95ec75c2f5f97bdba10e297cad12d23239354b7d66af47b4e9ef1496e8f6b8a7446f85827a8303105af7552616bc865a4e8114b89d3e6e3302ed6
+DIST tinker-8.2.1.tar.gz 33015410 BLAKE2B 0b7c94662248761459cf9d681056f5cf9c4d669a790a522f23f800bf355235f6a9f392e008b13d14cf1e17d9725abb6512077c24ff7772108d69c9cf35b43e6e SHA512 5039078781d1ce226456882dd95ad15715f1e91829d26efcdb29ceedc213973883699eb6710b0a162a74208809305b7fee734b175139e6df63d0460fe5751ae7
+EBUILD tinker-8.2.1.ebuild 2247 BLAKE2B ae2b50605eb32edd748884e731dffad61b56c3c4e620cb6db071b032045591cf40ac9ce086e5be8c275f26f863760505edd4cf095233d944a3abb5963aa55e6c SHA512 276d8152b83db1709590fc7be373da5732c81413945f61cccff8135025ff367985f238ae4569a561556a91b748826a3b910ca47cc2d011863bcd5002de514a79
 MISC metadata.xml 265 BLAKE2B d5a98b9309829a0486c4b8a4336c2d24a0fe34e926d52afd0cc87e16fcc887ca4c18851e58afb33866823121fa8f221a90e0d726dbd85552a4caf66cf03b7b4a SHA512 470f6c178e88c4e83afa46d5e901a45fc2427a779ae832df7fa2d6e25e9e8b4ce77cd3a8fe191e6242d6df3b673f0de6b4f90f1e147aa8b8dd566f18163cc73a
diff --git a/sci-chemistry/tinker/files/7.1.2-openmp.patch b/sci-chemistry/tinker/files/7.1.2-openmp.patch
deleted file mode 100644
index f3e8e2932b4a..000000000000
--- a/sci-chemistry/tinker/files/7.1.2-openmp.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/source/initial.f b/source/initial.f
-index 835f228..4099c74 100644
---- a/source/initial.f
-+++ b/source/initial.f
-@@ -73,8 +73,8 @@ c
- c
- c     Intel compiler extensions to OpenMP standard
- c
--!$    call kmp_set_stacksize_s (2**28)
--!$    call kmp_set_blocktime (0)
-+!    call kmp_set_stacksize_s (2**28)
-+!    call kmp_set_blocktime (0)
- c
- c     values of machine precision constants
- c
diff --git a/sci-chemistry/tinker/files/8.2.1-openmp.patch b/sci-chemistry/tinker/files/8.2.1-openmp.patch
new file mode 100644
index 000000000000..17199f9d4cfa
--- /dev/null
+++ b/sci-chemistry/tinker/files/8.2.1-openmp.patch
@@ -0,0 +1,18 @@
+ source/initial.f | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/source/initial.f b/source/initial.f
+index ff6ed54..9769a81 100644
+--- a/initial.f
++++ b/initial.f
+@@ -85,8 +85,8 @@ c
+ c     Intel compiler extensions to OpenMP standard, 268435456 bytes is
+ c     2**28 bytes, or 256 MB; comment these lines for other compilers
+ c
+-c!$   call kmp_set_stacksize_s (268435456)
+-c!$   call kmp_set_blocktime (0)
++!$   call kmp_set_stacksize_s (268435456)
++!$   call kmp_set_blocktime (0)
+ c
+ c     values of machine precision constants
+ c
diff --git a/sci-chemistry/tinker/files/tinker-7.1.2-build.patch b/sci-chemistry/tinker/files/tinker-7.1.2-build.patch
deleted file mode 100644
index d6ef484b19a4..000000000000
--- a/sci-chemistry/tinker/files/tinker-7.1.2-build.patch
+++ /dev/null
@@ -1,17 +0,0 @@
- make/Makefile | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/make/Makefile b/make/Makefile
-index 61d5037..9be384a 100644
---- a/make/Makefile
-+++ b/make/Makefile
-@@ -719,8 +719,7 @@ EXEFILES = alchemy.x \
- %.x: %.o libtinker.a
- 	${F77} ${LINKFLAGS} -o $@ $^ ${LIBS}; strip $@
- 
--all:
--	${EXEFILES}
-+all: ${EXEFILES}
- 
- install:
- 	rename
diff --git a/sci-chemistry/tinker/tinker-7.1.2.ebuild b/sci-chemistry/tinker/tinker-8.2.1.ebuild
index 46a8d2feb0f2..5dfafe90e1f4 100644
--- a/sci-chemistry/tinker/tinker-7.1.2.ebuild
+++ b/sci-chemistry/tinker/tinker-8.2.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 inherit eutils flag-o-matic fortran-2 java-pkg-opt-2 toolchain-funcs
 
@@ -35,9 +35,9 @@ pkg_setup() {
 }
 
 src_prepare() {
-	sed 's:strip:true:g' -i ../make/Makefile
-	[[ $(tc-getFC) =~ "ifort" ]] || epatch "${FILESDIR}"/${PV}-openmp.patch
-	cd .. && epatch "${FILESDIR}"/${P}-build.patch
+	sed 's:strip:true:g' -i ../make/Makefile || die
+	[[ $(tc-getFC) =~ "ifort" ]] && eapply "${FILESDIR}"/${PV}-openmp.patch
+	default
 }
 
 src_compile() {
@@ -75,7 +75,7 @@ src_compile() {
 	emake \
 		-f ../make/Makefile \
 		BINDIR="${S}"/../bin \
-		rename
+		rename_bin
 }
 
 src_test() {