[gentoo-commits] repo/proj/guru:dev commit in: dev-libs/xqilla/, dev-vcs/lazygit/

[gentoo-commits] repo/proj/guru:dev commit in: dev-libs/xqilla/, dev-vcs/lazygit/

[Vladislav Dudar]

commit:     750051e9c8f638f130ca5873292e4bb81656fee5
Author:     Vladislav Dudar <seal331gentoo <AT> gmail <DOT> com>
AuthorDate: Thu Oct 28 16:48:09 2021 +0000
Commit:     Vladislav Dudar <seal331gentoo <AT> gmail <DOT> com>
CommitDate: Thu Oct 28 18:20:07 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=750051e9

dev-libs/xqilla: move from app-text/tidy-html5 to app-text/htmltidy

due to masking; fix header

Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Vladislav Dudar <seal331gentoo <AT> gmail.com>

 dev-libs/xqilla/xqilla-2.3.4.ebuild | 9 +++++++--
 dev-vcs/lazygit/Manifest            | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/dev-libs/xqilla/xqilla-2.3.4.ebuild b/dev-libs/xqilla/xqilla-2.3.4.ebuild
index 8892c7f8c..a16585540 100644
--- a/dev-libs/xqilla/xqilla-2.3.4.ebuild
+++ b/dev-libs/xqilla/xqilla-2.3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE="static-libs tidy"
 
-DEPEND=">=dev-libs/xerces-c-3.2.1 tidy? ( app-text/tidy-html5 )"
+DEPEND=">=dev-libs/xerces-c-3.2.1 tidy? ( app-text/htmltidy )"
 RDEPEND="${DEPEND}"
 BDEPEND=""
 
@@ -22,6 +22,11 @@ PATCHES=(
 
 S="${WORKDIR}"/XQilla-${PV}
 
+src_prepare() {
+	eapply -p1 "${FILESDIR}/lib_to_lib64.patch"
+	eapply_user
+	sed  -i 's/buffio.h/tidybuffio.h/g' src/functions/FunctionParseHTML.cpp || die "sed failed"
+}
 src_configure() {
 	econf $(use_enable static-libs static) \
 	--with-tidy=$(usex tidy /usr no) \

diff --git a/dev-vcs/lazygit/Manifest b/dev-vcs/lazygit/Manifest
index f323f6143..40d23df71 100644
--- a/dev-vcs/lazygit/Manifest
+++ b/dev-vcs/lazygit/Manifest
@@ -1,3 +1,3 @@
 DIST lazygit-0.29.tar.gz 3385768 BLAKE2B 4968a45572d85a3af84fc8f459dbab1cfd3a70954c650f16ddd8e937a810b590c974642e94b26614f4b24166b6c4db2fc8dd2538052875d827fdecc8bf8acb18 SHA512 f24d63a01bc64e2704805a20437af7ad0304921c2b4084f64014f9a8d9d9711ef02f4cdcf09ee9955ea5f2ef4f94de58c9ecc55fa7cb05fc59a89c7d8c9237d7
-DIST lazygit-0.30.tar.gz 3521302 BLAKE2B 4d8bbf02aec124b89e2f05b8fd357aeb9ff75139b753d958ed61f4bd5298563c11736c1cf2dff70c55ff5eb86829a0283bee0ef56ba1327ff48a66e5234efb3c SHA512 16bd4b8fce43354aec9bc4da69e08843346527897fba85aff966a992f4d75b12d731aed9095b9f7d24a7def7f5b017a6dbaa63c44456f06d8dd5fe9760672663
 DIST lazygit-0.30.1.tar.gz 3520967 BLAKE2B 442bec8a7ffc7246895966e57aebb0631f774cffacba451e63d0964b72eba307a520a56413c06f2debef61466379b0e94608df6194f9631bbfda0354026dab4d SHA512 428f49511de3c4fb00aaf28c0c095464ee367d64557e355b86c4ab995dd9285fc411f5f981e06a08d8a6cf30c04f9ee305bdc34bdbec46fe048b463d12eee8ab
+DIST lazygit-0.30.tar.gz 3521302 BLAKE2B 4d8bbf02aec124b89e2f05b8fd357aeb9ff75139b753d958ed61f4bd5298563c11736c1cf2dff70c55ff5eb86829a0283bee0ef56ba1327ff48a66e5234efb3c SHA512 16bd4b8fce43354aec9bc4da69e08843346527897fba85aff966a992f4d75b12d731aed9095b9f7d24a7def7f5b017a6dbaa63c44456f06d8dd5fe9760672663