gentoo resync : 04.05.2021

7 files changed, 16 insertions, 232 deletions

diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest
index ce39b4af953c..69215e304c18 100644
--- a/dev-lang/swi-prolog/Manifest
+++ b/dev-lang/swi-prolog/Manifest
@@ -2,14 +2,10 @@ DIST swi-prolog-8.2.2-gentoo-patchset-0.tar.gz 539 BLAKE2B 53d8f4aeb6f83eae62802
 DIST swi-prolog-8.2.3-gentoo-patchset-0.tar.gz 535 BLAKE2B bb7869c5166104a3a7faa88dd14284ea147ab5090695ff1c950365823451ac656403bee97c7dd4a039e2d58085456842f8bbc7caa26d18916c6f8718a204097c SHA512 c1f0dce1e336c79fe84a3f9d0fe5e873d33c00071f91cbb683a73fbceaba1c6ca8c2875b58045829eafcbee78a0e713009a07bd51a2c56bf146f14881899f934
 DIST swipl-8.2.2.tar.gz 11002077 BLAKE2B 581c3ea83d2440cbe2454ba12ea2752bec9fda926f3afef6e36de1bbf70b43b34931ad768335bb15809a3d76959c7eec7dd3ad54a0a4085ad8ba34075dd3f4d9 SHA512 fb77cfd58932dc35c3d808899c1f493ffb22a58f56fe364ce0c0b48b8cabdd204d4f920346c39f696fadd9ee8335e163a8eb8d0a770c2835d803f030c1f3f878
 DIST swipl-8.2.3.tar.gz 10999577 BLAKE2B 57cfa9f6fb97f0136a35da1850c7ae8da123d1c18fe6e18597d1b2131b7304a638d42d673efad2a01eaf3f9dad7b4754e6feb64917423abda002323bfc8dec8c SHA512 cd9ffc8a963682c0d02cec4b76338352459e004e07f3e5c0f02b3c2f9b19f23fe9639e037cf52531491a41c201113138f0b6a039d401e891ad5774383b0d852f
-DIST swipl-8.3.18.tar.gz 11121028 BLAKE2B 9b5bca6cb2f11918e51f687d3f330f021cc207c029e58dff7e5cbb03c47a908878c56dded8b9a4df2a67e86c2dd28400462a8484802eb18cb0eb2454a96e59a0 SHA512 6a7845c807b7ef41b501bd53d7e11208cac95bb57ac2096c8e00dd2740987faa61bf7b5201b3abf879770bc7a0935ed377458bf84de0298696741c812c009a65
-DIST swipl-8.3.19.tar.gz 11135612 BLAKE2B 89e7b4dbfca9b52217ee55439bb6892344d322b4d99719755fb34f9503448c4d3b018d73a95094c31f51cb514ee09121822b579d6c94969ebad6553548136bbd SHA512 1b2acc0006f2d29113ffa51595b53883e7c903419c47ea137954922241f03ce5d6c28e07e4e4d89da228db531af9e42678cd36fcd854495b8d091e809c8e249b
 DIST swipl-8.3.20.tar.gz 11136550 BLAKE2B 83dd6ea056fd579816b88ca1faa3f857cb880d39d0cebc186aab0a0bf7cfdde19348874d4a7efb5e27995adfffb3ee075c42aa7fde1088ee17a5a05c137667ed SHA512 7f64ba639db0e1d75bd459e61ec14c30498035bbb59995f888702174fac159ebc96c47f22be2c3e466f5ba5547b39aaf83d296da2b2419ed89ff9195f355f3a4
 DIST swipl-8.3.21.tar.gz 11143843 BLAKE2B 4e4a009e40609d17f33bd783c477295e20805d471ffdb8f6451b52a7c51a749c123e79d0e5087a473fe20c5a673648208540e7039403c35c7ffb044851f72f04 SHA512 fe8596a4d0ecc5d2d48e7532619bdf09364d1b52beffc4ea73cdd79d29dde9d68ddc1a66a4f2f579d7eee1a3e215e13e918ca59b26788957e5e2dd5af2905139
-EBUILD swi-prolog-8.2.2.ebuild 2728 BLAKE2B 2f68414a86e2be19e0302b241af31a88e610dba7ec9a334a93cf293128e5e9d873fd7ccd4eb79fd0d9a9c4edbf928ef74d7a305733789babe175f0fdc3704b5c SHA512 9f3c9daa2fc6145a35fef9bfd66e79a968d3d4763a6d59c1262b37e6af0cbbba4c85a5b6e2600fbf76f86d84a7d6cad7cca5ca0d6e4acfdbfafdd355883dc27a
-EBUILD swi-prolog-8.2.3.ebuild 2731 BLAKE2B c6c267ea97f28de85d93fdfc5c60f18e6c82a537d0484773c42182435f0e69ad5952bc423ea3a653604f28417cc35eaf0bdbfd71534a7233c770a907a22c7721 SHA512 f692958280fa25fd34d55b3c22be7c08ffad497d5b802d64480fbb14d29b7428b6332c746aa8cfad69b151647dc7e632e623c5a7d9c3045865a29d0cc5fab83d
-EBUILD swi-prolog-8.3.18.ebuild 2633 BLAKE2B 1187443b7cce00ff2982b1ef170e02664dab732a84a566507c69b60c606ad6c6404ea0167aff65b4bcdff7294c49008d57f863524ef670fe7f522f7a36c17bd7 SHA512 a7edd73ebfab285c521fbcc4b96cd8901b820abb665269cf0b49b557e4745a7431d067f41602dad6fdfbdb1cecc5e5b6b6e8ced02e37082680167e43126b8164
-EBUILD swi-prolog-8.3.19.ebuild 2633 BLAKE2B 1187443b7cce00ff2982b1ef170e02664dab732a84a566507c69b60c606ad6c6404ea0167aff65b4bcdff7294c49008d57f863524ef670fe7f522f7a36c17bd7 SHA512 a7edd73ebfab285c521fbcc4b96cd8901b820abb665269cf0b49b557e4745a7431d067f41602dad6fdfbdb1cecc5e5b6b6e8ced02e37082680167e43126b8164
-EBUILD swi-prolog-8.3.20.ebuild 2633 BLAKE2B 1187443b7cce00ff2982b1ef170e02664dab732a84a566507c69b60c606ad6c6404ea0167aff65b4bcdff7294c49008d57f863524ef670fe7f522f7a36c17bd7 SHA512 a7edd73ebfab285c521fbcc4b96cd8901b820abb665269cf0b49b557e4745a7431d067f41602dad6fdfbdb1cecc5e5b6b6e8ced02e37082680167e43126b8164
-EBUILD swi-prolog-8.3.21.ebuild 2633 BLAKE2B 1187443b7cce00ff2982b1ef170e02664dab732a84a566507c69b60c606ad6c6404ea0167aff65b4bcdff7294c49008d57f863524ef670fe7f522f7a36c17bd7 SHA512 a7edd73ebfab285c521fbcc4b96cd8901b820abb665269cf0b49b557e4745a7431d067f41602dad6fdfbdb1cecc5e5b6b6e8ced02e37082680167e43126b8164
+EBUILD swi-prolog-8.2.2.ebuild 2670 BLAKE2B 9c953fbbd02d4b0b9a86b0f74d242edfa3907bf594d54d194630850ca62b5167fd9a6056e75610b57e6e8914fad483d30ffc6640b8ae2b53beea578d330ae895 SHA512 a9fa5d8b9f58a4c73c301d6243c9b5cb6ad0623b0b724504381f05f92ed58b7079a8bb391d8c7a9994131670798b8fb8efd5aef47cb915083e7308d3bb73198e
+EBUILD swi-prolog-8.2.3.ebuild 2673 BLAKE2B c9c7683f054a56bafc74318e714ca196a1bd1b4aa0bb575050beccbd751f56a08fd7e8bb0fd9b7b7fb32b10f3d4905219214b6b1744d7ae01d6b2d4c85b73d05 SHA512 d3f560dde65ad41c8e3c9ea9200839b429bda0bfc0be79e207102dea22e31ef5270c8b9350b44ffb025eb1ca0c1a1b2658a90d49b1cb0f6c651d7570e7c34603
+EBUILD swi-prolog-8.3.20.ebuild 2575 BLAKE2B 626297d8c655b525d116fa0ff2896af9bbead2fa360957f0eed5d7c0568e17628cd93ac1c6748f1d1058a948687d7fa8fad640a26131b6fee6264c17fdba045e SHA512 f6024dfca7b9e0019ee50aa6f7dedc1fde3d696c2a13c6a15b40dd040a9a63cf9c33f16472176ad8fd8d091db50960aadda00de78d9fb7ebde30c7c5f85bb9b8
+EBUILD swi-prolog-8.3.21.ebuild 2575 BLAKE2B 626297d8c655b525d116fa0ff2896af9bbead2fa360957f0eed5d7c0568e17628cd93ac1c6748f1d1058a948687d7fa8fad640a26131b6fee6264c17fdba045e SHA512 f6024dfca7b9e0019ee50aa6f7dedc1fde3d696c2a13c6a15b40dd040a9a63cf9c33f16472176ad8fd8d091db50960aadda00de78d9fb7ebde30c7c5f85bb9b8
 MISC metadata.xml 419 BLAKE2B 6d92e0713ed8da803ff8b6c778e616882af2fdb1426a62ea7bb6a265bbfff9a5c7debb8bf6a25c4ab60ed54a865b79fa3da4a09bc8a9123acf63dcb32107f54e SHA512 f805393c909e4108fe72b94f131d37d45279af1a4b501f9c3ae12d21590ef9c19227ca2a4b2966239ddb84847ce979cfbfcf3f3a2d24b60cb23977c522ff59c3
diff --git a/dev-lang/swi-prolog/swi-prolog-8.2.2.ebuild b/dev-lang/swi-prolog/swi-prolog-8.2.2.ebuild
index ce56f14344d4..476ccc7c68dc 100644
--- a/dev-lang/swi-prolog/swi-prolog-8.2.2.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-8.2.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.swi-prolog.org/download/stable/src/swipl-${PV}.tar.gz
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="archive berkdb debug doc +gmp java +libedit libressl minimal odbc pcre qt5 readline ssl test uuid X yaml"
+IUSE="archive berkdb debug doc +gmp java +libedit minimal odbc pcre qt5 readline ssl test uuid X yaml"
 RESTRICT="!test? ( test )"
 
 RDEPEND="sys-libs/ncurses:=
@@ -28,10 +28,9 @@ RDEPEND="sys-libs/ncurses:=
 	libedit? ( dev-libs/libedit )
 	gmp? ( dev-libs/gmp:0 )
 	ssl? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
+		dev-libs/openssl:0
 	)
-	java? ( >=virtual/jdk-1.7:= )
+	java? ( >=virtual/jdk-1.8:* )
 	uuid? ( dev-libs/ossp-uuid )
 	qt5? (
 		dev-qt/qtwidgets:5
diff --git a/dev-lang/swi-prolog/swi-prolog-8.2.3.ebuild b/dev-lang/swi-prolog/swi-prolog-8.2.3.ebuild
index 58dfc4d98f46..fd14de31d5ca 100644
--- a/dev-lang/swi-prolog/swi-prolog-8.2.3.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-8.2.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.swi-prolog.org/download/stable/src/swipl-${PV}.tar.gz
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="archive berkdb debug doc +gmp java +libedit libressl minimal odbc pcre qt5 readline ssl test uuid X yaml"
+IUSE="archive berkdb debug doc +gmp java +libedit minimal odbc pcre qt5 readline ssl test uuid X yaml"
 RESTRICT="!test? ( test )"
 
 RDEPEND="sys-libs/ncurses:=
@@ -28,10 +28,9 @@ RDEPEND="sys-libs/ncurses:=
 	libedit? ( dev-libs/libedit )
 	gmp? ( dev-libs/gmp:0 )
 	ssl? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
+		dev-libs/openssl:0
 	)
-	java? ( >=virtual/jdk-1.7:= )
+	java? ( >=virtual/jdk-1.8:* )
 	uuid? ( dev-libs/ossp-uuid )
 	qt5? (
 		dev-qt/qtwidgets:5
diff --git a/dev-lang/swi-prolog/swi-prolog-8.3.18.ebuild b/dev-lang/swi-prolog/swi-prolog-8.3.18.ebuild
deleted file mode 100644
index 0f70adef3414..000000000000
--- a/dev-lang/swi-prolog/swi-prolog-8.3.18.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils flag-o-matic multilib
-
-PATCHSET_VER="0"
-
-DESCRIPTION="versatile implementation of the Prolog programming language"
-HOMEPAGE="http://www.swi-prolog.org/"
-SRC_URI="http://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="archive berkdb debug doc +gmp java +libedit libressl minimal odbc pcre qt5 readline ssl test uuid X yaml"
-RESTRICT="!test? ( test )"
-
-RDEPEND="sys-libs/ncurses:=
-	sys-libs/zlib
-	archive? ( app-arch/libarchive )
-	berkdb? ( >=sys-libs/db-4:= )
-	odbc? ( dev-db/unixODBC )
-	pcre? ( dev-libs/libpcre )
-	readline? ( sys-libs/readline:= )
-	libedit? ( dev-libs/libedit )
-	gmp? ( dev-libs/gmp:0 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
-	)
-	java? ( >=virtual/jdk-1.7:= )
-	uuid? ( dev-libs/ossp-uuid )
-	qt5? (
-		dev-qt/qtwidgets:5
-		dev-qt/qtgui:5
-	)
-	X? (
-		virtual/jpeg:0
-		x11-libs/libX11
-		x11-libs/libXft
-		x11-libs/libXinerama
-		x11-libs/libXpm
-		x11-libs/libXt
-		x11-libs/libICE
-		x11-libs/libSM )
-	yaml? ( dev-libs/libyaml )"
-
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
-	java? ( test? ( =dev-java/junit-3.8* ) )"
-
-S="${WORKDIR}/swipl-${PV}"
-BUILD_DIR="${S}/build"
-CMAKE_USE_DIR="${S}"
-
-src_prepare() {
-	if [[ -d "${WORKDIR}"/${PV} ]] ; then
-		eapply "${WORKDIR}"/${PV}
-	fi
-	eapply_user
-
-	sed -i -e "s|\(SWIPL_INSTALL_PREFIX\)   lib/.*)|\1   $(get_libdir)/swipl)|" CMakeLists.txt || die
-	sed -i -e "s|\(SWIPL_INSTALL_CMAKE_CONFIG_DIR\) lib/|\1   $(get_libdir)/|" CMakeLists.txt || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-	use debug && append-flags -DO_DEBUG
-
-	mycmakeargs=(
-		-DSWIPL_INSTALL_PREFIX=$(get_libdir)/swipl
-		-DUSE_GMP=$(usex gmp)
-		-DINSTALL_DOCUMENTATION=$(use doc && usex archive)
-		-DSWIPL_PACKAGES_BASIC=$(usex !minimal)
-		-DSWIPL_PACKAGES_ARCHIVE=$(usex archive)
-		-DSWIPL_PACKAGES_ODBC=$(usex odbc)
-		-DSWIPL_PACKAGES_BDB=$(usex berkdb)
-		-DSWIPL_PACKAGES_PCRE=$(usex pcre)
-		-DSWIPL_PACKAGES_YAML=$(usex yaml)
-		-DSWIPL_PACKAGES_SSL=$(usex ssl)
-		-DSWIPL_PACKAGES_JAVA=$(usex java)
-		-DSWIPL_PACKAGES_QT=$(usex qt5)
-		-DSWIPL_PACKAGES_X=$(usex X)
-		-DSWIPL_PACKAGES_TERM=$(if use libedit || use readline; then echo yes; else echo no; fi)
-		)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	XDG_CONFIG_DIRS="${HOME}" \
-	XDG_DATA_DIRS="${HOME}" \
-		cmake-utils_src_compile
-}
-
-src_test() {
-	USE_PUBLIC_NETWORK_TESTS=false \
-	USE_ODBC_TESTS=false \
-		cmake-utils_src_test -V
-}
diff --git a/dev-lang/swi-prolog/swi-prolog-8.3.19.ebuild b/dev-lang/swi-prolog/swi-prolog-8.3.19.ebuild
deleted file mode 100644
index 0f70adef3414..000000000000
--- a/dev-lang/swi-prolog/swi-prolog-8.3.19.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils flag-o-matic multilib
-
-PATCHSET_VER="0"
-
-DESCRIPTION="versatile implementation of the Prolog programming language"
-HOMEPAGE="http://www.swi-prolog.org/"
-SRC_URI="http://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="archive berkdb debug doc +gmp java +libedit libressl minimal odbc pcre qt5 readline ssl test uuid X yaml"
-RESTRICT="!test? ( test )"
-
-RDEPEND="sys-libs/ncurses:=
-	sys-libs/zlib
-	archive? ( app-arch/libarchive )
-	berkdb? ( >=sys-libs/db-4:= )
-	odbc? ( dev-db/unixODBC )
-	pcre? ( dev-libs/libpcre )
-	readline? ( sys-libs/readline:= )
-	libedit? ( dev-libs/libedit )
-	gmp? ( dev-libs/gmp:0 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
-	)
-	java? ( >=virtual/jdk-1.7:= )
-	uuid? ( dev-libs/ossp-uuid )
-	qt5? (
-		dev-qt/qtwidgets:5
-		dev-qt/qtgui:5
-	)
-	X? (
-		virtual/jpeg:0
-		x11-libs/libX11
-		x11-libs/libXft
-		x11-libs/libXinerama
-		x11-libs/libXpm
-		x11-libs/libXt
-		x11-libs/libICE
-		x11-libs/libSM )
-	yaml? ( dev-libs/libyaml )"
-
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
-	java? ( test? ( =dev-java/junit-3.8* ) )"
-
-S="${WORKDIR}/swipl-${PV}"
-BUILD_DIR="${S}/build"
-CMAKE_USE_DIR="${S}"
-
-src_prepare() {
-	if [[ -d "${WORKDIR}"/${PV} ]] ; then
-		eapply "${WORKDIR}"/${PV}
-	fi
-	eapply_user
-
-	sed -i -e "s|\(SWIPL_INSTALL_PREFIX\)   lib/.*)|\1   $(get_libdir)/swipl)|" CMakeLists.txt || die
-	sed -i -e "s|\(SWIPL_INSTALL_CMAKE_CONFIG_DIR\) lib/|\1   $(get_libdir)/|" CMakeLists.txt || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-	use debug && append-flags -DO_DEBUG
-
-	mycmakeargs=(
-		-DSWIPL_INSTALL_PREFIX=$(get_libdir)/swipl
-		-DUSE_GMP=$(usex gmp)
-		-DINSTALL_DOCUMENTATION=$(use doc && usex archive)
-		-DSWIPL_PACKAGES_BASIC=$(usex !minimal)
-		-DSWIPL_PACKAGES_ARCHIVE=$(usex archive)
-		-DSWIPL_PACKAGES_ODBC=$(usex odbc)
-		-DSWIPL_PACKAGES_BDB=$(usex berkdb)
-		-DSWIPL_PACKAGES_PCRE=$(usex pcre)
-		-DSWIPL_PACKAGES_YAML=$(usex yaml)
-		-DSWIPL_PACKAGES_SSL=$(usex ssl)
-		-DSWIPL_PACKAGES_JAVA=$(usex java)
-		-DSWIPL_PACKAGES_QT=$(usex qt5)
-		-DSWIPL_PACKAGES_X=$(usex X)
-		-DSWIPL_PACKAGES_TERM=$(if use libedit || use readline; then echo yes; else echo no; fi)
-		)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	XDG_CONFIG_DIRS="${HOME}" \
-	XDG_DATA_DIRS="${HOME}" \
-		cmake-utils_src_compile
-}
-
-src_test() {
-	USE_PUBLIC_NETWORK_TESTS=false \
-	USE_ODBC_TESTS=false \
-		cmake-utils_src_test -V
-}
diff --git a/dev-lang/swi-prolog/swi-prolog-8.3.20.ebuild b/dev-lang/swi-prolog/swi-prolog-8.3.20.ebuild
index 0f70adef3414..2ea9f0c72e9c 100644
--- a/dev-lang/swi-prolog/swi-prolog-8.3.20.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-8.3.20.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz"
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="archive berkdb debug doc +gmp java +libedit libressl minimal odbc pcre qt5 readline ssl test uuid X yaml"
+IUSE="archive berkdb debug doc +gmp java +libedit minimal odbc pcre qt5 readline ssl test uuid X yaml"
 RESTRICT="!test? ( test )"
 
 RDEPEND="sys-libs/ncurses:=
@@ -27,10 +27,9 @@ RDEPEND="sys-libs/ncurses:=
 	libedit? ( dev-libs/libedit )
 	gmp? ( dev-libs/gmp:0 )
 	ssl? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
+		dev-libs/openssl:0
 	)
-	java? ( >=virtual/jdk-1.7:= )
+	java? ( >=virtual/jdk-1.8:* )
 	uuid? ( dev-libs/ossp-uuid )
 	qt5? (
 		dev-qt/qtwidgets:5
diff --git a/dev-lang/swi-prolog/swi-prolog-8.3.21.ebuild b/dev-lang/swi-prolog/swi-prolog-8.3.21.ebuild
index 0f70adef3414..2ea9f0c72e9c 100644
--- a/dev-lang/swi-prolog/swi-prolog-8.3.21.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-8.3.21.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz"
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="archive berkdb debug doc +gmp java +libedit libressl minimal odbc pcre qt5 readline ssl test uuid X yaml"
+IUSE="archive berkdb debug doc +gmp java +libedit minimal odbc pcre qt5 readline ssl test uuid X yaml"
 RESTRICT="!test? ( test )"
 
 RDEPEND="sys-libs/ncurses:=
@@ -27,10 +27,9 @@ RDEPEND="sys-libs/ncurses:=
 	libedit? ( dev-libs/libedit )
 	gmp? ( dev-libs/gmp:0 )
 	ssl? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
+		dev-libs/openssl:0
 	)
-	java? ( >=virtual/jdk-1.7:= )
+	java? ( >=virtual/jdk-1.8:* )
 	uuid? ( dev-libs/ossp-uuid )
 	qt5? (
 		dev-qt/qtwidgets:5