gentoo resync : 29.12.2022

6 files changed, 17 insertions, 271 deletions

diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest
index 65aa742b1702..ac3441042e58 100644
--- a/dev-lang/swi-prolog/Manifest
+++ b/dev-lang/swi-prolog/Manifest
@@ -1,13 +1,9 @@
 DIST swipl-8.4.1.tar.gz 11386908 BLAKE2B bd53355abe63ffde348ed38b0e7fee4bcba4e74128c73904a72ca3ba2021a8b650d08480a643ea3336f3fc6d1d7bcf7651deb1d32608581ce43bc118288df6da SHA512 22806d8abd0b729e27a6d7bbbd0df37af8af21bb186a8de58ec5f9a1d32c9a477838fd10155ff21998737fcc2aaf4711d1d4d5457ce5d62e328d5da032474ee5
 DIST swipl-8.4.2.tar.gz 11396705 BLAKE2B c0835bdbc09171ef00ccc52df14d07651ac42e36ab7bd6e6a72348050d3547a817bec13f2facd8fe051291dc3f0f80f64ed5c8a55e22dba314ccf896434013cf SHA512 1578d01c09ab7ee97c92703f58bab4d0fa5b94dc09092f87059e5002f3e4efbe0b9e85483e8b0a350837825c8b16d3b15c2e75df020571740fab6f1978d69669
-DIST swipl-8.5.10.tar.gz 11467250 BLAKE2B ae5667307365dade0e6b02b4253e353ca2211b2f8765a898315c6766849c98c40c471a8310a2c4d71ff254532c9b86bf39b6dacd44b60ecd76a9733e5f50c843 SHA512 e3a0513c4e5d5e290050a7579a33e3e95c1363e74167fd859a00a0f79a8c035eb63fa994547d154f42eb2e6878a122f35efba39672ecb413203ae6561e3f3de7
-DIST swipl-8.5.7.tar.gz 11426463 BLAKE2B cde89176abf278b115b2d9db884b4a605291e9154016c3489920ced9398befa52c811bb606e606d921c10dece92bab46c8c98330f18b7f723df8300e69e0f62c SHA512 36755abe26c5f629ed9f650dd9cef8fb4b36772f2c233e2bb2aba05fd7a1c72d9543935187a44b5b575679286cf20749a5991048f6c433d63a4c06439ed8ff35
-DIST swipl-8.5.8.tar.gz 11436345 BLAKE2B 10ecca2dcadc4dd1d0be27b32cd289f590d07a5fccdf64dca33e7fbe1fefb807f04c257a8359944de06097f6ffd2ef584aff11accc6ef833da1000a0912a8166 SHA512 5bb154bab2eb3f8a349b2bc08b76ff35981327f261317ad7d8fcbc5e0e9bc58ab32339454385c36dfb561253c718d57c596627fb61ed3dfc65e16cd0d6716b7f
-DIST swipl-8.5.9.tar.gz 11462380 BLAKE2B 1bf9e05d03f58754434a96c7bddd6db89463d3e461e1b7fe5db59cb15b7c902bff87e66a31c487d547d7b3178e347563376d2b09c95d8a093ee546d08a935df5 SHA512 c75dc58e9451205fd751ec8629f3865bf7d60e9bc3ef885ba3c328b36d807a459a8df1e8c61dbd6502335f6177b75a5f7c1a5c8acc77b8eed9fd5277a712d289
+DIST swipl-8.5.11.tar.gz 11480652 BLAKE2B eb812a272d3fbcb181c5cee0dd033f6b7ffdee467bf37c645a98a34ce455189ded7b7c678482e992918477160a6a585ea07dcc38a4aa123eb5f4e04a35dc20d0 SHA512 00387d25548198e0d738cc210a0769130a6ad6fb0596dec04539b1fb85ab8d660a73fec1fe5f5d01878b90e8736018dbb0c8cfd240e1d6b2b62c0bb892f0826c
+DIST swipl-8.5.12.tar.gz 11489072 BLAKE2B 1c8ce7a0386c20be8e2eeac9d31df5862adf78ce0341e31b1ebcc42a923403c28707da12b88ba0773f5ebfdd61efe5a8d38a99f8f20aa47672fd51cdc4fbfb8e SHA512 d530fb7048cd80fa0f07b7b026279915cbb58dd7b8199daafe13c22659c5ffeac62168bcc9208c7bbd72616f54d453f5161c1fc08bf5497ba87abc12e5e8e7df
 EBUILD swi-prolog-8.4.1.ebuild 3177 BLAKE2B 2c3984b0a9aff83643922c5d8ad4beaab21a6ddcf6cd4090e23ad4a770d104e6d3f2f75c9d4bf910e720e23eb5e1f73ae999c5dc7012c2b0ddd660171478f9c2 SHA512 488763c483a760a468319742bca8df6135dbb8f754176dfc21b337d051c48f42d7ceddb210bddaaa3a599d5b162a474694bfbb8a68f16d146496d1d087ec9c29
-EBUILD swi-prolog-8.4.2.ebuild 3180 BLAKE2B f9d06ab1789f4226cf8f885ccd7363cfd571d7e42e762fef8c2c293745b322e0916af369319c84ba8c3b5f800ba3f2efd49149bb13a0fed3062353182ce24cd2 SHA512 0b558a58d7c12e9f2c4a6e30239fb44d0ae1661f0e5ee9df30129788e94e335d31367183cfbee2de63dd9a6aebf46e23c1f86822551b1e8343de51f8dbe04d5c
-EBUILD swi-prolog-8.5.10.ebuild 3191 BLAKE2B 4a7e883cb444a54f71acd8fa37bdef88b900c0dcaa948a9429ea1d320cb650c1fa381a0780570f69e96eeb341f20d54ec4715700aa645255c5d140c6dcc798bd SHA512 efb05a84a5876bda9c55970f98b3a0195fa34a495e1c7b16d6058d18c9ac1091e01e975f0fc00d3416b84bcfdc086268e5e3c206fdbcf49e546a921bcbf47785
-EBUILD swi-prolog-8.5.7.ebuild 3179 BLAKE2B 4b173dd107ec5141d8a3bbc4175363deae9bf4598bc21020b9c74879a87cd554e1221ffc778ec8b50ba746ecd3536b14110ea67d1d8f70471d3de86073568b4c SHA512 0d01e1af08c63925a9487ebcec31e207febf63a2caf83a6ce1385bf6948ae7d1f3fb0c14d22ed3e4032c5e11b09954a68bcecac2c03263f3cb243ed5ab8f93a1
-EBUILD swi-prolog-8.5.8.ebuild 3179 BLAKE2B 4b173dd107ec5141d8a3bbc4175363deae9bf4598bc21020b9c74879a87cd554e1221ffc778ec8b50ba746ecd3536b14110ea67d1d8f70471d3de86073568b4c SHA512 0d01e1af08c63925a9487ebcec31e207febf63a2caf83a6ce1385bf6948ae7d1f3fb0c14d22ed3e4032c5e11b09954a68bcecac2c03263f3cb243ed5ab8f93a1
-EBUILD swi-prolog-8.5.9.ebuild 3179 BLAKE2B 4b173dd107ec5141d8a3bbc4175363deae9bf4598bc21020b9c74879a87cd554e1221ffc778ec8b50ba746ecd3536b14110ea67d1d8f70471d3de86073568b4c SHA512 0d01e1af08c63925a9487ebcec31e207febf63a2caf83a6ce1385bf6948ae7d1f3fb0c14d22ed3e4032c5e11b09954a68bcecac2c03263f3cb243ed5ab8f93a1
+EBUILD swi-prolog-8.4.2.ebuild 3250 BLAKE2B 7f9187ceaa1e9321b65451ccd79ca4840d9eeea297af79d8ddf8f1e54bd69a6abf37e9cda66ab991345d0c5802833a34f1381b7fc28f542645fa59854a71b489 SHA512 1863da90675ec911ae3a9c5d66d618a2aa12ea324d2e928873a313c8b2842330bf5657ab25fc74137af64826635fc2035ca1f0d565eb806ac6c37275c433d48c
+EBUILD swi-prolog-8.5.11.ebuild 3191 BLAKE2B 4a7e883cb444a54f71acd8fa37bdef88b900c0dcaa948a9429ea1d320cb650c1fa381a0780570f69e96eeb341f20d54ec4715700aa645255c5d140c6dcc798bd SHA512 efb05a84a5876bda9c55970f98b3a0195fa34a495e1c7b16d6058d18c9ac1091e01e975f0fc00d3416b84bcfdc086268e5e3c206fdbcf49e546a921bcbf47785
+EBUILD swi-prolog-8.5.12.ebuild 3249 BLAKE2B a0fee95fa73564d28ca8fdba9293ab89d6abb64c029f9166a181aee4c4adf0afba0bda99cac671b1b61c564f0cb4fac2cc8941010e38384cc63dfdef37fe82da SHA512 df2624efb0fc37a7a445860c62599bbc615eb4b3e90b172b0721985be178e851e0ff81ee0c8dd1adab061a122ab9bdd5408b0d5be13e821ca73e14bc1c5fd847
 MISC metadata.xml 420 BLAKE2B 9818164553dd7e47db556eebaa71cabc54621317465c3ef09a0fae22259c9d20bede548a61ffa383e9df8eaf6efa6b5ac800d49b1ee5cae3691d0112ed4a2a30 SHA512 6ce90a29c77852e822d5c35c4a1b0b4a093cb90070656b06b09337c57f00fb6ff42ae3c8178a22bee17ffcec8f40ea4ed6c9d0cecf4afe74e01b3389479fa4ff
diff --git a/dev-lang/swi-prolog/swi-prolog-8.4.2.ebuild b/dev-lang/swi-prolog/swi-prolog-8.4.2.ebuild
index 9dbcae6473d2..fc8d61141e4d 100644
--- a/dev-lang/swi-prolog/swi-prolog-8.4.2.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-8.4.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake desktop xdg-utils flag-o-matic toolchain-funcs
+inherit cmake desktop xdg-utils flag-o-matic toolchain-funcs java-pkg-opt-2
 
 PATCHSET_VER="0"
 
@@ -35,7 +35,7 @@ RDEPEND="sys-libs/ncurses:=
 		dev-qt/qtgui:5
 	)
 	X? (
-		virtual/jpeg:0
+		media-libs/libjpeg-turbo:=
 		x11-libs/libX11
 		x11-libs/libXft
 		x11-libs/libXinerama
@@ -53,6 +53,10 @@ BDEPEND="virtual/pkgconfig"
 
 S="${WORKDIR}/swipl-${PV}"
 
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+}
+
 src_prepare() {
 	if [[ -d "${WORKDIR}"/${PV} ]] ; then
 		eapply "${WORKDIR}"/${PV}
diff --git a/dev-lang/swi-prolog/swi-prolog-8.5.10.ebuild b/dev-lang/swi-prolog/swi-prolog-8.5.11.ebuild
index e85926dc78a4..e85926dc78a4 100644
--- a/dev-lang/swi-prolog/swi-prolog-8.5.10.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-8.5.11.ebuild
diff --git a/dev-lang/swi-prolog/swi-prolog-8.5.7.ebuild b/dev-lang/swi-prolog/swi-prolog-8.5.12.ebuild
index f1f52dee9349..02c3df8f53e6 100644
--- a/dev-lang/swi-prolog/swi-prolog-8.5.7.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-8.5.12.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake desktop xdg-utils flag-o-matic toolchain-funcs
+inherit cmake desktop xdg-utils flag-o-matic toolchain-funcs java-pkg-opt-2
 
 PATCHSET_VER="0"
 
@@ -35,7 +35,7 @@ RDEPEND="sys-libs/ncurses:=
 		dev-qt/qtgui:5
 	)
 	X? (
-		virtual/jpeg:0
+		media-libs/libjpeg-turbo:=
 		x11-libs/libX11
 		x11-libs/libXft
 		x11-libs/libXinerama
@@ -53,6 +53,10 @@ BDEPEND="virtual/pkgconfig"
 
 S="${WORKDIR}/swipl-${PV}"
 
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+}
+
 src_prepare() {
 	if [[ -d "${WORKDIR}"/${PV} ]] ; then
 		eapply "${WORKDIR}"/${PV}
diff --git a/dev-lang/swi-prolog/swi-prolog-8.5.8.ebuild b/dev-lang/swi-prolog/swi-prolog-8.5.8.ebuild
deleted file mode 100644
index f1f52dee9349..000000000000
--- a/dev-lang/swi-prolog/swi-prolog-8.5.8.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# 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
-}
diff --git a/dev-lang/swi-prolog/swi-prolog-8.5.9.ebuild b/dev-lang/swi-prolog/swi-prolog-8.5.9.ebuild
deleted file mode 100644
index f1f52dee9349..000000000000
--- a/dev-lang/swi-prolog/swi-prolog-8.5.9.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# 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
-}