gentoo Easter resync : 12.04.2020

7 files changed, 14 insertions, 449 deletions

diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest
index a95484818488..8afdb21cfdbe 100644
--- a/dev-lang/swi-prolog/Manifest
+++ b/dev-lang/swi-prolog/Manifest
@@ -1,15 +1,7 @@
 DIST swipl-8.0.3.tar.gz 10418553 BLAKE2B d7d381a3070384164f9788060e1c431cc4658dd3e2144fc4c186c9f5395fb7356593766dcaff3ff424f19f917c8a4b56da31b019bd2206a7f794ece549043b76 SHA512 e3a0788befb5499be6f70524ef398dc3282a38891f20519dd23ec92f216fc1919a76656e4b648c3dc9d94e578dc2663439ff976eb52ca0dba5a6594f8d4d3037
-DIST swipl-8.1.17.tar.gz 10858037 BLAKE2B 69d6528e250dfd780c17bd87c2d79f2923a4ed413d44a5b1f77ca28c2077d8000dc991058fe47a7aaaa6310cf015049980463005d53294a71ba610e43b67b0dd SHA512 42a5a529e1ed935501e87cab28ab5b6d3a18283027bb801a7e3d66d41342fe6ee74de70fe9e8a341f360ab145d0a2e49d8937cb661cfec52f9105c4cf06dc735
-DIST swipl-8.1.18.tar.gz 10865862 BLAKE2B 9728593b9ce890fdb8b4bda8667dbfa9323707d86e0491e62ca82098c62d797da3cdc0180aba0509393532f2b095d1626a0b465955036de80b4fff4dbb62cba6 SHA512 c6b29b57e42e464f03e328fcc272c04db7772b45e62a26fec14f7fe2b9d3c494eeb4c090237b942e38f666dea6fc92e1d00dacba83f6ea74d6dd53923fd23816
-DIST swipl-8.1.19.tar.gz 10865698 BLAKE2B 08da8b7d93a313f621f9bb6abcc509ab6997b673f89483356f6a90f80fd7053acfac611bfaaa2925b3c0d51d7216ea7a1fcbd52dc202961e5a157eb7d0cf0907 SHA512 6094ef47e6c30b5d15f01c8f8c52b125cd04153b9949b6c0a19f4b2e57cd2604377b6b905dec6fa34fd6c6baec1d74d0463c24dfe407fb25643e7e89515b3296
-DIST swipl-8.1.20.tar.gz 10866943 BLAKE2B 57efd2dcd7a60589a5f8073703c121c0bcdc988e5da1a638ec542c18b342d51ef6a26ddc2cadc4fd5d79de37134492b9cf447cb0229faf4366f190169c689592 SHA512 c05b57977d9204916dc18cfcc387971f0dcef74d4b5b0cdfd1d134d57faefd81255b668a97d1d09952ea2d0dcadee0997e84305d49d0252549f6f4d57bf84d4e
-DIST swipl-8.1.21.tar.gz 10867376 BLAKE2B 740ac827190d86e5803c61e09b6c122667fa3d956267a10f052bf35fbbdda3337756764d6a63c963e79321b2f7efb30215d4a9c51eee42f5d73747600120292c SHA512 85bdd1b76a6ca895e4350a688a18cf00a60e83e0ef73b4a4b269881b667504e3d31daefbdc8031423adce025b44d2020819717ef90f35b7a7636792ab4972404
-DIST swipl-8.1.22.tar.gz 10893825 BLAKE2B 7457570728dcf07d9df5c6049366fbe00497063b54eaed3540f80cfab3296da68236afb4816ff65f1fdc74691d0136f3ababc0aceb4da0209675229a13cbdc55 SHA512 7b0154d88688f4dd97ccf198e3e1f11c958345f08f62a5302d33c9530cdad09bf54c47a7f4b107ff2839bc1a354da284bc71f7caaf77e80d53ec412a2c566e5c
+DIST swipl-8.1.25.tar.gz 10896679 BLAKE2B 69c20e02d59d25d317f1d4c339b430af8faa7d9027e91a5224eeb13ffc6b92a0eb08b9ff8602f17e449410da4cd007c59b08f43f29049f0b475004bebde6f65b SHA512 f034ae521da9d27d9c8681a3b9404047b61c77449d6257fea599b3ba0a5ba572b559f0dcd2653ebbf70eb7588bbf99d3d43149411e373a346d27e16c620fe638
+DIST swipl-8.1.26.tar.gz 10893132 BLAKE2B 7ddaec9a292e454bd5ceefbbd00d489ae3669be66ba7237a0788b4c714910f49dac9f659a52c715075b91dd638f0590efb0234b8c88cbe2090ceb735faf38a9a SHA512 a89a09f2958182f05ebec161ec5b271664fe9dc0cbc29bb3246ea6418b4ba5fa2a0542ad5448c3f4d7dda080cd8575391b856e04ca01eb41907e00a194d8e502
 EBUILD swi-prolog-8.0.3.ebuild 2490 BLAKE2B edc287a8138d4d5e1c1638e316a860aded0a514a76b3b4e66d03977ba277ed280523544a2c6b8187ffb8f3f67035a475e2de80e0bce333dddcab385b06797eb4 SHA512 1c689254578253eb4f138f0ee2f498690c280148c6b544f3995827ed4a11bc61b63e95e1bf85bd83e7ccd0939267964679cf102f7bffb072b122a521d6521a96
-EBUILD swi-prolog-8.1.17.ebuild 2594 BLAKE2B f3501afc82f537b8729a49cab6a883fe30aeca2613d963483ae27e97f611629e18d6dd4e4de64d80da627d0d86df9014f0d9ddfade1fe69aac8a54e7b01eb936 SHA512 f2c97e516918257b85af4b3fea975c2deb5879cce17233734659faaffa46072cfa4de6b6b32bed7ae9ccc36e625212b7bdd572f6c00deb4a099bcea8bbc6248b
-EBUILD swi-prolog-8.1.18.ebuild 2594 BLAKE2B f3501afc82f537b8729a49cab6a883fe30aeca2613d963483ae27e97f611629e18d6dd4e4de64d80da627d0d86df9014f0d9ddfade1fe69aac8a54e7b01eb936 SHA512 f2c97e516918257b85af4b3fea975c2deb5879cce17233734659faaffa46072cfa4de6b6b32bed7ae9ccc36e625212b7bdd572f6c00deb4a099bcea8bbc6248b
-EBUILD swi-prolog-8.1.19.ebuild 2594 BLAKE2B f3501afc82f537b8729a49cab6a883fe30aeca2613d963483ae27e97f611629e18d6dd4e4de64d80da627d0d86df9014f0d9ddfade1fe69aac8a54e7b01eb936 SHA512 f2c97e516918257b85af4b3fea975c2deb5879cce17233734659faaffa46072cfa4de6b6b32bed7ae9ccc36e625212b7bdd572f6c00deb4a099bcea8bbc6248b
-EBUILD swi-prolog-8.1.20.ebuild 2594 BLAKE2B d5840bb83530ae6e0b1a00520bec268be97f7695af60f3771849cde506372e7c3ed2181509ff61431354fff79ddb10efcf032b017444cec9afefdfcb078958d5 SHA512 238f4c5eac973338e87cda5426251a43852d0abab3fa084ec09e6b31a754d51c14f8ba05550245bb9225e517345ce7ea6f6df7dab45e384ac56393225b741354
-EBUILD swi-prolog-8.1.21.ebuild 2594 BLAKE2B d5840bb83530ae6e0b1a00520bec268be97f7695af60f3771849cde506372e7c3ed2181509ff61431354fff79ddb10efcf032b017444cec9afefdfcb078958d5 SHA512 238f4c5eac973338e87cda5426251a43852d0abab3fa084ec09e6b31a754d51c14f8ba05550245bb9225e517345ce7ea6f6df7dab45e384ac56393225b741354
-EBUILD swi-prolog-8.1.22.ebuild 2594 BLAKE2B d5840bb83530ae6e0b1a00520bec268be97f7695af60f3771849cde506372e7c3ed2181509ff61431354fff79ddb10efcf032b017444cec9afefdfcb078958d5 SHA512 238f4c5eac973338e87cda5426251a43852d0abab3fa084ec09e6b31a754d51c14f8ba05550245bb9225e517345ce7ea6f6df7dab45e384ac56393225b741354
+EBUILD swi-prolog-8.1.25.ebuild 2593 BLAKE2B 106a52a3a29bfbc479c392f6798947c9730e87fbdc2812f662472e0acd46745fec01bd3fa1a79c7f09befaf639b9a9f50cfe49b5c4dce6b1db810b1fed2699d9 SHA512 ecac2c7e661b58a14a63d8b44e2714f88cd6e763e57e7cfc74e0220bfe522ce08757aae5188de6f23129b54853fda2f6785058ddd805fd81cbffc5533aa5f627
+EBUILD swi-prolog-8.1.26.ebuild 2553 BLAKE2B 9a4f63d674d380cbae06fd7d67432970e8c5f6f76ddbd77a2ada30dbd0cf8e6f28751cd8fd321bcdb6857a9ee99ba2f1632a8921e68c87ffc168e47ca356f73d SHA512 31745cc81c863c8062743be5960cf253e1c00173c1a11fdd0fa5d90457f94d5c8df615354275af865cd24b982372a35c6c3f45e0fb581e8b20f1183ff3610ef5
 MISC metadata.xml 419 BLAKE2B 6d92e0713ed8da803ff8b6c778e616882af2fdb1426a62ea7bb6a265bbfff9a5c7debb8bf6a25c4ab60ed54a865b79fa3da4a09bc8a9123acf63dcb32107f54e SHA512 f805393c909e4108fe72b94f131d37d45279af1a4b501f9c3ae12d21590ef9c19227ca2a4b2966239ddb84847ce979cfbfcf3f3a2d24b60cb23977c522ff59c3
diff --git a/dev-lang/swi-prolog/swi-prolog-8.1.17.ebuild b/dev-lang/swi-prolog/swi-prolog-8.1.17.ebuild
deleted file mode 100644
index 8b822e794107..000000000000
--- a/dev-lang/swi-prolog/swi-prolog-8.1.17.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
-
-inherit cmake-utils eutils 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 ~x86-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() {
-	EPATCH_FORCE=yes
-	EPATCH_SUFFIX=patch
-	if [[ -d "${WORKDIR}"/${PV} ]] ; then
-		epatch "${WORKDIR}"/${PV}
-	fi
-
-	sed -i -e "s|\(SWIPL_INSTALL_PREFIX\)   lib/.*)|\1   $(get_libdir)/swipl)|" CMakeLists.txt || die
-
-	eapply_user
-
-	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() {
-	cmake-utils_src_compile \
-		XDG_CONFIG_DIRS="${HOME}" \
-		XDG_DATA_DIRS="${HOME}"
-}
-
-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.1.18.ebuild b/dev-lang/swi-prolog/swi-prolog-8.1.18.ebuild
deleted file mode 100644
index 8b822e794107..000000000000
--- a/dev-lang/swi-prolog/swi-prolog-8.1.18.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
-
-inherit cmake-utils eutils 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 ~x86-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() {
-	EPATCH_FORCE=yes
-	EPATCH_SUFFIX=patch
-	if [[ -d "${WORKDIR}"/${PV} ]] ; then
-		epatch "${WORKDIR}"/${PV}
-	fi
-
-	sed -i -e "s|\(SWIPL_INSTALL_PREFIX\)   lib/.*)|\1   $(get_libdir)/swipl)|" CMakeLists.txt || die
-
-	eapply_user
-
-	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() {
-	cmake-utils_src_compile \
-		XDG_CONFIG_DIRS="${HOME}" \
-		XDG_DATA_DIRS="${HOME}"
-}
-
-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.1.19.ebuild b/dev-lang/swi-prolog/swi-prolog-8.1.19.ebuild
deleted file mode 100644
index 8b822e794107..000000000000
--- a/dev-lang/swi-prolog/swi-prolog-8.1.19.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
-
-inherit cmake-utils eutils 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 ~x86-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() {
-	EPATCH_FORCE=yes
-	EPATCH_SUFFIX=patch
-	if [[ -d "${WORKDIR}"/${PV} ]] ; then
-		epatch "${WORKDIR}"/${PV}
-	fi
-
-	sed -i -e "s|\(SWIPL_INSTALL_PREFIX\)   lib/.*)|\1   $(get_libdir)/swipl)|" CMakeLists.txt || die
-
-	eapply_user
-
-	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() {
-	cmake-utils_src_compile \
-		XDG_CONFIG_DIRS="${HOME}" \
-		XDG_DATA_DIRS="${HOME}"
-}
-
-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.1.20.ebuild b/dev-lang/swi-prolog/swi-prolog-8.1.20.ebuild
deleted file mode 100644
index 67d5ec674d94..000000000000
--- a/dev-lang/swi-prolog/swi-prolog-8.1.20.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils eutils 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 ~x86-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() {
-	EPATCH_FORCE=yes
-	EPATCH_SUFFIX=patch
-	if [[ -d "${WORKDIR}"/${PV} ]] ; then
-		epatch "${WORKDIR}"/${PV}
-	fi
-
-	sed -i -e "s|\(SWIPL_INSTALL_PREFIX\)   lib/.*)|\1   $(get_libdir)/swipl)|" CMakeLists.txt || die
-
-	eapply_user
-
-	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() {
-	cmake-utils_src_compile \
-		XDG_CONFIG_DIRS="${HOME}" \
-		XDG_DATA_DIRS="${HOME}"
-}
-
-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.1.21.ebuild b/dev-lang/swi-prolog/swi-prolog-8.1.25.ebuild
index 67d5ec674d94..8f4583928061 100644
--- a/dev-lang/swi-prolog/swi-prolog-8.1.21.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-8.1.25.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils eutils flag-o-matic multilib
 
@@ -94,9 +94,9 @@ src_configure() {
 }
 
 src_compile() {
-	cmake-utils_src_compile \
-		XDG_CONFIG_DIRS="${HOME}" \
-		XDG_DATA_DIRS="${HOME}"
+	XDG_CONFIG_DIRS="${HOME}" \
+	XDG_DATA_DIRS="${HOME}" \
+		cmake-utils_src_compile
 }
 
 src_test() {
diff --git a/dev-lang/swi-prolog/swi-prolog-8.1.22.ebuild b/dev-lang/swi-prolog/swi-prolog-8.1.26.ebuild
index 67d5ec674d94..2293c183ae1c 100644
--- a/dev-lang/swi-prolog/swi-prolog-8.1.22.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-8.1.26.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils eutils flag-o-matic multilib
 
@@ -56,16 +56,13 @@ BUILD_DIR="${S}/build"
 CMAKE_USE_DIR="${S}"
 
 src_prepare() {
-	EPATCH_FORCE=yes
-	EPATCH_SUFFIX=patch
 	if [[ -d "${WORKDIR}"/${PV} ]] ; then
-		epatch "${WORKDIR}"/${PV}
+		eapply "${WORKDIR}"/${PV}
 	fi
+	eapply_user
 
 	sed -i -e "s|\(SWIPL_INSTALL_PREFIX\)   lib/.*)|\1   $(get_libdir)/swipl)|" CMakeLists.txt || die
 
-	eapply_user
-
 	cmake-utils_src_prepare
 }
 
@@ -94,9 +91,9 @@ src_configure() {
 }
 
 src_compile() {
-	cmake-utils_src_compile \
-		XDG_CONFIG_DIRS="${HOME}" \
-		XDG_DATA_DIRS="${HOME}"
+	XDG_CONFIG_DIRS="${HOME}" \
+	XDG_DATA_DIRS="${HOME}" \
+		cmake-utils_src_compile
 }
 
 src_test() {