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

3 files changed, 181 insertions, 3 deletions

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() {