gentoo resync : 16.01.2021

3 files changed, 134 insertions, 3 deletions

diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest
index 82fd263f570f..94c5418e21f1 100644
--- a/dev-lang/swi-prolog/Manifest
+++ b/dev-lang/swi-prolog/Manifest
@@ -6,12 +6,14 @@ DIST swipl-8.4.1.tar.gz 11386908 BLAKE2B bd53355abe63ffde348ed38b0e7fee4bcba4e74
 DIST swipl-8.5.1.tar.gz 11374102 BLAKE2B 7782c193f14450aff5ea08d739e1b2db1be9b305f9a6608c40e800a05f76682340acc3e406d4f13fdcd24428af375dbf67a590e7d4fbe1bf35b28bce7ce56552 SHA512 4cb76e7268b7ae9ee12f3c7220558f8dddc18c3e53ed8d145ebe43f20f5a35ce657ac2316693e00bf2d0b7dc84de558900e66d45140bd6ea1d3848c33feb2686
 DIST swipl-8.5.2.tar.gz 11403262 BLAKE2B 1f6e362a85f15d7b6dff6e1e7317f9d70d65bf754f32e48caae9f6ab72bdf640fb7adbe0f39e32b14de4217020176c6681e8e84ffef972cf51e48716659e68f1 SHA512 11f3cbbe22deadddb5ca6b49bc19ed4d7f173c42ce033bbf7e04d05bd18700e9d511a8a9a80a6970fa57f3fad2faed282a8edbd7f024c00395c8ecb5e1d2f473
 DIST swipl-8.5.3.tar.gz 11396211 BLAKE2B f4475b9e0a3fa48590998e90c0ee6873c329fc25bbd52b095e15da5cb2878230cfbec5492e3806adc0ff2826de1d930d25068dd02d048282d957d857ea7401d9 SHA512 26d29b608cc08cbd70389f7a79cbfc58f97cb2497e7a4b119f80f5ffa1bc5264e2a55b76b2e15516a9167a4097af68ebc83cb1145dc0829e2edb318462af6047
+DIST swipl-8.5.4.tar.gz 11406222 BLAKE2B ece161b1143897324e2204bbeed0c7784824481de8b5ada12d42b4fea14334ab9b2be68cc39f3e4aceffb049baf6ec6c6b239438c4d8654172980e6aecea8016 SHA512 c277248d8a3b7cbad622d06eb0a418cbb87540802152d9a49364c3b45905e0be0be28ae100c6abcb06084c6ca5e92d7d4b46553d59d47c8b987e01b0d420bdb6
 EBUILD swi-prolog-8.2.3-r2.ebuild 2661 BLAKE2B 34a523f318cf39453bb07e8f484958585180f77b5cec51ccbc5f1cc5f26016dfa01793e1cc98ddd26dea30e33bdfb8ee14380a7465080fcc4f2b9edefc9675e3 SHA512 554e2e2c587fd0b7de160f8789ecfa8459149c2fca221fb7c8df9bb789b91247ae22eade75fc52b614eba2548db2314a013676c4c0bc7883a2166db0e8028ca8
 EBUILD swi-prolog-8.2.4-r2.ebuild 2854 BLAKE2B 61ed52d692815431f8965aaccb426dab4af427794b7fcc8b9882d16c535386d834b3433a5e0694a9848d41f28f8e56dd27ba1b54da1341b32c141e008c479736 SHA512 a13d74f6e0e69f7a219fb03e18f7de143e52a7e9ed5fdbac8da6dc0e1058802b70491ecf6a81b335377421ac6ecee1cf6aa035579b659d12c5d4ce37e0ec8624
 EBUILD swi-prolog-8.2.4-r3.ebuild 3179 BLAKE2B 2122c73ba239423cc4e47ae9df3f6e39ad15795c9045384ee9857845a05906f48602c17262e1e68f04ad8dee192d8483c1f48e1af64e73546f2ee5d0d5b16318 SHA512 fa8a027c2fa744682b8a7da84fe95885837b7a1a5c960e7c42feeb5a3f626f3282b5ca7142763108e8111d9a3f1f97c8a5dc12805f6d4def91b655a8a6f51954
 EBUILD swi-prolog-8.4.0.ebuild 3180 BLAKE2B f25841b2f8e6841f6b8700ad76cf14e26c65861f705089b3662359f9eda22ad4181cbce9e3039f7f07315a3d47e45b365684f11eabae1d297bece34075cd440c SHA512 21b2e976eb58f9b25d7cd2241d9321a452803f231c4ddcfba92672fed9a4a1754e2084af9cc3562ae14a4c15376362d89cc0d0627f94007530b6a17367f77ea1
-EBUILD swi-prolog-8.4.1.ebuild 3180 BLAKE2B f25841b2f8e6841f6b8700ad76cf14e26c65861f705089b3662359f9eda22ad4181cbce9e3039f7f07315a3d47e45b365684f11eabae1d297bece34075cd440c SHA512 21b2e976eb58f9b25d7cd2241d9321a452803f231c4ddcfba92672fed9a4a1754e2084af9cc3562ae14a4c15376362d89cc0d0627f94007530b6a17367f77ea1
+EBUILD swi-prolog-8.4.1.ebuild 3178 BLAKE2B 35516e6433aacc21d0bb65531dbadabc63ec07333c3c1cf5b0a68ebe3875313073ab737c36ab28f6b4478c2a2853a32113dcee04feba869d2dac28be34e41e47 SHA512 a6a2f4ca2e9e6ff08418ec109a2d9164fb3f64c12aa7dccf8274d976b2c16f35dbeed1d6f6e95fa22d4ae1dc7247a1f8008a06ae2cf949a20a0e277fc68a6aee
 EBUILD swi-prolog-8.5.1.ebuild 3179 BLAKE2B 50bf0ff7f795f9fcecddc5a9ca50f19efd252e37f0ee0371306fe5cb3cf6a8fc59810bc689a070fa087b647a60bf655cc5299964190f4f6e03af4327525093ad SHA512 0c080a2d2722c169b6ad999f92b612f068a3d5176ac6c5b31e57703446a111ca47d9dcdfd0f4c63f125a2ec43c558a4dbef3fcf4c067e7c6a2c8fe63c0b1198d
 EBUILD swi-prolog-8.5.2.ebuild 3179 BLAKE2B 50bf0ff7f795f9fcecddc5a9ca50f19efd252e37f0ee0371306fe5cb3cf6a8fc59810bc689a070fa087b647a60bf655cc5299964190f4f6e03af4327525093ad SHA512 0c080a2d2722c169b6ad999f92b612f068a3d5176ac6c5b31e57703446a111ca47d9dcdfd0f4c63f125a2ec43c558a4dbef3fcf4c067e7c6a2c8fe63c0b1198d
 EBUILD swi-prolog-8.5.3.ebuild 3179 BLAKE2B 50bf0ff7f795f9fcecddc5a9ca50f19efd252e37f0ee0371306fe5cb3cf6a8fc59810bc689a070fa087b647a60bf655cc5299964190f4f6e03af4327525093ad SHA512 0c080a2d2722c169b6ad999f92b612f068a3d5176ac6c5b31e57703446a111ca47d9dcdfd0f4c63f125a2ec43c558a4dbef3fcf4c067e7c6a2c8fe63c0b1198d
+EBUILD swi-prolog-8.5.4.ebuild 3179 BLAKE2B 4b173dd107ec5141d8a3bbc4175363deae9bf4598bc21020b9c74879a87cd554e1221ffc778ec8b50ba746ecd3536b14110ea67d1d8f70471d3de86073568b4c SHA512 0d01e1af08c63925a9487ebcec31e207febf63a2caf83a6ce1385bf6948ae7d1f3fb0c14d22ed3e4032c5e11b09954a68bcecac2c03263f3cb243ed5ab8f93a1
 MISC metadata.xml 420 BLAKE2B 9818164553dd7e47db556eebaa71cabc54621317465c3ef09a0fae22259c9d20bede548a61ffa383e9df8eaf6efa6b5ac800d49b1ee5cae3691d0112ed4a2a30 SHA512 6ce90a29c77852e822d5c35c4a1b0b4a093cb90070656b06b09337c57f00fb6ff42ae3c8178a22bee17ffcec8f40ea4ed6c9d0cecf4afe74e01b3389479fa4ff
diff --git a/dev-lang/swi-prolog/swi-prolog-8.4.1.ebuild b/dev-lang/swi-prolog/swi-prolog-8.4.1.ebuild
index f00dfe509d7c..01ff1d2f2a04 100644
--- a/dev-lang/swi-prolog/swi-prolog-8.4.1.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-8.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,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"
+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 )"
 
diff --git a/dev-lang/swi-prolog/swi-prolog-8.5.4.ebuild b/dev-lang/swi-prolog/swi-prolog-8.5.4.ebuild
new file mode 100644
index 000000000000..f1f52dee9349
--- /dev/null
+++ b/dev-lang/swi-prolog/swi-prolog-8.5.4.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake desktop xdg-utils flag-o-matic toolchain-funcs
+
+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
+	virtual/libcrypt:=
+	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* ) )"
+
+BDEPEND="virtual/pkgconfig"
+
+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
+
+	local ncurses_lib_flags=$($(tc-getPKG_CONFIG) --libs ncurses)
+	sed -i "/project(SWI-Prolog)/a set(CMAKE_REQUIRED_LIBRARIES \${CMAKE_REQUIRED_LIBRARIES} ${ncurses_lib_flags})" CMakeLists.txt || die
+	sed -i "s:\${CURSES_LIBRARIES}:${ncurses_lib_flags}:" src/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
+}