commit: 96c5465f23a90b555ccc7e520a2d51c9e5176ff9 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Jul 27 15:14:54 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Jul 27 19:46:34 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96c5465f
dev-util/gtk-doc: drop 1.33.2-r2 Closes: https://bugs.gentoo.org/957671 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> dev-util/gtk-doc/Manifest | 1 - ...on-t-backslash-escape-regular-characters-.patch | 175 --------------------- dev-util/gtk-doc/gtk-doc-1.33.2-r2.ebuild | 112 ------------- 3 files changed, 288 deletions(-) diff --git a/dev-util/gtk-doc/Manifest b/dev-util/gtk-doc/Manifest index 0bd282af0262..ca58663a6510 100644 --- a/dev-util/gtk-doc/Manifest +++ b/dev-util/gtk-doc/Manifest @@ -1,2 +1 @@ -DIST gtk-doc-1.33.2.tar.xz 507852 BLAKE2B dea3030060ecec89433fe3783dfacc2f58373780c49560a48ab1a32bedfe888692183de8396c92414255e4c8f537358cbc373fd307638ab8e7dbfd9ae44de58f SHA512 f50f68ab6b4bc59f55e84b49c1481f05700171cbf79eca9ba8f3a142a30a4ba88fe096983ebb8d117a9ef8bcea40934674096683d956f5c54cae457d31f651ab DIST gtk-doc-1.34.0.tar.xz 494116 BLAKE2B cb8550debed9f32b967de9d4ebdde8dbe83551eb8527221d2d788355431f34e62a4beedda3e7f5722516ae8e23794a56b97a4f761ede0f7f2c0ef288624b5f7a SHA512 d962fe31949b5f7c70122c7ebbd98f4d21725697804bf5dd75fd7a6662753a91c9350fd1e8bed22a58a957b173f35e200fcbb4c7c2ebc45ccbc0db2e916b27ea 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 deleted file mode 100644 index 6b51b1398489..000000000000 --- a/dev-util/gtk-doc/files/gtk-doc-1.33.2-gtkdocize-don-t-backslash-escape-regular-characters-.patch +++ /dev/null @@ -1,175 +0,0 @@ -https://gitlab.gnome.org/GNOME/gtk-doc/-/merge_requests/72 - -From d20e5befb071e79ee0f23a0a7a1b28cb0755caac Mon Sep 17 00:00:00 2001 -From: Thomas Haller <[email protected]> -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-r2.ebuild b/dev-util/gtk-doc/gtk-doc-1.33.2-r2.ebuild deleted file mode 100644 index f4a58e4ade74..000000000000 --- a/dev-util/gtk-doc/gtk-doc-1.33.2-r2.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_{10..13} ) - -inherit elisp-common gnome.org meson python-single-r1 readme.gentoo-r1 - -DESCRIPTION="GTK+ Documentation Generator" -HOMEPAGE="https://wiki.gnome.org/DocumentationProject/GtkDoc"; - -LICENSE="GPL-2 FDL-1.1" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" - -IUSE="emacs test" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" -RESTRICT="!test? ( test )" - -RDEPEND=" - ${PYTHON_DEPS} - >=dev-libs/glib-2.38:2 - dev-libs/libxslt - >=dev-libs/libxml2-2.3.6:2= - ~app-text/docbook-xml-dtd-4.3 - app-text/docbook-xsl-stylesheets - ~app-text/docbook-sgml-dtd-3.0 - >=app-text/docbook-dsssl-stylesheets-1.40 - emacs? ( >=app-editors/emacs-23.1:* ) - $(python_gen_cond_dep ' - dev-python/pygments[${PYTHON_USEDEP}] - ') -" -DEPEND="${RDEPEND} - test? ( - $(python_gen_cond_dep ' - dev-python/parameterized[${PYTHON_USEDEP}] - ') - ) -" -BDEPEND=" - ~dev-build/gtk-doc-am-${PV} - dev-util/itstool - virtual/pkgconfig -" - -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() { - DOC_CONTENTS="gtk-doc does no longer define global key bindings for Emacs. - You may set your own key bindings for \"gtk-doc-insert\" and - \"gtk-doc-insert-section\" in your ~/.emacs file." - SITEFILE=61${PN}-gentoo.el - python-single-r1_pkg_setup -} - -src_prepare() { - default - - # Requires the unpackaged Python "anytree" module - sed -i -e '/mkhtml2/d' "${S}"/tests/meson.build || die -} - -src_configure() { - local emesonargs=( - -Dautotools_support=true - -Dcmake_support=true - -Dyelp_manual=true - $(meson_use test tests) - ) - meson_src_configure -} - -src_compile() { - meson_src_compile - use emacs && elisp-compile tools/gtk-doc.el -} - -src_install() { - meson_src_install - - # The meson build system configures the shebangs to the temporary python - # used during the build. We need to fix it. - sed -i -e 's:^#!.*python3:#!/usr/bin/env python3:' "${ED}"/usr/bin/* || die - python_fix_shebang "${ED}"/usr/bin - - # Don't install this file, it's in gtk-doc-am now - rm "${ED}"/usr/share/aclocal/gtk-doc.m4 || die "failed to remove gtk-doc.m4" - rmdir "${ED}"/usr/share/aclocal || die - - if use emacs; then - elisp-install ${PN} tools/gtk-doc.el* - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - readme.gentoo_create_doc - fi -} - -pkg_postinst() { - if use emacs; then - elisp-site-regen - readme.gentoo_print_elog - fi -} - -pkg_postrm() { - use emacs && elisp-site-regen -}
