gentoo resync : 31.05.2021

3 files changed, 69 insertions, 2 deletions

diff --git a/dev-util/glib-utils/Manifest b/dev-util/glib-utils/Manifest
index 36a90e135a0f..32b16e025f92 100644
--- a/dev-util/glib-utils/Manifest
+++ b/dev-util/glib-utils/Manifest
@@ -1,9 +1,11 @@
 DIST glib-2.66.7.tar.xz 4844892 BLAKE2B 2d128e8c933a8c5bd27734e96e50244f27c29199823e2185e8cfa5b4bbc0ca23f761c9de275c9941672eb945e302178b3cb4b5bd577f375ad953a97dddc70e34 SHA512 f6e6cc0fe2ab4a31a623bf9a1e63f833783e044e7ed55b66a84fc0cbf1410eec233fe0e226abb20aac0e40167a9624bf5e65197f9eed879da1293af44408d530
+DIST glib-2.66.8.tar.xz 4845548 BLAKE2B 8def5a2970f1df4782c93a1736d9ebd83ff1faebbfadd508e6ac58aa1d28a88a0fc7f504cc8006c2623bb656ce15d2dcb9e9188042daccd55adc8df0319599ea SHA512 d9d1bee82409bdceb14ab6008508f1abbb6eedfc22a35b1635d381594ee43c4ee9a1569d46bebe5b0b6d9fe7c629079f75660c6fa8f3b85a1dbca304bc6a6205
 DIST glib-2.68.0.tar.xz 4938804 BLAKE2B abbb06e9be3198ea79a42862bc0b71a40e87de6e4d49634458a6dd883d19c23d9e1a314b7820ea8eae230b24dccc909fd53b0e73587738e2341ff6f116e40cbe SHA512 dce0660476d67d7736c00861f4c3c267723f39032f582d1b2c17660a4939eeccd97e975da61b5be49e6f54612c6d5ce592aa7bdeacf4ecc75f3b38358da94a1d
 DIST glib-2.68.1.tar.xz 4940260 BLAKE2B fcf3a2fa2420ea3df13025d7a7e136862fa4cb6aa4f64a1af9fef7187d075db70deddad13ebde56b9032940437dbb311e9658bf112fd3cae8d8313d252ad2d87 SHA512 f705cda6f1b4b0acc5fe8d21b60994ca0ec6de39c6722f4f01cbe0ece30eacb7271d3cb29067e638e0204a3cefa2df1e535f273b72330455e185b544cebc2ab0
 DIST glib-2.68.2.tar.xz 4944192 BLAKE2B d35489dcfe9d57d8bd6ecf4f893b7c8e93a5b8108765791071fc811598d1f41287e03d95f20591d50d51a78db34f11833cc7970b1bf29299385357a14977ba0b SHA512 74d481552629cab67d22f8a440a7263a4e4b83adb6f3b772d368e255c17321b206aafd3af4653e5efbb2c3c14ca67d35f453728cbc5cd68728275d0b56789019
 EBUILD glib-utils-2.66.7.ebuild 2360 BLAKE2B 3db2c371486a8e6a6d5db678b6a54d165060a11288fccb4222f6eb27c5cb631c7e764d728b9fa91f0959373198a0de7e704ac6a804a58d144632b49098f8f548 SHA512 8f9c6c8b629c541d154640695efd1c887d2d0a0e19415b18808e8a50a0dc4cbbc68592f84b02813385a88608be5fc2510f3896da9ede6e55e2980a784a857618
+EBUILD glib-utils-2.66.8.ebuild 2365 BLAKE2B 8ad4796258da73ec89f89f8d51c6a967663b27d236a74bb581acb73243abbf594a88d9cb906860d2d7f44ec380378fbf0e13209fc6c23980b49b9e3563239923 SHA512 71271446d5f5814fcd0f814ae31b6e0fe1cd5cec278e3cc123bf6cb4c57cba209b8c5c8ad639ce256e4062e420c698ddb5133ebcd2dc9411297a7c0798f74cb4
 EBUILD glib-utils-2.68.0.ebuild 2341 BLAKE2B 78a030119ec501c297e6dd634fe6c1dfee4671d0ab888d78785fcdf13b19c5aaa6f858f80462f5c3ee3843bf50aacf561b6ce801f1f396256b7ad434739eb43b SHA512 1257e090316395ba66f203a510b98ddbe4d926b52c1fc7cc9fdf0784170f628adf1b4e4f1e90727b80e7758106221ba736c201f5c8873164f5667029252432df
 EBUILD glib-utils-2.68.1.ebuild 2341 BLAKE2B 78a030119ec501c297e6dd634fe6c1dfee4671d0ab888d78785fcdf13b19c5aaa6f858f80462f5c3ee3843bf50aacf561b6ce801f1f396256b7ad434739eb43b SHA512 1257e090316395ba66f203a510b98ddbe4d926b52c1fc7cc9fdf0784170f628adf1b4e4f1e90727b80e7758106221ba736c201f5c8873164f5667029252432df
-EBUILD glib-utils-2.68.2.ebuild 2332 BLAKE2B 0f54cd1381a48b546ee77599660d40a83f605c29c43a713d7908b416f4933345a46ed186762fc05f8fbec59dffb6bdcc56c926d7e70996b3ae71b5cc1621235b SHA512 0fcf59511090213835d203d12d150070ffb6e3432f2e6a99fe32198a4a0088f9934e81f4033e13dfba3ce8e7a730417b9a4a6c56a722b6cbf9ff92654395328b
+EBUILD glib-utils-2.68.2.ebuild 2324 BLAKE2B 14053ce23924b454e18751045fecaf44fab2ddfeae9c92c94d51c4330c4e8e011481fdf36f0d3900f2df8db8fe6300df4b72fd806ddef79c0513e84dcdd18bbd SHA512 e9d496fd828a32ef852877913fbb1fc855fce580ed135e175644220429a4d49421278e7f6e4adcaf1474ed390284d287b3eb00ecbac37e6d585beaf70d6d641b
 MISC metadata.xml 332 BLAKE2B 1e3c081ae9a2c8ae53cee6c3ae133cbd5e8543a68c03d4a4f7e164437502d996ea9364789e93114687271e1f472bcf13a418cca5b74ecb95a51849f0a5f3dafa SHA512 f7680d9be4071b841f50ece99b5041dc492901d84ae05383c1ff05b6a73bab804b153a50eb70f5417137f6e2041230c5ba8eaede10f7a0bf8a899508642588c6
diff --git a/dev-util/glib-utils/glib-utils-2.66.8.ebuild b/dev-util/glib-utils/glib-utils-2.66.8.ebuild
new file mode 100644
index 000000000000..629fb5bcbe9c
--- /dev/null
+++ b/dev-util/glib-utils/glib-utils-2.66.8.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7,8,9} )
+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
+IUSE=""
+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}
+	!<dev-libs/glib-2.56.2:2
+"
+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.68.2.ebuild b/dev-util/glib-utils/glib-utils-2.68.2.ebuild
index 8bdd1b9a92db..b34e2c06e0e0 100644
--- a/dev-util/glib-utils/glib-utils-2.68.2.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.68.2.ebuild
@@ -14,7 +14,7 @@ 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"
+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}"