gentoo resync : 14.05.2020

4 files changed, 111 insertions, 9 deletions

diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest
index 8afdb21cfdbe..c3b878dff7c9 100644
--- a/dev-lang/swi-prolog/Manifest
+++ b/dev-lang/swi-prolog/Manifest
@@ -1,7 +1,9 @@
 DIST swipl-8.0.3.tar.gz 10418553 BLAKE2B d7d381a3070384164f9788060e1c431cc4658dd3e2144fc4c186c9f5395fb7356593766dcaff3ff424f19f917c8a4b56da31b019bd2206a7f794ece549043b76 SHA512 e3a0788befb5499be6f70524ef398dc3282a38891f20519dd23ec92f216fc1919a76656e4b648c3dc9d94e578dc2663439ff976eb52ca0dba5a6594f8d4d3037
-DIST swipl-8.1.25.tar.gz 10896679 BLAKE2B 69c20e02d59d25d317f1d4c339b430af8faa7d9027e91a5224eeb13ffc6b92a0eb08b9ff8602f17e449410da4cd007c59b08f43f29049f0b475004bebde6f65b SHA512 f034ae521da9d27d9c8681a3b9404047b61c77449d6257fea599b3ba0a5ba572b559f0dcd2653ebbf70eb7588bbf99d3d43149411e373a346d27e16c620fe638
-DIST swipl-8.1.26.tar.gz 10893132 BLAKE2B 7ddaec9a292e454bd5ceefbbd00d489ae3669be66ba7237a0788b4c714910f49dac9f659a52c715075b91dd638f0590efb0234b8c88cbe2090ceb735faf38a9a SHA512 a89a09f2958182f05ebec161ec5b271664fe9dc0cbc29bb3246ea6418b4ba5fa2a0542ad5448c3f4d7dda080cd8575391b856e04ca01eb41907e00a194d8e502
+DIST swipl-8.1.27.tar.gz 10911864 BLAKE2B d65dfe1103fd82adfbb81251c45b085c70d7c494ca0f484dc2d14b74658418272d679107981ac04814f1151ef5c71ec1d68176ae792540936c2047572e521e21 SHA512 f5cc8ed07c28a3f6a67213f66647e0e8fef80fd31871852283ac99d4b137da560734c8f0cf6c12563b0576f8fce8def752caa2b9f84619ca8a8c11d42c5949b9
+DIST swipl-8.1.28.tar.gz 10905268 BLAKE2B 91d2838b74384a78f32649a84c64aa0d9c66495bd45c6729f15e7a8f894521996827da792eb5449f78ed3778722426a02aad54221f3bea5d505b1e639cefe300 SHA512 0ea387aaabcc028362ee42a87b72237b59f6ddc8fccadeef81f0480136a6b8492a7420a3209ef7501425fa16fd362915c7d828a6f1bd3ff84b537ecba802ade7
+DIST swipl-8.1.29.tar.gz 10902999 BLAKE2B 2163cbe4ce772fc0ba8dc961aabf5d3940e0b735bb4688050041d8bcbe6c052d5308696cbbcec49ecc100db44faa960fd8520d89a934f9b05994170c5fab5bff SHA512 0aeaa093a0cc39375b25f2ac642dec99c50aad82c5fa0069be6c5c7bf3ba53deb20e4c887e47649874305e91e7c963bab2515ab8a48db6cdfae6e4560aee063f
 EBUILD swi-prolog-8.0.3.ebuild 2490 BLAKE2B edc287a8138d4d5e1c1638e316a860aded0a514a76b3b4e66d03977ba277ed280523544a2c6b8187ffb8f3f67035a475e2de80e0bce333dddcab385b06797eb4 SHA512 1c689254578253eb4f138f0ee2f498690c280148c6b544f3995827ed4a11bc61b63e95e1bf85bd83e7ccd0939267964679cf102f7bffb072b122a521d6521a96
-EBUILD swi-prolog-8.1.25.ebuild 2593 BLAKE2B 106a52a3a29bfbc479c392f6798947c9730e87fbdc2812f662472e0acd46745fec01bd3fa1a79c7f09befaf639b9a9f50cfe49b5c4dce6b1db810b1fed2699d9 SHA512 ecac2c7e661b58a14a63d8b44e2714f88cd6e763e57e7cfc74e0220bfe522ce08757aae5188de6f23129b54853fda2f6785058ddd805fd81cbffc5533aa5f627
-EBUILD swi-prolog-8.1.26.ebuild 2553 BLAKE2B 9a4f63d674d380cbae06fd7d67432970e8c5f6f76ddbd77a2ada30dbd0cf8e6f28751cd8fd321bcdb6857a9ee99ba2f1632a8921e68c87ffc168e47ca356f73d SHA512 31745cc81c863c8062743be5960cf253e1c00173c1a11fdd0fa5d90457f94d5c8df615354275af865cd24b982372a35c6c3f45e0fb581e8b20f1183ff3610ef5
+EBUILD swi-prolog-8.1.27.ebuild 2553 BLAKE2B 9a4f63d674d380cbae06fd7d67432970e8c5f6f76ddbd77a2ada30dbd0cf8e6f28751cd8fd321bcdb6857a9ee99ba2f1632a8921e68c87ffc168e47ca356f73d SHA512 31745cc81c863c8062743be5960cf253e1c00173c1a11fdd0fa5d90457f94d5c8df615354275af865cd24b982372a35c6c3f45e0fb581e8b20f1183ff3610ef5
+EBUILD swi-prolog-8.1.28.ebuild 2553 BLAKE2B 9a4f63d674d380cbae06fd7d67432970e8c5f6f76ddbd77a2ada30dbd0cf8e6f28751cd8fd321bcdb6857a9ee99ba2f1632a8921e68c87ffc168e47ca356f73d SHA512 31745cc81c863c8062743be5960cf253e1c00173c1a11fdd0fa5d90457f94d5c8df615354275af865cd24b982372a35c6c3f45e0fb581e8b20f1183ff3610ef5
+EBUILD swi-prolog-8.1.29.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.26.ebuild b/dev-lang/swi-prolog/swi-prolog-8.1.27.ebuild
index 2293c183ae1c..2293c183ae1c 100644
--- a/dev-lang/swi-prolog/swi-prolog-8.1.26.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-8.1.27.ebuild
diff --git a/dev-lang/swi-prolog/swi-prolog-8.1.25.ebuild b/dev-lang/swi-prolog/swi-prolog-8.1.28.ebuild
index 8f4583928061..2293c183ae1c 100644
--- a/dev-lang/swi-prolog/swi-prolog-8.1.25.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-8.1.28.ebuild
@@ -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
 }
 
diff --git a/dev-lang/swi-prolog/swi-prolog-8.1.29.ebuild b/dev-lang/swi-prolog/swi-prolog-8.1.29.ebuild
new file mode 100644
index 000000000000..2293c183ae1c
--- /dev/null
+++ b/dev-lang/swi-prolog/swi-prolog-8.1.29.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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() {
+	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
+
+	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
+}