gentoo resync : 16.06.2019

7 files changed, 14 insertions, 122 deletions

diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index dcc9c2ffb23d..7027d8f3a4f3 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/rstudio/Manifest b/sci-mathematics/rstudio/Manifest
index d8009dea58fb..1dd38bb58c05 100644
--- a/sci-mathematics/rstudio/Manifest
+++ b/sci-mathematics/rstudio/Manifest
@@ -26,7 +26,7 @@ DIST rstudio-1.1.463.tar.gz 20203779 BLAKE2B 97f879539cbb7051af362a8469795a47feb
 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 8339 BLAKE2B d6dd6efec40207a2a042827dffa99eb3bf9c820e385ee22dbe89ec0dabe60af523da054a8492ee97164eb4a2da47f3cb8848637a5d858111200767c2f689e53a SHA512 05cff959e87bf90125935b130544ae6d1ea4283069bae3d55f415037f97e44ca1ae032d595701157abd9d49d106e77bb8fd42085fa8a9167e7ff5ed981dcf86c
-EBUILD rstudio-1.1.453.ebuild 8504 BLAKE2B ecf0e0da004695e5b5520801c4cb3954b4498b9bf2ac651b78ab4cfd82f1228a4fa92b70350ce72c0b36cb311e5cee8fe5026850262d78c51385022803b8429e SHA512 003a9ac1cbefe121d79e70d6a618ac67aee7b83d38ec94ef11f79c70caf10e0c4e312cf13958fd28649ab065939a8c3e8345c30d9e84638e84e3bd5e28b9e193
-EBUILD rstudio-1.1.463.ebuild 8661 BLAKE2B f263fc73b6d36c88066e1267afa3d6f842af1a39a7bbec9c7584464f720e61b2f421eded7bba83499595f6457f6b4be7995e23443eee17b707d87d08a6fd9fab SHA512 bd144a29cc8829cdfc7e067d651804c828315d9598da6aa67830df9407167386e672d1179528b40a1a780d4de1661344d68a8fb79fe170ef9d5e48cd72f64324
+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.ebuild 8662 BLAKE2B 80861e38451ce653420d601c05ed2df9db0d5ceeb95758c8290abac212f9161e1ce3d09b6fba8b04a3a88b7028ff67f52577f6c626bf6a485c79876a02735e01 SHA512 bbfe44bf555d35a8eb6887760daead2a57e5d01d30eea39741a9f6202d27b9fff6b61af2bfe092be3841aedcd1bb92cdd82811715418b612756d738a8f7cb192
 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 afaf0c7e2ada..497626b47dc1 100644
--- a/sci-mathematics/rstudio/rstudio-1.1.383-r1.ebuild
+++ b/sci-mathematics/rstudio/rstudio-1.1.383-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -53,9 +53,9 @@ RDEPEND="
 	app-text/pandoc
 	dev-haskell/pandoc-citeproc
 	>=dev-lang/R-2.11.1
-	>=dev-libs/boost-1.63:=
+	<dev-libs/boost-1.70:=
 	>=dev-libs/mathjax-2.7.0
-	dev-libs/openssl:0
+	dev-libs/openssl:0=
 	sys-apps/util-linux
 	>=sys-devel/clang-3.5.0:*
 	sys-libs/zlib
diff --git a/sci-mathematics/rstudio/rstudio-1.1.453.ebuild b/sci-mathematics/rstudio/rstudio-1.1.453.ebuild
index b69961db0c96..7736e77fe6ac 100644
--- a/sci-mathematics/rstudio/rstudio-1.1.453.ebuild
+++ b/sci-mathematics/rstudio/rstudio-1.1.453.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -53,7 +53,7 @@ RDEPEND="
 	>=app-text/pandoc-${PANDOC_VER}
 	dev-haskell/pandoc-citeproc
 	>=dev-lang/R-2.11.1
-	>=dev-libs/boost-1.63:=
+	<dev-libs/boost-1.70:=
 	>=dev-libs/mathjax-2.7.4
 	sys-apps/util-linux
 	>=sys-devel/clang-3.5.0:*
@@ -81,8 +81,8 @@ RDEPEND="
 		server? ( virtual/pam )
 	)
 	dedicated? ( virtual/pam )
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl:0 )"
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )"
 DEPEND="${RDEPEND}
 	app-arch/unzip
 	dev-java/ant-core
diff --git a/sci-mathematics/rstudio/rstudio-1.1.463.ebuild b/sci-mathematics/rstudio/rstudio-1.1.463.ebuild
index f2d6cf5a20f7..271588e60b84 100644
--- a/sci-mathematics/rstudio/rstudio-1.1.463.ebuild
+++ b/sci-mathematics/rstudio/rstudio-1.1.463.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -53,7 +53,7 @@ RDEPEND="
 	>=app-text/pandoc-${PANDOC_VER}
 	dev-haskell/pandoc-citeproc
 	>=dev-lang/R-2.11.1
-	>=dev-libs/boost-1.63:=
+	<dev-libs/boost-1.70:=
 	>=dev-libs/mathjax-2.7.4
 	sys-apps/util-linux
 	>=sys-devel/clang-3.5.0:*
@@ -81,8 +81,8 @@ RDEPEND="
 		server? ( virtual/pam )
 	)
 	dedicated? ( virtual/pam )
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl:0 )"
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )"
 DEPEND="${RDEPEND}
 	app-arch/unzip
 	dev-java/ant-core
diff --git a/sci-mathematics/z3/Manifest b/sci-mathematics/z3/Manifest
index 5d3514fe943b..db799a1e2e67 100644
--- a/sci-mathematics/z3/Manifest
+++ b/sci-mathematics/z3/Manifest
@@ -2,9 +2,7 @@ AUX z3-4.4.1-gcc-6.patch 668 BLAKE2B d6d87a3f8204f04359b2843e6988b9ac2c13df9fae5
 DIST Z3-4.8.5.tar.gz 4177051 BLAKE2B f8c4be9dbab2d5cf6fdb0bd8e9e1648f8ac29bc8ca9241b3ef29699400b383f09601149d50899d6ca828abadacb71161af1524df6d1ed45d7fd95c4a49c0d3df SHA512 ca36e1a0332bd473a64f41dfdb31656fb3486178473e4fd4934dccce109a84c9686c08f94998df74bacb588eb12ea5db25dc17a564ee76f82fd2559349697309
 DIST z3-4.4.1.tar.gz 3347371 BLAKE2B 57f090b891618613c4647a89620d12f2ac05ea110268e63b343594f53fa2cc7aa347781001e2778ea7dc1ce475c964ddeced7a82c304b4be706ad164fd17a285 SHA512 76991a24f47f2b53ceb8d7a9a6be19913c57994ffb6cf6acfe30f61b2e73959cf02a99f656053594fccb5aaf4d1f44b3ae7e51f1c8953b213d738ceeeaea74f8
 DIST z3-4.5.0.tar.gz 3573695 BLAKE2B 285cc4d1f998d61ddb0b854044b7c79c1bb4cccf51bbdcba7c4a45698d74d9591f84d0aa74c5ef7c8aea2c6539ac987f29e326b44037e954108df67644dff594 SHA512 1ebc2c908d90b6b879f1e819c864ff894613276af47a440f27cf94968c195656952434754c3eb20f4bdbdd8497d227d22e1b4821c0d320b11052b5648d9e2dc7
-DIST z3-4.8.4.tar.gz 4117081 BLAKE2B 6912defbae0e5444c451c4d7c6fb5d51167a1ae166257c7bfc53044ce7e9b9c4bd9824986c2ae1e6abfd6fef495234c9bea60078f8db2c1faaae11f34d666831 SHA512 4660ba6ab33a6345b2e8396c332d4afcfc73eda66ceb2595a39f152df4d62a9ea0f349b0f9212389ba84ecba6bdae6ad9b62b376ba44dc4d9c74f80d7a818bf4
 EBUILD z3-4.4.1.ebuild 4306 BLAKE2B 7e81603d96667c8e5748467668615f07a9e2194be963b67ae94eb90b29252d7fb53be373df21efbbea007aa8671609f2199fcb8a5f866b1f284228ad0d6e9d00 SHA512 1a370b019b33e83d5984b6abf321b39ff25f3b633ca60b2c48ddf9e33b30252389b5cb6f2e34e0dc1103730c9e5bf60ac688d67914d9c5dae52cf5fc5354620c
 EBUILD z3-4.5.0.ebuild 4721 BLAKE2B 8d0dab01c8c06bb07462bb51311520bb9f600b64ab43dd1ad5975c39554416d1a019665d30079535f5e20cefa5d65c6e6eb7140fd2ebc90cd2c363e9c732421c SHA512 e52d01917d884d10c24bf081303bdef7b1efa3b042f838ebc7de678a473fdd01d7738a216c9e14c4929b847fe7e5c3abe7a92bdafc827a1c1aa54b86abe46664
-EBUILD z3-4.8.4.ebuild 2641 BLAKE2B b5157bbd4f009b269917a301305f8427186a42613645d1656e4f74aff4a3a31bf11b7a735201d54b7022eba010546deb9f053eeff67026e31eb30d3fa44fd140 SHA512 3252a697f537b1929fc732df488b4d89404c08e49a79c1596258de48d887d2883fe4646fdfeb1049447bf86c4e1e63db7ba590426a242ad3d15439dd9a471b4d
 EBUILD z3-4.8.5.ebuild 2643 BLAKE2B 0016ba725593c1d850833b3aa3339b644d5defa96075b520a452e4fb77780c275db4134f64b1fcebd292e4bd0222556e9eb5e062446d69f1b898a71f9f0005e0 SHA512 24576c9210d1e85840fffb56f5cd6b3b47155b9b667c8d25c827d5698a978b02bee2f5314737a961828059454b8a8dc774f42af297f792df46902eec7f00a9a5
 MISC metadata.xml 862 BLAKE2B 1d219fcfb0772a48ec398a51b8916748db336730b91b66e336e8df0b8522b9a47df718d6303aff5f305b699e9297aaad9b352c69d529a93f66cf2a1b76c8f094 SHA512 2a5cc11ae87199a23c72ffb7366c65cbb33683bb6ad142d1df84a65b56bd69f50907bca69f066a1c860947254c241089521c026bac9ff92bd405038c266907ef
diff --git a/sci-mathematics/z3/z3-4.8.4.ebuild b/sci-mathematics/z3/z3-4.8.4.ebuild
deleted file mode 100644
index 638ea8659b84..000000000000
--- a/sci-mathematics/z3/z3-4.8.4.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-
-inherit cmake-multilib python-single-r1 toolchain-funcs
-
-DESCRIPTION="An efficient theorem prover"
-HOMEPAGE="https://github.com/Z3Prover/z3/"
-SRC_URI="https://github.com/Z3Prover/z3/archive/${P}.tar.gz"
-
-SLOT="0/4.8"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="doc examples gmp isabelle java openmp python"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	gmp? ( dev-libs/gmp:0=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	java? ( >=virtual/jdk-1.8 )"
-
-S=${WORKDIR}/${PN}-${P}
-
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-pkg_setup() {
-	python_setup
-
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if use openmp && ! tc-has-openmp; then
-			ewarn "Please use an openmp compatible compiler"
-			ewarn "like >gcc-4.2 with USE=openmp"
-			die "Openmp support missing in compiler"
-		fi
-	fi
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${P}"
-		-DUSE_LIB_GMP=$(usex gmp)
-		-DUSE_OPENMP=$(usex openmp)
-		-DENABLE_EXAMPLE_TARGETS=OFF
-		-DBUILD_DOCUMENTATION=$(multilib_native_usex doc)
-		-DBUILD_PYTHON_BINDINGS=$(multilib_native_usex python)
-		-DBUILD_JAVA_BINDINGS=$(multilib_native_usex java)
-	)
-
-	cmake-utils_src_configure
-}
-
-multilib_src_test() {
-	cmake-utils_src_make test-z3
-	set -- "${BUILD_DIR}"/test-z3 /a
-	echo "${@}" >&2
-	"${@}" || die
-}
-
-multilib_src_install_all() {
-	dodoc README.md RELEASE_NOTES
-	use examples && dodoc -r examples
-	use python && python_optimize
-
-	if use isabelle; then
-		insinto /usr/share/Isabelle/contrib/${P}/etc
-		newins - settings <<-EOF
-			Z3_COMPONENT="\$COMPONENT"
-			Z3_HOME="${EPREFIX}/usr/bin"
-			Z3_SOLVER="${EPREFIX}/usr/bin/z3"
-			Z3_REMOTE_SOLVER="z3"
-			Z3_VERSION="${PV}"
-			Z3_INSTALLED="yes"
-			Z3_NON_COMMERCIAL="yes"
-		EOF
-	fi
-}
-
-pkg_postinst() {
-	if use isabelle; then
-		if [[ -f ${ROOT%/}/etc/isabelle/components ]]; then
-			sed -e "/contrib\/${PN}-[0-9.]*/d" \
-				-i "${ROOT%/}/etc/isabelle/components" || die
-			cat <<-EOF >> "${ROOT%/}/etc/isabelle/components" || die
-				contrib/${P}
-			EOF
-		fi
-	fi
-}
-
-pkg_postrm() {
-	if use isabelle; then
-		if [[ ! ${REPLACING_VERSIONS} ]]; then
-			if [[ -f "${ROOT%/}/etc/isabelle/components" ]]; then
-				# Note: this sed should only match the version of this ebuild
-				# Which is what we want as we do not want to remove the line
-				# of a new Isabelle component being installed during an upgrade.
-				sed -e "/contrib\/${P}/d" \
-					-i "${ROOT%/}/etc/isabelle/components" || die
-			fi
-		fi
-	fi
-}