gentoo resync : 13.10.2019

30 files changed, 145 insertions, 233 deletions

diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 80a03d62f9c5..fe4e6f5232b2 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/glpk/Manifest b/sci-mathematics/glpk/Manifest
index f5e9c215c6fa..30be09c59e6e 100644
--- a/sci-mathematics/glpk/Manifest
+++ b/sci-mathematics/glpk/Manifest
@@ -1,4 +1,4 @@
 AUX glpk-4.63-debundle-system-libs.patch 2240 BLAKE2B 5bd0d25768682a410159e3bf0eaf83dc038da8c6bda275c6994846516bb347caf6d4ea726e8635c77b84a463cb1ec32955f573589291486067c651a88d7f276c SHA512 186c1dd2197119b376a76a2db9a73d7fc1e43adc6ae54f5d3e39ad9114a9a406d45dd7bce4bcea31cfce94e71234b70872db22378e8312026912a93077488805
 DIST glpk-4.63.tar.gz 4131787 BLAKE2B 791fa1a1424011668019e180fc245c0319f601255f596affe87afa0df47d9d615a8accd794d51c15bff5fe4fe6409369362f6c9e82bdde67903177b8da55e891 SHA512 3ee9b9ec5322282a9c62b2ee209fc7760383a6a764ef3816445ffb66f15ed4d00309bff1b98d50c243b58aa74f83072afde45c389799e637e11e86f4db45276c
-EBUILD glpk-4.63.ebuild 1482 BLAKE2B 481b980c053570f4c01fcd01ed1f25795afe60b17b3fa9dc2b81016658322bfa9f77b25a416c5a703ca5a2f207e7384664bb7ecd3acb1b8851b4014868307ec3 SHA512 5f6724c325437111f9d8ecfee98080c753104bbb546b7b9bec170321560c09a0d052d30dcca70ae595dc63092d04931ba68eafe20d7f6dbe6fd886fcebd0b573
+EBUILD glpk-4.63.ebuild 1460 BLAKE2B 751d81fe05528d6c93bcf150c6261f6e6c37561db12bab92e5931c9fd2742f5cd46f82b07ae85a429c7a02afc2ec94554c88d7dbc99d8d2aa23b0d56d0711e0f SHA512 be886ba645979a1eafd8612ebd9c3688be98bee7e11fef6ade357e43bedfde366ca2e192721816392a94716ad8cb6759478d5f937b7df885a21df1cec0d9c27b
 MISC metadata.xml 668 BLAKE2B 9dec50a5d6aa33f108651ed8fd891750fc8146eedf8df28abc0fa04a6db2f0d590073fe3606c658a99d56d283d7a24629503bbf11f6593ef1b90314d26a1ab69 SHA512 0c37b2854097a14a58070b1651ccdcdfae652e7d2b5afd62c617e22fa0256acee07aab0409f6621382151e1fb5e605002a3a809113693b2078054a4b16e72452
diff --git a/sci-mathematics/glpk/glpk-4.63.ebuild b/sci-mathematics/glpk/glpk-4.63.ebuild
index b32475f03a75..994559365243 100644
--- a/sci-mathematics/glpk/glpk-4.63.ebuild
+++ b/sci-mathematics/glpk/glpk-4.63.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 SLOT="0/40"
 IUSE="doc examples gmp odbc mysql static-libs"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 
 RDEPEND="
 	sci-libs/amd:0=
diff --git a/sci-mathematics/gmm/Manifest b/sci-mathematics/gmm/Manifest
index 3f43cdee354f..176beaf8b21c 100644
--- a/sci-mathematics/gmm/Manifest
+++ b/sci-mathematics/gmm/Manifest
@@ -1,3 +1,3 @@
 DIST gmm-5.1.tar.gz 537290 BLAKE2B bd8463e028554905d42190e9bbec7b8823271789331011ffc6da23f117cba9be4fec88b05343406d4bef557d7630b0a31c2a06df443708674341263f6ce7dfac SHA512 403074c2efedf2d9f63076a46faabb27c1bc19356284fac89aef58220ce0900d126b6f1a4f9bbef1641be1d609a8379729cad063695a570756ae0b2c470cedad
-EBUILD gmm-5.1.ebuild 571 BLAKE2B b8126e34596cf14993c8497b77b561e0a2a5692154fcec7a691764a5dce63d10bd2fede66a370a528674ba697eaf5e065983f25dbbd5120f81ab9509b7816f2a SHA512 38e82747d1144b37b682b3599024af980e8d2e38a7f4bd078dcec3866c1709c0ec494fe95b271ca26df2ed3cf927d6465088a6bf9e9eea0742fcf7e8e4c7f78a
+EBUILD gmm-5.1.ebuild 561 BLAKE2B 918d8d7d58c85feab0d8895b4b3dc19c1be1368d517f40d3a4ca844f6a18ce4cc51e2c3da466cbe36634c33f30d35880b1dd4a8629621e1d2b94cc834b04cb22 SHA512 57876ab20574eb356839f0d3b91f331807a585a09f8d14332b6c82c734feb391a6062118da2a03c1426452093541cf0b2978fe6d419c1be9f742b25b2aa3e100
 MISC metadata.xml 747 BLAKE2B eb7f2a2c5c48f83d2c170f1f099fc473c2b2aad0f0230777331e46f2630eb2e38d51ebf74c87ad4d3a201bd0ce9995f15320780e6a37f8167b2cc709ebab0a9a SHA512 10c681ecfb5f05c61b24badecdc640e92053c56b3d1c3a324a8664a6c4012823c08070f7fd7334007353b04203f5570ded69821779446ce209896301741b7415
diff --git a/sci-mathematics/gmm/gmm-5.1.ebuild b/sci-mathematics/gmm/gmm-5.1.ebuild
index afc103e6cc62..42c6d3eace9d 100644
--- a/sci-mathematics/gmm/gmm-5.1.ebuild
+++ b/sci-mathematics/gmm/gmm-5.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www-gmm.insa-toulouse.fr/getfem/"
 
 LICENSE="|| ( LGPL-3 LGPL-3-with-linking-exception )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 src_configure() {
diff --git a/sci-mathematics/kodkod/Manifest b/sci-mathematics/kodkod/Manifest
deleted file mode 100644
index 5fad470506ad..000000000000
--- a/sci-mathematics/kodkod/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX kodkod-1.5.2-changes-in-most-specific-varargs-method-selection.patch 1045 BLAKE2B 42d8124cc53f3720c35395324dcd88fe7553781376ec6f777cb93480adcb124851df09e9fc299c134cdd108273d5c5a60a3a0c57833bcde46f3effd511c4677b SHA512 ff30065387503ffa1fb74de988a36526f3680a648faae1a6826db6b91c2dfaac0f63ff6dba32e5fcef11a7b5727a385dfd9301d030f45213e091886c40ea7867
-DIST kodkod-1.5.2.zip 2092639 BLAKE2B 76bcecb5d1063a7ee0244bfc1496e2684007ea3264a967cf2b8757caff96be872a5d7419f7f6ca1d2a990d5eaaaca8d63af950e66c4eb4453de6fc132d5716a0 SHA512 d55d84e1daabe37c6994fd434c157d5eaecd1d0b2bbe4ab5a2d5e0e529a378d0cb8dc1eac5b89336706f899b23b9682dfd1033f4a2caec76485b12966e091df0
-DIST waf-1.7.16 91846 BLAKE2B 1b95a96d1fb67775c905882d2a6e51a53a586b4e2e88399df13ee25dba870cbc28115ead4aac8a7ee4e8fa2b7593b61b88d0388a874a658b81dc4d33ed3207f8 SHA512 ccdf27cac76f525e11bde20d01c3f81b738b4c990934ee290a390fcf1b278da05047bcee76973c80be4557689344f6df33c13e232b278258745e2f19eeed5ebf
-EBUILD kodkod-1.5.2-r1.ebuild 3796 BLAKE2B 4fbba81e70a9cd7ffe9a80e47fee34827571be6553f3db94d3f7cbc78dac1155bd9d17a9e6c4624562e2e42558210f0ba4fb7b0ac4d5bfb1262a34be9be4c154 SHA512 90bbac904dc08bdecfdd40ab721b539fbc38452b14a484f0d84e96394858405fb08611b779f1cf94130edcddc0146f6dac3d9a35e367920238d370bd1a5bed9f
-MISC metadata.xml 927 BLAKE2B 678d66d0843b85a81ffbdeb2c8e498af617eb125fa62009e4a06373f9c9965d5c77fd69e4892765e54f214f3302bdc658ea4c6cd3e4266b6e88b3bccfa5abac1 SHA512 6ef6a53f3a21c6786ba6044925d13de7bf396a3e59d1810e963a75005575e57d9a816ac765338055f1d7a3f05f7fda8c98d6a357da7d310a223b0158d887b307
diff --git a/sci-mathematics/kodkod/files/kodkod-1.5.2-changes-in-most-specific-varargs-method-selection.patch b/sci-mathematics/kodkod/files/kodkod-1.5.2-changes-in-most-specific-varargs-method-selection.patch
deleted file mode 100644
index 613d713f0070..000000000000
--- a/sci-mathematics/kodkod/files/kodkod-1.5.2-changes-in-most-specific-varargs-method-selection.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- kodkod-1.5-orig/src/kodkod/util/ints/Ints.java	2011-09-22 19:00:22.000000000 +1000
-+++ kodkod-1.5/src/kodkod/util/ints/Ints.java	2013-02-02 22:30:12.825378928 +1100
-@@ -316,25 +316,6 @@
- 	}
- 	
- 	/**
--	 * An implementation of Paul Hsieh's hashing function, 
--	 * described at http://www.azillionmonkeys.com/qed/hash.html.
--	 * The method returns a 32 bit hash of the given objects' hash codes,
--	 * or zero if the array is empty.  Any null references in the array
--	 * are taken to have 0 as their hash code value.
--	 * @return a 32 bit hash of the given objects' hashCodes
--	 */
--	public static int superFastHash(Object... key) {
--		if (key.length==0) return 0;
--		int hash = key.length; 
--
--		for(Object o : key) {
--			hash = superFastHashIncremental(o == null ? 0 : o.hashCode(), hash);
--		}
--		//	no end cases since the hashcodes of key parts are ints
--		return superFastHashAvalanche(hash);
--	}
--	
--	/**
- 	 * An implementation of an IntSet wrapper for an IntRange.
- 	 */
- 	private static final class RangeIntSet extends AbstractIntSet {
diff --git a/sci-mathematics/kodkod/kodkod-1.5.2-r1.ebuild b/sci-mathematics/kodkod/kodkod-1.5.2-r1.ebuild
deleted file mode 100644
index 11c25bef00ae..000000000000
--- a/sci-mathematics/kodkod/kodkod-1.5.2-r1.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-JAVA_PKG_IUSE="doc source"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+)'
-
-inherit eutils java-pkg-2 python-any-r1 waf-utils
-
-DESCRIPTION="a constraint solver for relational logic"
-HOMEPAGE="http://alloy.mit.edu/kodkod/index.html"
-SRC_URI="http://alloy.mit.edu/kodkod/${PV}/${P}.zip
-	https://waf.googlecode.com/files/waf-1.7.16"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEP="${PYTHON_DEPS}"
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.6"
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.6
-	app-arch/unzip"
-
-S="${WORKDIR}/kodkod-1.5"
-
-JAVA_SRC_DIR="src"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-	unpack "${A% *}"
-	cp "${DISTDIR}/${A#* }" "${S}/waf" || die "Could not copy waf"
-}
-
-src_prepare() {
-	java-pkg-2_src_prepare
-	chmod u+x waf \
-		|| die "Could not set execute permisions on waf file"
-	sed -e 's@private N parent, left, right@protected N parent, left, right@' \
-		-e 's@private boolean color@protected boolean color@' \
-		-i "${S}/src/kodkod/util/ints/IntTree.java" \
-		|| die "Could not change private to protected in IntTree.java"
-	sed -e 's@conf.env.LINKFLAGS =@conf.env.LINKFLAGS +=@' \
-		-i "${S}/lib/cryptominisat-2.9.1/wscript" \
-		-i "${S}/lib/lingeling-276/wscript" \
-		|| die "Could not fix wscripts to respect LDFLAGS"
-	# Fix bug 453162 - sci-mathematics/kodkod-1.5.2: fails to build
-	epatch "${FILESDIR}/${PN}-1.5.2-changes-in-most-specific-varargs-method-selection.patch"
-
-	# Fix Bug 458462 sci-mathematics/kodkod-1.5.2: fails to build with JAVA_PKG_STRICT
-	local x=""
-	for i in $JAVACFLAGS
-	do
-		if [ "${x}" == "" ]; then
-			x="'${i}'"
-		else
-			x="${x}, '${i}'"
-		fi
-	done
-	for j in $(find . -name wscript -print)
-	do
-		sed -e "s@def configure(conf):@def configure(conf):\n    conf.env.JAVACFLAGS = [${x}]@" \
-			-i "${j}" \
-			|| die "Could not set JAVACFLAGS in ${j}"
-	done
-}
-
-# note: kodkod waf fails when passed --libdir:
-# waf: error: no such option: --libdir
-src_configure() {
-	${WAF_BINARY:="${S}/waf"}
-
-	tc-export AR CC CPP CXX RANLIB
-	echo "CCFLAGS=\"${CFLAGS}\" LINKFLAGS=\"${LDFLAGS}\" \"${WAF_BINARY}\" --prefix=${EPREFIX}/usr $@ configure"
-
-	CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS}" "${WAF_BINARY}" \
-		"--prefix=${EPREFIX}/usr" \
-		"$@" \
-		configure || die "configure failed"
-}
-
-src_compile() {
-	waf-utils_src_compile
-	if has doc ${JAVA_PKG_IUSE} && use doc; then
-		pushd src/kodkod || die "Could not cd to src/kodkod"
-		local doclint="-Xdoclint:none"
-		local jv="$(javac -version 2>&1 | cut -d' ' -f 2)"
-		if [[ "${jv}" == 1.6* ]] || [[ "${jv}" == 1.7* ]]; then
-			doclint=""
-		fi
-		javadoc ${doclint} -sourcepath "${S}"/src/kodkod:"${S}"/build/src/kodkod \
-			-classpath $(find "${PWD}" -name \*.jar -print | xargs | sed -e 's@ @:@g') \
-			$(find . -name \*.java -print) \
-			|| die "javadoc failed"
-		popd
-	fi
-}
-
-src_install() {
-	insinto "/usr/"$(get_libdir)
-	dodir "/usr/"$(get_libdir)"/${PN}"
-	exeinto "/usr/"$(get_libdir)"/${PN}"
-	for i in $(find . \( -name \*.so -o -name plingeling \) -print | xargs); do
-		doexe $i
-	done
-
-	for i in $(find . \( -name kodkod.jar -o -name org.sat4j.core.jar \) -print | xargs); do
-		einfo "java-pkg_dojar $i"
-		java-pkg_dojar $i
-	done
-
-	# javadoc
-	if has doc ${JAVA_PKG_IUSE} && use doc; then
-		java-pkg_dojavadoc src/kodkod
-	fi
-
-	# dosrc
-	if has source ${JAVA_PKG_IUSE} && use source; then
-		local srcdirs=""
-		if [[ ${JAVA_SRC_DIR} ]]; then
-			local parent child
-			for parent in ${JAVA_SRC_DIR}; do
-				for child in ${parent}/*; do
-					srcdirs="${srcdirs} ${child}"
-				done
-			done
-		else
-			# take all directories actually containing any sources
-			srcdirs="$(cut -d/ -f1 ${sources} | sort -u)"
-		fi
-		java-pkg_dosrc ${srcdirs}
-	fi
-}
diff --git a/sci-mathematics/kodkod/metadata.xml b/sci-mathematics/kodkod/metadata.xml
deleted file mode 100644
index a204ce809b84..000000000000
--- a/sci-mathematics/kodkod/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>gienah@gentoo.org</email>
-  </maintainer>
-  <maintainer type="project">
-    <email>sci-mathematics@gentoo.org</email>
-    <name>Gentoo Mathematics Project</name>
-  </maintainer>
-  <longdescription lang="en">
-Kodkod is an efficient SAT-based constraint solver for first order
-logic with relations, transitive closure, bit-vector arithmetic, and
-partial models. It provides analyses for both satisfiable and
-unsatisfiable problems: a finite model finder for the former and a
-minimal unsatisfiable core extractor for the latter. Kodkod is used in
-a wide range of applications, including code checking, test-case
-generation, declarative execution, declarative configuration, and
-lightweight analysis of Alloy, UML, and Isabelle/HOL.
-</longdescription>
-</pkgmetadata>
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index a5ac00f76258..2204f090659b 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -15,8 +15,8 @@ DIST octave-4.2.2.tar.gz 25624087 BLAKE2B c46de90d9a985c2b6b4f87b94b56f2ba4fb648
 DIST octave-4.4.0.tar.gz 29009355 BLAKE2B 3f7b4a6e1262cd0009f8649a570749acc2dc8b42aa1f88a6ce69b9c6bb99a95390f5a153c391a60ac118dc1e87f15596c7225764634c6076bb1ab3dfa4e09bcc SHA512 6a167a4a6a2f6ae70511f13b14feea0ce3efcc964227c93f3195adb3a1f1f28dda56f86a2e1c7c5e9f54891d2846fb96972092387e3da41f2e04cb700606ffc2
 DIST octave-4.4.1.tar.gz 28626462 BLAKE2B 0ea7a9b5840c7afdf20dff36e896b37c1c69eb8799ba48722c02f9636591b849f26f56720a75293c11c1000d0088e07373aa84ef7d360436eb095fc0a2e721a6 SHA512 21a1f13e2145fa530f2169254d19442b572745d65b91453ba1f552f6eda6aecfead57dbe0260b3293a29db0aa0f27cfd4f26df332e6d640848a822b20c1232f8
 DIST octave-5.1.0.tar.gz 32034788 BLAKE2B d387f41f6ae826b35735fc4208d71be84076a81544f5cd0e3d5410f41a70eebb5b0b3bbf19e4344b88901869d54f2759259dc374c44a430f681d3b0c32cb02cb SHA512 a842fb50c13f25e9d425fe9a2c71d9433d7e125747d2175efe0c9b2a780c799d9ce1ee085b5a13fbfedb7990b0ba5d11079d880ddb3bdb66782efc321390eebb
-EBUILD octave-4.2.2.ebuild 5112 BLAKE2B 2f08b20c4557a30b1b8bb3608c400805cf21af1f438ffc8e5f8cc54576b5c6116bfc009bb29c33b9a4f69e29e0f423994fda8cc4b04967209179d4a90a7d7d7d SHA512 4a033bec4259b063ed3c5008881c6ff57e061e7e769b9481f3dd14af3e004711d0a9f221b0afc9fce83386d102062d84d0813fd01cee3b240f4266b0c0371039
-EBUILD octave-4.4.0.ebuild 5092 BLAKE2B c78da0de6de2550d58131a36336d49d021ef203c42f3f1889913c01d1b0ee24af2c446bb30d6f56043c368d7ec3943d50637a939e65638bbd6ddba6030054614 SHA512 fc3e27c85ed9a5e54ce3acad53bd8d6122dace79b62cb02a155a4abe93c75209f883556761ed20ef78e6a64d8dc97c6c876b9f3a918898119db46cbef21d66dc
-EBUILD octave-4.4.1.ebuild 5190 BLAKE2B 6aeaf6fb0c50188027786ed55fd63f223a6d403ded9fa5736b0883aa0c3d443cc3147bd1fcfef6ea011e1f023057ba3fe90c29cb3e406d1f293f3a72698eefbe SHA512 726b0787936c803a03ff1669c1cdf5d29f926c13fe1c2010802829098a62502c0245ad69cad476b8d4149e7f97f2ca5c680fd553cc6708159654a61ad0434ed7
-EBUILD octave-5.1.0.ebuild 5086 BLAKE2B 96cedb79e27e8f1c846b467b28c2d62f999a9c3c16f3d9c3a9a08cd5b683ddcf8cac993cc38f4d0602b2a53d989fc0c383143eb19375d13386e3efcef4870702 SHA512 89f98419f393b8d0df576f275ec97adce10f75d815ded2ff7a89956ff5bedadac110be9c086e78d790a7d3d65a86f8c8188d223e1889a5a2d5689fc1001b82bd
+EBUILD octave-4.2.2.ebuild 5102 BLAKE2B 08512a3fd0d084a5e56cc0de1c6c22c171efe525a64a48e712261911d188f0a2d879b9d5b233d14bd6a69a937fa9370f50432dcabdee21f547c94823ce3f19e0 SHA512 56d2c1b5cb19657801bf47cb8eb1d9ea519da2631e113b7750fbd8d57a8a192b8903085ec361ac8af8aaef2f8fa624bbee6be7a3022e071e5d78102c339dc0a3
+EBUILD octave-4.4.0.ebuild 5082 BLAKE2B 8736fa239d93b6847d413e50cf75427bf16407814d5d32f55f2d8688b57fbeacb471afd2a86ec8c1f6a1c1da11882a40dd221e5eea9fdd0ad59e224c0f1e5d65 SHA512 b71030ab908c404a3672d1df9f85e2cf3aa99f4e6e968ae90a95af228912e4615e869d58efaa018a7cb1300d4630111af82bc306b3d1e56340df5dbd1065bd32
+EBUILD octave-4.4.1.ebuild 5180 BLAKE2B 495f7aa6fc5508fbe2285e5fbc8eb7a4055d84e538384487c3f535f9d5cb90bb3c0d896455d05a02878d786a0a338373380f8e955415673a625db17cc80a14fe SHA512 b26dd91d325a55a94da6eb4bba15f279f3d8c80dcecc19c53ff3d8c43c664aea45769b0f3310a38addab326bf6bc59aa6b88b2b07981d731803d82865989250d
+EBUILD octave-5.1.0.ebuild 5076 BLAKE2B 6f843fc6ff0157c6e4f80aaa2f2cc056c4215483e0b62b809821e8f81234caf8be57bb9232fd305fb2bf8d4266de452b7efa20c208a23f4aa7ca4e038785adb3 SHA512 41f83b3a3431a103b10a654573a8d7cb5eb1f45b79125e15818d8f2850faccd5266ee24ee102e4bed0452ba17a3d8999ca755830fea353ada4dd973282a5b0d1
 MISC metadata.xml 1199 BLAKE2B f1daa0330bdc0362c68458ce6e7145118dd8a9d1a3bcbcc76c04ccdffe700c9d6f71b5e8b7f05b5ed0154352a213ce7b5177284919362585fedb0dbd8b68cbca SHA512 aebb1728f0ca59ba83b649eea72c267c530efc0b97b12f0d7958ba8de0f482fcb37245cf93bc188c9368686e0feafc44da4a7dd97d6bab8246309945fee8f7a4
diff --git a/sci-mathematics/octave/octave-4.2.2.ebuild b/sci-mathematics/octave/octave-4.2.2.ebuild
index f326d2dd1043..ec97d6fd7401 100644
--- a/sci-mathematics/octave/octave-4.2.2.ebuild
+++ b/sci-mathematics/octave/octave-4.2.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 SLOT="0/${PV}"
 IUSE="curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java opengl openssl
 	portaudio postscript +qhull +qrupdate readline sndfile +sparse static-libs X zlib"
-KEYWORDS="amd64 ~arm hppa ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	app-arch/bzip2
diff --git a/sci-mathematics/octave/octave-4.4.0.ebuild b/sci-mathematics/octave/octave-4.4.0.ebuild
index d5d7b00aaf25..692b5029491b 100644
--- a/sci-mathematics/octave/octave-4.4.0.ebuild
+++ b/sci-mathematics/octave/octave-4.4.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 SLOT="0/${PV}"
 IUSE="curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java libressl opengl
 	portaudio postscript +qhull +qrupdate readline sndfile +sparse ssl static-libs X zlib"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	app-arch/bzip2
diff --git a/sci-mathematics/octave/octave-4.4.1.ebuild b/sci-mathematics/octave/octave-4.4.1.ebuild
index 56a8b3b9eb35..192d67e3fde9 100644
--- a/sci-mathematics/octave/octave-4.4.1.ebuild
+++ b/sci-mathematics/octave/octave-4.4.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 SLOT="0/${PV}"
 IUSE="curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java libressl opengl
 	portaudio postscript +qhull +qrupdate readline sndfile +sparse ssl static-libs X zlib"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	app-arch/bzip2
diff --git a/sci-mathematics/octave/octave-5.1.0.ebuild b/sci-mathematics/octave/octave-5.1.0.ebuild
index f347d4a6cfb1..d70fbe73ac50 100644
--- a/sci-mathematics/octave/octave-5.1.0.ebuild
+++ b/sci-mathematics/octave/octave-5.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 SLOT="0/${PV}"
 IUSE="curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java libressl opengl
 	portaudio postscript +qhull +qrupdate readline sndfile +sparse ssl static-libs X zlib"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	app-arch/bzip2
diff --git a/sci-mathematics/pari-data/Manifest b/sci-mathematics/pari-data/Manifest
index 6729537b8b97..b22bf65687b2 100644
--- a/sci-mathematics/pari-data/Manifest
+++ b/sci-mathematics/pari-data/Manifest
@@ -3,5 +3,5 @@ DIST galdata-20120726.tgz 53229 BLAKE2B 08f0a1be3c5252fbe534b2ed7e66b9bc8cddab80
 DIST galpol-20120726.tgz 469851 BLAKE2B d4242ef8e8373be14af69f53c654cadf9580b5b6fcd8a705094f7c689fa36064525a69fe9e1284d1a36cf55e0436e65f42bb3dd51f45da92a11d68cca4fa7761 SHA512 4aa390761403f68f0d6b4f783e70b188f55d24c58614f72324c8cad86066e66153111fad674a38aeda84265ee994784a0bf276c49d1faa2c972bc1a075885f27
 DIST nftables-20120726.tgz 8393731 BLAKE2B d33cbf1f52d3e8a040087da28014ab727b59c641d1a53c97d311a9d1613b59f6b317b7632e0fc89943bea0a507a737543890109b888707c4fb7879279549a2e9 SHA512 cccc62fb0f6d8c578a4e165a1f2daf3b87acbbc38377044ddd98e2901a8e0554a46c8714bad0f4f4e09107b0c0c8f43069b4ddf4fba9c7832bad65ce3c901183
 DIST seadata-20120726.tgz 19214199 BLAKE2B cafb89905180ff481f578ff2cdb150b04533ecbccfa96d045bdb61e5fe2c230262f3459d31b11f049ad1e16ed9dd6fb734569ee621efa3831800cc3d99583e60 SHA512 393f2fae45964ad0921fcf417113e10b296cb4c3a0e0eec138c896827f43a5464c4b42a07313e0f3a4383e8df97912e2e359a4cd5225d014d7575e80c7dd996a
-EBUILD pari-data-20120726.ebuild 648 BLAKE2B 70f64e93623d0b0c76e403401d8fc28021077b00fc1eabc7bd91e2e24e8d6271677888c358f748892da0e9ea7dba62736b59e86256e6b8dabf5d58a8c4f0dd35 SHA512 9ea233b08b871303bd7f12c9ea8f816dcc4bae8b1ed2f718c356028f4a060988e2eb806de83791cf4f933782234d0adfc4664a8961eb352b9a3aa01b015b35e7
+EBUILD pari-data-20120726.ebuild 638 BLAKE2B b0f723649e9edd37977e7e5e687304cfa109237728a0f6d75f5244414dbecd936d8eb6d55fb27d6fed891f4e19d9af5e3ce46aedf8dae1c4460192ca677efeed SHA512 c050626c96977f72f87b7a0ca7b2d6b00c557106a1babc2441fac6908e14934b65b4b25c30c2d1c2f5745ed730febdfcfba01ab3b7acd7e95c8d2a1ca04a874c
 MISC metadata.xml 725 BLAKE2B ad3ba5be947834b57bb950e21eecec41a7805907fe4460d9c4d7d086c0d6a4291b4825c1820218ee4cbe3ecfeefeb3db02aea797a55c96d86291e023cef48c31 SHA512 b542df0fdb45fab2f578a5870266bcefcdd91b41b3c26c069bf101be4e5f98c73542c35d19710b5cb13bba0af64615b54f9b8020137c5a071252b3baa17621f1
diff --git a/sci-mathematics/pari-data/pari-data-20120726.ebuild b/sci-mathematics/pari-data/pari-data-20120726.ebuild
index 05dc48afc2f7..c6c0f54d9ffc 100644
--- a/sci-mathematics/pari-data/pari-data-20120726.ebuild
+++ b/sci-mathematics/pari-data/pari-data-20120726.ebuild
@@ -12,7 +12,7 @@ done
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="!<sci-libs/pari-2.5.0-r1"
diff --git a/sci-mathematics/pari/Manifest b/sci-mathematics/pari/Manifest
index b60ee1b0b23d..692bc8424f6a 100644
--- a/sci-mathematics/pari/Manifest
+++ b/sci-mathematics/pari/Manifest
@@ -3,5 +3,5 @@ AUX pari-2.9.4-no-automagic.patch 2638 BLAKE2B a0e88763f7f69d6d284286961ad90719c
 AUX pari-2.9.4-ppc.patch 363 BLAKE2B 135e76972e4121362666a25e3da236c4a5b7cffa058bbc25b59ca19ea20ccb0665327f70701adca5239cb936d513976e3ba7b5cda915a3f77c7b2eb28e75eaa0 SHA512 aaf5960010e56722f11234079a20ee7a7f8819dc084e1f6567fd11ad2820e3ae47617608f312941c2f373b5312a8c09c9cd51bfa44e263ffe1e8062c9fd9877d
 AUX pari-2.9.4-strip.patch 323 BLAKE2B 85a2b56f5501b4dafc0bffe48249c1662d6f96e81f8e8260ad52ecf84f053efef2ee6d6be6a6fda47886c372eb338d8bbf4443910df79a0d4e168b2666228c37 SHA512 50624ead82da41819ccfadfbdb746fb6ff414196ae2576c5d6a86e83c67355740b0e6e901a2860cab202db15adb1b00e346aabba338ab303230bc6aee8d33076
 DIST pari-2.9.4.tar.gz 3851772 BLAKE2B 648e7fd14888bed2dfb7bbb9a25d097aa91899780da9734b444e29997916c27773109e735ecb2d3e9d164a596f3bb8da607d83f278e52d84c49a56df5c89b530 SHA512 539534496e9733bd905b6131374eef8019f93398423710d339bd3c01245e1af675a0a3f9489a05c3ceb2cf3b3426e6b1fb11ea4886b76a1b2e793b59f52e8787
-EBUILD pari-2.9.4-r1.ebuild 3515 BLAKE2B 5bda76d4650e90c242ce210b5672d073db58197bb3e6ccd75d76bb75de1b86f585fafdbcc8313b20b81d894b2d0c420dfd5897b1d6d2e42b0202de998452069f SHA512 0d87da0cf1c2f12e6ab6af952f352ab0848bee2917f272e9b375eea1134d2efdea7c3683d774540755cfd847db0a6af4a4619ac3b6bfd52d0c063ff30b00e878
+EBUILD pari-2.9.4-r1.ebuild 3505 BLAKE2B 85db8c4eec1791b0f9965ad4a8122ae43b1cfc829f23e1f880516fe367cac08e9f00d4f83e97f064ff0c1a21fbde3833a49137ad6e0b488f1032d0ead37e77df SHA512 3c75e72b86b1a892f105cbdee9d55cf4e4a52e3ba9ca6c83ab2b42cd22ed5ffcc67a0f602de7e5bb4dffcd485c7a839a33cce02e87900d2c5464ebabd3dcf7f8
 MISC metadata.xml 1223 BLAKE2B 57268bb1e2649602e4a6228924f0ea7b32d8fea2718f83595b971e1d5338a8cdd8b91ecf245401f2eefbf206b80dde0e56784d8e147128733fa45dc7edd2eece SHA512 3bb69fc9e0757e6fd1ed9f9394565a34269cd9ccc8dc2ce88283e2f2da8b4ef586b20fb914be28a4b3617ff074319f5925e0fc7a1e264b655303e943a63d6bfe
diff --git a/sci-mathematics/pari/pari-2.9.4-r1.ebuild b/sci-mathematics/pari/pari-2.9.4-r1.ebuild
index ce071489ded2..84317023bfdf 100644
--- a/sci-mathematics/pari/pari-2.9.4-r1.ebuild
+++ b/sci-mathematics/pari/pari-2.9.4-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Computer-aided number theory C library and tools"
 HOMEPAGE="http://pari.math.u-bordeaux.fr/"
 LICENSE="GPL-2"
 SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE="data doc fltk gmp X"
 SRC_URI="http://pari.math.u-bordeaux.fr/pub/${PN}/unix/${P}.tar.gz"
 
diff --git a/sci-mathematics/rstudio/Manifest b/sci-mathematics/rstudio/Manifest
index c58fb3ea5fa1..c120d8f74204 100644
--- a/sci-mathematics/rstudio/Manifest
+++ b/sci-mathematics/rstudio/Manifest
@@ -40,9 +40,9 @@ DIST rstudio-1.2.1335.tar.gz 20440199 BLAKE2B cdd54a7df5a234bcc6d440f4ba5b45e58e
 DIST selenium-java-2.37.0.zip 24625928 BLAKE2B b369a805ae96f0d0913c4be42888d9c2a1e213ff982f9daefe73fadb705baa80ab0186ab50ed52609e83697cffaf8d617d06d75405cb8e1c3fe8e7c5b81dba25 SHA512 68624e82dbc751a25c50fad72702a98eb30d77fd4337d2a969f8e06bcc49e5f8c835cd27ec53772f3375014ddde1d5636936e966b75f3594a9f86aa18ba4e779
 DIST selenium-server-standalone-2.37.0.jar 34730734 BLAKE2B 3899b1d4c5f9153c1f9f13bec66f7c1456ea2e0f34db7d8e54a1ce9063c33a05b3cf95216c2ae06bb40504f72f343a4b9ba6c8553fbbc340e7c18a5b612dde5c SHA512 b215446d42d2d1f69664349b6ae6dc53a532d3624c91254f0f4183d0ad764648792e5cc1126a55a1e60d9687d55200fed01d6d2f46cc3d853b1fa6ee38111018
 DIST shinyapps-0.98.1000.tar.gz 910095 BLAKE2B 4f9364692348bb52cbd12cc6ee447841cb0c805327f2518b2a9545920b602b954a98dea68ccb3daf32d2c3bab6464fb15402844d93277193315f1ae7b3ca5190 SHA512 3162317c4c20cfc1497e952a8235867084d629ae88407e6c465b3e208adb1dc97abfe6b9922e0374ddf4c8e38a76e112942bd312c54a66f74e6f2a3fe4c0a07c
-EBUILD rstudio-1.1.383-r1.ebuild 8336 BLAKE2B 0a4a5ce1a2dfd929728c2c2fa61254a786178a56b797ec1eb4df4fdeb3079e3529b1909ec844735da2c229a6315c666c66f4ee8d9270908ce046e4779d61da5a SHA512 9a516a74872da4b46742ebfaaeb55080a7815db818842d12fa47200ea5a604256244bf9051a55ee90f5506f2111a4a7799c8b5b706fca7a5e1a27419138a224a
-EBUILD rstudio-1.1.453.ebuild 8502 BLAKE2B 9cf5aee42e422d77798a65b5447ef2027b4ca7a2cc2c35d37c7ec44109956ab1efaf253c4fe54c1c401ad10e50947898e8fd632894df2ad99ebb0c60046cf9ac SHA512 087dd2e5fdac0bb6bd261d40a8ef53f50de7aa1e922eb2a20eab2a3560431748e202ba9de1ae7adf1fd65847b14627628ce945894c94903f8ebfc3287641118b
-EBUILD rstudio-1.1.463-r1.ebuild 8691 BLAKE2B e9cc9c2652c2f0193bfe5093c3a14a51f6d499a6e1c65b549ce8619017aaa8e196a55d8af3683b70ed3a139982e2e67ff4b829af0f8b554e8fb895aaab02d5df SHA512 9c98ecb0213f499c415e565d4da05d17c68c0276bc93fb5e9bee8a23057064bbcd32bac54c8a5bf5a111586438670d52d5bf92cde2947adc9e5911f72d6915b1
-EBUILD rstudio-1.1.463.ebuild 8714 BLAKE2B 415be08177b519e1e0863c60d3b3cceb241615862afb1d03f60367e03da3516ee32c45acef68e34951721290e7e775afec2c690534ccad3742b154709053c2eb SHA512 155cc3f01dd2e8ea20b5e061b5aa946cf69a42ed536db5e89352c759fdc4b2e1c7733d6181c3560beca2fa7e5571bc65ccafd0e9e33545229f1053cd20d13756
-EBUILD rstudio-1.2.1335.ebuild 8630 BLAKE2B 3a403fe159129f869b06dd59ede3b279ef9b20fdd467bfdc14b57acabf6191a2d1f4e4a2575f4728543440cbd00957709122faccae4e1ff89393ae96442ccfcf SHA512 a98ff2097ec07fef51c838d1c5705cdf34ac8ac40699c692f1038c926548e7906dacd5a475baf365be941186c1ebe8d929d198986b5e4dfe2404db262c2b9f25
+EBUILD rstudio-1.1.383-r1.ebuild 8338 BLAKE2B 8e31b308cd394d0e38f9cb861dd88b0259dc14655f6833cf39df717a00dfc7837f9c37715808d1a8ceefdfe74381956d6101121bef66f69cd7898e8b0edca35b SHA512 69d88552c40c0050d3e818c430682dbb50cda2b78acd081e6f211674cdff142211c8c809d5eca63eeacfa3f3d62a146f1b846a59138a52e9d8086830f62b4be1
+EBUILD rstudio-1.1.453.ebuild 8504 BLAKE2B 2932ca066ac46b127a02f34e43e2bc09f85a56b1c497e7f58230b012229900f64deb6a51c980fe71c33d7932f819529b80967e44c9c5d9fd53662b11b67b2c38 SHA512 1b86f33053e63de45d9b5f90a3f1fba7337dcabceb0410e72bdd6dde45b962a3ef3ed15149e5c89fe1ed386d600b19995ea23d07774f6319d510ba5a7d1f2fed
+EBUILD rstudio-1.1.463-r1.ebuild 8693 BLAKE2B 12234dd1c9093bfe4d09cc1f53fd051791372399c8bb84a6fc2f2f8e35739ccf1abb4ee40d977f9020842aed29a6bf2ae404fd48778261163f4313a85b8bcad9 SHA512 fc7cc0a2eea34b020ea9b6abc577bf4d86f2b1cf65564f1d4544cfea64875d7ceaface2a12bf6d995d0465dbabc8ccebc8c901a7a429b69e9814f4ceb68e6772
+EBUILD rstudio-1.1.463.ebuild 8716 BLAKE2B eb7f45aad1543f845788c251b65842b46963412d11e65e483fc613936337bb6f4c86bee4ea8807d4736527d56258c87930d0ab94e50750a86589c28267779d97 SHA512 6a350230f7930430a54f4d39ba7e5e89273775b4dec7a8a27068a04243481c672473ab66eba7febd135626b6bb27c347f2f4a36f027d3844058275082757bdbd
+EBUILD rstudio-1.2.1335.ebuild 8632 BLAKE2B 52f7fc66cca63e5fece04846f46e255b6100ce9f46a3a0b1576f8501b7f49b6d84f7bb45b9cc2d2eefb92d92baa2a80e88ca71713d94656addfe30ef21cde19e SHA512 a2c771bb210467b1d0f6f7a9918fd7a2cb751d1f54c319f4e555e5d32e829a5403d0672740fed63d467abc822123e35844cd5c4def11f7932b9f4c57420730ab
 MISC metadata.xml 590 BLAKE2B 53dc62775e118c9c26ee05e20ee1da1ac31b6a6b74cf7dac410856fe4e0cce40fbb800c7a03e60f59e14442baf3aad866ad42616ad5fbb5724f7f6d8c1636eea SHA512 7111442aaa52da1e554c34f824113ec0e227798dd11b0ea9148b81e7a31c08b2a527b9995e3adb9363c7a4f2a8594f30cbd4a179545bf31d69f07d5558c20f52
diff --git a/sci-mathematics/rstudio/rstudio-1.1.383-r1.ebuild b/sci-mathematics/rstudio/rstudio-1.1.383-r1.ebuild
index 497626b47dc1..9dc32b4769c4 100644
--- a/sci-mathematics/rstudio/rstudio-1.1.383-r1.ebuild
+++ b/sci-mathematics/rstudio/rstudio-1.1.383-r1.ebuild
@@ -79,9 +79,9 @@ RDEPEND="
 		>=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtxml-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT}
-		server? ( virtual/pam )
+		server? ( sys-libs/pam )
 	)
-	dedicated? ( virtual/pam )"
+	dedicated? ( sys-libs/pam )"
 DEPEND="${RDEPEND}
 	app-arch/unzip
 	dev-java/ant-core
diff --git a/sci-mathematics/rstudio/rstudio-1.1.453.ebuild b/sci-mathematics/rstudio/rstudio-1.1.453.ebuild
index 7736e77fe6ac..9c47ef9b01c2 100644
--- a/sci-mathematics/rstudio/rstudio-1.1.453.ebuild
+++ b/sci-mathematics/rstudio/rstudio-1.1.453.ebuild
@@ -78,9 +78,9 @@ RDEPEND="
 		>=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtxml-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT}
-		server? ( virtual/pam )
+		server? ( sys-libs/pam )
 	)
-	dedicated? ( virtual/pam )
+	dedicated? ( sys-libs/pam )
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:0= )"
 DEPEND="${RDEPEND}
diff --git a/sci-mathematics/rstudio/rstudio-1.1.463-r1.ebuild b/sci-mathematics/rstudio/rstudio-1.1.463-r1.ebuild
index cc1c95318e3a..c26f7f5c3001 100644
--- a/sci-mathematics/rstudio/rstudio-1.1.463-r1.ebuild
+++ b/sci-mathematics/rstudio/rstudio-1.1.463-r1.ebuild
@@ -78,9 +78,9 @@ RDEPEND="
 		>=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtxml-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT}
-		server? ( virtual/pam )
+		server? ( sys-libs/pam )
 	)
-	dedicated? ( virtual/pam )
+	dedicated? ( sys-libs/pam )
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:0= )"
 DEPEND="${RDEPEND}
diff --git a/sci-mathematics/rstudio/rstudio-1.1.463.ebuild b/sci-mathematics/rstudio/rstudio-1.1.463.ebuild
index 5c0511bb9a52..74ba9b3fb3b2 100644
--- a/sci-mathematics/rstudio/rstudio-1.1.463.ebuild
+++ b/sci-mathematics/rstudio/rstudio-1.1.463.ebuild
@@ -78,9 +78,9 @@ RDEPEND="
 		>=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtxml-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT}
-		server? ( virtual/pam )
+		server? ( sys-libs/pam )
 	)
-	dedicated? ( virtual/pam )
+	dedicated? ( sys-libs/pam )
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:0= )"
 DEPEND="${RDEPEND}
diff --git a/sci-mathematics/rstudio/rstudio-1.2.1335.ebuild b/sci-mathematics/rstudio/rstudio-1.2.1335.ebuild
index 60a61cb90a35..90a42d77b246 100644
--- a/sci-mathematics/rstudio/rstudio-1.2.1335.ebuild
+++ b/sci-mathematics/rstudio/rstudio-1.2.1335.ebuild
@@ -79,9 +79,9 @@ RDEPEND="
 		>=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtxml-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT}
-		server? ( virtual/pam )
+		server? ( sys-libs/pam )
 	)
-	dedicated? ( virtual/pam )
+	dedicated? ( sys-libs/pam )
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:0= )"
 DEPEND="${RDEPEND}
diff --git a/sci-mathematics/rw/Manifest b/sci-mathematics/rw/Manifest
index 1090bb410f8a..8c0d27493726 100644
--- a/sci-mathematics/rw/Manifest
+++ b/sci-mathematics/rw/Manifest
@@ -1,3 +1,3 @@
-DIST rw-0.7.tar.gz 322255 BLAKE2B 88d8f5da9b95619bd3cbb4fa3e006b64306e0dccb96f87945cbb86e757ba9ac68ee4446e558442afe1b06ef8bb9dcbbde2ac91872608e8b3c4732748f36c89e0 SHA512 2bccbaf1a7432b845e9bf14d79e350275d1ca417cb368e870b6cb1a310a92cce67c9e4ce3c550da2900a8e08c3771cc534d593f67267eee17d25c756d8c36e3b
-EBUILD rw-0.7-r2.ebuild 929 BLAKE2B d705d84ddf178ea26edee3ad7656dd72210d5534c2e4350abdc02c772415f0a491bdb8a2037bfe09e5d02464940b7c44523564dda593ead264b2560b19a85101 SHA512 cce48e453d7bfde36e91f45d35b3d89f9807a4b674866067d64ab7e0d4382dda3904d717b2183aa44f76310636acb51982ffe83689ed4a7c3654eb2b595a5c8d
-MISC metadata.xml 1121 BLAKE2B fde7ce008a730dcebc7c7b9223cbb32bdb80debeee70bab8d342d2a0ffd5fa8d68f99e62cf6f788b3fee1c0ab91ffbe73ca514afcfd53e62a3a22dfbdb55584c SHA512 9c22d1d83b1c68e0e6cc25d93965b1a4efb01e85083a8886be0b5cd74a4700c74fa855b8d9dbee3feadf102cbe964d1119610e6456e06a1e16ed7e993a35717b
+DIST rw-0.8.tar.gz 217215 BLAKE2B e6f379ce7cde0fafb0c6e234e8958018c0682ad47e60da3755a891b7eee4c910e84556252a333a12fe0cf2eac88863a272cb8fa6d2cfa4c9f1e93bd88bc6a2d2 SHA512 609d46fd3c76e2eb1724cc3e3ff9354d13b3c15ce23b96bef9f73f02b490e1d8713146230db079fcc87f45f5acc0e04130dac04e27589836e20891c63219f3ec
+EBUILD rw-0.8-r1.ebuild 1204 BLAKE2B 0c7001cfb9db693278219016886e25868718053d477a492f7b09243f4e2643922d1833bef5d5bc20e39e861471db24d125d571d31950e5ed27552945ac5d78d3 SHA512 8a8e7bbee44abb53b223b486dd3e29cb3564a6d7d2da438fabbace3ef0d7a8d79778df1ce75f1356d4b65f0193ffe7a9125c474be82ea3df63224732fca85204
+MISC metadata.xml 1205 BLAKE2B 2a62216c8067754068d125f90f3783436feabb898db67e31d564646c73f135c1313db00ccdc9ef7f3ca7a2b722c1b232aa0964dfa6543a51e35825d29517b60a SHA512 9446c48fd0db0897c094556e191ee9262ef412c64b519b87edcc47e25bfcd2520bd85b2750dbf50f39ea6c91076775b2c3983f57c5fe7787a924be8e8f3ac94f
diff --git a/sci-mathematics/rw/metadata.xml b/sci-mathematics/rw/metadata.xml
index 888e9c75b94d..76588843b8fb 100644
--- a/sci-mathematics/rw/metadata.xml
+++ b/sci-mathematics/rw/metadata.xml
@@ -32,4 +32,8 @@
   <use>
     <flag name="executable">Build the 'rw' program.</flag>
   </use>
+
+  <upstream>
+    <remote-id type="sourceforge">rankwidth</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sci-mathematics/rw/rw-0.7-r2.ebuild b/sci-mathematics/rw/rw-0.8-r1.ebuild
index b7bbee63c20c..9a8731893982 100644
--- a/sci-mathematics/rw/rw-0.7-r2.ebuild
+++ b/sci-mathematics/rw/rw-0.8-r1.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="Compute rank-width decompositions of graphs"
-AUTHORPAGE="http://pholia.tdi.informatik.uni-frankfurt.de/~philipp/"
-HOMEPAGE="${AUTHORPAGE}software/${PN}.shtml"
-SRC_URI="${AUTHORPAGE}software/${P}.tar.gz"
+HOMEPAGE="https://sourceforge.net/projects/rankwidth/"
+SRC_URI="https://downloads.sourceforge.net/project/rankwidth/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
@@ -21,6 +22,15 @@ RDEPEND="${DEPEND}
 
 DOCDIR="/usr/share/doc/${PF}"
 
+src_prepare() {
+	# The upstream tarball for v0.8 contains SYMLINKS to ar-lib,
+	# compile, install-sh, ltmain.sh, etc. And those symlinks don't
+	# always point to a working location for us, so we have to
+	# (re)generate actual files for that stuff. Bug 696986.
+	eautoreconf
+	default
+}
+
 src_configure(){
 	econf $(use_enable executable) --docdir="${EPREFIX}${DOCDIR}"
 }
diff --git a/sci-mathematics/why3-for-spark/Manifest b/sci-mathematics/why3-for-spark/Manifest
index 7cc82b66300b..a26a6debde4c 100644
--- a/sci-mathematics/why3-for-spark/Manifest
+++ b/sci-mathematics/why3-for-spark/Manifest
@@ -1,4 +1,7 @@
 AUX why3-for-spark-2018-gentoo.patch 1015 BLAKE2B 201846ae0ef17bc6d777b7c1a8baddd1f684e82b811b16d2cce447423189a899f3e599cbf5cbd01630e2b246f8257ba5a890b20aaf62b0c1bc24e46642a37600 SHA512 871534c90f4f7c680f07dcd0bcacc4ce75c43b3132e8570b73e66316fe4333c244b9c443998916af7ff8fd297c20f7079ec5e8bf4c97207d0b7537722cd010a6
+AUX why3-for-spark-2019-gentoo.patch 432 BLAKE2B 44e4dda628cdd9b1d27d000ac0e9a37e56cb87a704cf7f83c634775f7ecf8d868d9750561e078c318be5079f91bf9e0f30de9616e781a8a128fdd853e74b431f SHA512 804d9914031450ebdeeea24d2aad472b1765e0534d8ebe404189f039d78be361b51deb21027c85f2d1919668c1f5ef25e65694424a22f7533e5cd264e7e5a191
+DIST why3-2019-20190517-197BB-src.tar.gz 9439414 BLAKE2B 68072064e8ee9152528c90afc948047a1f4d58b960ac05b276761fdca5ba1204100c75f33db7bb0ea1a8a646b734e62892ed41bd875b954354f52b8f9d498d4a SHA512 9169a4ff9ee994a19f9f04b689d1b9c679f5340bcd631d7d49b4c55064f505bd5a6ca8149077e5d24d36f5365f0cab58587094e86f352a9105fc46f10c0746ba
 DIST why3-for-spark-gpl-2018-src.tar.gz 7682767 BLAKE2B 0b0272ca4d5519ca402990b234d0847378bcd2a0949fea78ea10e355233a16aebe79b938cdf8e4daadabb909171cab83b9d6ccacf9f2dc1c0b57bb6da6fd1fe0 SHA512 fc798acf343484fd8e70f470a318753c9a0e9967ff579f20ec185bf3c2a75e7a4a556388fc86a378610ce4a467f3e722c6f610da34d4c33bc3d6b10551731f07
 EBUILD why3-for-spark-2018.ebuild 1699 BLAKE2B 5d648c18c5c77e02afab395c874a769042acc6b705901477c016bd3ab77c02a892116d3a0d85631a67a2ffacc7cf044a4de3547b20deb3e2fdabdafd6648d6ca SHA512 271340f364718d8a29b36b4def19806d8428d7b84c0b8e882898018c91cfc892ae2f6d3d0dc74e05a5788ba0d73810ca1537b4f2ebb1f84f21f2cb588246a607
+EBUILD why3-for-spark-2019.ebuild 1768 BLAKE2B e598cf8b526394df6493c1f8753d0e45c9ec29a4e2337c19a16f00ccaa87bbf7021f0e9d5d2a3d336ac442350b8cc9280bc27bcb4483072998e297041887d8bd SHA512 43b68af3ada262eec23ed89adbf8e2ae3524a915eb649d219f9cbf663ad6face045ef3a29ad9a89d58d20fc00ce006216daf63ec0c6dcbe21612a8762e2a240a
 MISC metadata.xml 1363 BLAKE2B 820bfc974ca6984f78340f223f8f19d12f0313016118110a35cfe149129c2dc189d6f03f34bf3d30c9d3e5d9c9ab90bba33dca4320c034821a7a89f97b92a7f9 SHA512 ee8323cc37fdea800e355fc14ba67cac66c3ec3c41528d481a7e938b1d3e23859bdddfb06d3b6653725cdcfcc0d07e66ba1d3cc80b3637a781db7bab5f7dc677
diff --git a/sci-mathematics/why3-for-spark/files/why3-for-spark-2019-gentoo.patch b/sci-mathematics/why3-for-spark/files/why3-for-spark-2019-gentoo.patch
new file mode 100644
index 000000000000..f83a62566720
--- /dev/null
+++ b/sci-mathematics/why3-for-spark/files/why3-for-spark-2019-gentoo.patch
@@ -0,0 +1,14 @@
+--- a/src/gnat/gnat_config.ml	2017-10-18 09:07:03.118919785 +0200
++++ b/src/gnat/gnat_config.ml	2017-10-18 09:07:45.198216939 +0200
+@@ -12,10 +12,7 @@
+   | Limit_Check of Gnat_expl.check
+   | Limit_Line of Gnat_loc.loc
+ 
+-let spark_prefix =
+-  (Filename.dirname
+-          (Filename.dirname (Filename.dirname
+-          (Filename.dirname Sys.executable_name))))
++let spark_prefix = "/usr"
+ 
+ let rec file_concat l =
+   match l with
diff --git a/sci-mathematics/why3-for-spark/why3-for-spark-2019.ebuild b/sci-mathematics/why3-for-spark/why3-for-spark-2019.ebuild
new file mode 100644
index 000000000000..a0caa7b6cf68
--- /dev/null
+++ b/sci-mathematics/why3-for-spark/why3-for-spark-2019.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+MYP=why3-${PV}-20190517-197BB-src
+
+DESCRIPTION="Platform for deductive program verification"
+HOMEPAGE="http://why3.lri.fr/"
+SRC_URI="http://mirrors.cdn.adacore.com/art/5cdf915d31e87a8f1c967d54
+	-> ${MYP}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="coq doc emacs gtk html hypothesis-selection +ocamlopt profiling zarith zip"
+RESTRICT=strip
+
+DEPEND=">=dev-lang/ocaml-4.02.3[ocamlopt?]
+	dev-ml/menhir
+	coq? ( sci-mathematics/coq )
+	doc? ( dev-tex/rubber )
+	gtk? ( dev-ml/lablgtk[sourceview] )
+	emacs? ( virtual/emacs )
+	html? ( dev-tex/hevea )
+	hypothesis-selection? ( dev-ml/ocamlgraph )
+	zarith? ( dev-ml/zarith )
+	zip? ( >=dev-ml/camlzip-1.07 )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${MYP}
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+REQUIRED_USE="html? ( doc )"
+
+src_configure() {
+	econf \
+		--disable-pvs-libs \
+		--disable-isabelle-libs \
+		--enable-verbose-make \
+		$(use_enable coq coq-libs) \
+		$(use_enable doc) \
+		$(use_enable emacs emacs-compilation) \
+		$(use_enable gtk ide) \
+		$(use_enable html html-doc) \
+		$(use_enable hypothesis-selection) \
+		$(use_enable ocamlopt native-code) \
+		$(use_enable profiling) \
+		$(use_enable zarith) \
+		$(use_enable zip)
+}
+
+src_compile() {
+	emake -j1
+	if use ocamlopt; then
+		emake byte
+	fi
+	use doc && emake doc
+}
+
+src_install() {
+	emake DESTDIR="${D}" -j1 install
+	emake DESTDIR="${D}" -j1 install-lib
+	emake DESTDIR="${D}" install_spark2014_dev
+	dosym ../why3server /usr/$(get_libdir)/why3/commands/why3server
+	einstalldocs
+	docompress -x /usr/share/doc/${PF}/examples
+	dodoc -r examples
+	if use doc; then
+		dodoc doc/manual.pdf
+		use html && dodoc -r doc/html
+	fi
+}