dev-lang/yap: update patchset for x86 fixes

Package-Manager: Portage-3.0.28, Repoman-3.0.2
Signed-off-by: Keri Harris <keri@gentoo.org>

3 files changed, 24 insertions, 19 deletions

diff --git a/dev-lang/yap/Manifest b/dev-lang/yap/Manifest
index d7478b5cc996..dfcd9ac99fd8 100644
--- a/dev-lang/yap/Manifest
+++ b/dev-lang/yap/Manifest
@@ -1,5 +1,6 @@
 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.tar.gz 17500023 BLAKE2B 03705fc92574a23387681729410577f118e221011a51ce7e2d5d801453d55d9183dd359398cf7ca264ac526fa90f82f108d66e5172f3e1bbed51ea43c0ec9767 SHA512 f037f2bfc1e8263b25162f63604aac3173bf277b0e3bf61d0430109c42d45b159abb7298d6429800cf3121b9578ca5231b72eaf989a9c40e15c203044c30c428
-DIST yap-7.1.0-gentoo-patchset-0.tar.gz 1363 BLAKE2B 8f74b60b1e2b6e865d0d4c963f6bea22dcfcb2dff197cee231108359caf919bffaf9aecf0dee261948565359f9d62289bd4cd05500fc90d9e10bdfcfc25eeb49 SHA512 62f742fd78af7597579659c01b45d659fccc190d88e027bfdc5c2e22ae0a2775ed6c8c78c64bd5a59c1f53ecac8d17efb9dd20ece32c1ed004d8e1a3caf17d5a
-DIST yap-7.1.0.tar.gz 15206771 BLAKE2B 6996046110addf64bd33a6d27c281936fa690d8a7918584f375fe5fc1768dc7c2cd61d1672f00af53c4e0f0552fd278b5bb03a4246059b17b6bdf1447f25c12c SHA512 8777852eb0ec2819324c6f0ae2c2ad66b926733ac9f473f8a473e6652ec75e02053664705dec4784941c27a63cd7b41b73a5a7a6c1b22d3c78755d6981250253
+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-77bb2ba5eadfb95b67abccd22b298cfb75dd3328.tar.gz 15121857 BLAKE2B 0a38a1f302108a93cdc7b31fadb44823f1660e65bf3bb1910988afe81e313e6690094550c9eb4a6cfba322cd40b0cfb5ec853b350988ca123507fda362de118d SHA512 56da8cb9e56cb23d2592ba92b0b4cbd323e491767a121ca88896d2744737bef9d4a63f3b80b36fd52b1ead84a075d270060777fef85dff3ef36403a84c96b9fb
diff --git a/dev-lang/yap/yap-7.0.1.ebuild b/dev-lang/yap/yap-7.0.1.ebuild
index b6d897df36f3..8ed3e0222197 100644
--- a/dev-lang/yap/yap-7.0.1.ebuild
+++ b/dev-lang/yap/yap-7.0.1.ebuild
@@ -3,13 +3,18 @@
 
 EAPI=7
 
+PV_COMMIT=5bebd8e3aae655690ddf33dfb32289766910fa25
+
 PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit cmake flag-o-matic python-single-r1
 
+PATCHSET_VER="0"
+
 DESCRIPTION="YAP is a high-performance Prolog compiler"
 HOMEPAGE="http://www.dcc.fc.up.pt/~vsc/Yap/"
-SRC_URI="https://dev.gentoo.org/~keri/distfiles/yap/${P}.tar.gz"
+SRC_URI="https://github.com/vscosta/yap/archive/${PV_COMMIT}.tar.gz -> ${PN}-${PV_COMMIT}.tar.gz
+	https://dev.gentoo.org/~keri/distfiles/yap/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
 
 LICENSE="Artistic LGPL-2"
 SLOT="0"
@@ -42,22 +47,20 @@ DEPEND="${RDEPEND}
 	java? ( dev-lang/swig )
 	python? ( dev-lang/swig )"
 
+src_unpack() {
+	default
+	mv "${WORKDIR}"/yap-${PV_COMMIT} "${WORKDIR}"/${P} || die
+}
+
 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
-
 	cmake_src_prepare
 }
 
 src_configure() {
-
 	local mycmakeargs=(
 		-DWITH_YAP_STATIC=$(usex static)
 		-DWITH_THREADED_CODE=$(usex threads)
diff --git a/dev-lang/yap/yap-7.1.0.ebuild b/dev-lang/yap/yap-7.1.0.ebuild
index a4c959b4f5d0..6695c255840a 100644
--- a/dev-lang/yap/yap-7.1.0.ebuild
+++ b/dev-lang/yap/yap-7.1.0.ebuild
@@ -3,15 +3,17 @@
 
 EAPI=7
 
+PV_COMMIT=77bb2ba5eadfb95b67abccd22b298cfb75dd3328
+
 PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit cmake flag-o-matic python-single-r1
 
-PATCHSET_VER="0"
+PATCHSET_VER="1"
 
 DESCRIPTION="YAP is a high-performance Prolog compiler"
 HOMEPAGE="http://www.dcc.fc.up.pt/~vsc/Yap/"
-SRC_URI="https://dev.gentoo.org/~keri/distfiles/yap/${P}.tar.gz
+SRC_URI="https://github.com/vscosta/yap/archive/${PV_COMMIT}.tar.gz -> ${PN}-${PV_COMMIT}.tar.gz
 	https://dev.gentoo.org/~keri/distfiles/yap/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
 
 LICENSE="Artistic LGPL-2"
@@ -45,17 +47,16 @@ DEPEND="${RDEPEND}
 	java? ( dev-lang/swig )
 	python? ( >=dev-lang/swig-4.0.0 )"
 
+src_unpack() {
+	default
+	mv "${WORKDIR}"/yap-${PV_COMMIT} "${WORKDIR}"/${P} || die
+}
+
 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
-
 	cmake_src_prepare
 }