4 files changed, 222 insertions, 4 deletions
diff --git a/dev-lang/xsb/Manifest b/dev-lang/xsb/Manifest
index e1456d0e5f68..a5ab438def10 100644
--- a/dev-lang/xsb/Manifest
+++ b/dev-lang/xsb/Manifest
@@ -1,4 +1,7 @@
+DIST XSB-4-0-0.tar.gz 15340635 BLAKE2B 4832185a64c6c5786ae78e111c25cd3a5ffc2f80aec9c0c83f030ead482868c77b0d7abbfdf0d113b56fea395eb7e69ca2970a82ea70004fb78c0bf4de258a9d SHA512 fed1e0db4874db2508e0c1e716be20cbfbc4f7ed4c16e0b220750cfb3dfceb78bbdce0f8564b68c400af1bc2b8f9e3b35014e8849bba1705bddfab824f41e816
 DIST XSB38.tar.gz 13830570 BLAKE2B 60a6ab38435348d09e2d08bc65ca62c06b38495b72f40a6f3f10fe8d23949bfed0c580c9be0c8304d8a88a53b227bb695870b558d67f33a47543de6c1529180f SHA512 457c691450afcf3ed4e2fffc28deaef0949ef4bbf6fd69b504acc6507fbb144f2c6e427a25da2b6346b15b82e803c02d1b6962af698d16c1fcb9a3d56160ea30
-DIST xsb-3.8.0-gentoo-patchset-4.tar.gz 7373 BLAKE2B d34925e314c2b4726cdb1d5d6256f9ce5f0e9dbba408e77d1383ba72c6499be601fbd93f2ad20ef30e5df965016dd377bffed3dd3aba9f8256d8c4b57afd12d8 SHA512 8fcdaa3b2cafbd4e3b91fd1dc5c00b2986158a17968cfbffba263acd0752bdb76e342256b92f691c40d535a6f2f1c8632bbf8b095691fced55d18a67080ef559
-EBUILD xsb-3.8.0.ebuild 3684 BLAKE2B 1067cedf1dc55b9fc39ce7ca18de41bb5b41f5a14e66f3d3c07a9c686f08aadd94f737d6a90bd50b9cdc0972dd9aa297b910bed9bbfb1e02cdb6c3f5515b8f64 SHA512 8f2cdd6f45e4cfb031a45134a3cb4712f29af9feb7658a7effd62eaee3e49e07c524681ee5d62b8af074668877b3c09558162f6dbd360c2cdc7a036343581e64
-MISC metadata.xml 313 BLAKE2B e6feaeb68ae7144def50a0dff4671b3a9ff070be4d447d45e5b8fbab61940026a5ea9d13c54fb21a808ed67630debf2f55e44d9186e83ea094b26dccab3bf1e6 SHA512 e271dc66bb407abe43ebc5b1fc27c318cc8082b4b14f43f1c33f3453e4a248c83ba2fcc73ba32a63828e172093a00b507f81c629d022799c4cd5a14417fc5ef0
+DIST xsb-3.8.0-gentoo-patchset-5.tar.gz 7748 BLAKE2B 291beb7a2bf567708119eb200e06fd0d6ac976b5eaea9646d9b5fe9fe67908e01f48b1e55e36fc98f7fe75ee4b654422bc0f9c565e00ac75fe36cccd0439bc2b SHA512 cd3762545bb0b0c5532607741f5946658cacf062c21913c8261988a2162ab848d860ae5a0d11d7a4b8b36994f7fbc91c6e6b4fa607e8cc6ebed434dbf421dec1
+DIST xsb-4.0.0-gentoo-patchset-1.tar.gz 10284 BLAKE2B d31322bb3072e806a000bee137d1a6b89d6d555da9de1b24f4a319cbe6a6bf6bd097a1ec8b831fc50a5bb820c121ea197127248e2206719082ceead8d6b5ad24 SHA512 d904741d2deb49e613501affd1a02adf5a6449edba79e92efd8b18227c274f4bc9385932894b11abc7a714e56511d41d828871b4dd0a10f59ef53b9119ecba1b
+EBUILD xsb-3.8.0.ebuild 3684 BLAKE2B f3cb8e31a72ba410cbd38ca3da137097bca0fa5bce2799d47b848a12c32dbd4918cbdc440df570833ff377b85c565ff8417d7d244a7421989508df4ae2c837a3 SHA512 bec9a89c10256988a9ab42ebd75ee25fab4acf0eb3cf08614e6644e6dee8c49e3d95c77095fcd31fbd017b3c53a337d30efa418a4129570b8d2c2268704d8250
+EBUILD xsb-4.0.0.ebuild 4170 BLAKE2B edbd405f53a2dc1cbb982cc67dc6853588fcbba53f4c0f561dd902e3ccc89ffe80323dc15ecae1b411372aefbed5bc3a613b97377fe1cd0a8553caae487097ac SHA512 0f10e9b051eb2f37a686d6b0a79abd21f672eb13806d2c33a26e689759554874c4b6320a841823a5521b99a2689747eeb1768c353dc5eeeba1bfcba34ebc7579
+MISC metadata.xml 406 BLAKE2B 6fe5156e6490f7b53a7fdea57bf5d07d3122be79d0a24bb462b6bdc46bd5206a195526c46bfc7311822988e82df46aa9a328cb2eee289d786120b160800c3dbc SHA512 d5d676b6f4d39acfcc17ac2e3601608566e92ac0cfdc071a1606acd7eafa73024d57a07ef7dc009c2e373825552f659befc84c975502f832e588379748ee287b
diff --git a/dev-lang/xsb/metadata.xml b/dev-lang/xsb/metadata.xml
index cabb7385917b..b10e89771921 100644
--- a/dev-lang/xsb/metadata.xml
+++ b/dev-lang/xsb/metadata.xml
@@ -8,4 +8,7 @@
 	<upstream>
 		<remote-id type="sourceforge">xsb</remote-id>
 	</upstream>
+	<use>
+		<flag name="mariadb">Enable support for the mariadb database backend</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-lang/xsb/xsb-3.8.0.ebuild b/dev-lang/xsb/xsb-3.8.0.ebuild
index 8740043421f3..7ab720531788 100644
--- a/dev-lang/xsb/xsb-3.8.0.ebuild
+++ b/dev-lang/xsb/xsb-3.8.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PATCHSET_VER="4"
+PATCHSET_VER="5"
 
 inherit autotools java-pkg-opt-2
 
diff --git a/dev-lang/xsb/xsb-4.0.0.ebuild b/dev-lang/xsb/xsb-4.0.0.ebuild
new file mode 100644
index 000000000000..ade1cadd4b35
--- /dev/null
+++ b/dev-lang/xsb/xsb-4.0.0.ebuild
@@ -0,0 +1,212 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PATCHSET_VER="1"
+
+inherit autotools java-pkg-opt-2
+
+DESCRIPTION="XSB is a logic programming and deductive database system"
+HOMEPAGE="http://xsb.sourceforge.net"
+SRC_URI="mirror://sourceforge/xsb/XSB-4-0-0.tar.gz
+	https://dev.gentoo.org/~keri/distfiles/xsb/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="curl debug iodbc java mariadb mysql odbc pcre threads xml"
+
+RDEPEND="curl? ( net-misc/curl )
+	iodbc? ( dev-db/libiodbc )
+	java? ( >=virtual/jdk-1.8:* )
+	mariadb? ( dev-db/mariadb-connector-c:= )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	odbc? ( dev-db/unixODBC )
+	pcre? ( dev-libs/libpcre )
+	xml? ( dev-libs/libxml2 )"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/XSB
+
+PATCHES=( "${WORKDIR}/${PV}" )
+
+src_prepare() {
+	default
+	cd "${S}"/build
+	eautoconf
+
+	if use mariadb ; then
+		sed -i \
+			-e "s:mysqlclient:mariadb:" \
+			-e "s:mysql_config:mariadb_config:" \
+			"${S}"/packages/dbdrivers/mysql/configure \
+			"${S}"/packages/dbdrivers/mysql/mysql_driver_config.P
+	fi
+
+	find "${S}"/packages -name Installation_summary \
+		| xargs rm -f || die
+}
+
+src_configure() {
+	cd "${S}"/build
+
+	econf \
+		--prefix=/usr/$(get_libdir) \
+		--disable-optimization \
+		--disable-ccmpl \
+		--without-smodels \
+		$(use_with odbc) \
+		$(use_with iodbc) \
+		$(use_enable threads mt) \
+		$(use_enable debug)
+
+	if use curl ; then
+		cd "${S}"/packages/curl
+		econf
+	fi
+
+	if use mysql || use mariadb ; then
+		local impl=$(usex mariadb mariadb mysql)
+		cd "${S}"/packages/dbdrivers/mysql
+		econf \
+			--with-mysql-incdir=/usr/include/${impl}
+	fi
+
+	if use odbc ; then
+		cd "${S}"/packages/dbdrivers/odbc
+		econf
+	fi
+
+	if use pcre ; then
+		cd "${S}"/packages/pcre
+		econf
+	fi
+
+	if use xml ; then
+		cd "${S}"/packages/xpath
+		econf
+	fi
+}
+
+src_compile() {
+	cd "${S}"/build
+
+	default
+
+	# All XSB Packages are compiled using a single Prolog engine.
+	# Consequently they must all be compiled using a single make job.
+
+	cd "${S}"/packages
+	rm -f *.xwam
+	emake -j1
+
+	if use curl ; then
+		emake -j1 curl
+		emake -j1 sgml
+		if use xml ; then
+			emake -j1 xpath
+		fi
+	fi
+
+	if use mysql || use mariadb ; then
+		emake -j1 mysql
+	fi
+
+	if use odbc ; then
+		emake -j1 odbc
+	fi
+
+	if use pcre ; then
+		emake -j1 pcre
+	fi
+}
+
+src_install() {
+	cd "${S}"/build
+	default
+
+	local XSB_INSTALL_DIR=/usr/$(get_libdir)/xsb-${PV}
+	dosym ${XSB_INSTALL_DIR}/bin/xsb /usr/bin/xsb
+
+	cd "${S}"/packages
+	local PACKAGES=${XSB_INSTALL_DIR}/packages
+	insinto ${PACKAGES}
+	doins *.xwam
+
+	insinto ${PACKAGES}/chr
+	doins chr/*.xwam
+
+	insinto ${PACKAGES}/clpqr
+	doins clpqr/*.xwam
+
+	insinto ${PACKAGES}/gap
+	doins gap/*.xwam
+
+	insinto ${PACKAGES}/justify
+	doins justify/*.xwam
+	doins justify/*.H
+
+	insinto ${PACKAGES}/regmatch
+	doins regmatch/*.xwam
+	insinto ${PACKAGES}/regmatch/cc
+	doins regmatch/cc/*.H
+
+	insinto ${PACKAGES}/slx
+	doins slx/*.xwam
+
+	insinto ${PACKAGES}/wildmatch
+	doins wildmatch/*.xwam
+	insinto ${PACKAGES}/wildmatch/cc
+	doins wildmatch/cc/*.H
+
+	if use curl ; then
+		insinto ${PACKAGES}/curl
+		doins curl/*.xwam
+		insinto ${PACKAGES}/curl/cc
+		doins curl/cc/*.H
+		insinto ${PACKAGES}/sgml
+		doins sgml/*.xwam
+		insinto ${PACKAGES}/sgml/cc
+		doins sgml/cc/*.H
+		insinto ${PACKAGES}/sgml/cc/dtd
+		doins sgml/cc/dtd/*
+		if use xml ; then
+			insinto ${PACKAGES}/xpath
+			doins xpath/*xwam
+			insinto ${PACKAGES}/xpath/cc
+			doins xpath/cc/*.H
+		fi
+	fi
+
+	if use mysql || use mariadb || use odbc ; then
+		insinto ${PACKAGES}/dbdrivers
+		doins dbdrivers/*.xwam
+		doins dbdrivers/*.H
+		insinto ${PACKAGES}/dbdrivers/cc
+		doins dbdrivers/cc/*.H
+		if use mysql || use mariadb ; then
+			insinto ${PACKAGES}/dbdrivers/mysql
+			doins dbdrivers/mysql/*.xwam
+			insinto ${PACKAGES}/dbdrivers/mysql/cc
+			doins dbdrivers/mysql/cc/*.H
+		fi
+		if use odbc ; then
+			insinto ${PACKAGES}/dbdrivers/odbc
+			doins dbdrivers/odbc/*.xwam
+			insinto ${PACKAGES}/dbdrivers/odbc/cc
+			doins dbdrivers/odbc/cc/*.H
+		fi
+	fi
+
+	if use pcre ; then
+		insinto ${PACKAGES}/pcre
+		doins pcre/*.xwam
+		insinto ${PACKAGES}/pcre/cc
+		doins pcre/cc/*.H
+	fi
+
+	cd "${S}"
+	dodoc FAQ README
+}