gentoo resync : 24.12.2018

3 files changed, 3 insertions, 49 deletions

diff --git a/dev-util/gtk-builder-convert/Manifest b/dev-util/gtk-builder-convert/Manifest
index 26a05714bb1e..7e9698af2af9 100644
--- a/dev-util/gtk-builder-convert/Manifest
+++ b/dev-util/gtk-builder-convert/Manifest
@@ -1,5 +1,3 @@
-DIST gtk+-2.24.31.tar.xz 12805344 BLAKE2B f516f9970a95afa21ae5dbe9f0cafd3c57c5cd27af0c6740a0f7f4367eb8032719e39e533bf89db72dddba7485ee499da9c2370707f51bbc4a7af2d4fb7c1309 SHA512 75b846661308d94b5236e7e1c367deabf57753792ca87e92f9769822dd5ec90e00cd8d5574adcc12162e3702e1ae6dc152278a1d218f9bd9e4d1c8dc1dd520c1
 DIST gtk+-2.24.32.tar.xz 12620860 BLAKE2B 03f4c0a8be98473f62bc8c86859937969c4169960a5f93d37ff6dcde00413215fa6c7125b15781bf50d67b40aa0056cb71b83fb50acb2c3467b5deb3c8d938f0 SHA512 8e8fd9ae32f1d6fb544da260f00599f0f05090d910d767b06ef086ab4f1f8373a29bb0da9767761c9b5f4cfd51b5c45d0fa5d39b0428c839ddf0a579df806696
-EBUILD gtk-builder-convert-2.24.31-r1.ebuild 1143 BLAKE2B 312226957ba27d49f769307beccf1da2a7298a781d11a9cb0e5bdf49dd1052e37b3b1fbec5a85112ef583b72e9b604e78e8b1ebcc75b0a6a7c220062f0126519 SHA512 a5280de2fe70f0b77febf86f32d66e1cefd7949d7d97054ef5533ab8959e4f73556cd8fe6bc0735337c0280cf8eab16ccc81020f0e7a16c2f6cd2ee1c3039ddc
-EBUILD gtk-builder-convert-2.24.32.ebuild 1144 BLAKE2B 4ad87705cfa462a7d3ad4c7fa1265212fa0384d51d35480f4f3ec0760e65854bb9b6abd1ce6d21e9c026480f4148a10d0b7ee4a9e8cf05efc901be2c83803ad4 SHA512 b2a81ffb79ee9964e347f9366d9a81142503cdeb3406c90d22e57b1b47168651f5679a2bb0ee72722f884bc56e98ce64b3ba7f2078c89990beb0093494694ee0
+EBUILD gtk-builder-convert-2.24.32.ebuild 1140 BLAKE2B 0f806a2243e690b1e70731a4953356341038367029140de6d8091983674a22551085074c10ac8008b02b53fe787b769dfecf8dbf64c04026df64a5a9396db37a SHA512 ec8c27e3960444bb94eead1fa34ca032038b9dcd7e8f77a62795de29d598cec2138e606bf781b56cb31cf53bc14e22c80c74c18eafab36fb87c4ccb7c450464d
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.31-r1.ebuild b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.31-r1.ebuild
deleted file mode 100644
index 88f84ddcce5f..000000000000
--- a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.31-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_ORG_MODULE="gtk+"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit gnome.org python-single-r1
-
-DESCRIPTION="Converts Glade files to GtkBuilder XML format"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}"
-
-# gtk-builder-convert was part of gtk+ until 2.24.10-r1
-# man page transitioned in 2.24.31-r1
-RDEPEND="${COMMON_DEPEND}
-	!<x11-libs/gtk+-2.24.31-r1:2
-"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.3
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-"
-
-src_configure() { :; }
-
-src_compile() {
-	xsltproc -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl docs/reference/gtk/gtk-builder-convert.xml
-}
-
-src_install() {
-	doman gtk-builder-convert.1
-	python_doscript gtk/gtk-builder-convert
-}
diff --git a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32.ebuild b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32.ebuild
index 343a7787a024..5d57fbb6bfd2 100644
--- a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32.ebuild
+++ b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"