gentoo auto-resync : 16:01:2025 - 06:41:40

3 files changed, 149 insertions, 0 deletions

diff --git a/dev-util/gtk-doc/Manifest b/dev-util/gtk-doc/Manifest
index 18324cb72c74..41317dbdaaa5 100644
--- a/dev-util/gtk-doc/Manifest
+++ b/dev-util/gtk-doc/Manifest
@@ -1,6 +1,9 @@
 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.34.0-mkhtml-test.patch 1001 BLAKE2B 385d6b8b9f6910f79d9ccafce843d646d24e152732b19234477f53f80395d8c80f78b36474360227aa58e36a2fec610e9906ad7ee44ebe9e5e94ec6e89772ea6 SHA512 a21a37419aa98a8ec02bf3639d2cc29f0fbad91d3e8a03e3f5c1a1cf527d2b5f88735d3765cab5bf276dc0d87e40ff805747471146cccc0908d554fa1259c85c
 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
+DIST gtk-doc-1.34.0.tar.xz 494116 BLAKE2B cb8550debed9f32b967de9d4ebdde8dbe83551eb8527221d2d788355431f34e62a4beedda3e7f5722516ae8e23794a56b97a4f761ede0f7f2c0ef288624b5f7a SHA512 d962fe31949b5f7c70122c7ebbd98f4d21725697804bf5dd75fd7a6662753a91c9350fd1e8bed22a58a957b173f35e200fcbb4c7c2ebc45ccbc0db2e916b27ea
 EBUILD gtk-doc-1.33.2-r1.ebuild 2677 BLAKE2B 7f77b0e734466cbef117e939ec2d6e1c346c90423ccf33e19462872d9108cb220ae1783e62e99cc966302e144bd7a1984666f66d7f31ab715b95a22e075c617f SHA512 fc8e3d574a2b099ac0c1e8578ba2118a5def2c163857a2981162f4c9b6ce6280dedbdd8a2da8ad9e85c912f2a04107dc27302b18967c1667a48baf98f21ea8a3
+EBUILD gtk-doc-1.34.0.ebuild 2696 BLAKE2B 241102877f6792f4153765db1bbf8303653471c1ee9e5ec9828b05f37830214276a07bab40e583cd2dc44812eda22a8fc246d71d299c6588b77e99f3f81c5a12 SHA512 d8d52900978454782e0f05c27e1eff01e7e31b0366b1becb921cbbe4867984de00b0c33b46dba093938f984e0df115f9ebb5acb58ae8692ba00e38ea0afe93f3
 MISC metadata.xml 605 BLAKE2B 1f39610cb7bb45a71462268a6c7b14b6af94502839882b36342099e171b0aa976e773d25b1fd8eb49ef502cbdb961e3a5a82103286667eac7aad728d51b0b052 SHA512 712a1cca5e2cc349412cabb8bdc5a0a0a859629877d5a9615afc3e499a67e3e24905a9dfc1d7c22e1dce1f678a5d0632ac04f20fae9c3c7dd1d8df096e4be8c5
diff --git a/dev-util/gtk-doc/files/gtk-doc-1.34.0-mkhtml-test.patch b/dev-util/gtk-doc/files/gtk-doc-1.34.0-mkhtml-test.patch
new file mode 100644
index 000000000000..982b5bd11f7a
--- /dev/null
+++ b/dev-util/gtk-doc/files/gtk-doc-1.34.0-mkhtml-test.patch
@@ -0,0 +1,33 @@
+From 951743698610eaaa0cc9030f7d7d02437419ac24 Mon Sep 17 00:00:00 2001
+From: Neil Hanlon <neil@shrug.pw>
+Date: Fri, 9 Feb 2024 15:32:38 -0500
+Subject: [PATCH] Add gobject example source code to path for mkhtml test
+
+Fixes #150
+
+I'm not really sure why this is required, but I suspect it has to do
+with changes in how GCC handles path traversal due to recent (ish)
+security issues, as the code here is evaluated to
+`../xml/../../examples/gobject.c` which probably looks unhealthy to
+automatically include.
+
+Signed-off-by: Neil Hanlon <neil@shrug.pw>
+---
+ tests/gobject/docs/meson.build | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tests/gobject/docs/meson.build b/tests/gobject/docs/meson.build
+index a1dd66c..236a1cc 100644
+--- a/tests/gobject/docs/meson.build
++++ b/tests/gobject/docs/meson.build
+@@ -119,6 +119,7 @@ test(
+     '--path=@0@'.format(':'.join([
+       gobject_test_docs_dir,
+       srcdir,
++      join_paths(srcdir, 'tests/gobject/examples'),
+       ])
+     ),
+   ],
+-- 
+GitLab
+
diff --git a/dev-util/gtk-doc/gtk-doc-1.34.0.ebuild b/dev-util/gtk-doc/gtk-doc-1.34.0.ebuild
new file mode 100644
index 000000000000..49e15e21f1e3
--- /dev/null
+++ b/dev-util/gtk-doc/gtk-doc-1.34.0.ebuild
@@ -0,0 +1,113 @@
+# 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://gitlab.gnome.org/GNOME/gtk-doc"
+
+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
+
+	# https://gitlab.gnome.org/GNOME/gtk-doc/-/issues/150
+	"${FILESDIR}"/${PN}-1.34.0-mkhtml-test.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
+}