gentoo resync : 29.06.2021

3 files changed, 2 insertions, 126 deletions

diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest
index 79dd128c0739..2f3c12ed146b 100644
--- a/dev-lang/swi-prolog/Manifest
+++ b/dev-lang/swi-prolog/Manifest
@@ -1,12 +1,10 @@
 DIST swi-prolog-8.2.3-gentoo-patchset-0.tar.gz 535 BLAKE2B bb7869c5166104a3a7faa88dd14284ea147ab5090695ff1c950365823451ac656403bee97c7dd4a039e2d58085456842f8bbc7caa26d18916c6f8718a204097c SHA512 c1f0dce1e336c79fe84a3f9d0fe5e873d33c00071f91cbb683a73fbceaba1c6ca8c2875b58045829eafcbee78a0e713009a07bd51a2c56bf146f14881899f934
 DIST swipl-8.2.3.tar.gz 10999577 BLAKE2B 57cfa9f6fb97f0136a35da1850c7ae8da123d1c18fe6e18597d1b2131b7304a638d42d673efad2a01eaf3f9dad7b4754e6feb64917423abda002323bfc8dec8c SHA512 cd9ffc8a963682c0d02cec4b76338352459e004e07f3e5c0f02b3c2f9b19f23fe9639e037cf52531491a41c201113138f0b6a039d401e891ad5774383b0d852f
 DIST swipl-8.2.4.tar.gz 10998859 BLAKE2B b18f26102a685ff5c66aeaf0c14a08c532f9327f9f995cd46657a71b6779d021eb4f5651b2be77883197c7c5ee31c23259f46ed559aeeb0bb53ad10aea0081ed SHA512 cdbd23d4a0e9699ecc32bdcad9979e4042fb0f24de84010f6f097bc7148af38150b0e61e393c057b0dbae932d0fc1c02a41808bcbafd2c23e24fd73070bed470
-DIST swipl-8.3.23.tar.gz 11162363 BLAKE2B 3808da5bfda1059332dde6a134c2c014c6ee190791ac0c1ace6ea6713719470c1f63df9cf25bdfa69ab73a63090d9d4e37a3afee3b0c107786568a7786c5cbea SHA512 ca592bfa815496d3668a3251f3249c578df46185d856df7bddb88786923fd247542eecd8505181c5f6d4cbb9ddde0d54177d053ab7bd8d024910ccb3f00f7430
-DIST swipl-8.3.24.tar.gz 11202181 BLAKE2B c5ac25b3cb73deeef51b8469977e9554ffc9da275dfb4541e7f653fb3e3f411abb971fc66ebf77d662ecdbd2d57070b18b76200f7d26d649a491a6789b807ef4 SHA512 36c436088e7eb78147d2e61fb6377e1703b5a1a6290e98a73810d18e07bda2b598aeb7aaff22b2a4caef90c3873c7a06c7ae84e71bb5f52cc2c6b315e4680f28
 DIST swipl-8.3.25.tar.gz 11186018 BLAKE2B a06befea48e065d516eeeb4ce2fa87342647d02ec509eaec208be143520af7d4de3217ac726720a36cdd15e1e263963cfc71bb2d7249ff55f9673e7e1bea5620 SHA512 4a06cd36ffbf22d8e582776c6181c8e848abe9bfca32e5e0e43d58e801c8b7c8e1d8556279716461df020530d0ea44cdcfe9390e8387b2a8e8936adf8c3f9774
+DIST swipl-8.3.26.tar.gz 11202495 BLAKE2B 5d0dcd7a77592ffa86c67f386708330c0b9efc855a084178613990b93308a4e8e9d8d0617a44ae8f8fca050afb6181158269eea0d5943458790d481b4cb544ce SHA512 bdae2a66200517f3452eaf97efcb21d223bfbcc3868d2defc7474272e2b947e3c3035f2b8e5a8ee192271849a4075752a1b8b9c7460e941290111cec85e4df29
 EBUILD swi-prolog-8.2.3-r1.ebuild 2638 BLAKE2B 9d46f34c3d035c75ce7ecc09600ece9766705305d7fe23760df165e507fc607059e1bd615319640ede894b9ccf285e461e1e94b78197730a4e0550671f9b1840 SHA512 0eaf416fd71c4ef82978c41c5363cc81a3cbeebb50f4115b5e64514fb82dd4fcfa9cadd11cf630eb33ef34b9ae128b721c9364d2f50bc5883a463ec380cd5e17
 EBUILD swi-prolog-8.2.4-r1.ebuild 2831 BLAKE2B abcef64cf914725a35ca4bfadf24030eb068e25ce477ff4227377c80334ca630c000ad0c06154fcea57fce8b68732529b1f1bc222d929c4a4087e7c19623c864 SHA512 c5c30a95d7ac79ab6fd2a2832e0a46a511164dddfc1ad32d3fbbf7dad2596a01b1c12ae1855147b7e94aebc2b7facfd724b2fb10f89d2c2354fc251457f385b5
-EBUILD swi-prolog-8.3.23-r1.ebuild 2830 BLAKE2B 71485d97656afe1e2c3a07bdf18cbe999b83999d8a45b825c49d05df7b93e9e3cb1663715679fa6043f8d389e72ade7794784b622f4ffc0deba0cf1a2ce22238 SHA512 3fb525550656ac67f0b93aca01eb16b33e48f8c56deb766cad1ca06a6a43fb2a7677a717401aca752b15e6c9a0a53351873f404cebc977ad36d454a944b0b502
-EBUILD swi-prolog-8.3.24-r1.ebuild 2830 BLAKE2B 71485d97656afe1e2c3a07bdf18cbe999b83999d8a45b825c49d05df7b93e9e3cb1663715679fa6043f8d389e72ade7794784b622f4ffc0deba0cf1a2ce22238 SHA512 3fb525550656ac67f0b93aca01eb16b33e48f8c56deb766cad1ca06a6a43fb2a7677a717401aca752b15e6c9a0a53351873f404cebc977ad36d454a944b0b502
 EBUILD swi-prolog-8.3.25-r1.ebuild 2830 BLAKE2B 71485d97656afe1e2c3a07bdf18cbe999b83999d8a45b825c49d05df7b93e9e3cb1663715679fa6043f8d389e72ade7794784b622f4ffc0deba0cf1a2ce22238 SHA512 3fb525550656ac67f0b93aca01eb16b33e48f8c56deb766cad1ca06a6a43fb2a7677a717401aca752b15e6c9a0a53351873f404cebc977ad36d454a944b0b502
+EBUILD swi-prolog-8.3.26.ebuild 2830 BLAKE2B 71485d97656afe1e2c3a07bdf18cbe999b83999d8a45b825c49d05df7b93e9e3cb1663715679fa6043f8d389e72ade7794784b622f4ffc0deba0cf1a2ce22238 SHA512 3fb525550656ac67f0b93aca01eb16b33e48f8c56deb766cad1ca06a6a43fb2a7677a717401aca752b15e6c9a0a53351873f404cebc977ad36d454a944b0b502
 MISC metadata.xml 419 BLAKE2B 6d92e0713ed8da803ff8b6c778e616882af2fdb1426a62ea7bb6a265bbfff9a5c7debb8bf6a25c4ab60ed54a865b79fa3da4a09bc8a9123acf63dcb32107f54e SHA512 f805393c909e4108fe72b94f131d37d45279af1a4b501f9c3ae12d21590ef9c19227ca2a4b2966239ddb84847ce979cfbfcf3f3a2d24b60cb23977c522ff59c3
diff --git a/dev-lang/swi-prolog/swi-prolog-8.3.24-r1.ebuild b/dev-lang/swi-prolog/swi-prolog-8.3.24-r1.ebuild
deleted file mode 100644
index cf72f0070592..000000000000
--- a/dev-lang/swi-prolog/swi-prolog-8.3.24-r1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake desktop xdg-utils flag-o-matic
-
-PATCHSET_VER="0"
-
-DESCRIPTION="Versatile implementation of the Prolog programming language"
-HOMEPAGE="https://www.swi-prolog.org/"
-SRC_URI="https://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 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? ( dev-libs/openssl:0= )
-	java? ( >=virtual/jdk-1.8:* )
-	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}"
-
-src_prepare() {
-	if [[ -d "${WORKDIR}"/${PV} ]] ; then
-		eapply "${WORKDIR}"/${PV}
-	fi
-
-	sed -e "s|\(SWIPL_INSTALL_PREFIX\)   lib/.*)|\1   $(get_libdir)/swipl)|" \
-		-e "s|\(SWIPL_INSTALL_CMAKE_CONFIG_DIR\) lib/|\1   $(get_libdir)/|" \
-		-i CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-	use debug && append-flags -DO_DEBUG
-
-	local 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_src_configure
-}
-
-src_compile() {
-	XDG_CONFIG_DIRS="${HOME}" \
-	XDG_DATA_DIRS="${HOME}" \
-		cmake_src_compile
-}
-
-src_test() {
-	USE_PUBLIC_NETWORK_TESTS=false \
-	USE_ODBC_TESTS=false \
-		cmake_src_test -V
-}
-
-src_install() {
-	cmake_src_install
-
-	if use qt5; then
-		doicon "${S}"/snap/gui/swipl.png
-		make_desktop_entry swipl-win "SWI-Prolog" swipl "Development"
-	fi
-}
-
-pkg_postinst() {
-	if use qt5; then
-		xdg_icon_cache_update
-		xdg_desktop_database_update
-	fi
-}
-
-pkg_postrm() {
-	if use qt5; then
-		xdg_icon_cache_update
-		xdg_desktop_database_update
-	fi
-}
diff --git a/dev-lang/swi-prolog/swi-prolog-8.3.23-r1.ebuild b/dev-lang/swi-prolog/swi-prolog-8.3.26.ebuild
index cf72f0070592..cf72f0070592 100644
--- a/dev-lang/swi-prolog/swi-prolog-8.3.23-r1.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-8.3.26.ebuild