gentoo resync : 10.02.2019

3 files changed, 246 insertions, 49 deletions

diff --git a/dev-lang/xsb/Manifest b/dev-lang/xsb/Manifest
index 6764f0fa6528..f83b9eec2d8b 100644
--- a/dev-lang/xsb/Manifest
+++ b/dev-lang/xsb/Manifest
@@ -2,6 +2,7 @@ DIST XSB360.tar.gz 12842882 BLAKE2B 734d17a05eb9cb79906a98a77a6562a9445603a88452
 DIST XSB370.tar.gz 12322913 BLAKE2B 64db80704ce656bfaa402d161a94c7b1cd3119a363e848b2c7768665df580b25f1fc43b49b381960d9049d947590b7eb3c846c1a2d6b8a1233d8eb2c4de04f7e SHA512 e2c11b0e5fbbffc2fb6d493e39b7dd74de43509ea1c844f1b3e5d1002c116d6fb8b245905b7b512499e40765a6603d4bef883052bdeec4a3078011c305f85a9f
 DIST xsb-3.6.0-gentoo-patchset-4.tar.gz 7513 BLAKE2B cf846dc94e0f1194f5da381b888f4ce6476a4e861cb23e6dca87b0cd2c0ea24c4290ea080432d2c5440f7350cf0862c7fc34e303a8dfe824e2e3e06f29aa4815 SHA512 bb7ba7836fa2df7a54fd2837b4cb760f7ae0e9511bc0a4b2be8cba89ed4aeedda6712937a4748bd9e9ee16366d442fd962a121dbf83017e2199eb3a287efb1d5
 DIST xsb-3.7.0-gentoo-patchset-3.tar.gz 5636 BLAKE2B f7b66131d3f02fd75e8b6019f8e64cb6f531155116364da432df41a8f7b3ba2b8d300f7b64bbcae7a755478c6aeb637b36457b491998c88457a96b64e5ecb46e SHA512 bee6d62b900c9ee3a373dfa0ad7362b18c748bb9e0559a878534ed517067d753e1fa79277b0588133a1eeceafcd56b4dcc9ff81892309f6c6666150baaaaf047
+EBUILD xsb-3.6.0-r1.ebuild 3719 BLAKE2B 3f9ad681420e551346f3d75172e5a1c1bafce0a232d3c5fe2eca73e2c39ed01e82768bac93b6ca79712fe362a9f4c48c4a44daf3461d0aa1a0658a521bd89494 SHA512 52d15ea7b41a1dfca4b12a559a90ba0dab170eb40ec9ac7f6f4cc290396ecb4276b85866fef9dc5fefe20b680a5f282193e876bf1f08ff713d29fbe31064b5d2
 EBUILD xsb-3.6.0.ebuild 4198 BLAKE2B b4c03a359d2255d3eb6443fd53aea2ae4d7c5f4852110a49fde079e510dea4d5d618bc1a1a2006fbd8c715b9658bb9d8ee3e28d79b3c79e4d2148437c674a5cf SHA512 2c6bb4e577457fa658a63b15b6930bd512d38a5250d4725aa9ac2e0446a7e55ea69d6d96c1d71415615fb818796979bc1d19fd17a662b76b89d8e429572c2755
-EBUILD xsb-3.7.0.ebuild 4244 BLAKE2B 1bfee1b2d088cedda1e70e2c633e68ed99c92ae8461740844c129a57cf14fc4bab58de06098bb7d212078cbb8424d295fd2b46f19442f81c54c4b42d98f21078 SHA512 c414b73a696e2677dffcfb70ef69d18d1b66a7bda214091a16214f30b2d3a0759bef3503a73995b5b8fcad1804fd12f2cbbeac14dc8385beb4da532d67e90fd2
+EBUILD xsb-3.7.0-r1.ebuild 3662 BLAKE2B 51219153887a0702feac12dae98ef326a65ec524a32395ec55576c3c1c1ba08031d068b268bf787863b1d2961a82ee15610d4d6dbdf1aa83a0b442c44a604c28 SHA512 146fc16485c95f4b4bcd7ee8735edec39ee76347b9f6b5b8d7690e545ebdfcac141b3cb1ee08067597f815fde6c3c4deee0faffc8e99431a253ab10802420010
 MISC metadata.xml 313 BLAKE2B e6feaeb68ae7144def50a0dff4671b3a9ff070be4d447d45e5b8fbab61940026a5ea9d13c54fb21a808ed67630debf2f55e44d9186e83ea094b26dccab3bf1e6 SHA512 e271dc66bb407abe43ebc5b1fc27c318cc8082b4b14f43f1c33f3453e4a248c83ba2fcc73ba32a63828e172093a00b507f81c629d022799c4cd5a14417fc5ef0
diff --git a/dev-lang/xsb/xsb-3.6.0-r1.ebuild b/dev-lang/xsb/xsb-3.6.0-r1.ebuild
new file mode 100644
index 000000000000..b33ce06c15cd
--- /dev/null
+++ b/dev-lang/xsb/xsb-3.6.0-r1.ebuild
@@ -0,0 +1,199 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P="XSB${PV//./}"
+
+PATCHSET_VER="4"
+
+inherit autotools java-pkg-opt-2
+
+DESCRIPTION="XSB is a logic programming and deductive database system"
+HOMEPAGE="http://xsb.sourceforge.net"
+SRC_URI="http://xsb.sourceforge.net/downloads/${MY_P}.tar.gz
+	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="curl debug iodbc java mysql odbc pcre threads xml"
+
+RDEPEND="curl? ( net-misc/curl )
+	iodbc? ( dev-db/libiodbc )
+	java? ( >=virtual/jdk-1.4:= )
+	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
+}
+
+src_configure() {
+	cd "${S}"/build
+
+	econf \
+		--prefix=/usr/$(get_libdir) \
+		--disable-optimization \
+		--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 ; then
+		cd "${S}"/packages/dbdrivers/mysql
+		econf --with-mysql-libdir=$(mysql_config --variable=pkglibdir)
+	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 ; 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 odbc ; then
+		insinto ${PACKAGES}/dbdrivers
+		doins dbdrivers/*.xwam
+		doins dbdrivers/*.H
+		insinto ${PACKAGES}/dbdrivers/cc
+		doins dbdrivers/cc/*.H
+		if use mysql ; 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
+}
diff --git a/dev-lang/xsb/xsb-3.7.0.ebuild b/dev-lang/xsb/xsb-3.7.0-r1.ebuild
index 8bd4db509d01..983c93a7be46 100644
--- a/dev-lang/xsb/xsb-3.7.0.ebuild
+++ b/dev-lang/xsb/xsb-3.7.0-r1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 MY_P="XSB${PV//./}"
 
 PATCHSET_VER="3"
 
-inherit eutils autotools java-pkg-opt-2
+inherit autotools java-pkg-opt-2
 
 DESCRIPTION="XSB is a logic programming and deductive database system"
 HOMEPAGE="http://xsb.sourceforge.net"
@@ -22,7 +22,7 @@ IUSE="curl debug iodbc java mysql odbc pcre threads xml"
 RDEPEND="curl? ( net-misc/curl )
 	iodbc? ( dev-db/libiodbc )
 	java? ( >=virtual/jdk-1.4:= )
-	mysql? ( virtual/mysql )
+	mysql? ( dev-db/mysql-connector-c:0= )
 	odbc? ( dev-db/unixODBC )
 	pcre? ( dev-libs/libpcre )
 	xml? ( dev-libs/libxml2 )"
@@ -31,13 +31,10 @@ DEPEND="${RDEPEND}"
 
 S="${WORKDIR}"/XSB
 
-src_prepare() {
-	EPATCH_FORCE=yes
-	EPATCH_SUFFIX=patch
-	if [[ -d "${WORKDIR}"/${PV} ]] ; then
-		epatch "${WORKDIR}"/${PV}
-	fi
+PATCHES=( "${WORKDIR}/${PV}" )
 
+src_prepare() {
+	default
 	cd "${S}"/build
 	eautoconf
 }
@@ -83,120 +80,120 @@ src_configure() {
 src_compile() {
 	cd "${S}"/build
 
-	emake || die "emake failed"
+	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 || die "emake packages failed"
+	emake -j1
 
 	if use curl ; then
-		emake -j1 curl || die "emake curl package failed"
-		emake -j1 sgml || die "emake sgml package failed"
+		emake -j1 curl
+		emake -j1 sgml
 		if use xml ; then
-			emake -j1 xpath || die "emake xpath package failed"
+			emake -j1 xpath
 		fi
 	fi
 
 	if use mysql ; then
-		emake -j1 mysql || die "emake mysql package failed"
+		emake -j1 mysql
 	fi
 
 	if use odbc ; then
-		emake -j1 odbc || die "emake odbc package failed"
+		emake -j1 odbc
 	fi
 
 	if use pcre ; then
-		emake -j1 pcre || die "emake pcre package failed"
+		emake -j1 pcre
 	fi
 }
 
 src_install() {
 	cd "${S}"/build
-	emake DESTDIR="${D}" install || die "make install failed"
+	default
 
 	local XSB_INSTALL_DIR=/usr/$(get_libdir)/xsb-${PV}
-	dosym ${XSB_INSTALL_DIR}/bin/xsb /usr/bin/xsb || die
+	dosym ${XSB_INSTALL_DIR}/bin/xsb /usr/bin/xsb
 
 	cd "${S}"/packages
 	local PACKAGES=${XSB_INSTALL_DIR}/packages
 	insinto ${PACKAGES}
-	doins *.xwam || die
+	doins *.xwam
 
 	insinto ${PACKAGES}/chr
-	doins chr/*.xwam || die
+	doins chr/*.xwam
 
 	insinto ${PACKAGES}/clpqr
-	doins clpqr/*.xwam || die
+	doins clpqr/*.xwam
 
 	insinto ${PACKAGES}/gap
-	doins gap/*.xwam || die
+	doins gap/*.xwam
 
 	insinto ${PACKAGES}/justify
-	doins justify/*.xwam || die
-	doins justify/*.H || die
+	doins justify/*.xwam
+	doins justify/*.H
 
 	insinto ${PACKAGES}/regmatch
-	doins regmatch/*.xwam || die
+	doins regmatch/*.xwam
 	insinto ${PACKAGES}/regmatch/cc
-	doins regmatch/cc/*.H || die
+	doins regmatch/cc/*.H
 
 	insinto ${PACKAGES}/slx
-	doins slx/*.xwam || die
+	doins slx/*.xwam
 
 	insinto ${PACKAGES}/wildmatch
-	doins wildmatch/*.xwam || die
+	doins wildmatch/*.xwam
 	insinto ${PACKAGES}/wildmatch/cc
-	doins wildmatch/cc/*.H || die
+	doins wildmatch/cc/*.H
 
 	if use curl ; then
 		insinto ${PACKAGES}/curl
-		doins curl/*.xwam || die
+		doins curl/*.xwam
 		insinto ${PACKAGES}/curl/cc
-		doins curl/cc/*.H || die
+		doins curl/cc/*.H
 		insinto ${PACKAGES}/sgml
-		doins sgml/*.xwam || die
+		doins sgml/*.xwam
 		insinto ${PACKAGES}/sgml/cc
-		doins sgml/cc/*.H || die
+		doins sgml/cc/*.H
 		insinto ${PACKAGES}/sgml/cc/dtd
-		doins sgml/cc/dtd/* || die
+		doins sgml/cc/dtd/*
 		if use xml ; then
 			insinto ${PACKAGES}/xpath
-			doins xpath/*xwam || die
+			doins xpath/*xwam
 			insinto ${PACKAGES}/xpath/cc
-			doins xpath/cc/*.H || die
+			doins xpath/cc/*.H
 		fi
 	fi
 
 	if use mysql || use odbc ; then
 		insinto ${PACKAGES}/dbdrivers
-		doins dbdrivers/*.xwam || die
-		doins dbdrivers/*.H || die
+		doins dbdrivers/*.xwam
+		doins dbdrivers/*.H
 		insinto ${PACKAGES}/dbdrivers/cc
-		doins dbdrivers/cc/*.H || die
+		doins dbdrivers/cc/*.H
 		if use mysql ; then
 			insinto ${PACKAGES}/dbdrivers/mysql
-			doins dbdrivers/mysql/*.xwam || die
+			doins dbdrivers/mysql/*.xwam
 			insinto ${PACKAGES}/dbdrivers/mysql/cc
-			doins dbdrivers/mysql/cc/*.H || die
+			doins dbdrivers/mysql/cc/*.H
 		fi
 		if use odbc ; then
 			insinto ${PACKAGES}/dbdrivers/odbc
-			doins dbdrivers/odbc/*.xwam || die
+			doins dbdrivers/odbc/*.xwam
 			insinto ${PACKAGES}/dbdrivers/odbc/cc
-			doins dbdrivers/odbc/cc/*.H || die
+			doins dbdrivers/odbc/cc/*.H
 		fi
 	fi
 
 	if use pcre ; then
 		insinto ${PACKAGES}/pcre
-		doins pcre/*.xwam || die
+		doins pcre/*.xwam
 		insinto ${PACKAGES}/pcre/cc
-		doins pcre/cc/*.H || die
+		doins pcre/cc/*.H
 	fi
 
 	cd "${S}"
-	dodoc FAQ README || die
+	dodoc FAQ README
 }