gentoo auto-resync : 20:06:2023 - 01:14:49

12 files changed, 389 insertions, 89 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 7310b14af689..aae07e690989 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/astyle/Manifest b/dev-util/astyle/Manifest
index 6038ec7a3420..7fe686303081 100644
--- a/dev-util/astyle/Manifest
+++ b/dev-util/astyle/Manifest
@@ -1,3 +1,5 @@
+DIST astyle-3.4.tar.bz2 226981 BLAKE2B 1d3db58a7123e516657f224c217ac300fc9d75a50c3ed5cddf8d51868e251397c45ffb43dac9a9f414eaf47896171002bd5eb857ffe4336153fb1bddff3d7eb7 SHA512 c81fb18a8ebba89500639377291d320107983ebc842fa99973d00efa08c41950ffac7fe78faddb3d025b30eae58ccf8d643582965c1a3df2604f0a0240fd8e82
 DIST astyle_3.1_linux.tar.gz 185589 BLAKE2B d0bc9bf3403de89d207f33ac885c7cd57fd1e71314c947e1593ee24ade9ce36c83c6fd8e7021f44d8d3b344ea3add63fa5a7b246c40f10193dc38b51e7ad36bc SHA512 2e8f13d291abda66bbba30174c364c81a81a490e0a21376f7da7cf471644c22caa37b9eefb100d093bf26d1a8bfa9d2f14b4c2a9b75b3cb84428b4514e277ff2
 EBUILD astyle-3.1-r2.ebuild 1891 BLAKE2B fea27eafaf14eaf1245a87a873dbfa327a23987468a291a9bf8de1af50d57f168143ae94b6dfb8dadfdf121ee3fc13f6efd90656962bd866093e27c2477544be SHA512 ecab4c77e646ee8dd2f174e50e8b5c3af9a077b1c1ddfac4ab05ec56e1b83e82ff7f8053d3f52454c282a9f545a470ba2caa2f1786956a26514b6f0adb988fe7
+EBUILD astyle-3.4.ebuild 1857 BLAKE2B 86499c77af050c94a5d3459a9fe9a4a468b8b92deadea4703eb918cdf263ab0c4653fcc9ad870666fe63fbb3b4f4bc7e30510466f9a94acb026544010dc39927 SHA512 7ea107261645e5530516ebc4738ccc89d8b58615a90d8eff1cce75757fed7331796c746aeb5b688110e0ae402bad46ae505500bd355691bac269734a289097e2
 MISC metadata.xml 754 BLAKE2B c034556afe246a6d75d57b2e37399bdd24a37046a1bf0181757ed449f144f099964e7cdf470502f83542707094c752de3841d92bf2844fa7ee0b6038d25494f2 SHA512 0e4087bab09255528dfce61e21b12a4a05b93d3eaf75874b2a2b12f168046c0e9e040c29321766cfd505bdc5360eb6d16d320a73b317849d19b2555a95415396
diff --git a/dev-util/astyle/astyle-3.4.ebuild b/dev-util/astyle/astyle-3.4.ebuild
new file mode 100644
index 000000000000..729799088abb
--- /dev/null
+++ b/dev-util/astyle/astyle-3.4.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs java-pkg-opt-2
+
+DESCRIPTION="Artistic Style is a re-indenter and reformatter for C++, C and Java source code"
+HOMEPAGE="https://astyle.sourceforge.net/"
+SRC_URI="mirror://sourceforge/astyle/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0/3.2"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="examples java static-libs"
+
+DEPEND="
+	app-arch/xz-utils
+	java? ( >=virtual/jdk-1.6:= )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	if use java ; then
+		java-pkg-opt-2_src_prepare
+		sed	-e "s:^\(JAVAINCS\s*\)=.*$:\1= $(java-pkg_get-jni-cflags):" \
+			-e "s:ar crs:$(tc-getAR) crs:" \
+			-i build/gcc/Makefile || die
+	else
+		default
+	fi
+}
+
+src_configure() {
+	tc-export CXX
+	default
+}
+
+src_compile() {
+	# ../build/clang/Makefile is identical except for CXX line.
+	emake CXX="$(tc-getCXX)" -f ../build/gcc/Makefile -C src \
+		${PN} \
+		shared \
+		$(usev java) \
+		$(usev static-libs static)
+}
+
+src_install() {
+	doheader src/${PN}.h
+
+	pushd src/bin >/dev/null || die
+	dobin ${PN}
+
+	local libastylename="lib${PN}.so.${SLOT##*/}.0"
+	local libastylejname="lib${PN}j.so.${SLOT##*/}.0"
+	local libdestdir="/usr/$(get_libdir)"
+
+	dolib.so "${libastylename}"
+	dosym "${libastylename}" "${libdestdir}/lib${PN}.so.$(ver_cut 1 ${SLOT##*/})"
+	dosym "${libastylename}" "${libdestdir}/lib${PN}.so"
+	if use java ; then
+		dolib.so "${libastylejname}"
+		dosym "${libastylejname}" "${libdestdir}/lib${PN}j.so.$(ver_cut 1 ${SLOT##*/})"
+		dosym "${libastylejname}" "${libdestdir}/lib${PN}j.so"
+	fi
+	if use static-libs ; then
+		dolib.a lib${PN}.a
+	fi
+	popd >/dev/null || die
+	if use examples ; then
+		docinto examples
+		dodoc -r file/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	local HTML_DOCS=( doc/. )
+	einstalldocs
+}
diff --git a/dev-util/b2/Manifest b/dev-util/b2/Manifest
index d7bf963784eb..23d38cc60480 100644
--- a/dev-util/b2/Manifest
+++ b/dev-util/b2/Manifest
@@ -4,6 +4,8 @@ AUX b2-4.9.2-disable_python_rpath.patch 343 BLAKE2B 7b8449db1054dcee76ecbe1b1c82
 AUX b2-4.9.2-no-implicit-march-flags.patch 8376 BLAKE2B 50e0b8effbb268467d90cc51df70dc4bd234789b352a279d9bb3e60161be80296f5f31f4a0d2a3d1ae2380f3079f7b950b24ef494574e25bbda48b516c6aacbb SHA512 0089a48cbe3e9e4f222e5cd1e9e12a5c4d16857b002a1c849f4cf6f8d7935c0a9b1e0f51ced51bf5346c2fdcbd214ce05e3c144c98fbf82a9842c45b59c19740
 AUX b2-4.9.2-odr.patch 1109 BLAKE2B 0bf70f2b2237369acd5089d1d1c6e1362f1d3528b036a7f7b9c5c4d077e60850f45c87a67c830f441297e09be2f7dd8bf41ea45a2c66b307678404c4a0db0ed5 SHA512 90ca58661322b35c4af6543558015368385a1b0e12740cd76723d893f95411645ec4a3a23694503863dd786b73a0ec9b0cb34b473e357334d8e82d973f800e4b
 AUX site-config.jam 688 BLAKE2B e43a7ad1a94d113a7f890e8b634770f5c60556101d428d83f655bbbe72c46b587485886a9941d05a2ae4319fc325f1e0ecfb9b660158b81c5e9fd02e0b1c0530 SHA512 b65bf1be3133f9f66d3139b00f195a288591bb20a13ba35041507c2c33d7d2da6047c3b02dc27bc4eb21798b91e1262a60e294b7fd4af90808b9de0f5af517df
+DIST b2-4.10.0.tar.gz 982436 BLAKE2B 7e408e4ae67cf483c972fd7cefda39938c7819aa28e3ef358f44efe19ef43014d52fe32be40e27f33c27db760833948bbeb54e4ee99fd7ebb4e73e8ea3618c6b SHA512 251a3e07b18cbc768e7423d6259eec7466dfb33d2bab1e2f88bc0896574c854338429b591e6961c0d81c17b9ec6eb4cda06f46a8952f5ca4e4fa8bffb69a50d7
 DIST b2-4.9.6.tar.gz 977724 BLAKE2B 15ce459d7051be037bdb477432591baccb4e5339a16385a63205c19815766406f631879f0e1f986e184640466f5b6af5ade72d248975731528032a8e735e483e SHA512 a3dc9dccbf1221971607a15df642d4ad9029c1acaf329e419f363a6e6ddb6062a8ef595aa49810dc2ff3a3f333bfbaed7384819a143cc5847a95daf6fd48ccb1
+EBUILD b2-4.10.0.ebuild 1911 BLAKE2B 9cf2e99161eeb6dad8eab6ae629be62ada6c5ac571102303f0f047abcabf92248e56006f371c31909f1996cbae97f0a9791da3622dd35546a5a66216585ce67e SHA512 70a49594be5f4a59fec966c6279ab3c386434e51477ae0d3156bc1398a0473394a695565c2f6113a0d1d935259f0d79ad3814836b1d4f5514e0286eafa155a44
 EBUILD b2-4.9.6.ebuild 1903 BLAKE2B b0532b868a77033c4a7a71710c156315bb8a3345a06832c2a587ed54b7fb5680cf51c554437a9829d4c0c735a2766eaeaa8ef93d85043a5fdd7108d4aa92d9ba SHA512 001f4cf6cfcb464d67c4d3241da3a0f83bf1b3f563228ce8ee02d23b3af1ca9a795ea3f5db729ac0e0903f438cebf498741cb36c46ce2efd31c09326c1069d68
 MISC metadata.xml 320 BLAKE2B e32bcf6d7bfe5e8a0f36d34022d49ef8baf1d4c0324fa7e7b25e1fa41ac81c21e010a8e49d456b7ce6027c51af57b6b07f3bdc8b7e05daa18b288c63a58a171e SHA512 767da992cd650d91b393848e73d6f0626febcb02eba350a16d390e8416a2832c49b1ca2608be98a9f4abd9ae2078a7f1a543a387be139e5533f90d82171796bf
diff --git a/dev-util/b2/b2-4.10.0.ebuild b/dev-util/b2/b2-4.10.0.ebuild
new file mode 100644
index 000000000000..84055fa002bc
--- /dev/null
+++ b/dev-util/b2/b2-4.10.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo flag-o-matic toolchain-funcs
+
+MY_PV="$(ver_rs 1- _)"
+
+DESCRIPTION="A system for large project software construction, simple to use and powerful"
+HOMEPAGE="https://www.bfgroup.xyz/b2/"
+SRC_URI="https://github.com/bfgroup/b2/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P}/src"
+
+LICENSE="Boost-1.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="examples"
+RESTRICT="test"
+
+RDEPEND="!dev-util/boost-build"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.9.2-disable_python_rpath.patch
+	"${FILESDIR}"/${PN}-4.9.2-darwin-gentoo-toolchain.patch
+	"${FILESDIR}"/${PN}-4.9.2-add-none-feature-options.patch
+	"${FILESDIR}"/${PN}-4.9.2-no-implicit-march-flags.patch
+	"${FILESDIR}"/${PN}-4.9.2-odr.patch
+)
+
+src_configure() {
+	# need to enable LFS explicitly for 64-bit offsets on 32-bit hosts (#761100)
+	append-lfs-flags
+}
+
+src_compile() {
+	cd engine || die
+
+	# upstream doesn't want separate flags for CPPFLAGS/LDFLAGS
+	# https://github.com/bfgroup/b2/pull/187#issuecomment-1335688424
+	edo ${CONFIG_SHELL:-${BASH}} ./build.sh cxx \
+		--cxx="$(tc-getCXX)" \
+		--cxxflags="${CXXFLAGS} ${CPPFLAGS} ${LDFLAGS}" \
+		-d+2 \
+		--without-python
+}
+
+src_test() {
+	# Forget tests, b2 is a lost cause
+	:
+}
+
+src_install() {
+	dobin engine/b2
+
+	insinto /usr/share/b2/src
+	doins -r "${FILESDIR}/site-config.jam" \
+		bootstrap.jam build-system.jam ../example/user-config.jam \
+		build kernel options tools util
+
+	find "${ED}"/usr/share/b2/src -iname '*.py' -delete || die
+
+	dodoc ../notes/{changes,release_procedure,build_dir_option,relative_source_paths}.txt
+
+	if use examples; then
+		docinto examples
+		dodoc -r ../example/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-util/glade/Manifest b/dev-util/glade/Manifest
index 392fa1f107dd..156973f3a1e8 100644
--- a/dev-util/glade/Manifest
+++ b/dev-util/glade/Manifest
@@ -2,5 +2,4 @@ AUX glade-3.14.1-doc-version.patch 853 BLAKE2B b7cad3cc9d49cfe24189ba21bffaec2c5
 AUX glade-3.40.0-webkitgtk-4.1.patch 673 BLAKE2B 530d034a64b38684a48f292bc792ff4eaf4fa8e0e11708f0974678ad9b396cb9a5281dd9669ed08dd7aa33c4c5668d09ac3cba5b73a55df250b03da66c47d897 SHA512 e62966e164a0e452d2b2e403f17a8abf89aaa0d2e52b9f7f28eea16e105769d3b71a04faa56436e0203fb28e5529005fa001f1a1582a2d3d2d8b24114d9fc67d
 DIST glade-3.40.0.tar.xz 2654772 BLAKE2B 472dfd841e9501f7bbc96bde49ebe26dfd54193cd479658d042547eba5d1af196c0a06212ec5c894c53c12f3791967f6c77859f96802e3df5760b36c6c0c4af1 SHA512 6b018f882e9d155a4b2256c0b4c72743f971c8d730a53f16faa240d01e14051f5b6ce04e355dcc78e1679579fb091facaa06acdda6297c5b8efc642c42bb7b4e
 EBUILD glade-3.40.0-r1.ebuild 2107 BLAKE2B 24f2988dd36e86d9f6207f5604b46d19d87db9a3de6048724af5b576c5c51459993508225295f56556bd53443352896283525cc74fb212df5d132e91eb2def90 SHA512 30ca24e9a595e34eda477695d8f7fbda7d579fd8fe41d09f677df768846cd511c75ead28af9feaa61dd94ad5412ca01beebd98c3d709fe0e2cbdd4a1cfcfdfde
-EBUILD glade-3.40.0.ebuild 2004 BLAKE2B 3ff0d7da3c9f4200759f9285de049ed439ffef1925ec95e5ce8ee103a6d39979ed7e2b6ccfd1f948b14db2c3284f62b0575f85fd2058a0e565fdc487756cbb0a SHA512 9883eb00364c2159064fd12eb9df2cb332a57e37e30a870baee09bbc8e9a1afb7f69dc0a67c5eb7b4415283958d418d49d3e2d3b20bd93e3c35788daf0a6391f
 MISC metadata.xml 549 BLAKE2B 50f112215883d1628dadc355533b44b504e1e1a6d2cc7fb46f257aeb5c4b52589a1bcaa5b8500bd5f04f3b92ce0c256b8833d33052e150ce669df6db6108a5ce SHA512 7153d8384151784c266e74f700f3c2b58729dbf5f09cb78f9b488117558d4b732e78471d18d1739c7d94202e676c834c236ed69bf882093bae9dcaeca1e61a31
diff --git a/dev-util/glade/glade-3.40.0.ebuild b/dev-util/glade/glade-3.40.0.ebuild
deleted file mode 100644
index d4a3d6f420ef..000000000000
--- a/dev-util/glade/glade-3.40.0.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit gnome2 python-single-r1 meson optfeature virtualx
-
-DESCRIPTION="A user interface designer for GTK+ and GNOME"
-HOMEPAGE="https://glade.gnome.org https://gitlab.gnome.org/GNOME/glade"
-
-LICENSE="GPL-2+ FDL-1.1+"
-SLOT="3.10/13" # subslot = suffix of libgladeui-2.so
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
-
-IUSE="gjs gtk-doc +introspection python webkit"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="
-	dev-libs/atk[introspection?]
-	>=dev-libs/glib-2.53.2:2
-	>=dev-libs/libxml2-2.4.0:2
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:2[introspection?]
-	>=x11-libs/gtk+-3.22.0:3[introspection?]
-	x11-libs/pango[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-1.32:= )
-	gjs? ( >=dev-libs/gjs-1.64.0 )
-	python? (
-		${PYTHON_DEPS}
-		x11-libs/gtk+:3[introspection]
-		$(python_gen_cond_dep '
-			>=dev-python/pygobject-3.8:3[${PYTHON_USEDEP}]
-		')
-	)
-	webkit? ( >=net-libs/webkit-gtk-2.12.0:4 )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	gtk-doc? (
-		dev-util/gtk-doc
-		app-text/docbook-xml-dtd:4.2
-	)
-	dev-libs/libxslt
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-RESTRICT="test" # https://gitlab.gnome.org/GNOME/glade/issues/333
-
-PATCHES=(
-	# To avoid file collison with other slots, rename help module.
-	# Prevent the UI from loading glade:3's gladeui devhelp documentation.
-	"${FILESDIR}"/${PN}-3.14.1-doc-version.patch
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dgladeui=true
-		$(meson_feature gjs)
-		$(meson_feature python)
-		$(meson_feature webkit webkit2gtk)
-
-		$(meson_use gtk-doc gtk_doc)
-		$(meson_use introspection)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	optfeature_header
-	optfeature "integration API documentation support" dev-util/devhelp
-}
diff --git a/dev-util/gtk-doc/Manifest b/dev-util/gtk-doc/Manifest
index 42620b19666d..d94d19532ab3 100644
--- a/dev-util/gtk-doc/Manifest
+++ b/dev-util/gtk-doc/Manifest
@@ -1,5 +1,6 @@
 AUX 61gtk-doc-gentoo.el 283 BLAKE2B 116d2b43d42b05130482c5bff7a10f13930a0d04f34874d25bfa6c61dc8920efe60ae615e6d54de1eeed87044a7232a992a37582d608b0756f0b099b5ee62d03 SHA512 d9e7c8bacd97a5147dbbe9ad568323356c9c38ad982ce88c63ef5f8e3955289274393a91e07d2159c082ac2a058455a1905c251ff3676f60bad596379fb12837
+AUX gtk-doc-1.33.2-gtkdocize-don-t-backslash-escape-regular-characters-.patch 8013 BLAKE2B 4b8206306598fac8f3a54f39ef7a188e0db71451e0a9b8c5ca9d0c2f7acb561b355876356a55e84cdee772e0ddb72e1594d035dd720fe9d62766ef9e8bd953a3 SHA512 982b99fc70cec029b095d3f2e4228985cdbfe575ebf58784675e19674c7ab902ee3a6c9d0b63e6f5d3c838624de669c12a7fb0e7100fee582a98be8812828be7
 AUX gtk-doc-1.8-emacs-keybindings.patch 582 BLAKE2B 9591f8f58dbd2c5897abf020f96a3ad8124830c274bfa581756ccaa43c67002264cc6d5a04c0316e4bb2dfa75a3cb08b5de6217a81a295b3a31e18dae8d1ad7d SHA512 360e97c0d2603c17dd1c1ca92739eb5ac229f3bcda6dc76267b95cac73db1008a52164ac9cba5a0e43f7b6359b5e6d3b242fde757fa1b7409051bade5f6f35a6
 DIST gtk-doc-1.33.2.tar.xz 507852 BLAKE2B dea3030060ecec89433fe3783dfacc2f58373780c49560a48ab1a32bedfe888692183de8396c92414255e4c8f537358cbc373fd307638ab8e7dbfd9ae44de58f SHA512 f50f68ab6b4bc59f55e84b49c1481f05700171cbf79eca9ba8f3a142a30a4ba88fe096983ebb8d117a9ef8bcea40934674096683d956f5c54cae457d31f651ab
-EBUILD gtk-doc-1.33.2.ebuild 2601 BLAKE2B 34536fd52a508b59105bbf34184303ff5a5f922303cda9ef2e210776ac39bf17e5f868faafced7c0bc1f5943262e2148f2d8dd2b5ccf32168fc73c6c422287ad SHA512 2ec2431724731d0b2419319cf74b2f6e25256fd9e737c1075427fc5530f103f2550d976da47e4d73c941e53c27234fe7141530ce3b5119ebabe8fd46d349ea22
+EBUILD gtk-doc-1.33.2-r1.ebuild 2682 BLAKE2B 6ca7e0ca5ecc175b7174d52850262a4fa88d27be52ec76796b244c78cd2ad1f92e92dad597bbdda8ddf139807d6eba3d56f3991266ef4e2296fc23d59085e415 SHA512 cb1def11b23840f69cf34b0ba2eb1ea48a81dad77660224ce062f99ef6765040bbfc5a6f434f4f545f4be1f5a1e655fb4222b6b1942d8b57bb1ab16fea6e3fd9
 MISC metadata.xml 605 BLAKE2B 1f39610cb7bb45a71462268a6c7b14b6af94502839882b36342099e171b0aa976e773d25b1fd8eb49ef502cbdb961e3a5a82103286667eac7aad728d51b0b052 SHA512 712a1cca5e2cc349412cabb8bdc5a0a0a859629877d5a9615afc3e499a67e3e24905a9dfc1d7c22e1dce1f678a5d0632ac04f20fae9c3c7dd1d8df096e4be8c5
diff --git a/dev-util/gtk-doc/files/gtk-doc-1.33.2-gtkdocize-don-t-backslash-escape-regular-characters-.patch b/dev-util/gtk-doc/files/gtk-doc-1.33.2-gtkdocize-don-t-backslash-escape-regular-characters-.patch
new file mode 100644
index 000000000000..6b51b1398489
--- /dev/null
+++ b/dev-util/gtk-doc/files/gtk-doc-1.33.2-gtkdocize-don-t-backslash-escape-regular-characters-.patch
@@ -0,0 +1,175 @@
+https://gitlab.gnome.org/GNOME/gtk-doc/-/merge_requests/72
+
+From d20e5befb071e79ee0f23a0a7a1b28cb0755caac Mon Sep 17 00:00:00 2001
+From: Thomas Haller <thaller@redhat.com>
+Date: Tue, 18 Apr 2023 12:05:08 +0200
+Subject: [PATCH] gtkdocize: don't backslash escape regular characters in grep
+
+Grep 3.8 warns about wrongly escaped characters:
+
+  $ echo | grep '\,'
+  grep: warning: stray \ before ,
+  $ echo | grep '\ '
+  grep: warning: stray \ before white space
+  $ echo | grep ' \-'
+  grep: warning: stray \ before -
+
+Note that a '\-' as first character is OK, to not interpret the pattern
+as command line argument:
+
+  $ echo | grep '\--Wall'
+
+https://gitlab.gnome.org/GNOME/gtk-doc/-/issues/146
+---
+ buildsystems/autotools/gtk-doc.make         | 14 +++++++-------
+ buildsystems/autotools/gtk-doc.no-xslt.make | 10 +++++-----
+ buildsystems/autotools/gtkdocize.in         |  6 +++---
+ tests/gtk-doc.make                          |  4 ++--
+ 4 files changed, 17 insertions(+), 17 deletions(-)
+
+diff --git a/buildsystems/autotools/gtk-doc.make b/buildsystems/autotools/gtk-doc.make
+index c673175..fb2e7e2 100644
+--- a/buildsystems/autotools/gtk-doc.make
++++ b/buildsystems/autotools/gtk-doc.make
+@@ -136,7 +136,7 @@ scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB)
+ 	gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES)
+ 	$(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
+ 	  scanobj_options=""; \
+-	  gtkdoc-scangobj 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
++	  gtkdoc-scangobj 2>&1 --help | grep  >/dev/null "\--verbose"; \
+ 	  if test "$$?" = "0"; then \
+ 	    if test "x$(V)" = "x1"; then \
+ 	      scanobj_options="--verbose"; \
+@@ -198,13 +198,13 @@ GTK_DOC_V_XREF_0=@echo "  DOC   Fixing cross-references";
+ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files)
+ 	$(GTK_DOC_V_HTML)rm -rf html && mkdir html && \
+ 	mkhtml_options=""; \
+-	gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
++	gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\--verbose"; \
+ 	if test "$$?" = "0"; then \
+ 	  if test "x$(V)" = "x1"; then \
+ 	    mkhtml_options="$$mkhtml_options --verbose"; \
+ 	  fi; \
+ 	fi; \
+-	gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-path"; \
++	gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\--path"; \
+ 	if test "$$?" = "0"; then \
+ 	  mkhtml_options="$$mkhtml_options --path=\"$(abs_srcdir)\""; \
+ 	fi; \
+@@ -227,7 +227,7 @@ GTK_DOC_V_PDF_0=@echo "  DOC   Building PDF";
+ pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files)
+ 	$(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \
+ 	mkpdf_options=""; \
+-	gtkdoc-mkpdf 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
++	gtkdoc-mkpdf 2>&1 --help | grep  >/dev/null "\--verbose"; \
+ 	if test "$$?" = "0"; then \
+ 	  if test "x$(V)" = "x1"; then \
+ 	    mkpdf_options="$$mkpdf_options --verbose"; \
+@@ -236,7 +236,7 @@ pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_cont
+ 	if test "x$(HTML_IMAGES)" != "x"; then \
+ 	  for img in $(HTML_IMAGES); do \
+ 	    part=`dirname $$img`; \
+-	    echo $$mkpdf_options | grep >/dev/null "\-\-imgdir=$$part "; \
++	    echo $$mkpdf_options | grep >/dev/null "\--imgdir=$$part "; \
+ 	    if test $$? != 0; then \
+ 	      mkpdf_options="$$mkpdf_options --imgdir=$$part"; \
+ 	    fi; \
+@@ -250,10 +250,10 @@ pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_cont
+ clean-local:
+ 	@rm -f *~ *.bak
+ 	@rm -rf .libs
+-	@if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-types" ; then \
++	@if echo $(SCAN_OPTIONS) | grep -q "\--rebuild-types" ; then \
+ 	  rm -f $(DOC_MODULE).types; \
+ 	fi
+-	@if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-sections" ; then \
++	@if echo $(SCAN_OPTIONS) | grep -q "\--rebuild-sections" ; then \
+ 	  rm -f $(DOC_MODULE)-sections.txt; \
+ 	fi
+ 
+diff --git a/buildsystems/autotools/gtk-doc.no-xslt.make b/buildsystems/autotools/gtk-doc.no-xslt.make
+index 1acee5e..5a4b895 100644
+--- a/buildsystems/autotools/gtk-doc.no-xslt.make
++++ b/buildsystems/autotools/gtk-doc.no-xslt.make
+@@ -136,7 +136,7 @@ scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB)
+ 	gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES)
+ 	$(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
+ 	  scanobj_options=""; \
+-	  gtkdoc-scangobj 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
++	  gtkdoc-scangobj 2>&1 --help | grep  >/dev/null "\--verbose"; \
+ 	  if test "$$?" = "0"; then \
+ 	    if test "x$(V)" = "x1"; then \
+ 	      scanobj_options="--verbose"; \
+@@ -215,7 +215,7 @@ GTK_DOC_V_PDF_0=@echo "  DOC   Building PDF";
+ pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files)
+ 	$(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \
+ 	mkpdf_options=""; \
+-	gtkdoc-mkpdf 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
++	gtkdoc-mkpdf 2>&1 --help | grep  >/dev/null "\--verbose"; \
+ 	if test "$$?" = "0"; then \
+ 	  if test "x$(V)" = "x1"; then \
+ 	    mkpdf_options="$$mkpdf_options --verbose"; \
+@@ -224,7 +224,7 @@ pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_cont
+ 	if test "x$(HTML_IMAGES)" != "x"; then \
+ 	  for img in $(HTML_IMAGES); do \
+ 	    part=`dirname $$img`; \
+-	    echo $$mkpdf_options | grep >/dev/null "\-\-imgdir=$$part "; \
++	    echo $$mkpdf_options | grep >/dev/null "\--imgdir=$$part "; \
+ 	    if test $$? != 0; then \
+ 	      mkpdf_options="$$mkpdf_options --imgdir=$$part"; \
+ 	    fi; \
+@@ -238,10 +238,10 @@ pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_cont
+ clean-local:
+ 	@rm -f *~ *.bak
+ 	@rm -rf .libs
+-	@if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-types" ; then \
++	@if echo $(SCAN_OPTIONS) | grep -q "\--rebuild-types" ; then \
+ 	  rm -f $(DOC_MODULE).types; \
+ 	fi
+-	@if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-sections" ; then \
++	@if echo $(SCAN_OPTIONS) | grep -q "\--rebuild-sections" ; then \
+ 	  rm -f $(DOC_MODULE)-sections.txt; \
+ 	fi
+ 
+diff --git a/buildsystems/autotools/gtkdocize.in b/buildsystems/autotools/gtkdocize.in
+index 83127bf..bf21563 100755
+--- a/buildsystems/autotools/gtkdocize.in
++++ b/buildsystems/autotools/gtkdocize.in
+@@ -57,9 +57,9 @@ if test $no_configure_found -eq 0; then
+   macro=`grep '^GTK_DOC_CHECK' $configure 2>/dev/null`
+   if test $? -eq 0; then
+     # GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
+-    params=`echo $macro | sed -e 's/^GTK_DOC_CHECK(\ *\(.*\)).*$/\1/'`
+-    if echo $params | grep -q '^.*\,\ *\[\{0,1\}'; then
+-      extra_options=`echo $params | sed -e 's/^.*\,\ *\[\{0,1\}\([^]]*\)\]\{0,1\}\ *$/\1/'`
++    params=`echo $macro | sed -e 's/^GTK_DOC_CHECK( *\(.*\)).*$/\1/'`
++    if echo $params | grep -q '^.*, *\[\{0,1\}'; then
++      extra_options=`echo $params | sed -e 's/^.*, *\[\{0,1\}\([^]]*\)\]\{0,1\} *$/\1/'`
+       #echo >&2 "DEBUG: adding extra options [$extra_options] to [$*]"
+       set - $* $GTKDOCIZE_FLAGS $extra_options
+     else
+diff --git a/tests/gtk-doc.make b/tests/gtk-doc.make
+index 9235874..60d9853 100644
+--- a/tests/gtk-doc.make
++++ b/tests/gtk-doc.make
+@@ -196,7 +196,7 @@ pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
+ 	if test "x$(HTML_IMAGES)" != "x"; then \
+ 	  for img in $(HTML_IMAGES); do \
+ 	    part=`dirname $$img`; \
+-	    echo $$mkpdf_options | grep >/dev/null "\-\-imgdir=$$part "; \
++	    echo $$mkpdf_options | grep >/dev/null "\--imgdir=$$part "; \
+ 	    if test $$? != 0; then \
+ 	      mkpdf_options="$$mkpdf_options --imgdir=$$part"; \
+ 	    fi; \
+@@ -213,7 +213,7 @@ pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
+ clean-local:
+ 	@rm -f *~ *.bak ts gtkdoc-*.log
+ 	@rm -rf .libs
+-	@if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-types" ; then \
++	@if echo $(SCAN_OPTIONS) | grep -q "\--rebuild-types" ; then \
+ 	  rm -f $(DOC_MODULE).types; \
+ 	fi
+ 	$(MAKE) distclean-local
+-- 
+2.39.3
+
diff --git a/dev-util/gtk-doc/gtk-doc-1.33.2.ebuild b/dev-util/gtk-doc/gtk-doc-1.33.2-r1.ebuild
index 6025905e457c..65209fd0d2a4 100644
--- a/dev-util/gtk-doc/gtk-doc-1.33.2.ebuild
+++ b/dev-util/gtk-doc/gtk-doc-1.33.2-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-PYTHON_COMPAT=( python3_{9..11} )
+EAPI=8
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit elisp-common gnome.org meson python-single-r1 readme.gentoo-r1
 
@@ -47,6 +47,8 @@ BDEPEND="
 PATCHES=(
 	# Remove global Emacs keybindings, bug #184588
 	"${FILESDIR}"/${PN}-1.8-emacs-keybindings.patch
+
+	"${FILESDIR}"/${P}-gtkdocize-don-t-backslash-escape-regular-characters-.patch
 )
 
 pkg_setup() {
diff --git a/dev-util/sh/Manifest b/dev-util/sh/Manifest
index 7ea6de158227..0f4da1420290 100644
--- a/dev-util/sh/Manifest
+++ b/dev-util/sh/Manifest
@@ -2,7 +2,10 @@ DIST sh-3.5.1-deps.tar.xz 3113476 BLAKE2B 0998ebeacdd7c882542eea25ad5ab3131211c6
 DIST sh-3.5.1.tar.gz 222608 BLAKE2B a81af092d0f8d0ee7c05240d816a99f044bce3e35d242a815a238a27893db5bfc320efc4a0237ca9ecfa0276e4687152c87f6e0170f5326e2d0a8604f94f6adb SHA512 fd1084921254b70376b3ac47b97e2108308252fa6bd23aff1e59aaefb45a7e01c1738a46ae6f4eb255ecade77fb9659fbc8184d2473e8e4f70e520757bad506d
 DIST sh-3.6.0-deps.tar.xz 3291776 BLAKE2B 63a04877eb69aca3b82cf08cd5b171de7fb9aa46910d5d59e7584f2eac424e52bcefdefffb4216b47ea6760535f298fca5ae5e4db29eef9c66a72ffb880b6ec8 SHA512 01271d1e311ab5d6e89dec4287b18229dcd892b05ee0bbf9917fdc9a9318d3f44e1322ca50722e5771091615dfa12f8041a23d533c7107ed03010d399667a24f
 DIST sh-3.6.0.tar.gz 216645 BLAKE2B a4b9e711eb1d8889e317775fcbab95a273c0bef9ff46ce043c1db39b4b21ca944272b595f60d190bf169ce4924f6c37c9aa1945155e62f9f27c7af2ff9008e3f SHA512 c7812496c66df2fd32b674fc260d0f100b3b6297540bc9e4890d603ca8f41589950493d6d62924bded6d17d4dd9347ee5bc47464608cdcde9c1f73e198c454cd
+DIST sh-3.7.0-deps.tar.xz 9776560 BLAKE2B 2376bba34d0b57897f748ce277b8c40da2ac98ad518e516868c442a521b24e4e19016b26dd0e889157781fa75cc7f945dea72a0451937a3bef24d65149d8de7b SHA512 3baf5276b1916e726a99b47dcf1319fb9a015e6096d8dbd430df478f9dbc1ecbcffcb82de72efbb455aa4a6dc17437e00287df27abd2e7e126253171d7024a9e
+DIST sh-3.7.0.tar.gz 219380 BLAKE2B 5de1f5576f3e92f5cc892da730b62640b0922f879005e844b3e0b0d84a4e8f1a5f76e89c53152dd3de11c67da20411c5bddd44627ab31b66a72f950b1bf03393 SHA512 5869b68d4bb59907ff7543019e02e8e1efee5963475763b2b2daf0b1ef8621d919d54978a50e52d865b5b76b188c821fecb673e6a9ce42b30cd9907a020e6387
 EBUILD sh-3.5.1.ebuild 1124 BLAKE2B 0bde749e4856c27ab0125fb3afef356dfcd34afc588d4dc74d45389fadf1b6999245a1455fc15b5ce3424570be96c056ec5e2e06a632659d0d9a2e5dd9f03275 SHA512 94b0e355218e6cdacdd775301e6b779a74111655fbe010e0828b4f9985e753db0611eb9fb723b1f175d8651bec827e345c166a8511401bff944de460a7c283a1
 EBUILD sh-3.6.0.ebuild 1131 BLAKE2B b88dad8c9438b7991d8197d02a421736840a366f03126a31a3375b297564db0eaa7d005d34f9e79de8eb8f4f4824a48b0a5a59f966ce71acff96b49c26665b70 SHA512 6659592096319d199b16775c5b0dfbd772b9725b039e6e23b58d53599f440c4ae16d4bdf5040c47c2d6ee55568112ff6c2da5b40a2ee5033aed09fb809effd4b
+EBUILD sh-3.7.0.ebuild 1136 BLAKE2B ef6ba3861e8d11ae56f86813e34debfef3e1b41a01747008a3cf2fd9bf68dbf57fc88606a8be2df3b4ea95fdb3ef2dd83493c7892597125fa0d98e701f380dc5 SHA512 daf31cd0b5007e1be410c1839d9e96b8fd3b46515c7a009658834791974fda02bc1c694027b75a2accd227ff8846601f3ee8038547b79dde0db4f87d85eb2374
 EBUILD sh-9999.ebuild 1136 BLAKE2B ef6ba3861e8d11ae56f86813e34debfef3e1b41a01747008a3cf2fd9bf68dbf57fc88606a8be2df3b4ea95fdb3ef2dd83493c7892597125fa0d98e701f380dc5 SHA512 daf31cd0b5007e1be410c1839d9e96b8fd3b46515c7a009658834791974fda02bc1c694027b75a2accd227ff8846601f3ee8038547b79dde0db4f87d85eb2374
 MISC metadata.xml 717 BLAKE2B 0f9d6a11056a5a0ba6e297601a55b88ea86ee47d08dba0da2b4367c71f2a8e5876f0513f4fc31fd0b63905ad89a9da57b95a90ecb2efce8009ef1f23dc14a109 SHA512 b9ad5206fb1d1e3e22751c6619f998635d8f17d31b75b9cc4e99516eff8ce875b4dc8597c5c25b16cc684312b3e3b458a674f5be557f4c286cf3a374716c8863
diff --git a/dev-util/sh/sh-3.7.0.ebuild b/dev-util/sh/sh-3.7.0.ebuild
new file mode 100644
index 000000000000..c85de409caf7
--- /dev/null
+++ b/dev-util/sh/sh-3.7.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+DESCRIPTION="A shell parser, formatter, and interpreter with bash support"
+HOMEPAGE="https://github.com/mvdan/sh"
+
+if [[ ${PV} == *9999 ]]; then
+	EGIT_REPO_URI="https://github.com/mvdan/sh.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/mvdan/sh/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+	S="${WORKDIR}/${PN//fmt/}-${PV}"
+fi
+
+LICENSE="Apache-2.0 BSD"
+SLOT="0"
+IUSE="+man"
+
+BDEPEND="man? ( app-text/scdoc )"
+
+src_unpack() {
+	default
+	if [[ ${PV} == *9999 ]]; then
+		git-r3_src_unpack
+		go-module_live_vendor
+	fi
+}
+
+src_compile() {
+	# Not bothering with gosh for now as it's very new
+	# https://github.com/mvdan/sh#gosh
+	ego build ./cmd/shfmt
+	if use man; then
+		scdoc <cmd/shfmt/shfmt.1.scd >shfmt.1 || die "conversation of man page failed"
+	fi
+}
+
+src_test() {
+	cd syntax || die
+	ego test -run=-
+}
+
+src_install() {
+	dobin shfmt
+	if use man; then
+		doman shfmt.1
+	fi
+}