gentoo resync : 18.03.2018

3 files changed, 2 insertions, 40 deletions

diff --git a/sci-libs/parmgridgen/Manifest b/sci-libs/parmgridgen/Manifest
index a8da239b90db..fd2e63752c41 100644
--- a/sci-libs/parmgridgen/Manifest
+++ b/sci-libs/parmgridgen/Manifest
@@ -3,6 +3,5 @@ AUX parmgridgen-1.0-autotools.patch 15980 BLAKE2B 17ad43d00cc80bc699e8434b2c5d88
 AUX parmgridgen-1.0-format-security.patch 1338 BLAKE2B 2b857f31ecb59afc9bb52272283dc6c7db9915e7fa3c9f4386abdb21f0f3965b099f360e843c164fedcecf4c090ef37d056c2959d07983be696324edc862a0db SHA512 5f7e3e2417f6764e8faa4c5db89d317ea741be14f3051ac3ba1f99b31cc48fab534d14f2c2d2f6fc240f5352c1f82c31fdecc3eea5ca99812fbc7fd332c24033
 AUX parmgridgen-1.0-impl-fct.patch 2207 BLAKE2B c9665f969730628a8811f24b5c5d8ce43cbc5c202ec4d277bdf770760f0cbdeaf5a4cef7ac94a52b3d04666b4e48911e39e49c917b40d56fe1344cfa82a76f2f SHA512 078690430ffefcc56a3f84942ee49e06663b1be995ba8be5755930e5bf1eb76fdaaf27eb1756474911ad9ada2250f3bf3ecfff9de240e2142cd5ea46083f001d
 DIST ParMGridGen-1.0.tar.gz 2623528 BLAKE2B 982e6d7a0df3b9c101993ecf397c75f10d0cf390914ccca6f02efbe5ae190c65bc31e5770bd57ff375a8e3a3aab878c56da50af4f3e5f0f422044137d90ddff8 SHA512 e12ea3c923dd900c92ba4f2639daacc6c3596c5ea3c8d366b269c4c21247b10e6400c384321cfc65b486e4f8217dcd43f43eee27570b1fe1375deb02e255cb16
-EBUILD parmgridgen-1.0-r1.ebuild 882 BLAKE2B cea3acbdb3d549f2f2e2e25c256171ec03b1c286b9a846a3950ea62531bdb5be9b7312e4ecc61cc19e3b9668c6547957de439bf2f9a7d818bcb4902083ed55bc SHA512 4a82148929fd9e713e43d135a8ba26f81dd9da88ee425160844bebc125cd628c0f1304d222e7b00fa47e26914652ee17a28baf52a9908333118ca637df79d4f8
-EBUILD parmgridgen-1.0.ebuild 753 BLAKE2B 69c013bc95f832e473f30ba46f62c32e884ac7bbb86e7ad28cabc012aef852aab5ff0cec59f0e7f40ebaa9fa3773e545c83cb4fb520cc9bf0a09ac0f3d6f113b SHA512 147c3676e89ebc6b7130e9e74ea3e4bf39f808c6a44d6cc7840d133c704e8fd84b9ee6eb4d7a7faa154512dda7394d6998f5dfde7ca68ebb58ea741444f2778f
+EBUILD parmgridgen-1.0-r1.ebuild 881 BLAKE2B 20fff01c994d7baa7dc7a9991b29a19531addb23d5a36d07ce73fe9ce7762e55632f85b200f83c490c53790e51ff8d2d967eae96825d8b73479dce13dca978c7 SHA512 c64f85a46d02e6ccee978c17ef0401a900c82650431691c9e8d19e1f29998e8926d3be825b1452cb97ed90e4fca443e9a3138d668375eb9867bd5e8be970f910
 MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/sci-libs/parmgridgen/parmgridgen-1.0-r1.ebuild b/sci-libs/parmgridgen/parmgridgen-1.0-r1.ebuild
index a86859128043..6294d8598f99 100644
--- a/sci-libs/parmgridgen/parmgridgen-1.0-r1.ebuild
+++ b/sci-libs/parmgridgen/parmgridgen-1.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www-users.cs.umn.edu/~moulitsa/download/${MYP}.tar.gz"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="static-libs"
 
 RESTRICT="mirror bindist"
diff --git a/sci-libs/parmgridgen/parmgridgen-1.0.ebuild b/sci-libs/parmgridgen/parmgridgen-1.0.ebuild
deleted file mode 100644
index 04b93b89793d..000000000000
--- a/sci-libs/parmgridgen/parmgridgen-1.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit eutils autotools
-
-MYP=ParMGridGen-${PV}
-
-DESCRIPTION="Software for parallel (mpi) generating coarse grids"
-HOMEPAGE="http://www-users.cs.umn.edu/~moulitsa/software.html"
-SRC_URI="http://www-users.cs.umn.edu/~moulitsa/download/${MYP}.tar.gz"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="amd64 x86"
-RESTRICT="mirror bindist"
-
-DEPEND="virtual/mpi"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MYP}
-
-pkg_setup(){
-	export CC=mpicc
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-autotools.patch"
-	epatch "${FILESDIR}/${P}-as-needed.patch"
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc README Doc/*.pdf || die
-}