commit: eed9d04a0804e07bd4d6ea1f4518df9e536d63d9 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Thu Sep 18 04:51:21 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Sep 18 04:51:21 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eed9d04a
dev-util/gdbus-codegen: drop 2.78.6, 2.80.5-r1 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-util/gdbus-codegen/Manifest | 2 - .../files/gdbus-codegen-2.78.4-distutils.patch | 36 ---------- dev-util/gdbus-codegen/gdbus-codegen-2.78.6.ebuild | 80 ---------------------- .../gdbus-codegen/gdbus-codegen-2.80.5-r1.ebuild | 80 ---------------------- 4 files changed, 198 deletions(-) diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest index bedd8506bff5..f8e0bbcc3e16 100644 --- a/dev-util/gdbus-codegen/Manifest +++ b/dev-util/gdbus-codegen/Manifest @@ -1,5 +1,3 @@ -DIST glib-2.78.6.tar.xz 5344808 BLAKE2B d16173794c4aa019459cf8c8c84d4107fb8393828f41ec6c631b9452890f34f9022ed848a543ed134fdb8a575faef6b941cea3e05de512eb1b7a99f7601a2485 SHA512 8d75f8fd77b6309215ca86a0c7648878efe11051f18b279840c137669017ea4066388f8682367e4ea3f154333d833c9dc28ccd4a66a91f0c3854a40a2838f8da -DIST glib-2.80.5.tar.xz 5538308 BLAKE2B 3f17ff85a85d20858b69c2dccc1e5d6ffd92661a8cfda8b8770dd391861999ff3381008f4fe382e90f0a7798fe218debda7f559f6e3ac8f9305e3be98b879969 SHA512 c9cc9f99e217fd950810fcfbfa7300c7850cae4dbfbabc03cdcadb6dcca2e51ea7979ceb68c09d8e9776fd1c04db73b89b81f748c8bd911e1f7ad9f704dff172 DIST glib-2.82.5.tar.xz 5554704 BLAKE2B e7853034be1137f8b793483df9e9ce1465dd10a990eb9b3cb9ac76c9f8f86ccc6fda85645b04b35963b28c33e0f6c02df4f3d03e06cc278b8515e588d6bd05f6 SHA512 a6b035c32a42b9d6f4c031a29da405848002619654b58c9205f2f78dbb9698cd5866f31ab213adc04aa214d2c48840a9592c0a1e9201e6851ebd435635f393ae DIST glib-2.84.0.tar.xz 5613328 BLAKE2B a482076d6b0c82824179094974110dbd10d47fce93f84f4626d0d3dbea528602c41ac4a7ab8feedc3d7cc5e404ef8bef30c6c744b6f0f4f3a764644e28210e28 SHA512 72b85e30c535c5da7d8598d1cec02b1b481c467e612dbb396a0a64ad1d37cf2f1802c6fa576885c99cf8a22f4f0fc7dfdf42a3f32f7f40394f72db588fdbebb7 DIST glib-2.84.1.tar.xz 5615396 BLAKE2B d20ade482eb95873adaefc656e22c57e6712a6263a4812e448220040e30144919331cb279566a89a2ab46495b46d6a79e3821e491317587325fa3a64b40d62cc SHA512 ee7f38a4726fd72e41ddb75c4933c7b1bb30935bb2fddc84902d0627a836af512534195132cc02e3d15f168fefc816576181a8d6e436472b582191437b79a456 diff --git a/dev-util/gdbus-codegen/files/gdbus-codegen-2.78.4-distutils.patch b/dev-util/gdbus-codegen/files/gdbus-codegen-2.78.4-distutils.patch deleted file mode 100644 index 38fbe0e1a9b5..000000000000 --- a/dev-util/gdbus-codegen/files/gdbus-codegen-2.78.4-distutils.patch +++ /dev/null @@ -1,36 +0,0 @@ -https://bugs.gentoo.org/922654 -https://gitlab.gnome.org/GNOME/glib/-/issues/3134 -https://gitlab.gnome.org/GNOME/glib/-/commit/6ef967a0f930ce37a8c9b5aff969693b34714291 - -[sam: Trimmed the CI changes.] - -From 6ef967a0f930ce37a8c9b5aff969693b34714291 Mon Sep 17 00:00:00 2001 -From: Jordan Williams <[email protected]> -Date: Fri, 1 Dec 2023 09:53:50 -0600 -Subject: [PATCH] Switch from the deprecated distutils module to the packaging - module - -The distutils module was removed in Python 3.12. ---- - ---- a/utils.py -+++ b/utils.py -@@ -19,7 +19,7 @@ - # - # Author: David Zeuthen <[email protected]> - --import distutils.version -+import packaging.version - import os - import sys - -@@ -166,4 +166,4 @@ def version_cmp_key(key): - v = str(key[0]) - else: - v = "0" -- return (distutils.version.LooseVersion(v), key[1]) -+ return (packaging.version.Version(v), key[1]) --- -GitLab - - diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.78.6.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.78.6.ebuild deleted file mode 100644 index bd914e2e8cad..000000000000 --- a/dev-util/gdbus-codegen/gdbus-codegen-2.78.6.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -GNOME_ORG_MODULE="glib" -PYTHON_COMPAT=( python3_{10..13} ) -PYTHON_REQ_USE="xml(+)" -DISTUTILS_USE_PEP517=setuptools -DISTUTILS_SINGLE_IMPL=1 - -inherit gnome.org distutils-r1 - -DESCRIPTION="GDBus code and documentation generator" -HOMEPAGE="https://www.gtk.org/"; - -LICENSE="LGPL-2+" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos" - -RDEPEND=" - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/packaging[${PYTHON_USEDEP}] - ') -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-libs/libxslt - app-text/docbook-xsl-stylesheets -" - -S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen" - -python_prepare_all() { - PATCHES=( - "${FILESDIR}/${PN}-2.56.1-sitedir.patch" - "${FILESDIR}/${PN}-2.78.4-distutils.patch" - ) - distutils-r1_python_prepare_all - - local MAJOR_VERSION=$(ver_cut 1) - local MINOR_VERSION=$(ver_cut 2) - sed -e 's:@PYTHON@:python:' gdbus-codegen.in > gdbus-codegen || die - sed -e "s:@VERSION@:${PV}:" \ - -e "s:@MAJOR_VERSION@:${MAJOR_VERSION}:" \ - -e "s:@MINOR_VERSION@:${MINOR_VERSION}:" config.py.in > config.py || die - cp "${FILESDIR}/setup.py-2.32.4" setup.py || die "cp failed" - sed -e "s/@PV@/${PV}/" -i setup.py || die "sed setup.py failed" -} - -do_xsltproc_command() { - # Taken from meson.build for manual manpage building - keep in sync (also copied to dev-util/glib-utils) - xsltproc \ - --nonet \ - --stringparam man.output.quietly 1 \ - --stringparam funcsynopsis.style ansi \ - --stringparam man.th.extra1.suppress 1 \ - --stringparam man.authors.section.enabled 0 \ - --stringparam man.copyright.section.enabled 0 \ - -o "${2}" \ - http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \ - "${1}" || die "manpage generation failed" -} - -src_compile() { - distutils-r1_src_compile - do_xsltproc_command \ - "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.xml" \ - "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1" -} - -src_test() { - einfo "Skipping tests. This package is tested by dev-libs/glib" - einfo "when merged with FEATURES=test" -} - -python_install_all() { - distutils-r1_python_install_all # no-op, but prevents QA warning - doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1" -} diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.80.5-r1.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.80.5-r1.ebuild deleted file mode 100644 index fdac85ed73c3..000000000000 --- a/dev-util/gdbus-codegen/gdbus-codegen-2.80.5-r1.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -GNOME_ORG_MODULE="glib" -PYTHON_COMPAT=( python3_{10..13} ) -PYTHON_REQ_USE="xml(+)" -DISTUTILS_USE_PEP517=setuptools -DISTUTILS_SINGLE_IMPL=1 - -inherit gnome.org distutils-r1 - -DESCRIPTION="GDBus code and documentation generator" -HOMEPAGE="https://www.gtk.org/"; - -S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen" - -LICENSE="LGPL-2+" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos" - -RDEPEND=" - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/packaging[${PYTHON_USEDEP}] - ') -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-libs/libxslt - app-text/docbook-xsl-stylesheets - >=dev-python/docutils-0.21.1 -" - -python_prepare_all() { - PATCHES=( - "${FILESDIR}/${PN}-2.56.1-sitedir.patch" - ) - distutils-r1_python_prepare_all - - local MAJOR_VERSION=$(ver_cut 1) - local MINOR_VERSION=$(ver_cut 2) - sed -e 's:@PYTHON@:python:' gdbus-codegen.in > gdbus-codegen || die - sed -e "s:@VERSION@:${PV}:" \ - -e "s:@MAJOR_VERSION@:${MAJOR_VERSION}:" \ - -e "s:@MINOR_VERSION@:${MINOR_VERSION}:" config.py.in > config.py || die - cp "${FILESDIR}/setup.py-2.32.4" setup.py || die "cp failed" - sed -e "s/@PV@/${PV}/" -i setup.py || die "sed setup.py failed" -} - -do_xsltproc_command() { - # Taken from meson.build for manual manpage building - keep in sync (also copied to dev-util/glib-utils) - xsltproc \ - --nonet \ - --stringparam man.output.quietly 1 \ - --stringparam funcsynopsis.style ansi \ - --stringparam man.th.extra1.suppress 1 \ - --stringparam man.authors.section.enabled 0 \ - --stringparam man.copyright.section.enabled 0 \ - -o "${2}" \ - http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \ - "${1}" || die "manpage generation failed" -} - -src_compile() { - distutils-r1_src_compile - rst2man \ - "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.rst" \ - "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1" -} - -src_test() { - einfo "Skipping tests. This package is tested by dev-libs/glib" - einfo "when merged with FEATURES=test" -} - -python_install_all() { - distutils-r1_python_install_all # no-op, but prevents QA warning - doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1" -}
