gentoo resync : 23.09.2020

3 files changed, 3 insertions, 38 deletions

diff --git a/dev-ruby/airbrussh/Manifest b/dev-ruby/airbrussh/Manifest
index 712f22f7587e..e6b210c0cf0a 100644
--- a/dev-ruby/airbrussh/Manifest
+++ b/dev-ruby/airbrussh/Manifest
@@ -1,7 +1,5 @@
-DIST airbrussh-1.3.3.tar.gz 1449872 BLAKE2B b5c19a61bb16d3b4c7379929894c3f58e0e0758ec79b590cae1eab1d8478195ce4959f9e2e026cdfd6a307ba006de54cd5982593f5041cdf0d03d47911619cda SHA512 e4f8a02f000ef26be4a121b16d8ab421c8f0de198e5407980116d1b5f0caa83a214112ec8b3bda00b09d72872f8b5d95a3207a3a157d7eda8fbc456a224a4796
 DIST airbrussh-1.3.4.tar.gz 1449949 BLAKE2B 26b7a408e5453554ff422d4da2f53a3fddc6f68ab652673445db24fa53ef52f0b8293d1701406a63d6b6323e5219c9cbc9880879e58e394b2a912b9a1dc22cce SHA512 8fbca27a115b5bc5e87ffaf3a0e91aabdf3e64b22b7192b5e6a38efe862a7ad6720447241eb85dc20a459f07054c298e8f71fcd80a1d461375a4136fab4db409
 DIST airbrussh-1.4.0.tar.gz 1450070 BLAKE2B 94f128cd25c5af48f17fa771c366d3cdf744dc4e7ccef23de583b1ed60ffe1640dd7d02d76fb78573936beb3412c277151b36a870ac3e11222c3135f34b0e140 SHA512 e3a5cb80365a963875e89d15fa2b4dc86985d6b5f13ecfa9baf9ad599b5780ef8ea2c2e4040bb35498a5ecd1c6becb081b3e917cfe082d2db63fd74ba54755b7
-EBUILD airbrussh-1.3.3.ebuild 865 BLAKE2B b482c6bec1ddaea50248784bd3da92831816233e84543e3c631a56b6417a5bf44d0fb3c1b71ec2d0615cc1ac43123bf8655d292068b003e088638ebb04d350ed SHA512 06df970320d26526272c06fdddb482eac2639bdc21c15c1922054f8e5580f5fbe955ff7dc03f2c913af66a5b3be26a4bdbd0e7cc53e47e0d8caee6a160e4c61b
 EBUILD airbrussh-1.3.4.ebuild 865 BLAKE2B 8affb973ef0539e6e626f65d6e4d1774ef880a913f53eceb86234eb5dfa654a50e211ba27fe599252b38c05d1bcc11ad49f9db4137684c97258c947b998bcb38 SHA512 f6359208830ad4b5baa9dd7d0f975a98089b7b5f9591d539ae2e684a55f6ccc44efda2991041540b48d6d44556fec10f3070b7edccdebff482a43530d99267a1
-EBUILD airbrussh-1.4.0.ebuild 873 BLAKE2B d3b5372a5769ebc560cbe54d0ad53adb75fc9ec89e07c2763aaa7f628a79da7cc8e3ae54b7cbbe92554207e335057feea000304ff6e7d417b5683f68d1148c92 SHA512 baacd7ba27e7addbbc85b0f33026fed17d222a1213b645976ebebf5b70a5e3c4a2fe8a457ca35c8b20064f62325d321af76d15d844d99205e84808d00d897eed
+EBUILD airbrussh-1.4.0.ebuild 889 BLAKE2B a2b6121b61bfd7a21e2c1942be0ed9cae00c8ff2a62ead036a7a00c7125ebfe46855ecefb9fd278b57b13e603d3a505e93fab81481b9d394e1d5fe95b11c195a SHA512 2a6280d45b3d9684d0bdc9369895bc7bb024a2c54e8cafc5aa9bae566276a64854f91960f18daa2043d4124afc7930af893c3b17c3c7d89f888e504fda9dca20
 MISC metadata.xml 395 BLAKE2B de7df6f620f49f99e10fb18c145f58369dc5cbb85b70a2c10fa05c8bb12fd8700ee5fc57fe1c695fe8be2625f82d7b96e1b9bfb24af23eb7776231c763ac64c3 SHA512 c969db304610c45088a5efac1e694bc7ccfcf0360631fa43fe10f48ea045f6c400ec6cf3faa97e153b95133a1d1e1ebc9fca48c1d3ea1b63f73bb33d5546bc28
diff --git a/dev-ruby/airbrussh/airbrussh-1.3.3.ebuild b/dev-ruby/airbrussh/airbrussh-1.3.3.ebuild
deleted file mode 100644
index 3f9afd070160..000000000000
--- a/dev-ruby/airbrussh/airbrussh-1.3.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="airbrussh.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A replacement log formatter for SSHKit"
-HOMEPAGE="https://github.com/mattbrictson/airbrussh"
-SRC_URI="https://github.com/mattbrictson/airbrussh/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="amd64"
-IUSE=""
-
-ruby_add_rdepend ">dev-ruby/sshkit-1.7.0"
-
-ruby_add_bdepend "test? ( dev-ruby/mocha )"
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	rm -f test/support/minitest_reporters.rb || die
-
-	# Avoid a test poluting the environment
-	sed -i -e '/test_color_is_can_be_forced_via_env/,/^  end/ s:^:#:' test/airbrussh/console_test.rb || die
-}
diff --git a/dev-ruby/airbrussh/airbrussh-1.4.0.ebuild b/dev-ruby/airbrussh/airbrussh-1.4.0.ebuild
index fe3d447edd01..07c738f0bde5 100644
--- a/dev-ruby/airbrussh/airbrussh-1.4.0.ebuild
+++ b/dev-ruby/airbrussh/airbrussh-1.4.0.ebuild
@@ -16,12 +16,12 @@ SRC_URI="https://github.com/mattbrictson/airbrussh/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 
 ruby_add_rdepend ">dev-ruby/sshkit-1.7.0"
 
-ruby_add_bdepend "test? ( dev-ruby/mocha )"
+ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/mocha )"
 
 all_ruby_prepare() {
 	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die