4 files changed, 7 insertions, 142 deletions
diff --git a/dev-lang/yap/Manifest b/dev-lang/yap/Manifest
index 6fa3c32b483a..11d8659d89ee 100644
--- a/dev-lang/yap/Manifest
+++ b/dev-lang/yap/Manifest
@@ -1,10 +1,7 @@
-DIST YAP-6.3.4.tar.gz 11007893 BLAKE2B d8024fb68269bbb4f9a434e2be13b4a42aa250f7e6505ef8f6e4c76d50510e04e9a2985796ce66b1d426a877646eafeecb30774c353f5a820c32dc3cbdf20b1c SHA512 67884b98bbc564f23f88cbb1462127a47f3d0602ac347d1c8b0857e5d8ebd9d0ca28770229a6beb52493c6c3256b6cdf8dad25ed2963c64102093f70c4c20a3a
 DIST yap-5bebd8e3aae655690ddf33dfb32289766910fa25.tar.gz 17378041 BLAKE2B ff474ec1edc9bab493cd441c99e3b646f786e59662a4d398f7ac0fe0039ae99ccbab3700b1d0405dcda84bd292a5101fcde63fd1471fc19cd0d1fa37d2eebe1f SHA512 b61033f0ed3994533a056ba8b0dd7f103df2707355cad7e010babbbcf9e9415b65e5b1d294b9f9698d8c61d4c399ae8c1eea0a79dcbb7c33e841ac71645433c5
-DIST yap-6.3.4-gentoo-patchset-1.tar.gz 5544 BLAKE2B ea47ebff2d51bba1fda8aa54daa0c3236b4e3d910fea222cf19bfd92b781eca726ab38f8f92a1c5d019672dda234e58053a66728b0a620db3823245a0493792c SHA512 c6ac0bfdba1747496c433a393c9828962b3097c77cba6c7daefbda9b33d61a4c838e5de752307ac3b8965fd89928a4974366fe6da066f0a8a12cccde658c0d6e
 DIST yap-7.0.1-gentoo-patchset-0.tar.gz 2390 BLAKE2B 2e7dbfe6dc8ea60c8a7ee056707e87f205076a7413d48b04f2ce1a997ce59b87d98f3f2994f93c6bb1e9933f94a02823cc729a0954739b9c38502a03894b05d8 SHA512 3f4364ab4fd887b8cfde6916257a517e7632585df9e501092ac1abc0f7f3fd7de97770a840d7279b5e89e1930b3dab0569e25636c1fb1acfc11f810c56681b45
-DIST yap-7.1.0-gentoo-patchset-1.tar.gz 3850 BLAKE2B 7d6648b6e7051bd26f9abca6ae89b1705e7e6264ee8a056d7d64764d4d378f984e1c0903ec5caabc3f7e1af96f62bcde2a51a7005da442073e04ad9ab2e46637 SHA512 e25e2140241adebafeb0b827a530428265d75eb4ead565054e412175abd3332afab708b14f66b12fb85d74b28ed314329cd13b060426af9d772636819d295aac
+DIST yap-7.1.0-gentoo-patchset-3.tar.gz 4353 BLAKE2B 90c4750517189b3492fde0afde3da587a60f5aa98138a9b0626789dd79ce76981a9278706c510f0870595613e51c7c7be296fc9195618ef7ed6d3c4977191be9 SHA512 2effb29eebdf25996b10dacb625497159c880dc3c5e58e99cdd215bf3df744e3c504262b4fe4fe3e1eea7ec2e132c68b8dbe4633ac3c625efb6343f3fe5b87c4
 DIST yap-77bb2ba5eadfb95b67abccd22b298cfb75dd3328.tar.gz 15121857 BLAKE2B 0a38a1f302108a93cdc7b31fadb44823f1660e65bf3bb1910988afe81e313e6690094550c9eb4a6cfba322cd40b0cfb5ec853b350988ca123507fda362de118d SHA512 56da8cb9e56cb23d2592ba92b0b4cbd323e491767a121ca88896d2744737bef9d4a63f3b80b36fd52b1ead84a075d270060777fef85dff3ef36403a84c96b9fb
-EBUILD yap-6.3.4-r1.ebuild 3245 BLAKE2B a9f03cdf044aad1ee30072e71cfbbb9a6895bca00b0e2646af6e5fab7b012e6b84b2f5d9940dee2f365402bd65d2963e0a380fc1945fbfee7b05c86d35549a6b SHA512 077d9ef90700b92fcbdf876fb76c1442270d6df700849604d8ba5e4795fed893b62a8957a8d98089a0eafa5a8d7af64744f21152a2e8488265f9aac6c64d7dc6
-EBUILD yap-7.0.1.ebuild 2445 BLAKE2B 100a5cd17e377448e6d6e6991a9382da58cd15a1a3842be4a03a86f3b0abab172bd8d4f7180f7222a1a5d0191900dc0bd533d29437e4e09000b0e2c3d476a3ae SHA512 e21c8a7557cfbc6c87ae9cd975e43db26a36941e042dabac8c1b5f2b1a8b959f7e6adb6076b32ff8be6e680d36d233e37df8dab9671a95a2b6b67a9f38ed7194
-EBUILD yap-7.1.0.ebuild 2454 BLAKE2B 2a82595fd59573111989e40fe91e538c1eaf465c630ad23f5c44754abfb76021b4132d599ef299ca36b45b627d7f5d86f25310e4108f144cc376365ae1acc5b1 SHA512 5198ddfc2e10647ef82a045cf0965c909fa4c027c4de66c1e14a8a2e62fabfb16742881c12e4137476feb5bc9c420935ab00fb3adc944be7e646b43c2567495f
+EBUILD yap-7.0.1.ebuild 2443 BLAKE2B 163f5d58a5504f4b038988f1cf3b9d15f87da4809abfdc327a6a3538ee4fd929b0d5e7f09e8c0a20ab19bb0505b726e5e9b048f23e9e8ac0149168b54ce14310 SHA512 a7a09f992ee5c4ad30a728a04787c2fb0f550ae80b0d4db605a4399fc0ac3755fc41e7eb83cf29a9480839bc690ef3e3108f4d94483b389a418396f05223ed5e
+EBUILD yap-7.1.0.ebuild 2454 BLAKE2B 8cf7b1506ffff9d5fcc30e9c18e97976100b6fc899ff87015f0e9d597f05da4c43e258a7a81a0c4f297c964bc1489b8879e4a5e78ccc24bae291919baaca8e6d SHA512 effa8cc21685bbaec6596415edb1d422be485ade15ccedd364424d85c822b77683e51ab92b7bbfefee5235e0954d42e5a2f205e8cad8a97745440afdc2bc7f60
 MISC metadata.xml 389 BLAKE2B ac9f98ed97d411c1dadc014176d7514d6c4226d80340f2a0f801832f574eb78a319f7444eb2a815f5d74b6435596f5eaf2cbc3e94159d1ab4e5373f7857f2222 SHA512 6b40c043d0a685349a6cf865e6ddf4c5ad16b5a8fbe56332f5547784538d54e4df35eadf9d745710c5664bbe41365415784143c422605e8aaddeb3dd6fab163b
diff --git a/dev-lang/yap/yap-6.3.4-r1.ebuild b/dev-lang/yap/yap-6.3.4-r1.ebuild
deleted file mode 100644
index 68d25ab1d22b..000000000000
--- a/dev-lang/yap/yap-6.3.4-r1.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P=YAP-${PV}
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit cmake flag-o-matic python-r1
-
-PATCHSET_VER="1"
-
-DESCRIPTION="YAP is a high-performance Prolog compiler"
-HOMEPAGE="http://www.dcc.fc.up.pt/~vsc/Yap/"
-SRC_URI="https://github.com/vscosta/yap-6.3/archive/YAP-${PV}.tar.gz
-	https://dev.gentoo.org/~keri/distfiles/yap/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
-
-LICENSE="Artistic LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="R debug doc examples gmp java mpi mysql odbc postgres python raptor readline sqlite ssl static threads xml"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="dev-libs/libutf8proc
-	sys-libs/zlib
-	gmp? ( dev-libs/gmp:0 )
-	java? ( >=virtual/jdk-1.8:* )
-	mpi? ( virtual/mpi )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	odbc? ( dev-db/unixODBC )
-	postgres? ( dev-db/postgresql:= )
-	R? ( dev-lang/R )
-	python? ( ${PYTHON_DEPS} )
-	raptor? ( media-libs/raptor )
-	readline? ( sys-libs/readline:= sys-libs/ncurses:= )
-	sqlite? ( dev-db/sqlite )
-	ssl? ( dev-libs/openssl )
-	xml? ( dev-libs/libxml2 )"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen[dot] )
-	java? ( dev-lang/swig )
-	python? ( dev-lang/swig )"
-
-S="${WORKDIR}"/yap-6.3-${MY_P}
-
-src_prepare() {
-	if [[ -d "${WORKDIR}"/${PV} ]] ; then
-		eapply "${WORKDIR}"/${PV}
-	fi
-
-	sed -i \
-		-e "s|\(set ( libdir \"\${exec_prefix}\)/lib\")|\1/$(get_libdir)\")|" \
-		-e "s|\(set ( dlls \"\${exec_prefix}\)/lib/Yap\")|\1/$(get_libdir)/Yap\")|" \
-		-e "s|\(set ( docdir \"\${exec_prefix}/share/doc\)/Yap\")|\1/${PF}\")|" \
-		CMakeLists.txt || die
-	rm -rf "${S}"/yap || die "failed to remove yap xcode project"
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing -fcommon -fno-inline-small-functions
-
-	local mycmakeargs=(
-		-DWITH_YAP_STATIC=$(usex static)
-		-DWITH_Threads=$(usex threads)
-		-DWITH_GMP=$(usex gmp)
-		-DWITH_Readline=$(usex readline)
-		-DCMAKE_DISABLE_FIND_PACKAGE_OpenSSL=$(usex !ssl)
-		-DWITH_MPI=$(usex mpi)
-		-DWITH_ODBC=$(usex odbc)
-		-DWITH_MySQL=$(usex mysql)
-		-DWITH_PostgreSQL=$(usex postgres)
-		-DWITH_Sqlite3=$(usex sqlite)
-		-DWITH_JNI=$(usex java)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Java=$(usex !java)
-		-DWITH_PythonInterp=$(usex python)
-		-DWITH_PythonLibs=$(usex python)
-		-DWITH_SWIG=$(if use java || use python; then echo yes; else echo no; fi)
-		-DWITH_R=$(usex R)
-		-DWITH_RAPTOR=$(usex raptor)
-		-DWITH_LibXml2=$(usex xml)
-		-DWITH_DOCUMENTATION=$(usex doc)
-		-DWITH_CUDD=no
-		-DWITH_Gecode=no
-		-DWITH_Matlab=no
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-
-	if use doc ; then
-		cmake_src_compile doc
-	fi
-}
-
-src_test() {
-	# libtai package contains check.c which confuses the default
-	# src_test() function
-	true
-}
-
-src_install() {
-	cmake_src_install
-
-	dodoc changes*.html README
-
-	if use examples ; then
-		docinto examples/chr
-		dodoc packages/chr/Examples/*
-
-		if use java ; then
-			docinto examples/jpl/prolog
-			dodoc packages/jpl/jpl/examples/prolog/*
-
-			docinto examples/jpl/java
-			dodoc packages/jpl/jpl/examples/java/README
-			dodoc -r packages/jpl/jpl/examples/java/*/*.{java,pl}
-		fi
-
-		if use mpi ; then
-			docinto examples/mpi
-			dodoc library/mpi/examples/*.pl
-		fi
-	fi
-}
diff --git a/dev-lang/yap/yap-7.0.1.ebuild b/dev-lang/yap/yap-7.0.1.ebuild
index 8ed3e0222197..dd3ad5fba721 100644
--- a/dev-lang/yap/yap-7.0.1.ebuild
+++ b/dev-lang/yap/yap-7.0.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
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/vscosta/yap/archive/${PV_COMMIT}.tar.gz -> ${PN}-${P
 
 LICENSE="Artistic LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="R debug doc examples java mpi mysql odbc postgres python raptor readline sqlite static threads xml"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-lang/yap/yap-7.1.0.ebuild b/dev-lang/yap/yap-7.1.0.ebuild
index 6695c255840a..f86b8754434a 100644
--- a/dev-lang/yap/yap-7.1.0.ebuild
+++ b/dev-lang/yap/yap-7.1.0.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
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit cmake flag-o-matic python-single-r1
 
-PATCHSET_VER="1"
+PATCHSET_VER="3"
 
 DESCRIPTION="YAP is a high-performance Prolog compiler"
 HOMEPAGE="http://www.dcc.fc.up.pt/~vsc/Yap/"