gentoo resync : 18.05.2019

4 files changed, 3 insertions, 66 deletions

diff --git a/sci-libs/libgeodecomp/Manifest b/sci-libs/libgeodecomp/Manifest
index ae44d6154309..940ac3410369 100644
--- a/sci-libs/libgeodecomp/Manifest
+++ b/sci-libs/libgeodecomp/Manifest
@@ -1,8 +1,5 @@
-AUX libflatarray.patch 528 BLAKE2B 474cde0e9871454c042587c282d9439cace5ffacc91f171dd4c77ea4c6298c9e863fb3a6267d2a97222255f396f7689a98e28e57ea47f063e2e01159d77dd8c7 SHA512 e3b195723999285fa14702e01497485f55e8523883951db16eb883220cb636d3f20f3df776b1a0dff70da221dfd7483a032e08b2996e94fd642fa175f69cc627
 AUX libgeodecomp-0.4.0-libdir.patch 694 BLAKE2B 87b08665e9f1d236183f7bfaaf34ef5a9839e28f7a94a6b870fe99d19603b11f152227137202be5669c9f9cd2ba65b3f559eba9ca2460676f19c22e0911ab36e SHA512 fa8e0e08b45d9250d6f32e1a8ade6ff8bdb8acb7951115916cee7b6df600800f8aa64cfb92e13bb5b108af98e8ac2b1f127f34b415648ebe556a589bb11af68d
 AUX libgeodecomp-0.4.0-scotch.patch 7962 BLAKE2B e47365810132838ba0afc63dead520a17d866c0c6b5c2c2bf8f7299d688bcf10ef34ff19d1b29a29d3388101f082080b5943b037fdc9aedf937b392ffb46a68a SHA512 78d805aedb820b457ae01e5f35c530edf7de014cc60c640314cefb1cdfa88f54a6128fb56a81e974fed9d0620e56c31a8f97922d78e88d729bbf3c29c71f7f5d
-DIST libgeodecomp-0.3.1.tar.bz2 740341 BLAKE2B f08f4a7e1b8666d20e40a21d494dbd1cf54b38bae90f451a1b239038e313ae692d39e81d2182cd018d85a4dfc298394c74da2d36218d379e226807feb9ff2cc3 SHA512 28f0ea04e45cb0a5b81b18efd3e3a011d58c077562f8039ff42e701cc362f86dff90bd505690ec22c8a42e9de1236d5b6c61d288ad4c154289e92700a2a7fcc0
 DIST libgeodecomp-0.4.0.tar.bz2 766090 BLAKE2B 2abc5d10371fbad92f957118cabd656f0b4938d5e102da6446851bd979debddaf5eba8a6321dffd32356a40ca12659d9a7a691929e71989e48a71e5177fedc51 SHA512 3ff1a45844e5879662012cb4bae5d577f30ee71094ed4063b535b0ac3da900f34a1bc25be524c006ff91e0edd665e46cbb6cfc0db7966eebfea30f9fee6eeddb
-EBUILD libgeodecomp-0.3.1.ebuild 1149 BLAKE2B a4f53fc01e70fc062f33b3e5977d002a24976c03501bde84cf7d18392cbdfe1c834c32f1f250fae70e3c37983bcdf3335133831e48cb3f36fdce27a9968e4c7d SHA512 25bc38e283677b494026427ef3aacf8b30b0092294fbab5536d5fae383398f2287d7fcd22b580af09f8c696ba5f90472d50bf29e7098ba19e27a1437361a82ae
-EBUILD libgeodecomp-0.4.0.ebuild 1433 BLAKE2B b01b43bb080a42db99cb4f9a7d5b40cd7c398cded3f70c042c56893ff004ee5cec9e21e3247ca663a2a2e103c5a0850349c5ec6ea501d43da0c70ae136f3910b SHA512 26eebc9213e4b09c5b8708fbf2965a6e7215b65a455f54f07e97f1a088374082c14d7dcb09456821236b03bb1307185f2ac3502771aae5458944c51b10a4c407
+EBUILD libgeodecomp-0.4.0.ebuild 1435 BLAKE2B b259a896d174988bec38e7e1be7493648ca5ed862eb04eecd1fc3b182b5b7bca159fa57075334368fbc3e667f4168db43134199e426ff890c1a17afdd61b8adc SHA512 f3a91db74a114d40bbecce9a3c997bdfa85c14c650fa14d35507b536ab34eff91fe11314d81c63c9f720bdcf43f29d67879b33fb1929f6d60840b14a000d459a
 MISC metadata.xml 1252 BLAKE2B 1c35e4efb788c48e23b62025853472afeedfe1f860797cf22e79877e8bab3170998bb1e064ff05a36bf8ddbb6e70b40da329cf9be7ab929a7cb6a9aca2b51c04 SHA512 e8c259afc51b594f4d167128555c7c0ef6935eab46e43ee92407ed32183815cd5e3588a3b0cb0230d757dfa9ca0ddb1f36ef4887b9c31f27ee57e668413f1026
diff --git a/sci-libs/libgeodecomp/files/libflatarray.patch b/sci-libs/libgeodecomp/files/libflatarray.patch
deleted file mode 100644
index 8a109d986577..000000000000
--- a/sci-libs/libgeodecomp/files/libflatarray.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/CMakeLists.txt.orig	2015-05-06 07:03:21.508147301 +0200
-+++ src/CMakeLists.txt	2015-05-06 07:03:27.038147363 +0200
-@@ -439,7 +439,7 @@
-   install(FILES ${HEADERS} DESTINATION include/${PACKAGE_NAME}/${dir})
- endforeach(dir)
- # install libflatarray, too
--install(FILES ../lib/libflatarray/src/flat_array.hpp DESTINATION include/libflatarray)
-+#install(FILES ../lib/libflatarray/src/flat_array.hpp DESTINATION include/libflatarray)
- 
- # link against the libs we need
- set(INSTALLER_LINK_FLAGS "-L\${libdir} -lgeodecomp ")
diff --git a/sci-libs/libgeodecomp/libgeodecomp-0.3.1.ebuild b/sci-libs/libgeodecomp/libgeodecomp-0.3.1.ebuild
deleted file mode 100644
index 739df1ee915c..000000000000
--- a/sci-libs/libgeodecomp/libgeodecomp-0.3.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="An auto-parallelizing library to speed up computer simulations"
-HOMEPAGE="http://www.libgeodecomp.org"
-SRC_URI="http://www.libgeodecomp.org/archive/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="Boost-1.0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc examples"
-
-RDEPEND=">=dev-libs/boost-1.48"
-DEPEND="${RDEPEND}
-	dev-libs/libflatarray
-	examples? ( !sys-cluster/mpich2 )"
-
-S="${WORKDIR}/${P}/src"
-PATCHES=( "${FILESDIR}/libflatarray.patch" )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -i 's/libdir=${CMAKE_INSTALL_PREFIX}\/lib/libdir=\/usr\/'$(get_libdir)'/' "${S}/CMakeLists.txt"
-	sed -i 's/install(TARGETS geodecomp DESTINATION lib)/install(TARGETS geodecomp DESTINATION '$(get_libdir)')/' "${S}/CMakeLists.txt"
-
-	if ! use examples ; then
-		sed -i 's/examples//g' CMakeLists.txt
-	fi
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	use doc && cmake-utils_src_make doc
-}
-
-src_install() {
-	DOCS=( ../README )
-	use doc && HTML_DOCS=( ../doc/html/* )
-	cmake-utils_src_install
-}
-
-src_test() {
-	cmake-utils_src_make test
-}
diff --git a/sci-libs/libgeodecomp/libgeodecomp-0.4.0.ebuild b/sci-libs/libgeodecomp/libgeodecomp-0.4.0.ebuild
index 98fd350e079c..d3a1b4df976b 100644
--- a/sci-libs/libgeodecomp/libgeodecomp-0.4.0.ebuild
+++ b/sci-libs/libgeodecomp/libgeodecomp-0.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://www.libgeodecomp.org/archive/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="Boost-1.0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="doc mpi cuda opencl opencv silo hpx visit"
 
 RDEPEND=">=dev-libs/boost-1.48"