gentoo resync : 20.03.2022

3 files changed, 4 insertions, 68 deletions

diff --git a/dev-util/glib-utils/Manifest b/dev-util/glib-utils/Manifest
index a0a0e924a886..72e275cdd65a 100644
--- a/dev-util/glib-utils/Manifest
+++ b/dev-util/glib-utils/Manifest
@@ -1,5 +1,3 @@
-DIST glib-2.70.2.tar.xz 4822356 BLAKE2B 63b1f4e05f26cd51c3345bb042e2175ebcdb22afa3fef85bccae530581a378070e6c7ea48eb957bcc73142ea228ddb70bdac2679ca2f81155a668560397aaa37 SHA512 872e3f06f87f21a32446b41aac7454fd6bf4d665c753121f6e9772cddebc592b79d88713fc6b8d510636af9f9c4528a9d508d8c4225c6dfeb928390120fb4809
-DIST glib-2.70.3.tar.xz 4824700 BLAKE2B ba84333b3ad27c0092ebd8bfe31a522d30ef8b18e7483123da6e353bb572f8a58307e23758e93ac95eb781b4d5ff86f20d84eedc1ac6e72af85822f2891bcea0 SHA512 d0e58ea71575e30707b6eda0a5231bc9bd202bcd7a0293fed9e378252a9e430e219b82cd8a12eaab41bb0a0605bb9f3a1cdb8db6766cd42bac8ca9bd9885b80a
-EBUILD glib-utils-2.70.2.ebuild 2325 BLAKE2B 41a83426356b676395ad73eafbe3e8bb6642fd26c0258392763ff6a513d7871acced7aed6f99b4e68026b32cd565be11048f86f5f921071509cd17089218c49f SHA512 406a7c904e96055543a2025b808f675199f0f5a76fa511899ffee4dfc7fd6a8aea98e0a678825891e1f9879641b292fd784cc310368496917736d2991cd213e5
-EBUILD glib-utils-2.70.3.ebuild 2333 BLAKE2B 4355ec8d3face6b515901ae4d045c444258926622d716f3a4450b7bebd2bb05a68de349ece956318d3bed44b7124e99eda02b750dae4abba7e5705668042e9a5 SHA512 a0f23485fbba8965a3b437dcbf9b2b5d343d1fa57d3e932aa6687c15d62b8a477fa81e1e7d963d34e65c935e4db7860accca4ddfbc4c13b8b9647d47e65493f1
+DIST glib-2.70.4.tar.xz 4824296 BLAKE2B 10e472672bfa20cadad01a9c22d01f2363c3033a234f4abe939c30a86e22621ffe9f8bec8031f43b18cc8c07a1ddfa05631979641d8dab88ae7b42345b2a3cde SHA512 e0fa19ef7c2ee48d94fb15074e4e58ecd23b288cfa7bb92ca72d3e337dade80c675595f05b26c10d351a0167f6b273656aef3686d44708121a8861b16b7635c0
+EBUILD glib-utils-2.70.4.ebuild 2325 BLAKE2B 767c5fd70775f5a8d8222d802316d474f6b4038556a1c932e35374bc36dcb572d95dabb1fb3a5e60a6e74c0f0d9977821b258cb17c818bf9fda2895c1deb4155 SHA512 5a20a3c359f296ed6df07cbda7222eeaf0fc7891f72124b15accdf2daf8380abbcf707bf332ba692be992296c259b4e5f1588265435d51b6e7b7dbb79fc6f497
 MISC metadata.xml 333 BLAKE2B 70d0e83f8a0437baadea4b6771019a55d0d6f6a292bcb4263a7d811ec0b63a2ee4838b94371e03d62c4c43678eb7ae542b611166e2aecdea8c5194955ef1cda3 SHA512 0eab24184eba31bfda9752b62211472d6d8607644a2a3c2352a4483bc34975b87252aa5482a76499c5afe30414a75ba5958bd5bbf1bc755850806824e4267031
diff --git a/dev-util/glib-utils/glib-utils-2.70.3.ebuild b/dev-util/glib-utils/glib-utils-2.70.3.ebuild
deleted file mode 100644
index 1872b62fdd4c..000000000000
--- a/dev-util/glib-utils/glib-utils-2.70.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..10} )
-GNOME_ORG_MODULE="glib"
-
-inherit gnome.org python-single-r1
-
-DESCRIPTION="Build utilities for GLib using projects"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-"
-
-src_configure() { :; }
-
-do_xsltproc_command() {
-	# Taken from meson.build for manual manpage building - keep in sync (also copied to dev-util/gdbus-codegen)
-	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() {
-	sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-genmarshal.in > gobject/glib-genmarshal || die
-	sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-mkenums.in > gobject/glib-mkenums || die
-	sed -e "s:@GLIB_VERSION@:${PV}:g;s:@PYTHON@:python:g" glib/gtester-report.in > glib/gtester-report || die
-	do_xsltproc_command docs/reference/gobject/glib-genmarshal.xml docs/reference/gobject/glib-genmarshal.1
-	do_xsltproc_command docs/reference/gobject/glib-mkenums.xml docs/reference/gobject/glib-mkenums.1
-	do_xsltproc_command docs/reference/glib/gtester-report.xml docs/reference/glib/gtester-report.1
-}
-
-src_install() {
-	python_fix_shebang gobject/glib-genmarshal
-	python_fix_shebang gobject/glib-mkenums
-	python_fix_shebang glib/gtester-report
-	exeinto /usr/bin
-	doexe gobject/glib-genmarshal
-	doexe gobject/glib-mkenums
-	doexe glib/gtester-report
-	doman docs/reference/gobject/glib-genmarshal.1
-	doman docs/reference/gobject/glib-mkenums.1
-	doman docs/reference/glib/gtester-report.1
-}
diff --git a/dev-util/glib-utils/glib-utils-2.70.2.ebuild b/dev-util/glib-utils/glib-utils-2.70.4.ebuild
index b3ccd00c17bd..6838cb159a00 100644
--- a/dev-util/glib-utils/glib-utils-2.70.2.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.70.4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-PYTHON_COMPAT=( python3_{7..10} )
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
 GNOME_ORG_MODULE="glib"
 
 inherit gnome.org python-single-r1