gentoo auto-resync : 07:10:2022 - 13:23:59

6 files changed, 25 insertions, 8 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 50e0a03b147b..24e998669c52 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/aha/Manifest b/app-text/aha/Manifest
index 02c1717fda0b..39568d4d0ce0 100644
--- a/app-text/aha/Manifest
+++ b/app-text/aha/Manifest
@@ -1,4 +1,4 @@
 AUX aha-0.5.1-null-ptr-dereference-fix.patch 2937 BLAKE2B 6806292fa4e1c97fe620fa692e4d22e6e952f329aa95b70f00d80f25021cad3d352af529dd6b77a6dd3668fb8646b459c9ad1409afe7edd4b4d73e2837735912 SHA512 240066fc094214290cfb49f403cdf654e29b1e3574562f3fc749bfc49f9ce20dae997c538a826889ef2a7c481b1eefabdc5f0033f0f23271687eecb6031f4767
 DIST aha-0.5.1.tar.gz 394410 BLAKE2B 7276219068a8e496b41a953f4cdfc130b85778b44d194fedb63b0f0d921db0efcf0f62fae52ec580ac1462e3b03edd6ad97dab7d7ff2c138ef300824efbad111 SHA512 0eb88e681208c0956e344d6574f9d7ba155d38bfb386d0a9f17022c5e925fb16d0efb6aa04804191b4cac1697a87a0f16ba51bcd97b6135cc7606046eaf89288
-EBUILD aha-0.5.1.ebuild 506 BLAKE2B d7570cc27fcb4af1430b67ac34abccd98307747317a3d39379d53d2a6d1ef7f3fd02cca215d1e49c2d9cc3add3f63c3a4c6e99fb6bc4b2bd53fcf137227bd5cb SHA512 cf2a8fb8c6f3319f7663230cb76b72c3082c5898ab4c9ea7e718c7bce15b7b256fbab57232bb6d9f2db441e48b97d13e07c31ad99e842da9338372b7d40a381d
+EBUILD aha-0.5.1.ebuild 513 BLAKE2B 3d200a39bba318da94570f7af08b40b00c6c5d682649f18a8271cd0064198cdcd0cd9e191a1f18dc4e0a88096c20faa80b7e82d4205468e71dec2300732bc6a6 SHA512 509257d8d3a92804b07a6b89100e20eedbb7f40eb3e8b69ad0bc85b2bceaa4439ae00ebf4fcf8e3b2fe2ca815b80adbc4b88b67ce1064c4f2066b6859d86e023
 MISC metadata.xml 679 BLAKE2B 1e3f5288af1d2a30f9ad157f676c196642113faf28fe97db1de68d8d62ede2cf45b76b8f17aa33b52b3c3015f131f6063a107c9dab75108278f1d055c247c521 SHA512 dfdba86f3c0cc684ed4a74e0ebe715aa295b5f8acae000e86609ceddbe3ee3e87b8c5640b0c955a60e389eef8201d64a5799ddbf061cf47c5423030fba458b9a
diff --git a/app-text/aha/aha-0.5.1.ebuild b/app-text/aha/aha-0.5.1.ebuild
index f8096fd528c7..78b71d00245a 100644
--- a/app-text/aha/aha-0.5.1.ebuild
+++ b/app-text/aha/aha-0.5.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/theZiz/aha/archive/refs/tags/${PV}.tar.gz -> ${P}.ta
 
 LICENSE="LGPL-2+ MPL-1.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv"
 
 PATCHES=(
 	"${FILESDIR}/${P}-null-ptr-dereference-fix.patch"
diff --git a/app-text/sgrep/Manifest b/app-text/sgrep/Manifest
index eb34430688c9..138ad2b69af2 100644
--- a/app-text/sgrep/Manifest
+++ b/app-text/sgrep/Manifest
@@ -1,3 +1,4 @@
+AUX sgrep-1.94a-clang16.patch 332 BLAKE2B db943a01e40f19b224767d27df8bc172a0b1fc3a5c1c71248ca247462864c86797065b422d2062bf560d088944612e4ee161e5a734dc694fd10d81ff3932d775 SHA512 4c8ecfc695564807cc681eaadc61a4a11fabbcc83b2fe95f60e5886ae01c9ee1b1d0d7a99e23448123dad24dcfd83f74fbad2aa2601ea344bd87e4026ad71297
 DIST sgrep-1.94a.tar.gz 193267 BLAKE2B fe37f62e2cb5c2ccad88df8ee3000d937357b5801ac6c55938a575f77735db7f94c0475e2eaa2521dfbae194132dcda4efe009db32e23b50c13acbc359b9abaf SHA512 8d2571a738c6a87cc34aea3a0692d15aea1d4a0439401b97368da2a021992ef8d0754e91e10409c1c059712bfe69ac4188e3be856211e48f8e6d528b5684283a
-EBUILD sgrep-1.94a.ebuild 707 BLAKE2B 6ea4827c2dcedfb6c2c73b4761bc157328aa45a0729c8b0fe2fac2ff8701c1eb27d577a4a905fe6a56e5060ae4777e6332a153734bf4a203c445914d622de14f SHA512 f5ede16338af4744ba9444b0508a442ddc20fbc4248ba5fc6e0593c370297e2cc877ab3d41d9b5294ebaf457661d072f5e8e2047ab9b4f171099b35cab10f71a
+EBUILD sgrep-1.94a-r1.ebuild 755 BLAKE2B f23b0ab5c3dfa30e4568db0a8f92b15a8243e1c1ca734df5fbd60cc63b058fe04c874ca3aa58a847c52876b3354bec2a3c97dc7ecd7f20e47c80ba9443b61988 SHA512 e893588a5079dc2a8924c814725c9d77d2e89b7ffb1c0041547774701951b013b274983376386fed6d4944923e994a54cd991d92b75aad7cfb287e70e78fb7c7
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-text/sgrep/files/sgrep-1.94a-clang16.patch b/app-text/sgrep/files/sgrep-1.94a-clang16.patch
new file mode 100644
index 000000000000..8892f79bbb01
--- /dev/null
+++ b/app-text/sgrep/files/sgrep-1.94a-clang16.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/871036
+--- a/sgrep.h
++++ b/sgrep.h
+@@ -20,2 +20,3 @@
+ #include <stdlib.h>
++#include <string.h>
+ #include <assert.h>
+@@ -616,2 +617,3 @@
+ int create_index(const IndexOptions *options);
++int index_query(IndexOptions *options, int argc, char *argv[]);
+ int add_region_to_index(struct IndexWriterStruct *writer,
diff --git a/app-text/sgrep/sgrep-1.94a.ebuild b/app-text/sgrep/sgrep-1.94a-r1.ebuild
index 9facab819c5c..eb45eb4f246a 100644
--- a/app-text/sgrep/sgrep-1.94a.ebuild
+++ b/app-text/sgrep/sgrep-1.94a-r1.ebuild
@@ -1,20 +1,24 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Use structural criteria to grep and index text, SGML, XML and HTML and filter"
-SRC_URI="ftp://ftp.cs.helsinki.fi/pub/Software/Local/Sgrep/${P}.tar.gz"
 HOMEPAGE="https://www.cs.helsinki.fi/u/jjaakkol/sgrep.html"
+SRC_URI="ftp://ftp.cs.helsinki.fi/pub/Software/Local/Sgrep/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
+
+PATCHES=(
+	"${FILESDIR}"/${P}-clang16.patch
+)
 
 src_prepare() {
 	default
-	sed -i -e "s:/usr/lib:/etc:g" sgrep.1 || die
+
+	sed -i "s:/usr/lib:${EPREFIX}/etc:g" sgrep.1 || die
 }
 
 src_configure() {
@@ -25,6 +29,7 @@ src_install() {
 	dobin sgrep
 	doman sgrep.1
 	dodoc AUTHORS ChangeLog NEWS README sample.sgreprc
+
 	insinto /etc
 	newins sample.sgreprc sgreprc
 }