Revert "gentoo resync : 02.06.2018"

This reverts commit 6c14fa2586d9e9c4427b5f727dc6c8ab77587cec.

5 files changed, 6 insertions, 8 deletions

diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index 605e204b532f..6acb74bdf3ef 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index 0bfbdc49602c..7e5e9144f3d4 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -4,7 +4,7 @@ AUX gnuplot-5.2.2-regis.patch 1171 BLAKE2B 57d2faba0f01ca27de0ff39b9b9d01faeffcb
 DIST gnuplot-5.0.7.tar.gz 5100186 BLAKE2B 97fcefa12148fc2b581113c5283eb09217e87858ae293931758d0bb595fd7aaca4671216956211a3d30492be35f91809a975c9c80c25861c477e9235a8b5b309 SHA512 5d7241dc1472f87af8632110a1e88f83b5ea3f41e1bc8c89a45dc4662a3071d91a25bf9ae5196a2b8bef09c8079c22f635bb947c02def3416d78880d61eea919
 DIST gnuplot-5.2.2.tar.gz 5282973 BLAKE2B a15c72aaa8d62079ea3e9f20fa9fe3aaaf6036cf8dc67a784dee79ac7bd0ad7bfac754c9583b50c46deeef2f1bcd920d1094a5d1e19a1dae75405de8c3249621 SHA512 51d5b2234dae358580cc2794ed63f8a5b950baf73edc5362f5bb18d77e8066c3c010239c3b29840db11e5936cb9381bb57193de751bd274af5547a45d6d88b0b
 EBUILD gnuplot-5.0.7.ebuild 5857 BLAKE2B 9aa0b6f0f9fdbb73bbde43d4546244843806bbe4135890dacc08f100f09ced0fc7c95827f45b503ec7a22a14a48b168da5175ad64356510a7e34cded1ca1d7ee SHA512 5d1694c12e4e23866bb306c289dbcdbb64e9c592ad0a12e5a0f71b602c8a90b0d31ea4a36a6bc3b13a5d7a6260ccaba6f4972e1838b22e7c8b24b8329a56649f
-EBUILD gnuplot-5.2.2.ebuild 5887 BLAKE2B 50212f4c30d8005e3e2eb499a1468c8c496fb8b5ec0f62eb90e8cc994fee2f14d4881e156d1b45809e6d1439db1d358527145049c97eaaca628297a2ab1e3c07 SHA512 f7ad13ad4bca41ab85a3a692d1df36cb5fe2bd482879cb9139922db209126d480d279cbbe2b29716efdf4ba2e9005ad3d2a8365f2ba911cc2f3d4760d9a6bb96
+EBUILD gnuplot-5.2.2.ebuild 5876 BLAKE2B b6daa35ef514d88dc4e732c08e521e29aadeed227076b9017470a97bc4da9365a89b195446d71399ec0c1bca03a4fbe3dae6c7b6dee64ec61862148ed1d7179b SHA512 41d9c41f00705e287fc7b044c488a83af77abffc08b2d1b31955731f61a3cce691d8d6ec28b7f45c75bcb6c5c619e8ca7ac2ab4d6b70de100e4ff03120246710
 EBUILD gnuplot-5.2.9999.ebuild 5807 BLAKE2B 3a2afe5f7ac171bd54334c94ac51d7ecf289ef19d4ff0109598e997a1174bf1451885ba885c86e03ec488cbe7ce2df9a21a26e4f1dcfd30e7dd1e7cf4aee1e27 SHA512 c197bda66704c895b49a0935bdfa20fd8e85c9460966ad621a46f0bc195e1648c3329e53d3be43dab137fb4eb9ebdb84727e82ff748e02f9aadd0e5be21909d1
 EBUILD gnuplot-5.3.9999.ebuild 5794 BLAKE2B ca534f75fe5a9c39d93b9e750ec020aecacf426bec9c1852ce21879b44cbcb3e77c2599ea52dc02b69fb20b8a94a34b97225f5c793ea820985b40017ba5ecba5 SHA512 501777c51d6fd6fb63106857a25bdfc1038bcbaed039d5e9e351f2e80043ed88d90055f611c72964f60b4fe948d562db6ebe2c1c9adf1fb10940666c1d147d42
 MISC metadata.xml 1267 BLAKE2B f3b0192ce2cd8d0fb10c2f4fb4bad9780f01746cb283c19e7ecc622c85470ed8a3b7193ca2f7abdee6fdb771719e0c0a9a8a5c7fd9320ef0dae1f1210e7e36cd SHA512 dc9f36a7f2ffb85eeafb41a2b5d0b61746ef3e1de049db18ba351108b887b4cf506ea871754918faae8b4989e5ee7dbfc9f7f48c5b9df55a3bbe782425dc0421
diff --git a/sci-visualization/gnuplot/gnuplot-5.2.2.ebuild b/sci-visualization/gnuplot/gnuplot-5.2.2.ebuild
index 7f889aeb5031..af8759f6cea6 100644
--- a/sci-visualization/gnuplot/gnuplot-5.2.2.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.2.2.ebuild
@@ -17,11 +17,11 @@ if [[ -z ${PV%%*9999} ]]; then
 	ECVS_CVS_OPTIONS="-dP"
 	MY_P="${PN}"
 	SRC_URI=""
-	KEYWORDS="alpha amd64 arm ia64 ppc ppc64 x86"
+	KEYWORDS="alpha amd64 ia64 x86"
 else
 	MY_P="${P/_/.}"
 	SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
-	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~s390 ~sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="gnuplot bitmap? ( free-noncomm )"
diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest
index 6acb29911929..ca610b3c8f59 100644
--- a/sci-visualization/paraview/Manifest
+++ b/sci-visualization/paraview/Manifest
@@ -7,5 +7,5 @@ DIST ParaView-v5.4.1.tar.gz 43783720 BLAKE2B 2197d7f390b7192eb58ad67b88c84119da3
 DIST ParaView-v5.5.0.tar.gz 51414419 BLAKE2B 832a01701d21f463c07186912501796756c2477063803fa3b2b67dbb9ac2c9db28a45a8b3d22077085255adf16eb429c3289093848b3712ebab46c0ae4c17956 SHA512 0915eac75a710736334fa9d436369a14546e2f90a1b55f9a0f7a96fedb94ced043d27576d2a179f275478be17e326cd3bee76f06266a776d586f6510722f3172
 EBUILD paraview-5.3.0.ebuild 9230 BLAKE2B c65d17b150e9a9aacaa9a98331556d06422140cde16a066df2ae2107fe35fd445d6f6b427b6cee9a7cbcbb21c7ea451a6973079490bc473e1cd981c4ea81cace SHA512 7d8ea25c399d2951b3892d50c429cf136a5c9d7be199a0b55978d1ee3dc0228298ba79e69f57358e3cce9517804e509d6680ba700552e1f86e277693164c6cec
 EBUILD paraview-5.4.1.ebuild 8162 BLAKE2B e5ac791d2e598f6f18b238bcc2ddc73677ef7a73e0094880b7df3b80084a92025e463eee46ae3d9f7438117c351f46804f845bd163c4172d3e09a424064f2aa2 SHA512 f2e4c0939dfe6b3413d4d6683c21793ad3449061c0b7f867f5e9999e319fa1f97b1e9b86c112789adbcd997fa7df28c01da0c7f2f8d1b46656a5cd27687ec703
-EBUILD paraview-5.5.0.ebuild 8306 BLAKE2B a29723366f2524727657cd25f4994e62385d984d5c24ce236dc52a4e678942a14602d5aa91d95577886957cb0955ee9d66b49ffc7ad4eec8f03fea81827c56ba SHA512 dc733226df988c419cc56b8b2cc1a567f7d9f7f9aa6b2888edbb50c790178d9dfd449f7eabeb7d76e2f2e844f0570e8daaeb646672877842bbc7862415d090fc
+EBUILD paraview-5.5.0.ebuild 8194 BLAKE2B e3f53fb059f93f9c6a8f772be48b5714d51a97c6b7ef01e0973025e37740ba8c02d595d6da6f87464e2af0f9ce157e0d794380c312a149b522a779a6f7c25720 SHA512 b3101948d94bb693b78ba84ba75992022dc0e967c065e4b4011a55be3ec0f90720310d6e899c847856b225ea1e9c9e554ea396045dad51cc3451bc41f8a49ba6
 MISC metadata.xml 748 BLAKE2B 25046c08c0a8df768efba10cae82ef24d583776d21ddda5fd65f895e11214ca9745205458f27e96f45d83fd0d6e77d5f2c12653206eaef09f398fa7a9275418e SHA512 5354c12b5448883903bca724a5d3adfc1cccf352d378317f7ab43f3e4125e2329d9477081eff7e37c8602aaba2aa6df0c73a240d409541017555920f57847d65
diff --git a/sci-visualization/paraview/paraview-5.5.0.ebuild b/sci-visualization/paraview/paraview-5.5.0.ebuild
index 82c2a17ce248..580afbbb19fb 100644
--- a/sci-visualization/paraview/paraview-5.5.0.ebuild
+++ b/sci-visualization/paraview/paraview-5.5.0.ebuild
@@ -260,10 +260,8 @@ src_install() {
 	cmake-utils_src_install
 
 	# remove wrapper binaries and put the actual executable in place
-	for i in {paraview-config,pvserver,pvdataserver,pvrenderserver,pvbatch,pvpython,paraview}; do
-		if [ -f "${ED}"/usr/lib/"$i" ]; then
-			mv "${ED}"/usr/lib/"$i" "${ED}"/usr/bin/"$i" || die
-		fi
+	for i in "${ED}"/usr/bin/*; do
+		mv "${ED}"/usr/lib/"$(basename $i)" "$i" || die
 	done
 
 	# install libraries into correct directory respecting get_libdir: