gentoo (leap year) resync : 29.02.2020

18 files changed, 24 insertions, 169 deletions

diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index 35a4cb63f07a..e6f2c1c00052 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
diff --git a/sci-visualization/gfsview/Manifest b/sci-visualization/gfsview/Manifest
deleted file mode 100644
index b4a6ed079bac..000000000000
--- a/sci-visualization/gfsview/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gfsview-snapshot-120706.tar.gz 707640 BLAKE2B 680d3f2edff08a9032cd0c6c3c79cfa1c832427af53b6c6a8f1a3cb9fc174ad5dbfcd92481bba8fe6373552eb2174294d578b83939368fb738d543cfc9c78363 SHA512 89d31a5a10c7ba21a16534b20faf6532c097c84375d09ce9940593b9e569e538db0e5174b9554e0890fb94b2194852b782e235f20dd9d7d609c08d88ac0bffa2
-EBUILD gfsview-20120706-r1.ebuild 754 BLAKE2B 4a08c35be08f916e91c0ce49e1dffc93ad13ed2f299229814833794e59426fe0be5a4bba535af52fe3f9328271cacedb667486fbee593a086ba0947206ca4d1f SHA512 5a10135785a8623be1de34a830080a11fda22a7137578be3771d35e01a8ec0078ff9261db0235e3815e6d64d9466cec0bc9479eac69e819fce2bf2dfd3f5da7c
-MISC metadata.xml 448 BLAKE2B 7d5f370c3497c462b753a9f401922aa2fe82597b6d376ba96943f3d9e0356eaaf0a8b480e3e477c45c0b41d3ec033ecb81f2170ca344e4e0eb249df740b05a86 SHA512 1205ec4dfff0511161c854d6d9925c876910d94d95194635bf9f5d42ba4f1485d994626755f2cbd6a8c470eff7a4cf2ea58dfb18beda4b6a1acf9022cf212c01
diff --git a/sci-visualization/gfsview/gfsview-20120706-r1.ebuild b/sci-visualization/gfsview/gfsview-20120706-r1.ebuild
deleted file mode 100644
index 7a896c558ffa..000000000000
--- a/sci-visualization/gfsview/gfsview-20120706-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils toolchain-funcs
-
-MYP=${P/-20/-snapshot-}
-
-DESCRIPTION="Graphical viewer for Gerris simulation files"
-HOMEPAGE="http://gfs.sourceforge.net/"
-SRC_URI="http://gerris.dalembert.upmc.fr/gerris/tarballs/${MYP}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-RDEPEND="
-	sci-libs/gerris
-	media-libs/ftgl
-	media-libs/mesa[osmesa,X(+)]
-	x11-libs/gtk+:2
-	>=x11-libs/gtkglext-1.0.6
-	x11-libs/startup-notification
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MYP}"
-
-src_prepare() {
-	export LIBS="$($(tc-getPKG_CONFIG) --libs gl)"
-	autotools-utils_src_prepare
-}
diff --git a/sci-visualization/gfsview/metadata.xml b/sci-visualization/gfsview/metadata.xml
deleted file mode 100644
index 57ac151a80d9..000000000000
--- a/sci-visualization/gfsview/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>sci@gentoo.org</email>
-    <name>Gentoo Science Project</name>
-  </maintainer>
-  <longdescription lang="en">
-  GfsView is a graphical viewer for Gerris simulation files.
-  </longdescription>
-  <upstream>
-    <remote-id type="sourceforge">gfs</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index a6287f68a8d8..4fc6629d49ca 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -5,9 +5,9 @@ AUX gnuplot-5.2.6-caca.patch 385 BLAKE2B 33607e93cf59c6774892df7588c843c9c03b2ee
 DIST gnuplot-5.0.7.tar.gz 5100186 BLAKE2B 97fcefa12148fc2b581113c5283eb09217e87858ae293931758d0bb595fd7aaca4671216956211a3d30492be35f91809a975c9c80c25861c477e9235a8b5b309 SHA512 5d7241dc1472f87af8632110a1e88f83b5ea3f41e1bc8c89a45dc4662a3071d91a25bf9ae5196a2b8bef09c8079c22f635bb947c02def3416d78880d61eea919
 DIST gnuplot-5.2.6.tar.gz 5321601 BLAKE2B 4281ba29926ee7fc046b48006fed6513dd3a9ee8bd3a6aa41c5782c5162bfc8af64ffdfec77d4996af6a634f5f3424404eab77c0efd91c65bd34412f5b8f17c7 SHA512 557c0d00c951055ca03ef0f2b262e96b8013da4fedeb64dc5325fabd94772144fd2fe7bfa9d159fa47ab76695109cb4d3f01fc5bfa996df4576aee0eebe36a90
 DIST gnuplot-5.2.7.tar.gz 5335673 BLAKE2B 6ca3055f6bb2e032562c7f21beda0adca1087598c7bacc9ab187c7ea4a3d85e08598ddb0ff0660bca081bc17899dbb92bbfbb6acde8b7b5367f12da7a2a14b62 SHA512 f6b77e16b25e5705ea9dad4f89ed5f5a3cf95d3e4215da00be3cbfbcdeee23009e9205156399448526783f25b5b7599b674670c94c01345abafeff74f6c7de93
-EBUILD gnuplot-5.0.7.ebuild 5772 BLAKE2B 06b1d0d77ceea91443c3972f54850d22213819adac7f48a2d870aa0476ed814bf6150e8171d5d2e9f115c3d09b705f5901f916c6bbf3c087dde099656be9c324 SHA512 c8f47c9903eaf1c2cf81c9f630f41c26bd3eb22ae96734b105a099d4810ad23fb5381bedcaee3c924fd66259726089309db55a3d583be4dadce8e6e126ae2665
-EBUILD gnuplot-5.2.6.ebuild 5836 BLAKE2B 3db5540a52f1ede2946454cd22e36a5ab224825363916352733dd36578a06f8d3a57882f0dbd943d5f41ffd6cfe35d7c13db5d339abc09b9d255dfaed613aab0 SHA512 67f56ab064a5b8976c85b809ac38b34118f34d05a4b8e606c1a49a5a0ec9016ffb2420294bb6badb67956870f65b32b20b56bda72ddaed508c74086bc10e1fd0
-EBUILD gnuplot-5.2.7.ebuild 5836 BLAKE2B 4b185e9880efbfc7adf373116f135f609614a5a3f51776fb021fcb79db47431cd98c0a1c6721cbf7913585976ba3beb5802ad747e228026d3ac66edb6184fee8 SHA512 434b8c6d616e1af1692f5605ae660cc755e9a0ff6fdabce67779c00037e407b2c1830a0c3e1561345701feb62bd34a196d3a9eba5f885df669fde81011a04698
-EBUILD gnuplot-5.2.9999.ebuild 5732 BLAKE2B 30e18d41e564b6316253b6aad9ad99f6e181996df3235f6c3dc89798528479c83bc66eb2912165c6bda278916a45834e3899d54373907707717caa6ce43e6e25 SHA512 ec8298cc2b0e7d82578a0322f9634710d3875e1c21cd4360ae79dae77a744eb179efdd375057344d771fd554302c1fa1e7832efe8502ee7eccbbebbeae07dbc6
-EBUILD gnuplot-5.3.9999.ebuild 5154 BLAKE2B ffed0a6362d6db589ebd626f93cbf36c7ecc3539d39ed979e62b7d7b42e596b207980c98a0459d72c4d2dd57b1054486dc6009f679de7763b6d31b15eff5df36 SHA512 2613b14581d311a39f1e128131b5dea6f96896371df2f8138ce7c2ce037e8e925a5341922d9bb2223088578891b9760d9e9319375297b653a3732a383ceff048
+EBUILD gnuplot-5.0.7.ebuild 5771 BLAKE2B aa00c5538543ee465400fc5f92f72c7fc00c40845f7d1129fa0de468e09e53436de67b1f5105b2cedc3a894cfb4ae29358f6e382caeda9235d65e3f3afe2b92c SHA512 962a8ad43e1635eb845ec0e0ba6f369185410366c69d2685e9236a41fd7bc7a7845a4c31b820e480136298096fc6c3d78d56d23ef88c48d5fcfe66ed752346f4
+EBUILD gnuplot-5.2.6.ebuild 5835 BLAKE2B 42bcdb894058d5023a983dcf1881b29417894aa1149741bd8cb9aeef468f261b2c552bcf6cdbe996e486fcc3b86121b6d5697b7a3647b64dbca48776b5bf3edb SHA512 b1bd2bffe921fccc85637e563dfc5ab2a16a1ac5d3c4a20b6ceeb8c1d0f639d1aa2180faeacd743ffd5d1c07e8c468f7189c19378e755098e1483ba20320a425
+EBUILD gnuplot-5.2.7.ebuild 5835 BLAKE2B 42bcdb894058d5023a983dcf1881b29417894aa1149741bd8cb9aeef468f261b2c552bcf6cdbe996e486fcc3b86121b6d5697b7a3647b64dbca48776b5bf3edb SHA512 b1bd2bffe921fccc85637e563dfc5ab2a16a1ac5d3c4a20b6ceeb8c1d0f639d1aa2180faeacd743ffd5d1c07e8c468f7189c19378e755098e1483ba20320a425
+EBUILD gnuplot-5.2.9999.ebuild 5731 BLAKE2B 776e90f78d35c64393aafe6a0185241c3a0b9c512269d7993e3b94d562af2acd41802737e0835b5e5ba38f108e665bf509cb9048295b5ddca26d9b5f18b991b8 SHA512 2b284ee5634b1fe6e1e365ee5a356f3150a87185f8ee90e7290ab65c7789b0ed035cbfa993e4bf265ebcf2773da3512f030fd19c4c67d2dfcb6136a4c6a4f2c7
+EBUILD gnuplot-5.3.9999.ebuild 5153 BLAKE2B df9dcf40c7a3372f8776c0eddde73c4adf83c19205ff579c16c7939ad08b431f586f38fc99b1790d3697f38db005bd1484c08364a727d5316d79d04d8edcc350 SHA512 cb24bdfe5d09ceead6e59545bd9cfa7da16e8293c8da950a5f793dee64dec8d3684f0df3e90033ade9b82963034da07e839475ae728f2e82d665c55eb090d6d8
 MISC metadata.xml 1267 BLAKE2B f3b0192ce2cd8d0fb10c2f4fb4bad9780f01746cb283c19e7ecc622c85470ed8a3b7193ca2f7abdee6fdb771719e0c0a9a8a5c7fd9320ef0dae1f1210e7e36cd SHA512 dc9f36a7f2ffb85eeafb41a2b5d0b61746ef3e1de049db18ba351108b887b4cf506ea871754918faae8b4989e5ee7dbfc9f7f48c5b9df55a3bbe782425dc0421
diff --git a/sci-visualization/gnuplot/gnuplot-5.0.7.ebuild b/sci-visualization/gnuplot/gnuplot-5.0.7.ebuild
index 5e41cba3154c..001588328da0 100644
--- a/sci-visualization/gnuplot/gnuplot-5.0.7.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.0.7.ebuild
@@ -172,7 +172,7 @@ src_compile() {
 	fi
 }
 
-src_install () {
+src_install() {
 	emake DESTDIR="${D}" install
 
 	dodoc BUGS ChangeLog NEWS PGPKEYS PORTING README*
diff --git a/sci-visualization/gnuplot/gnuplot-5.2.6.ebuild b/sci-visualization/gnuplot/gnuplot-5.2.6.ebuild
index 2a12c827ecbd..9002846bcfed 100644
--- a/sci-visualization/gnuplot/gnuplot-5.2.6.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.2.6.ebuild
@@ -171,7 +171,7 @@ src_compile() {
 	fi
 }
 
-src_install () {
+src_install() {
 	emake DESTDIR="${D}" install
 
 	dodoc BUGS ChangeLog NEWS PGPKEYS README* RELEASE_NOTES TODO
diff --git a/sci-visualization/gnuplot/gnuplot-5.2.7.ebuild b/sci-visualization/gnuplot/gnuplot-5.2.7.ebuild
index e2c078bf41d8..9002846bcfed 100644
--- a/sci-visualization/gnuplot/gnuplot-5.2.7.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.2.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -171,7 +171,7 @@ src_compile() {
 	fi
 }
 
-src_install () {
+src_install() {
 	emake DESTDIR="${D}" install
 
 	dodoc BUGS ChangeLog NEWS PGPKEYS README* RELEASE_NOTES TODO
diff --git a/sci-visualization/gnuplot/gnuplot-5.2.9999.ebuild b/sci-visualization/gnuplot/gnuplot-5.2.9999.ebuild
index ed42ef2faa1b..56845ef2630d 100644
--- a/sci-visualization/gnuplot/gnuplot-5.2.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.2.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -168,7 +168,7 @@ src_compile() {
 	fi
 }
 
-src_install () {
+src_install() {
 	emake DESTDIR="${D}" install
 
 	dodoc BUGS ChangeLog NEWS PGPKEYS PORTING README* RELEASE_NOTES TODO
diff --git a/sci-visualization/gnuplot/gnuplot-5.3.9999.ebuild b/sci-visualization/gnuplot/gnuplot-5.3.9999.ebuild
index 738583343650..f1ec64c8b8c4 100644
--- a/sci-visualization/gnuplot/gnuplot-5.3.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.3.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -157,7 +157,7 @@ src_compile() {
 	fi
 }
 
-src_install () {
+src_install() {
 	emake DESTDIR="${D}" install
 
 	dodoc BUGS ChangeLog NEWS PGPKEYS PORTING README* RELEASE_NOTES TODO
diff --git a/sci-visualization/gwyddion/Manifest b/sci-visualization/gwyddion/Manifest
index 68260f06708e..d3e4f09a2863 100644
--- a/sci-visualization/gwyddion/Manifest
+++ b/sci-visualization/gwyddion/Manifest
@@ -1,8 +1,5 @@
-AUX gwyddion-2.47-cfitsio.patch 863 BLAKE2B 9bfb48ba7fc3dd75cba86a0ca1910c68f6affa78722723ab5945354e9d7fd477ed5b7d5df320b031a693fa9c3187270f7a1bbf37ee3d914a215f18af7ae0ae94 SHA512 5558022a002e589a358e2560ea23eb68b1b3c01536663f11dfd6e84f8927220b56ca16b00ffc9481a14b3fb0b605d1fcb71ff9529a5b3561a6f83a2aa7785db8
 AUX gwyddion-2.55-automagic.patch 1441 BLAKE2B 3f6096392742beea11c908035efebb24129ebd8a4c7207f35615c7c1b97842f5ad774bcf24369d50cb7e0270db8b46c39dd4c4074c660dd00e1a2a9150c6fa3a SHA512 6a83a723e5a82c8123b0739aba8d638d641a776fd807f8dedbff68cd035256cf3b1941b89a039bf5fd5ad24b3bf2f25237dc13f89797e7eace0e1832f74a8c7e
 AUX gwyddion-2.55-mime.patch 726 BLAKE2B fde2a0b132fbc484f905a0c06a9b666b8bd57a33b9804e7db56b58bf543947434e2f15eb82d6c2cddc066bbc575412461b57fd3be4c3668ec35e69af3081b3dc SHA512 8703b8a09fb84a979afef5a921e29af8514318d47d184ece66f3caae45639fa643701be29bc78ea541f13dc7018950f75a5f5c7099ce2275004ddf768b5c68a1
-DIST gwyddion-2.47.tar.xz 3974120 BLAKE2B c9a0241fe509a2f067c16f77d2b02885505d47c3ba0f25a44449e0d5ad05ce8596784392d8f1265823577aeebbab7ad9c96a39625b01bf11da3cebeb1c6453cc SHA512 a6bbda2d32ec013a9d6c7e2b6dbf2cef08d8f964099c0fda511bc92c16c943459f29d52f784a599466af65027aaae3aaeb1b79e56c40e39bc47019044eecd3e6
 DIST gwyddion-2.55.tar.xz 4607560 BLAKE2B 30489d980d3feb6986be4041b59c847673ee589674d5913b4508f28f072eb2f570b98f0b1be01dcf6e1d45e86607582967fd83fe3c859172fcdef3c7bffae741 SHA512 680c33b1f7d36de31274869e7f0af9c06030e04779d6b59f06860ae3f47db4ad45bbf3ee2219bb7b6c01807a807aeafa4f5d0aefe20601e0dda1011acf59fc8e
-EBUILD gwyddion-2.47-r1.ebuild 1477 BLAKE2B a1840c25a0f5f073bc77843b964cd58a919dfaffc6e54f43aeefbdb1bf7ffed1c06f48c1a48b66bbd937bdec0d5ab32a5dcca3770183f4acc3e4c18f9065a7d6 SHA512 75d698162922c955ab0d46890eb99646a5d5ec3a6c805c59455e073e4bc38a66cc6f3009b1771b53117e91752e046d82f8d259b1602df2fff62e3d0701e9a392
-EBUILD gwyddion-2.55-r2.ebuild 1559 BLAKE2B 6905a712d6672c928840f36fc4150d7f4ad3a85c8bd505b5a415cb94476a616bb933590130373c63f47be36f0bfb7ef4e0a2cd3544e9c994f3d3262afbf84fbd SHA512 2c172f1d9df59c72a800336035c1839f69a1e5fab98a5f49a90024e4d4fe74bd7150dd7de8ccfa7480eabf2dbe2eef5fd1de649881222cfb130bab579fc86036
+EBUILD gwyddion-2.55-r2.ebuild 1557 BLAKE2B d416e4970e7fc6b2ac16b6b0193b23a1eeda1234cc8660f7eb0fd33b3a7cb8d17211cffd09806b4a0ecf774d93abafb8696104c41948124d4bb1725f842746ce SHA512 645959f0196192f08d16534674f45dc437b2fec0ccc89971dc14551f2d7ee7747547f569941d332d4bba43688a7dbb940f0ae06be2eaa9aa68f96501ff4436be
 MISC metadata.xml 938 BLAKE2B a6bdd3f5aa17f3846d6e44ebbb6f7e230253df851819bd3ce27be44d6e288590f149576fb2bbd8e19ad04c757d58675f6b96d57571c0c92eae8dde432a08b2ee SHA512 2e90996291b1a4ca744a87af2621e3f8afcf39660a550e82d1b018ffffc41123897a923702ba61718ca97586d95672dee8777579cc4f666e57df88e534f555b1
diff --git a/sci-visualization/gwyddion/files/gwyddion-2.47-cfitsio.patch b/sci-visualization/gwyddion/files/gwyddion-2.47-cfitsio.patch
deleted file mode 100644
index 9380eafa9055..000000000000
--- a/sci-visualization/gwyddion/files/gwyddion-2.47-cfitsio.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -ruN gwyddion-2.47.orig/configure.ac gwyddion-2.47/configure.ac
---- gwyddion-2.47.orig/configure.ac	2016-11-18 11:17:57.000000000 +0100
-+++ gwyddion-2.47/configure.ac	2020-01-24 04:39:18.892183563 +0100
-@@ -632,11 +632,13 @@
- #############################################################################
- # CFITSIO
- # Optional.  Used for FITS image import.
--enable_cfitsio=yes
--PKG_CHECK_MODULES(CFITSIO, [cfitsio],
-+GWY_WITH([cfitsio],,[build with cfitsio support])
-+if test "x$enable_cfitsio" != "xno"; then
-+  PKG_CHECK_MODULES(CFITSIO, [cfitsio],
-                   [AC_DEFINE(HAVE_CFITSIO,1,
-                             [Define if we have the cfitsio package.])],
-                   [enable_cfitsio=no])
-+fi
- AM_CONDITIONAL([HAVE_CFITSIO],[test x$enable_cfitsio != xno])
- 
- #############################################################################
diff --git a/sci-visualization/gwyddion/gwyddion-2.47-r1.ebuild b/sci-visualization/gwyddion/gwyddion-2.47-r1.ebuild
deleted file mode 100644
index 1e7286e2d11b..000000000000
--- a/sci-visualization/gwyddion/gwyddion-2.47-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools gnome2-utils xdg
-
-DESCRIPTION="Framework for Scanning Mode Microscopy data analysis"
-HOMEPAGE="http://gwyddion.net/"
-SRC_URI="http://gwyddion.net/download/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc fits fftw gnome nls opengl perl ruby sourceview xml X"
-
-RDEPEND="
-	media-libs/libpng:0=
-	x11-libs/cairo
-	x11-libs/gtk+:2
-	x11-libs/libXmu
-	x11-libs/pango
-	fits? ( sci-libs/cfitsio )
-	fftw? ( sci-libs/fftw:3.0= )
-	gnome? ( gnome-base/gconf:2 )
-	opengl? ( virtual/opengl x11-libs/gtkglext )
-	perl? ( dev-lang/perl:= )
-	ruby? ( dev-ruby/narray )
-	sourceview? ( x11-libs/gtksourceview:2.0 )
-	xml? ( dev-libs/libxml2:2 )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( dev-util/gtk-doc )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.47-cfitsio.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-rpath \
-		--without-kde4-thumbnailer \
-		$(use_enable doc gtk-doc) \
-		$(use_enable nls) \
-		--disable-pygwy \
-		$(use_with fits cfitsio) \
-		$(use_with perl) \
-		--without-python \
-		$(use_with ruby) \
-		$(use_with fftw fftw3) \
-		$(use_with opengl gl) \
-		$(use_with sourceview gtksourceview) \
-		$(use_with xml libxml2) \
-		$(use_with X x)
-}
-
-pkg_postinst() {
-	use gnome && gnome2_gconf_install
-	xdg_pkg_postinst
-}
-
-pkg_prerm() {
-	use gnome && gnome2_gconf_uninstall
-}
diff --git a/sci-visualization/gwyddion/gwyddion-2.55-r2.ebuild b/sci-visualization/gwyddion/gwyddion-2.55-r2.ebuild
index af6b46015063..81eb34a955ae 100644
--- a/sci-visualization/gwyddion/gwyddion-2.55-r2.ebuild
+++ b/sci-visualization/gwyddion/gwyddion-2.55-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://gwyddion.net/download/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc fits gnome nls openexr perl ruby sourceview xml X"
 
 RDEPEND="
diff --git a/sci-visualization/quickplot/Manifest b/sci-visualization/quickplot/Manifest
index 337efa244980..0261841d1abb 100644
--- a/sci-visualization/quickplot/Manifest
+++ b/sci-visualization/quickplot/Manifest
@@ -1,7 +1,7 @@
 DIST quickplot-0.10.6.tar.xz 445172 BLAKE2B bcb2c694cc6a3777b7d88a5fbd6562d2612f76b0fabde67562ddba44708db0674336b72f5223aa6043524e9c6cb057e518b076086f2c05370bef6eb54b07e8bf SHA512 10b5277d8d0b8febc3c663256f3912bdd9d879b3038a5fdd3a7adc223419893ee56b825f04b5bee29883f30acb3b6a329d8e314b049fef26d6220192767d4adb
 DIST quickplot-0.10.8.tar.bz2 531610 BLAKE2B 3092329b471b45c5a9c0387528ee65ac6c83ca3f21f2e4b7cd1b644a958c83eeb019e4da772a72343c45b478d1709b659372886c50b51623c5b756b4be6ba6d0 SHA512 e382206ba70849755e4110070a5e6b128bea4502ef623c59aa041ba84ed407e0ad06c62366b3bbcd71f8a76a3e651a04efab61edeb616ab6321c5680b03afa95
 DIST quickplot-1.0.1rc.tar.gz 303055 BLAKE2B 52c8b60b0f79171358d81691f8824e39c1e3bafc1c084c3a52037e8cd1148e8bf68027ccc90593eca15fcbee0074d42ad7def1eb9d1f5c656b86e12adb6cfdcc SHA512 9cfaaafb7db379fb43b2975d588464288ac18eb21b3248fb02e5a30b0fa0950313a9818cfec23821046f9819d78255f02dff9970668a4b4ed8c4f452d6df3451
-EBUILD quickplot-0.10.6.ebuild 1002 BLAKE2B afc12e786124ca92b52bd648e3b98da12bd2f7b8def7c49126a441925b7e69352e3dccbc8ecfaa7c029047ba2d25c577577c4efa5afd75c982d2301b4affb603 SHA512 a95b5a5f536207d903caa1f910d007f8633cca56459114c03715be693df9c808c04f4ec4c118d60c75d44c2a37353aee00f3dae5c219e25a8a4df8bea0cc9a22
-EBUILD quickplot-0.10.8.ebuild 1043 BLAKE2B 1166ac7718ab7737b26a05ebe8505ac6ba8f5c75a6b13267a45c1d45697f937d388c9a2cbcead7dc8d2b7d144e4df051d1062b0fd3a81f8188c8ebfd1d1d77f2 SHA512 b89f918a04054fc6c1d4dfedf338a9780c538de6fc53718d4416183a53d04c152022685ed6c2344ae9d932e5496935a6c59dc1df0ad6b713db6a60b6b40cbd46
-EBUILD quickplot-1.0.1_rc.ebuild 1061 BLAKE2B 292435b127577ae3e876dae1b220c2ecb5b0624dd6eb9ca35fffada6b69b7a096eeb7c2ddf02c60a2dfd2c290d26dfe1f0979312aa3c3da28c7811bd252f3a72 SHA512 dd9fa3f7347719c379997dd5c7b68dbc7f4ae244079c91346c569cb12bb236d46351d50e59c9b406ebeead7a9ed03cc59b1a9a32be017eec6fe10841b284c576
+EBUILD quickplot-0.10.6.ebuild 998 BLAKE2B 156205b729053992a6d80118c0bff6f90bbe8bdc2af9cb042fb692cf0ac8f088265331529c22566ffcb964f877c5ac062cf553d258a3ae09bbec8131860d573d SHA512 3ad72225a71f9c3e4c2c5e2f9e409ec0f30ffdc30817b46277590e314a089cfbea95cda0a874eb15baf0ff37942df0e4423c5bfebae2ec804ca455504a76f850
+EBUILD quickplot-0.10.8.ebuild 1039 BLAKE2B b9e9d2aaa20e3da495dfbf299d8778a86cb19879a0b49b3b85fa9f4e4b7b6541ec2aec2b8968997c5b48b480490b1f0a068d26a6179ed5a007e822aacee7f55b SHA512 1cccfd4d2b089e41a46cbbbd1b96168ad80a966b5392dba507cf39264128f7205eef8fb04b9ad16b4dc106ba5db19cf8896ddaa0e64ef64cd0259daf5047afcd
+EBUILD quickplot-1.0.1_rc.ebuild 1057 BLAKE2B 4b496544bf2632ba005ea519071bdc957339d3a8267905e14c025786b15fc5541c81a6d4beec3521c2c0c25890028260f1ac75e62a744b56e3a085a7e30e72cf SHA512 d02264953582e47bfa69dbe439b782bf9c8f70d9d34e8c1acaeb9f1c9ff1d5b7f659408dc4ce9dfb312eb3471c549cd5b3d25f1a299db9d4189e1d717750fba1
 MISC metadata.xml 853 BLAKE2B 96a2968fcecaddf9d143be2c33c4065b6809417d997aa1ca2fda48dbc755178d1c32d47d2e82aa507fbc614c41c9f3395de7310e61abe8bf3a9da70a915547e5 SHA512 8485d4cad78fd9161043a10a764dd494f2b9a5aded964366b3bbe519b423c793cdbabeb29c16e207a7f989339390f03beb57bd918d0df70321b7518f501bfece
diff --git a/sci-visualization/quickplot/quickplot-0.10.6.ebuild b/sci-visualization/quickplot/quickplot-0.10.6.ebuild
index f2a1d88660d0..b3e060ecccee 100644
--- a/sci-visualization/quickplot/quickplot-0.10.6.ebuild
+++ b/sci-visualization/quickplot/quickplot-0.10.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -35,7 +35,7 @@ src_configure() {
 	autotools-utils_src_configure
 }
 
-src_install () {
+src_install() {
 	autotools-utils_src_install
 	make_desktop_entry 'quickplot --no-pipe' Quickplot quickplot Graphics
 	mv "${ED}"/usr/share/applications/quickplot*.desktop \
diff --git a/sci-visualization/quickplot/quickplot-0.10.8.ebuild b/sci-visualization/quickplot/quickplot-0.10.8.ebuild
index c543aa5bab0a..64c6464035c6 100644
--- a/sci-visualization/quickplot/quickplot-0.10.8.ebuild
+++ b/sci-visualization/quickplot/quickplot-0.10.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -35,7 +35,7 @@ src_configure() {
 	autotools-utils_src_configure
 }
 
-src_install () {
+src_install() {
 	autotools-utils_src_install
 	make_desktop_entry 'quickplot --no-pipe' Quickplot quickplot Graphics
 	mv "${ED}"/usr/share/applications/quickplot*.desktop \
diff --git a/sci-visualization/quickplot/quickplot-1.0.1_rc.ebuild b/sci-visualization/quickplot/quickplot-1.0.1_rc.ebuild
index 962d54e5556f..3b95c16cf526 100644
--- a/sci-visualization/quickplot/quickplot-1.0.1_rc.ebuild
+++ b/sci-visualization/quickplot/quickplot-1.0.1_rc.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -42,7 +42,7 @@ src_configure() {
 		$(use_enable static-libs static)
 }
 
-src_install () {
+src_install() {
 	default
 	make_desktop_entry 'quickplot --no-pipe' Quickplot quickplot Graphics
 	mv "${ED%/}"/usr/share/applications/quickplot{*,}.desktop || die