gentoo resync : 31.12.2018

4 files changed, 2 insertions, 83 deletions

diff --git a/dev-util/glib-utils/Manifest b/dev-util/glib-utils/Manifest
index df5d5d5e2889..01b52dbcad32 100644
--- a/dev-util/glib-utils/Manifest
+++ b/dev-util/glib-utils/Manifest
@@ -1,10 +1,7 @@
 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
-EBUILD glib-utils-2.52.3.ebuild 468 BLAKE2B 862493f148a7e42e6f7aa1e52ee0eeee924889c528b60da5d7ad1908f547cd1434a7b590cdf6c50b6693cc94f5749fa14a4a591e9ec9b00fbd6f6825bdc8e217 SHA512 0320dc667f5e53e0fa68570316b3432c9b3b7d3ba25bd3ecbd3641bead76204c066af0f54a436daba81dbdfc8067a656def6e71942eaa3c1a814e1669fc5caba
 EBUILD glib-utils-2.56.2.ebuild 1412 BLAKE2B 19d1c079c16b76facbd3e3660257c407b5e199a34699f2cdb8ce96994a2583dfd711e4645cb2dc7105fd93144a4a45c8549ac6c79b0b60f38412485219b776a1 SHA512 6877ea1e614ba2f94cae7f70793813a1e43195723cf469e936278996b9039f4890520c9df6f57297015f6cd07d1ea58ab248a4835edca66857938fc8f2dfcf97
-EBUILD glib-utils-2.56.4.ebuild 1415 BLAKE2B 6ea26697d5cd3c0cc5490b161394eb7948a9e7012c39b317bf93f62c258dc9648059df76adf35503d8725a4c4d5d9c361cf977a3f5ea7421c9432c9ee1b2c212 SHA512 516dfaf6e96bd3e9c6aa22e37932b0236dd7e2d67a77a111e3080b50259a9b2ec434b25cdee8b3fc5b7a2131b411e29617b0664df0039006a75872852506970f
-EBUILD glib-utils-2.58.1.ebuild 2290 BLAKE2B 9b350d5b20a2e00df86554a02272141c6675b79371385aae9dc64a86648c0fbc17b6644803d30d5b989e9705df9fe80d566344226cda96d912406ace766c405a SHA512 7d3b3e26fd27ed4fe3f311cbc6165cf02412e6b1cf5dbd18490a6d04fc174a0ecae57e20bb0049f4314239474270f620238d5cb7c6033b80fc21a566d543476a
+EBUILD glib-utils-2.56.4.ebuild 1411 BLAKE2B d0cf30d9beb3e100198a7898fe52111feeb6220e04b168667e4353d91f68b5dd26f5239dab6e594d1588426a62f6c9dd1c2a887d239756f8a5afd322ed17966e SHA512 53054e7cc6cb8bc04e2b6354b7e0fe791cbab45d824914880eebb385641d3b9f8ab69b3fe6d822694cbada77181d7b1706eec0207c0b9612dc7a92ad5f31e5bc
 EBUILD glib-utils-2.58.2.ebuild 2411 BLAKE2B 3b498ea0da25ed833915203ac8f4cfa736b46fd8d7d389fb9ca59369a23c1ff04638a50b5ca24fb5db2d7812e68a1051428df0829afa7464739685c7a0ce4558 SHA512 b505bcee6d11c9fba2c05db68959c38456c58d5cb30ee66849e484844f94f1b691d9933f9b702c1afc0610dc52bbec525b23116ae26460dfbf453010a3932305
 MISC metadata.xml 332 BLAKE2B 1e3c081ae9a2c8ae53cee6c3ae133cbd5e8543a68c03d4a4f7e164437502d996ea9364789e93114687271e1f472bcf13a418cca5b74ecb95a51849f0a5f3dafa SHA512 f7680d9be4071b841f50ece99b5041dc492901d84ae05383c1ff05b6a73bab804b153a50eb70f5417137f6e2041230c5ba8eaede10f7a0bf8a899508642588c6
diff --git a/dev-util/glib-utils/glib-utils-2.52.3.ebuild b/dev-util/glib-utils/glib-utils-2.52.3.ebuild
deleted file mode 100644
index d87dee708d85..000000000000
--- a/dev-util/glib-utils/glib-utils-2.52.3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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=""
-
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-
-RDEPEND="dev-libs/glib:2"
diff --git a/dev-util/glib-utils/glib-utils-2.56.4.ebuild b/dev-util/glib-utils/glib-utils-2.56.4.ebuild
index 471add2b213b..337ac0b5df29 100644
--- a/dev-util/glib-utils/glib-utils-2.56.4.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.56.4.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 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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.58.1.ebuild b/dev-util/glib-utils/glib-utils-2.58.1.ebuild
deleted file mode 100644
index d0b5138514f1..000000000000
--- a/dev-util/glib-utils/glib-utils-2.58.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
-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 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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}
-	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
-	sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-mkenums.in > gobject/glib-mkenums
-	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
-}