Merge branch 'edge' into next

3 files changed, 69 insertions, 2 deletions

diff --git a/dev-util/glib-utils/Manifest b/dev-util/glib-utils/Manifest
index ef08e4f8da72..fba0a268bb18 100644
--- a/dev-util/glib-utils/Manifest
+++ b/dev-util/glib-utils/Manifest
@@ -2,8 +2,10 @@ DIST glib-2.60.7.tar.xz 4590568 BLAKE2B a3f2a3bd0443a27326e8359c2ad1e6022ca1634f
 DIST glib-2.62.5.tar.xz 4702492 BLAKE2B 03e04cb149b3301959013c5db20b1f3606951ed80105e0580d40177586a5834afb975ace0d25d5311fd63d29a48129128bdddf29a808e371f1400c00033be1a3 SHA512 2f99422ff8245524aabdb52f5d388ef4bde0fc075eab24499b4023f6ca143b80a74e265117b9e7a9de68a347b0c7eaa8655c836d7bbb63d54cad5c6dda630371
 DIST glib-2.62.6.tar.xz 4703424 BLAKE2B 0a27245be2575c574dcc730dd051a8c284f421dbc46579aadc5fbbacb8f934af4374b61bb26085e5c9ab78a868c567818f3fb9d67adddce37f5c4fec00e0d276 SHA512 8e3972a371f3c1a50b7d245b30e4f740583ad72ba4ab325e0e15e0732be44dfb69b603fb39dcf4989255a23a181e9ea5dd25982dd94c386cd9f21952243ad6f5
 DIST glib-2.64.1.tar.xz 4758548 BLAKE2B 5585d23fee28d7c32b1bb9e1defbc31ba469aa259e3c328760d1e702d98706cf251bfb50b5e2aed37b2cdfa6ab4319372ddcd0a9937c97a2614741b504af17a5 SHA512 1cefe49a42233f24ac6bd09c134ceea7119f4f74f42204a731be56100a180eec69c8224674f0b08d1538ad0859896ed08260a6af0fed469c7d10b4508116a6bc
+DIST glib-2.64.2.tar.xz 4760436 BLAKE2B 8145684ca9f966f92ed9cdafcbf46c59291dc1215fc9feae482fb33f61bd175a679fe5bc80f031190c9a0eb5eb650fab01e13bdda4bd41e9df3d21c6779681bc SHA512 c65adb76f4a03c19f2df186dde49724135975ec6cd059efca5d753e7459f77925657b1fb6fc4ff0d09b2461b2f6e58c9710fc8cde0a5d648ba0d68ccfef1ec57
 EBUILD glib-utils-2.60.7.ebuild 2390 BLAKE2B 1b5593fbfae292b25bf6131c5535f9133dff55d3e63089f5074c78bd8736e510220f277720c081ac7767ffff85e2393da4a8e0e127b13821e5f7fc5bd7d6c24b SHA512 3783dc9671c78d5aeab4fde397ac82654d63875b98e59bfd10cf0fe58fe392c76ebb2ef6d52cca9cdcdba84f600d6627912fdf2e2f7dd5b52b840fe67df199d3
 EBUILD glib-utils-2.62.5.ebuild 2399 BLAKE2B 68065e66c639d695af972944e37e40eb633c6b7033d9d6d4f032f5c016017529cda1ea8d1e264dcaaa6ebdf0c3c2c643b59dae936b87f787c68703f1bb560526 SHA512 15730dd4f08903d49d4c462eb045b557b5c237e581699fcd9253199dc1c953415552dc908e110c701d7ef1803e336a25547509ba15c8bcd95ce8515e1d5914d7
-EBUILD glib-utils-2.62.6.ebuild 2394 BLAKE2B c4ed537a342494830318ef9b76e2d5ad3841609c0851930eb7ec7da2071f1e061abd1e4aac8ec437d321a731bb9fdf0c3bec5db63ed3c0c2d98b423483f3504a SHA512 77d7125bd123a01fe32ed9ebf3fe8e13a4fcaa4082fad5b1672fec61d1ef85d4cbdf59d4620da5f7159fdb9d66a6e36733bcbbfbaac54f91c1252081ac6fa143
+EBUILD glib-utils-2.62.6.ebuild 2392 BLAKE2B 64c91335e69aeb9a55aac916ff86a677f65aff8117eb589cc91a57c8917b5faf911cca5ad13dfc9c491f303f950c814e5c23651e36e4ad7519448e416ea7f13c SHA512 f7859638ad2563f1f95660135712788d6ca57983b20185204e81f6eca5f463205232710305760368a57fba6daf16cb8e32e48f3579b5ae586674e526e9ddba13
 EBUILD glib-utils-2.64.1.ebuild 2399 BLAKE2B 68065e66c639d695af972944e37e40eb633c6b7033d9d6d4f032f5c016017529cda1ea8d1e264dcaaa6ebdf0c3c2c643b59dae936b87f787c68703f1bb560526 SHA512 15730dd4f08903d49d4c462eb045b557b5c237e581699fcd9253199dc1c953415552dc908e110c701d7ef1803e336a25547509ba15c8bcd95ce8515e1d5914d7
+EBUILD glib-utils-2.64.2.ebuild 2399 BLAKE2B 68065e66c639d695af972944e37e40eb633c6b7033d9d6d4f032f5c016017529cda1ea8d1e264dcaaa6ebdf0c3c2c643b59dae936b87f787c68703f1bb560526 SHA512 15730dd4f08903d49d4c462eb045b557b5c237e581699fcd9253199dc1c953415552dc908e110c701d7ef1803e336a25547509ba15c8bcd95ce8515e1d5914d7
 MISC metadata.xml 332 BLAKE2B 1e3c081ae9a2c8ae53cee6c3ae133cbd5e8543a68c03d4a4f7e164437502d996ea9364789e93114687271e1f472bcf13a418cca5b74ecb95a51849f0a5f3dafa SHA512 f7680d9be4071b841f50ece99b5041dc492901d84ae05383c1ff05b6a73bab804b153a50eb70f5417137f6e2041230c5ba8eaede10f7a0bf8a899508642588c6
diff --git a/dev-util/glib-utils/glib-utils-2.62.6.ebuild b/dev-util/glib-utils/glib-utils-2.62.6.ebuild
index 01ebbea72a6a..0e766bd21e33 100644
--- a/dev-util/glib-utils/glib-utils-2.62.6.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.62.6.ebuild
@@ -15,7 +15,7 @@ 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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND="${PYTHON_DEPS}
 	!<dev-libs/glib-2.56.2:2
diff --git a/dev-util/glib-utils/glib-utils-2.64.2.ebuild b/dev-util/glib-utils/glib-utils-2.64.2.ebuild
new file mode 100644
index 000000000000..0dd0c2ddd686
--- /dev/null
+++ b/dev-util/glib-utils/glib-utils-2.64.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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
+}