gentoo resync : 08.05.2018

11 files changed, 52 insertions, 47 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 47e8a555c281..83a3d7c196e8 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/aruba/Manifest b/dev-util/aruba/Manifest
index 658f42633e21..930dcf13155d 100644
--- a/dev-util/aruba/Manifest
+++ b/dev-util/aruba/Manifest
@@ -3,6 +3,5 @@ DIST aruba-0.6.2.gem 75776 BLAKE2B 569af009cc20b644878fda25b5e7f79bd2f7c6f5fa9ef
 DIST aruba-0.8.1.gem 121344 BLAKE2B 0b601a4d4bcd19159bb23b22b7975d1275ed2ab9c06e9ab550e11a151e953eba9ec4cc05280e69685a54b82996b4863b485a74f91d64270cc058f43272f6df6d SHA512 9d65778828ac1915c56862acb1db0faf6214b102eb892317b390f451aab55750067519fb6cf6e08c55f58b865eaaa78921402d745addf2d3b0038527eb5d898f
 EBUILD aruba-0.5.4-r1.ebuild 978 BLAKE2B 87b1c5200542713b1e1aff8c42146bdc3cfa5984f9d44a358444a24554b88388b84d60ecb4abdb63198e64af0c6d7f3c462c2e39c11a54152936cb9af039ffae SHA512 6064116cef51005229e016cba328b1b63c96e5279c52f09ca76a89c1a62bb0e2e134d5cdc10a484ea37d849ac34d98763bf0fbf9a1b8f82ae53bfec364e5b1cd
 EBUILD aruba-0.6.2-r1.ebuild 992 BLAKE2B 44400b3953d5f6b4ff34d1a8878249238c9b64c9142ade8b6ec182ac6cc2ad4192e2e48f7e515932e01d1a1acb771d2edba7c99e047b92f965c6b11afe4abfbf SHA512 cade3518b27a5935b40276c6adb7a8f339d0dcdd147e7b90857959c8b2889c82b28a450e81ef459483e15639a9d40736d289ee5031764cc576e90e217f105100
-EBUILD aruba-0.6.2.ebuild 985 BLAKE2B fe9c02aed0fd268983ef592164fa53306fda96ce32d27ef3ea93090c3917da2f97030e2dd21777751d78cb0666d192c947f722f62aab70f15770ef85d19a9a3f SHA512 deb59f89b7ad08e033cad93b6075b9d72a89959fe72553feb3b4f66a458c0d4508a4833ac0e9ee7e0199910e5ecc7551f56b6c5183c68e3f4407bba22e2abf30
 EBUILD aruba-0.8.1.ebuild 1666 BLAKE2B 9aff62c204cd99a32b631cd3765d07fbe7a9751bdf2460085ad08102145159be2a5b5923c85aecc69c54584a8519f4cb046ff7639ccf3f623a7bfeab9aa55608 SHA512 738cbf69940544392993e84fdfa1d5f34423818e34e7fc301ae4c2378d03a5641c6783e83b6f71951e667f050f6c24c84e6075b30959e463508733004db9bdb9
 MISC metadata.xml 296 BLAKE2B 5d13c2f0fdb1a3a5e8278e93124af9b7f8e069ccca8ac9327132e8aea862aaee163d778260bd0ba6cd0d6488372b04b4330cc2838447fe2d075ec5fdcb28cadc SHA512 6add4a1a905857c1d96e347089fa8f47643f990a153f6457c4d424978bcf76b89607c89f60d3e312365525b1d0dbd17db62b4baf48ee3da9a0f2ab77435d68b4
diff --git a/dev-util/aruba/aruba-0.6.2.ebuild b/dev-util/aruba/aruba-0.6.2.ebuild
deleted file mode 100644
index f85d54a391d8..000000000000
--- a/dev-util/aruba/aruba-0.6.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby22 ruby23"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_RECIPE_TEST="cucumber"
-RUBY_FAKEGEM_EXTRADOC="History.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="aruba.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Cucumber steps for driving out command line applications"
-HOMEPAGE="https://github.com/cucumber/aruba"
-LICENSE="MIT"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-SLOT="0"
-IUSE=""
-
-DEPEND="${DEPEND} test? ( sys-devel/bc )"
-RDEPEND="${RDEPEND}"
-
-ruby_add_rdepend "
-	>=dev-ruby/childprocess-0.3.6
-	>=dev-ruby/rspec-expectations-2.7:2
-	>=dev-util/cucumber-1.1.1"
-
-ruby_add_bdepend "test? ( >=dev-ruby/rspec-2.11:2 >=dev-ruby/bcat-0.6.1 )"
-
-all_ruby_prepare() {
-	# Remove bundler-related code.
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-	rm Gemfile || die
-
-	# Remove references to git ls-files.
-	sed -i -e '/git ls-files/d' aruba.gemspec || die
-}
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 73d53f56c968..c05cce1dc662 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -4,6 +4,6 @@ AUX ccache-config-3 2147 BLAKE2B 6e703e12b6a2f83b838f8b1d1e534de3366b6e2994990b3
 DIST ccache-3.2.4.tar.xz 302548 BLAKE2B 7d642dc3f944183660e79cfdfd68948528aa3ea4ef8162a4d04837c85ccace35107e663ec81a15438dab133fca2e8bf100fecd483f33c9b0aa52c68989ae8122 SHA512 d048b70804c81dece97f3ba511b3c109ec0d14e7dca69bc68faeeb61a4a7b5639c03e3e5ad7dad4e42b4bd198d7a7fffa4e3b7ef99590dfd4df0805db6c25db7
 DIST ccache-3.3.4.tar.xz 314468 BLAKE2B 6e465598df428979a2c821a698afef25c05d09045cbb54ec54cc3b65b8ce6416b6eb46fae0cf5d60f766129cef11eb01410b522318c67416fdf47f6e8fceae66 SHA512 891bcf11b27fa20a250bc86d182663e46af450a3a807b6cab502f202cd57123ce93bcb1fe5e48866feecda76912a5f742efa5869df9117d81624ba185dd4e02c
 EBUILD ccache-3.2.4.ebuild 2068 BLAKE2B 8fb9e15fe1787760e878ac9c13f9c97e9e9e87e3046ec700266ccd3a1d44240e7a5cf0e24deaef38bad30f66d823488e8979ebe79a9668ff55c6a417ec048229 SHA512 965dcf43bd7999352de8aa6097e90418160cf4f51e4016113c05dc37d023518e22d001a2415ad7948c07e55ab57ae044021e7e4f044df127b81a12ad2bd37653
-EBUILD ccache-3.3.4-r1.ebuild 1911 BLAKE2B 8e2cf00959b850524dd98b5d3a7736875501972bf432cd806c759dc5fcbc3d5a90dc4819ee184638a7d06ae2aca21aeb15e1682f03088c2e311f86a8bc567b60 SHA512 c1286b20835373a99718c7466adb011ba6dcf27158045b5a9ac4a18945be9c85c36730014c94817577fd7a52950f09fc3d1b21e5f54dadbb30fa90c480d46b0c
+EBUILD ccache-3.3.4-r1.ebuild 1910 BLAKE2B 8ee658431f0f19568086923ae2421cd5c25b26a0278274f4ed540b018f37d2148aa83b2204e74afec137c1ff570c5149d0db29f1961df9671151eb2b0c1d23c4 SHA512 fb121c0752483d182ad2fe51b7be40ff1bae63965001fbcf3600a53bf5a0491c57068f22cf4e8684997d9742fb0723dcf66148deb336ef4d5b099d3c0e6a3b1d
 EBUILD ccache-3.3.4.ebuild 2083 BLAKE2B c9ab28add0fd4b71ce98d2e5d6ad8fe6383c9d097438925f37cb7a61e6668e6ef9f517fa73ab7e69fed483948408bf9f782281ecc439eb14641f30193ac86798 SHA512 3e48057216c5618b26cdf5361fea268caae0814d7ee7cc5abfd54be4adfb3cfca7da171acda1f17ab2794478ba4c9b2721403023cc04fd468239e7a3a737378f
 MISC metadata.xml 445 BLAKE2B 8ef8f120989420428ea85108180c659c72a7553f3f20ab96597d26aa04b059f491aeae8c887697a214c437f2dba30fbb934cb47c1db93821eda7dd489e6cb693 SHA512 41ffcad23c9f0274c48a058090d6404cd782dea6674b81615a6b3b7fa272ff5df4c68404fb4dcdb9d2275c13fb137f21f0f65232d5fb1ef6152cc25213893249
diff --git a/dev-util/ccache/ccache-3.3.4-r1.ebuild b/dev-util/ccache/ccache-3.3.4-r1.ebuild
index 5e9e3a5522eb..af04e4dd4221 100644
--- a/dev-util/ccache/ccache-3.3.4-r1.ebuild
+++ b/dev-util/ccache/ccache-3.3.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.samba.org/ftp/ccache/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-fbsd"
 IUSE=""
 
 DEPEND="app-arch/xz-utils
diff --git a/dev-util/gtk-builder-convert/Manifest b/dev-util/gtk-builder-convert/Manifest
index 7b09150f40a8..d0d84790e1e7 100644
--- a/dev-util/gtk-builder-convert/Manifest
+++ b/dev-util/gtk-builder-convert/Manifest
@@ -1,3 +1,5 @@
 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 1154 BLAKE2B 6f23d8b14d7b86023a5db01e36951d7fa222b690bf3d225f042254fd68e039995f0243a6edf085a2f83420be2204b35888e7eca81243f127b3bf8f167f230a61 SHA512 1b2d8ee90718a47e79b1063efe19e2ba35a4595a3f253a7d6061379b6fcecfdbbd1dd98cca2d08b5eddb1a52abc7a6002edb19398ce9e925aeb41775f828aa76
+EBUILD gtk-builder-convert-2.24.32.ebuild 1163 BLAKE2B 20024264de938c5fd522d3251f5e079c28e1a6c7a23ed43de9d8d7bb4c19d1baf1557f57f4ef491900ea8c5e4f5d5791841ef5c44845437275a68013fb82e812 SHA512 e7a6eca33d965c42576bbe63ef99a35ee37babbd4d1c244f95917aa39c98be095ca96b853236d64c89839e03c98d8c2c3c48315e785b93af99254a556d192c04
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
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
new file mode 100644
index 000000000000..258cf2dda4eb
--- /dev/null
+++ b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 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 ~arm-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/shadowman/Manifest b/dev-util/shadowman/Manifest
index afe69fff657d..ac1bb2e72a05 100644
--- a/dev-util/shadowman/Manifest
+++ b/dev-util/shadowman/Manifest
@@ -1,4 +1,4 @@
 DIST shadowman-2.tar.gz 3349 BLAKE2B 2881c0487205c00114967be7600ef5483cc64c7ad5ed5cac60fe8bf2ca17e5b06d5df6e39148d90ff68a51d3e918ca616d0c5eedf11366df90c788a07e4c63b0 SHA512 eeb10248c7f76116352bffa671ab7c761b2f79cb943de20dba327b0d7bf1126d15021508c9e9389b9f0c37cf5049ad2c67bad93f6a03340fcfd27e03c4969110
-EBUILD shadowman-2.ebuild 669 BLAKE2B 72a3b686b51546fb2f3622949dee5661d36f40f7ee7bdc2be14d5369ee5cbe92d38892af9cfca699a5c110f10f0cec339f2e617f7650ce7048797d2496b87de4 SHA512 20e93de4f11d0af9d5198ed652c3ce1751c95b2baaaa175bf029c0ea503346e4d6f13bc154397cdad5d46c110af9ee6c5ea2a9496ff2232a9dd187e57458bf57
+EBUILD shadowman-2.ebuild 668 BLAKE2B 4a8a363337492f38c066972e2f62b08095bd27f2ade9635eaa4c2565cc5949aade7f7a104e741a3b75621ac1121e0f11602bf27c790947f520d32db0c12d8297 SHA512 88124e03be0fe84118452496fc9790a3db107acde15c1e31e3b25a2c4a96c5237a2e168c7b723c281f916ddea19158722363301a307ba2b1f03c7cdb3d575294
 EBUILD shadowman-9999.ebuild 568 BLAKE2B 199779d69123dae88d3024a00370b24a898f40ce7aca43257e0dfd3a9747f5b969133cffce9aa70ff1fa0555a18442e4170829df7d27d397ea10b96136a76524 SHA512 4325db35429e59387690b10c09e86268e79e3a4a5e968075f36155fbcd5af7e0ec0a79b6a08b6e9e74ea5cad6727be0697abebcc63ba48c7449cd54141edd794
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/dev-util/shadowman/shadowman-2.ebuild b/dev-util/shadowman/shadowman-2.ebuild
index dc58b9c9c869..830f284c3f2c 100644
--- a/dev-util/shadowman/shadowman-2.ebuild
+++ b/dev-util/shadowman/shadowman-2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/mgorny/shadowman/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-fbsd"
 IUSE=""
 
 RDEPEND="app-admin/eselect"
diff --git a/dev-util/statifier/Manifest b/dev-util/statifier/Manifest
index eec7d8663ae2..9fbb2a7c62b5 100644
--- a/dev-util/statifier/Manifest
+++ b/dev-util/statifier/Manifest
@@ -1,3 +1,3 @@
 DIST statifier-1.7.4.tar.gz 73245 BLAKE2B 897b78b31aa4f148b6a6a986251ba9d4f40ebad3209f71896ffffb71e06ab25d337a4a79adc0217592051f917bc71428d3032f6216ec053f62c4632edef474d5 SHA512 22d4873130bafe06144c8f6ce7089aa25e3eb047bbee5709344fee1e8d85b24aac689c88d34537fe4a690e231d768e56a2fa13672b9eccf27d945b3f8bcda756
-EBUILD statifier-1.7.4.ebuild 1131 BLAKE2B a278f994399923631a587542e2e8fda7f22f53210c9d2e4ab594aedaa3afede3effd0921d8b89128e36dd5b5796005c70e21b23314b5de4e9ac848a4b11cd10c SHA512 3359e99cc8ab99dfbf80b780dcb3f7acfc1843ae17b55815591bdd20b6669e736013ce3d4157e7e6878e74503c3dc286746717d4ecfeec4d1c632967e49f85cc
+EBUILD statifier-1.7.4.ebuild 1129 BLAKE2B 925e516a8711b4c71e39e0f77160f9f144d66139536a86a4daec55ee2debb29369d9cb87ea67463295ee0aa42c2ae8ca8ddcd7fe13a61ac0f58bfc0875b91914 SHA512 43321c83d8fbd0228f91f6dacdae168db1fe7fd1f73b5c41d42c731182e2bb5e7a9dd1508c1ccaea85bac16fdac3675e454bccfc637ce50682bbd337a3ced075
 MISC metadata.xml 369 BLAKE2B 99bc89ce5469bce6e867ce73fa66fee3fa41bf2166453c3606b03b1f3879f837c46d41068430e217a7ab4b0d0096650762095ffe5f13382ab055e5815f90ebb1 SHA512 5d49b66d13a6055421fc9e9a180d6d5657e367cfdc6e74a13c16955cc1bfda765605f0ab7c0d7d5f67ce847e09306fef52a2fb621eccdf358e5d21e82129a2b3
diff --git a/dev-util/statifier/statifier-1.7.4.ebuild b/dev-util/statifier/statifier-1.7.4.ebuild
index a90f4825f90a..08b4f7afec9b 100644
--- a/dev-util/statifier/statifier-1.7.4.ebuild
+++ b/dev-util/statifier/statifier-1.7.4.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Statifier is a tool for creating portable, self-containing Linux ex
 HOMEPAGE="http://statifier.sourceforge.net"
 SRC_URI="https://sourceforge.net/projects/${PN}/files/${PN}/${PV}/${P}.tar.gz"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE=""