public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-util/gdbus-codegen/, dev-util/gdbus-codegen/files/
@ 2018-06-10  8:25 Mart Raudsepp
  0 siblings, 0 replies; 3+ messages in thread
From: Mart Raudsepp @ 2018-06-10  8:25 UTC (permalink / raw
  To: gentoo-commits

commit:     2b5a908fab7d45931b55d455072d39b453cb8213
Author:     Sobhan Mohammadpour <sobhan <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  4 11:28:48 2018 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sun Jun 10 08:25:18 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b5a908f

dev-util/gdbus-codegen: bump to 2.54.3

Bug: https://bugs.gentoo.org/651830
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-util/gdbus-codegen/Manifest                    |  1 +
 .../files/gdbus-codegen-2.54.3-sitedir.patch       | 22 +++++++++++
 dev-util/gdbus-codegen/gdbus-codegen-2.54.3.ebuild | 46 ++++++++++++++++++++++
 3 files changed, 69 insertions(+)

diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index 02f95e63ed7..060b85d6531 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -1,2 +1,3 @@
 DIST glib-2.50.3.tar.xz 7589284 BLAKE2B 8648e5d9e8f4c943ca3ec5a5ec01f380f55f76555bf4ec731e211b33d0e23c29ea2a9323e2e839f35f89f292863df76d4e8c622fc44c0e5905eb904576618dbd SHA512 ef35806c15170b6608445f255136c0bebd2d433adf903c2af2865f6a57b4f2fcfc1e4a7cea1a0dac48ff5fe26248fbf7886dba4a8d209506f0a94160df8fb7af
 DIST glib-2.52.3.tar.xz 7679972 BLAKE2B 8d9f6b714571bd04ab9717fbf9ded8556664e43dcdb7dd59436b8b7f1a8a5cdf98e9ce60ca1ead941af1d57688044fefb6c749fa735084622a3482b058864ff6 SHA512 a068f2519cfb82de8d4b7f004e7c1f15e841cad4046430a83b02b359d011e0c4077cdff447a1687ed7c68f1a11b4cf66b9ed9fc23ab5f0c7c6be84eb0ddc3017
+DIST glib-2.54.3.tar.xz 7836536 BLAKE2B 140e7cf09a41b72a5b22e5b87e9674cbfdfe1b82f3cf5f0fd3ecb2ed6b1f62a90f8b4c0bc2f655e297f91394f771f6ecad210357e31f104ee49ca178be6b9d76 SHA512 23eb4458684624f80c17aa784eab42a38eec87bb5979fcfe56f0bc63b5c7bcf8251a0d4ea916fe2c8109ff5b14a4b60c6260755d079ff984c0d8e6a2871d307d

diff --git a/dev-util/gdbus-codegen/files/gdbus-codegen-2.54.3-sitedir.patch b/dev-util/gdbus-codegen/files/gdbus-codegen-2.54.3-sitedir.patch
new file mode 100644
index 00000000000..f739026db25
--- /dev/null
+++ b/dev-util/gdbus-codegen/files/gdbus-codegen-2.54.3-sitedir.patch
@@ -0,0 +1,22 @@
+diff --git a/gio/gdbus-2.0/codegen/gdbus-codegen.in b/gio/gdbus-2.0/codegen/gdbus-codegen.in
+index 8050981..932410a 100644
+--- a/gdbus-codegen.in
++++ b/gdbus-codegen.in
+@@ -28,16 +28,7 @@ filedir = os.path.dirname(__file__)
+ 
+ if srcdir is not None:
+     path = os.path.join(srcdir, 'gio', 'gdbus-2.0')
+-elif os.path.basename(filedir) == 'bin':
+-    # Make the prefix containing gdbus-codegen 'relocatable' at runtime by
+-    # adding /some/prefix/bin/../share/glib-2.0 to the python path
+-    path = os.path.join(filedir, '..', 'share', 'glib-2.0')
+ else:
+-    # Assume that the modules we need are in the current directory and add the
+-    # parent directory to the python path.
+-    path = os.path.join(filedir, '..')
+-
+-sys.path.insert(0, os.path.abspath(path))
+-from codegen import codegen_main
++     from gdbus_codegen import codegen_main
+ 
+ sys.exit(codegen_main.codegen_main())

diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.54.3.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.54.3.ebuild
new file mode 100644
index 00000000000..1ac95b47d96
--- /dev/null
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.54.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME_ORG_MODULE="glib"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE="xml"
+
+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 ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+# To prevent circular dependencies with glib[test]
+PDEPEND=">=dev-libs/glib-${PV}:2"
+
+S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
+
+python_prepare_all() {
+	PATCHES=(
+		"${FILESDIR}/${PN}-2.54.3-sitedir.patch"
+	)
+	distutils-r1_python_prepare_all
+
+	sed -e 's:@PYTHON@:python:' gdbus-codegen.in > gdbus-codegen || 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"
+}
+
+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"
+}


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/gdbus-codegen/, dev-util/gdbus-codegen/files/
@ 2018-12-30 11:28 Mart Raudsepp
  0 siblings, 0 replies; 3+ messages in thread
From: Mart Raudsepp @ 2018-12-30 11:28 UTC (permalink / raw
  To: gentoo-commits

commit:     d9f2c9496fda66392269bb1b1b17e8b323027081
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 30 11:07:35 2018 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sun Dec 30 11:11:55 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9f2c949

dev-util/gdbus-codegen: remove old

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 dev-util/gdbus-codegen/Manifest                    |  3 -
 .../files/gdbus-codegen-2.40.0-sitedir.patch       | 31 ----------
 .../files/gdbus-codegen-2.54.3-sitedir.patch       | 22 -------
 dev-util/gdbus-codegen/gdbus-codegen-2.52.3.ebuild | 46 --------------
 dev-util/gdbus-codegen/gdbus-codegen-2.54.3.ebuild | 46 --------------
 .../gdbus-codegen/gdbus-codegen-2.58.1-r1.ebuild   | 70 ----------------------
 6 files changed, 218 deletions(-)

diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index 08247f8f360..07a83137e9e 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -1,6 +1,3 @@
-DIST glib-2.52.3.tar.xz 7679972 BLAKE2B 8d9f6b714571bd04ab9717fbf9ded8556664e43dcdb7dd59436b8b7f1a8a5cdf98e9ce60ca1ead941af1d57688044fefb6c749fa735084622a3482b058864ff6 SHA512 a068f2519cfb82de8d4b7f004e7c1f15e841cad4046430a83b02b359d011e0c4077cdff447a1687ed7c68f1a11b4cf66b9ed9fc23ab5f0c7c6be84eb0ddc3017
-DIST glib-2.54.3.tar.xz 7836536 BLAKE2B 140e7cf09a41b72a5b22e5b87e9674cbfdfe1b82f3cf5f0fd3ecb2ed6b1f62a90f8b4c0bc2f655e297f91394f771f6ecad210357e31f104ee49ca178be6b9d76 SHA512 23eb4458684624f80c17aa784eab42a38eec87bb5979fcfe56f0bc63b5c7bcf8251a0d4ea916fe2c8109ff5b14a4b60c6260755d079ff984c0d8e6a2871d307d
 DIST glib-2.56.2.tar.xz 8041756 BLAKE2B 1af5bb37378856e959602bcb9299266bba46b990839c923f6b9881624aed306af0779005281b3e3a46b5994c54812edc86aade9cb782c596fd63b6fd91baba51 SHA512 8201ea82d3613d2e879284abe01520b766da30957c5a1a22f3e6019b0cce6bf95d25beae78867b6a133401c4165153c0c92974dd459ab12f9e0e9dd0c95df5d4
 DIST glib-2.56.4.tar.xz 7029768 BLAKE2B 21cf840128e468151eeac55f0323f8f643973422b70bb65655e24c0a6b2f7ee72d5ae879bfae73df84fa2281fc425cc98328597910ba8fd99d7a52024e1b3ab6 SHA512 280a46c2af13283a08c15ff0b4f5492659c2884521930600ad45310ed181c44a878ad8f9b36bae68ed6e7d92db6f1630f7bf015148c513dc317d25807f13abb0
-DIST glib-2.58.1.tar.xz 4906444 BLAKE2B 022da8624a8ae2ec7fdc45777556a518d056e7389158d96db36baccdb238ed6fbdb6f224ec8b1c1bfec78001aa0348d3fc1fd43d20908a8c4690a0e03038bf61 SHA512 115b74fcd43241e3c4b4babfb8170453b2a002ff02d5996f3c097876199cadccc1cf67b017c10c14c0d2a1bb4228027b743f4926bda0ef7d74012ed712ccd155
 DIST glib-2.58.2.tar.xz 4862612 BLAKE2B e94d3dfc5d4b6d100c2425fda34c90fdf643fdb71b8bd65df691e34d11bfaf79fdc4c844eb215df24b0f680991fb0d0c08c3bb3dea61f5157ccd8bec200e2059 SHA512 4017ae308f2ef6313abbff2eb9b21ec6f8fa38935007491ca0cb4d1ffac6fedab6f50e911ac088995d6212323ba1767399f18529a2620d60378ecade193b4b1a

diff --git a/dev-util/gdbus-codegen/files/gdbus-codegen-2.40.0-sitedir.patch b/dev-util/gdbus-codegen/files/gdbus-codegen-2.40.0-sitedir.patch
deleted file mode 100644
index ffeb17ba237..00000000000
--- a/dev-util/gdbus-codegen/files/gdbus-codegen-2.40.0-sitedir.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 626f79dcfb1f26997f2807829c6fa19f6c3303f5 Mon Sep 17 00:00:00 2001
-From: Sobhan Mohammadpour <sobhanmohammadpour1@yahoo.fr>
-Date: Sun, 20 Jan 2013 20:25:13 +0330
-Subject: [PATCH] glib-2.35.4-external-gdbus-codegen
-
----
- gio/gdbus-2.0/codegen/gdbus-codegen.in | 8 +-------
- 1 file changed, 1 insertion(+), 7 deletions(-)
-
-diff --git a/gio/gdbus-2.0/codegen/gdbus-codegen.in b/gio/gdbus-2.0/codegen/gdbus-codegen.in
-index 253d151..2295481 100644
---- a/gio/gdbus-2.0/codegen/gdbus-codegen.in
-+++ b/gio/gdbus-2.0/codegen/gdbus-codegen.in
-@@ -29,13 +29,7 @@ srcdir = os.getenv('UNINSTALLED_GLIB_SRCDIR', None)
- 
- if srcdir is not None:
-     path = os.path.join(srcdir, 'gio', 'gdbus-2.0')
--elif os.name == 'nt':
--    # Makes gdbus-codegen 'relocatable' at runtime on Windows.
--    path = os.path.join(os.path.dirname(__file__), '..', 'share', 'glib-2.0')
- else:
--    path = os.path.join('@datadir@', 'glib-2.0')
--
--sys.path.insert(0, os.path.abspath(path))
--from codegen import codegen_main
-+    from gdbus_codegen import codegen_main
- 
- sys.exit(codegen_main.codegen_main())
--- 
-1.8.1
-

diff --git a/dev-util/gdbus-codegen/files/gdbus-codegen-2.54.3-sitedir.patch b/dev-util/gdbus-codegen/files/gdbus-codegen-2.54.3-sitedir.patch
deleted file mode 100644
index d3bbba4cb03..00000000000
--- a/dev-util/gdbus-codegen/files/gdbus-codegen-2.54.3-sitedir.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/gio/gdbus-2.0/codegen/gdbus-codegen.in b/gio/gdbus-2.0/codegen/gdbus-codegen.in
-index 8050981..932410a 100644
---- a/gdbus-codegen.in
-+++ b/gdbus-codegen.in
-@@ -28,16 +28,7 @@ filedir = os.path.dirname(__file__)
- 
- if srcdir is not None:
-     path = os.path.join(srcdir, 'gio', 'gdbus-2.0')
--elif os.path.basename(filedir) == 'bin':
--    # Make the prefix containing gdbus-codegen 'relocatable' at runtime by
--    # adding /some/prefix/bin/../share/glib-2.0 to the python path
--    path = os.path.join(filedir, '..', 'share', 'glib-2.0')
- else:
--    # Assume that the modules we need are in the current directory and add the
--    # parent directory to the python path.
--    path = os.path.join(filedir, '..')
--
--sys.path.insert(0, os.path.abspath(path))
--from codegen import codegen_main
-+    from gdbus_codegen import codegen_main
- 
- sys.exit(codegen_main.codegen_main())

diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.52.3.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.52.3.ebuild
deleted file mode 100644
index 1b6ca98b5f6..00000000000
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.52.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GNOME_ORG_MODULE="glib"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-PYTHON_REQ_USE="xml"
-
-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 ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE=""
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-
-# To prevent circular dependencies with glib[test]
-PDEPEND=">=dev-libs/glib-${PV}:2"
-
-S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
-
-python_prepare_all() {
-	PATCHES=(
-		"${FILESDIR}/${PN}-2.40.0-sitedir.patch"
-	)
-	distutils-r1_python_prepare_all
-
-	sed -e 's:#!@PYTHON@:#!/usr/bin/env python:' gdbus-codegen.in > gdbus-codegen || 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"
-}
-
-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.54.3.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.54.3.ebuild
deleted file mode 100644
index 56bea99d5df..00000000000
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.54.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_ORG_MODULE="glib"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-PYTHON_REQ_USE="xml"
-
-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 ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE=""
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-
-# To prevent circular dependencies with glib[test]
-PDEPEND=">=dev-libs/glib-${PV}:2"
-
-S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
-
-python_prepare_all() {
-	PATCHES=(
-		"${FILESDIR}/${PN}-2.54.3-sitedir.patch"
-	)
-	distutils-r1_python_prepare_all
-
-	sed -e 's:@PYTHON@:python:' gdbus-codegen.in > gdbus-codegen || 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"
-}
-
-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.58.1-r1.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.58.1-r1.ebuild
deleted file mode 100644
index 9f7004d0f1c..00000000000
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.58.1-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_ORG_MODULE="glib"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
-PYTHON_REQ_USE="xml"
-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 ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE=""
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-"
-
-# To prevent circular dependencies with glib[test]
-PDEPEND=">=dev-libs/glib-${PV}:2"
-
-S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
-
-python_prepare_all() {
-	PATCHES=(
-		"${FILESDIR}/${PN}-2.56.1-sitedir.patch"
-	)
-	distutils-r1_python_prepare_all
-
-	sed -e 's:@PYTHON@:python:' gdbus-codegen.in > gdbus-codegen || die
-	sed -e "s:@VERSION@:${PV}:" 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"
-}


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/gdbus-codegen/, dev-util/gdbus-codegen/files/
@ 2024-01-22 11:27 Sam James
  0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2024-01-22 11:27 UTC (permalink / raw
  To: gentoo-commits

commit:     d2a3cfe3b625829a894f700da57795327a9cbe92
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 22 11:25:05 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan 22 11:26:10 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2a3cfe3

dev-util/gdbus-codegen: patch out distutils use

Just like the fix from bug #922654, but utils.py gets installed, so we need
to make sure we both patch it here too & add dev-python/packaging to RDEPEND.

Thanks to leio for pointing it out.

Bug: https://bugs.gentoo.org/919904
Bug: https://bugs.gentoo.org/922654
Fixes: 214971a1af7edd43d423a590d17f8cff8f36526e
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/gdbus-codegen-2.78.4-distutils.patch     | 36 ++++++++++++++++++++++
 ....78.4.ebuild => gdbus-codegen-2.78.4-r1.ebuild} |  8 ++++-
 2 files changed, 43 insertions(+), 1 deletion(-)

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
new file mode 100644
index 000000000000..38fbe0e1a9b5
--- /dev/null
+++ b/dev-util/gdbus-codegen/files/gdbus-codegen-2.78.4-distutils.patch
@@ -0,0 +1,36 @@
+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 <jordan@jwillikers.com>
+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 <davidz@redhat.com>
+ 
+-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.4.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.78.4-r1.ebuild
similarity index 93%
rename from dev-util/gdbus-codegen/gdbus-codegen-2.78.4.ebuild
rename to dev-util/gdbus-codegen/gdbus-codegen-2.78.4-r1.ebuild
index a859319309e2..00234d0e217a 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.78.4.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.78.4-r1.ebuild
@@ -17,7 +17,12 @@ LICENSE="LGPL-2+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 
-RDEPEND="${PYTHON_DEPS}"
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/packaging[${PYTHON_USEDEP}]
+	')
+"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	dev-libs/libxslt
@@ -29,6 +34,7 @@ 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
 


^ permalink raw reply related	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-01-22 11:27 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-01-22 11:27 [gentoo-commits] repo/gentoo:master commit in: dev-util/gdbus-codegen/, dev-util/gdbus-codegen/files/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2018-12-30 11:28 Mart Raudsepp
2018-06-10  8:25 Mart Raudsepp

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox