Merge updates from master

2026-07-18 03:23:20 -04:00 · 2021-10-03 07:12:20 +00:00
parent 4666ca0192 62cd1fd568
commit e31f23e56f
7 changed files with 71 additions and 24 deletions
--- a/app-accessibility/rhvoice/rhvoice-1.4.2-r1.ebuild
+++ b/app-accessibility/rhvoice/rhvoice-1.4.2-r1.ebuild
@@ -56,9 +56,9 @@ DEPEND="
 RDEPEND="${DEPEND}
 	!dev-libs/hts_engine
 "
+# TODO: readd dev-libs/rapidxml in ::guru
 BDEPEND="
-	dev-cpp/cli11:=
-	dev-libs/rapidxml
+	dev-cpp/cli11
 	dev-libs/utfcpp
 "
 REQUIRED_USE="|| ( ao portaudio pulseaudio )"
@@ -99,13 +99,15 @@ src_prepare() {
 	sed "s|/lib/speech-dispatcher-modules|/$(get_libdir)/speech-dispatcher-modules|" \
 		-i src/sd_module/CMakeLists.txt || die

+	# fix dbus service install path
 	sed "s|/systemd/system||" \
 		-i src/service/CMakeLists.txt || die

-	sed -e "/set(RAPIDXML_INCLUDE_DIR/d" \
-		-i src/third-party/CMakeLists.txt || die
+	#sed -e "/set(RAPIDXML_INCLUDE_DIR/d" \
+	#	-i src/third-party/CMakeLists.txt || die
 	sed "/set(UTF8_INCLUDE_DIR/d" -i src/CMakeLists.txt || die

+	# fix build failure
 	sed 's/ "RHVoice_question_match"//' \
 		-i src/third-party/mage/CMakeLists.txt || die

@@ -145,7 +147,7 @@ src_configure() {
 		-DWITH_PULSE=$(usex pulseaudio)
 		-DWITH_PORTAUDIO=$(usex portaudio)
 		# src/third-party/CMakeLists.txt
-		-DRAPIDXML_INCLUDE_DIR=/usr/include/rapidxml
+		#-DRAPIDXML_INCLUDE_DIR=/usr/include/rapidxml
 		-DUTF8_INCLUDE_DIR=/usr/include/utf8cpp
 	)

--- a/app-misc/navi/Manifest
+++ b/app-misc/navi/Manifest
@@ -2,7 +2,7 @@ DIST aho-corasick-0.7.15.crate 113071 BLAKE2B a22743be74f873b9545648db6a994250e3
 DIST aho-corasick-0.7.18.crate 112923 BLAKE2B 4f6947d1aacf89ccfab0592cdc55fa61ef09cea38231d3f758765dbce328a810c0b588be4ba96e81d64955379ee005722d22a7aec39caea6e72342245d7ca34f SHA512 7a23b16231a90d23ee60ad4c81bc225410599a4560d33d3a203138fc540c39cf1000100fed3aed40dcc371c3635656a3792545dca5dd1aefbde00d8774eebd00
 DIST anyhow-1.0.40.crate 34534 BLAKE2B 79a3731153f8e3ace906b9a360521147fd055f7401a99ea2373501ade7e49ecdb280dd59b6a3b9b2f88e90857302e71f772c767e62cb702e32c8343fd4b0f741 SHA512 5efc7347a7fa72abce9a8b3b76649abb00d73c16c5125aa4b6faaa7040eb5138d7d9470b66c186825c9651272f5c359578503d0866ce7242ea7ca9dc05087165
 DIST anyhow-1.0.42.crate 34827 BLAKE2B adf276a869889819c78dc10cf9ceb310d57fc64dd00b603a16e7b6f111d446ca8ed43439c3f18f590c28c1e59a67cbe39fafb00c510d03b65eb8ba15a18d2b0d SHA512 7bbafa2fc5d78a6d8e68b44b104fd8d6a7882fc127b39e04c5a76240ee24ccf311004b754d93836d6daf1918be9c33fdb68a6baf55eab8f1e921b7aec3a35455
-DIST anyhow-1.0.43.crate 34968 BLAKE2B a846dbc5275906e9f8ec4d5019a0fbff56e16eb970f8f528f2a7e5e2078e39a235d879870ffb92d6af45dc01b730825beb0a346fd6a2de1ddbf076366cd8eada SHA512 d35eb86b3c1676a88fcd9fa8a956f0fb3d3a657caa777e27eb8d5f6a86fec352273c463782dd803a87514c72fe679855d7a379c63bb385df593a5e14c069b7a3
+DIST anyhow-1.0.44.crate 35067 BLAKE2B 19dd53abcbf5ade698f3bf5b1522fa8c1c55b777d91fd05f6c43a7a32691d00da756c7af9d991ebfc71b02fa4e8e2e257c78ce3e29f8c3034066ca43eea4c07d SHA512 d8ec44c64cf4b06121421c99157573b59e2078ab1aba7d949aad9ddd5ec4a1b585a07d0ca06807ed2349c6becaed1cba69f10f9affa2da25f749b615a70aa9ff
 DIST arrayvec-0.5.2.crate 27838 BLAKE2B 51e2eacae0ef148f3f52d21ae00794e540e7ce4c013fb496dd1347ad91ffbbca199381fffbb064225f829216f6c5e915edfa64833f91fabdd13c3f011d86491f SHA512 1896b5f64b4dbdcff8ad234bda4ea8129bcacf87839347304717e94ee9f369cf5f4371755e453ff7d72817edb8f7fdbc726d77cc4f28ed05148dc89c7714b004
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
 DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
@@ -89,7 +89,7 @@ DIST serde_derive-1.0.125.crate 54155 BLAKE2B c99e9e806831dccb3ccca20675e11f603a
 DIST serde_derive-1.0.127.crate 54201 BLAKE2B 207c20d2e276a173a1ae0326be307f3d77937442838a7890db923fea434d6e134a9591a07139f8eabb9981aee74dd092d6e2c0a98f17aa67f069faa3dccec6c8 SHA512 2c346d45bb96867ea5b4a0ca24aa9b0584d83f26578f5a1ec8a51c514d0158d98c7b76408a0ea64e5718567afb6a0cfc5922d3c5588a89b7e19035b13b1a0416
 DIST serde_derive-1.0.130.crate 54703 BLAKE2B 35db74464913a93da88b80cf29e4983bcc4377e397618064b1cb397ecbc9e6620c863e4d365153d03ab77ec6dbe9b1d03f8f86aba1adb76fc6d697f39ea7316f SHA512 d3ca974bf8856ed8a73af4eaff69941b35eef187d7e348d6d2ef9ee79eccad893e66270c7d814ac3871e09e21e603d34d7d1f24b182d9b39e9219acd42a7baa8
 DIST serde_yaml-0.8.17.crate 40805 BLAKE2B 8f70ed3efa5afa1f8f45b2c107463799269d745705ac2b90e8ce69c090f4f52721d49723dc48967bdbab30efe853c661631063fe16bc3ceaed4d0158f90ffbcb SHA512 3e7a4baa156ca1d9655a76fbaccd2d87b6929165972f6390316c9d4d55fc9815827e3c4bbb8a1c594f048dcc9c3fd6f4c55370df27f6257dbc28e2066274a7c1
-DIST serde_yaml-0.8.20.crate 42755 BLAKE2B 11cdafde6974107c66d7e1de25c0719d5765ede6800662bb1c82ea80b6c703b6a4c6d427be9e515f11c37acead645fb837d4a7ac6d8176af781c502c5c507c05 SHA512 063fff5b104d8d093a5a1bc1c614f89a1bf6ba817e3e0fcec73849d15f86e91e67f30c7e7e4b3c35405d23d100c007961a1eddaf5c5e5d83075d0d44f8927d77
+DIST serde_yaml-0.8.21.crate 42603 BLAKE2B 4556a2cb4f81a1cc3ce7487caed863eb6403c966f38d505fef6ddad0586813612b0b1d5d6c32ddfb3a7d8dab8a870bf4d2bd6b06321e28165ee0b14293ec2203 SHA512 82e5a6663392b2a3e049f735b88b35023bb9255167b0e396c2cc5982b014ad2e6804433d15ffd19fe2ffd6e423a6e04e9a32b4b3d2b012adaa1f4f44996a81ea
 DIST shellwords-1.1.0.crate 3965 BLAKE2B ed45861b5b0760e078fad4eb19d0f0891bdcc559ac56187c512313c94c938e36cdfcf9c9d856ee0234413d775e735796a979aa7f312d2ccfd08862a6e6474d02 SHA512 1af48cfd1c09fa21aa436acfadf664a82b0fbccfae0c0ff8f01602ab912e0a4a0adf8677159af8ade9bc99a1df28774fda76ade243d8ac70afe0da8fe3c4098c
 DIST signal-hook-0.1.17.crate 27085 BLAKE2B 0e58cb64b07cb8c76a043f603edbf27bcc92040a1aadb2d0c96993b1ea1a55ef63a222ec51e1396d95bb4907016e1dbf20ba3f0c1915303828f187af44ba2df4 SHA512 253d1478d7a6491a0b423637a706c941cc2a9707d32d29126f48af808daf8acd88e59013936f8e164df687c04e3a8f5c201b5eeb1952e3269b1419efdb4df94f
 DIST signal-hook-0.3.9.crate 48416 BLAKE2B 1075d4b767f3d3c2e556ad1ca2511eee4eea8674989ee76cf4234ebac78f1351291f3dfff72605ec9fe92e978fc9ba25298182564e5a17676fb14441de6bb6e4 SHA512 bcb6cfd4d062ed4a2a83a7fbb35ec90f7dfa5e875807fe6b7c65d0393447b56fee613eac2b3dd08dae0cf2e3cdee920f2c3b3d27ccd1f6f8dbec849c3e6e4261
--- a/app-misc/navi/navi-9999.ebuild
+++ b/app-misc/navi/navi-9999.ebuild
@@ -7,7 +7,7 @@ EAPI=8

 CRATES="
 	aho-corasick-0.7.18
-	anyhow-1.0.43
+	anyhow-1.0.44
 	arrayvec-0.5.2
 	atty-0.2.14
 	autocfg-1.0.1
@@ -67,7 +67,7 @@ CRATES="
 	scopeguard-1.1.0
 	serde-1.0.130
 	serde_derive-1.0.130
-	serde_yaml-0.8.20
+	serde_yaml-0.8.21
 	shellwords-1.1.0
 	signal-hook-0.3.9
 	signal-hook-mio-0.2.1
--- a/app-shells/mrsh/metadata.xml
+++ b/app-shells/mrsh/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>contact@hacktivis.me</email>
+		<name>Haelwenn (lanodan) Monnier</name>
+	</maintainer>
+</pkgmetadata>
--- a/app-shells/mrsh/mrsh-9999.ebuild
+++ b/app-shells/mrsh/mrsh-9999.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit git-r3 meson
+
+DESCRIPTION="minimal strictly POSIX compliant shell"
+HOMEPAGE="https://mrsh.sh/"
+EGIT_REPO_URI="https://git.sr.ht/~emersion/mrsh"
+LICENSE="MIT"
+SLOT="0"
+
+IUSE="+readline libedit"
+REQUIRED_USE="?? ( libedit readline )"
+
+DEPEND="
+	libedit? ( dev-libs/libedit )
+	readline? ( sys-libs/readline:= )
+"
+RDEPEND="${DEPEND}"
+
+RESTRICT="test"
+
+src_configure() {
+	local emesonargs=(
+		-Dwerror=false
+		-Dauto_features=disabled
+	)
+
+	if use readline || use libedit; then
+		emesonargs+=(
+			-Dreadline=enabled
+			-Dreadline-provider=$(usev readline || usev libedit)
+		)
+	fi
+
+	meson_src_configure
+}
--- a/www-client/badwolf/Manifest
+++ b/www-client/badwolf/Manifest
@@ -1 +1 @@
-DIST badwolf-1.1.0.tar.gz 76314 BLAKE2B e5faf43eaceece52809bc27e1c47d176373d537cb349f682eb7fbd68c3cb4b6ad510e4c2c8b55b9c5092f910321f148261f25aecddc1327dd635611dd685a57a SHA512 dcde764c71519700e225c9a5488bcc092a9008c365b892a60e02bd53031801090d4ec73d0da38078a1c0061cd6be4cc41250f0cdbaf991250557c784f6aac961
+DIST badwolf-1.2.0.tar.gz 79538 BLAKE2B 1889fa905bafb5ed5d4ae387b958f49697130bb93690c91c25f74b16574d8e609c43a3c4e8fb4da7d37f6d645d6d73bab23583220f337e83567e206bbbad703a SHA512 ccf0eb25630438ba783ae7e6d30b0c516290966199bbe36f76b22f2091c3a2940676ee0fb0a5cf46a9cb258e7979084d6f34662f7252c1b37ec0cee7c9958fb0
--- a/www-client/badwolf/badwolf-1.2.0.ebuild
+++ b/www-client/badwolf/badwolf-1.2.0.ebuild
@@ -25,32 +25,30 @@ SLOT="0"

 DOCS=("README.md" "KnowledgeBase.md")

+IUSE="test"
+RESTRICT="!test? ( test )"
+
 DEPEND="
 	x11-libs/gtk+:3
 	net-libs/webkit-gtk:4=
 "
 RDEPEND="${DEPEND}"
+BDEPEND="test? ( app-text/mandoc )"

 src_configure() {
 	[[ "${PV}" == "9999" ]] || restore_config config.h
-	default
-}

-src_compile() {
-	emake \
-		CC="${CC:-cc}" \
-		CFLAGS="${CFLAGS:--02 -Wall -Wextra}" \
-		LDFLAGS="${LDFLAGS}" \
-		PREFIX="/usr"
+	CC="${CC:-cc}" \
+	CFLAGS="${CFLAGS:--02 -Wall -Wextra}" \
+	LDFLAGS="${LDFLAGS}" \
+	DOCDIR="/usr/share/doc/${PF}" \
+	WITH_WEBKITGTK=4.0 \
+	PREFIX="/usr" \
+	./configure
 }

 src_install() {
-	emake \
-		DESTDIR="${D}" \
-		DOCDIR="/usr/share/doc/${PF}" \
-		PREFIX="/usr" \
-		install
+	default

 	[[ "${PV}" == "9999" ]] || save_config config.h
-	einstalldocs
 }