gentoo resync : 18.08.2019

3 files changed, 8 insertions, 42 deletions

diff --git a/dev-ruby/airbrussh/Manifest b/dev-ruby/airbrussh/Manifest
index c02accaa6cba..f61d07bb5e44 100644
--- a/dev-ruby/airbrussh/Manifest
+++ b/dev-ruby/airbrussh/Manifest
@@ -1,7 +1,5 @@
-DIST airbrussh-1.3.0.tar.gz 1451304 BLAKE2B fc7fb26606efbd2591d707bff43c9bb9d1e712d4338e6151c7d5bada99f555f0dd1fe3e2c925a2e4c9bc9d0aedf9d63adfacfba77f84c07a174a2997e873db58 SHA512 e7c22f21673f11b124ac0082cfec19dc12764f52058857248619bf41841e6b10b2c402d9c17a2db76b459ec5cd1f464d2c2ef78fcf0a202ea2287653980bf10b
-DIST airbrussh-1.3.1.tar.gz 1451404 BLAKE2B 2224946477047e0b282a3ba9cc89efd888aca45b8c931a9163f6420bead2059cde380d66eb21f6cc0aac334c1cc2d1ee30d84faa7dd636bbd121c0372332b457 SHA512 edfc0b742ff854c76d96be88cb93eb385dfe554cdf4550b422b63cc6c997bc5bd6b235e52e8558ed578ebe4b1cfbb40987be48567e3b03d56f236c5497fb504c
 DIST airbrussh-1.3.2.tar.gz 1451710 BLAKE2B d2b3f8cc07a13e82e7d8e74c9e3a9ed9837b042350f85da21f8c51b2b766c629f9129bed18d4664e5833d70b2f0d9e0d1703be30350c265377df7ff4b25bc7b4 SHA512 e5ee119d8994f7c23ac0ef553e247c5d5041e2e5fd2c552385c5b4fe42e4aa671460a364fe926225fa447822010380ae6af90b3bd17f73e7f5cf9c7576711331
-EBUILD airbrussh-1.3.0.ebuild 901 BLAKE2B 9e23bac7593147ec543845ec2540fb0db7089db3249a55ac54af27b10f5928dd826adc9600329d9f44825d9466e7853f0ea662ecce54ccf4689f0ea814b43009 SHA512 ecb5f376a0bce1e71d7b459882ed5d5d633e2113521b628481b1f7645a83ead5230691f5747d89a280e4142a8effc4fedd61265cad60c7fc43a59fa38326e477
-EBUILD airbrussh-1.3.1.ebuild 784 BLAKE2B 616fdf3a52c01889bfe48a36616dcbdf67e22918e433b2e1cd33e9e2833adfc4b11ab8b672fd851ea29fc919fef221c315cf4cfb6d721be56aa2d3154384128f SHA512 2a3953d2e307667c520d7e45c8c997b7f73c32add294d0f62a9e805ede33e442a3330031fdd13f07edef2a4915153007b4005dd5453a847854fbf3fe203b28a6
+DIST airbrussh-1.3.3.tar.gz 1449872 BLAKE2B b5c19a61bb16d3b4c7379929894c3f58e0e0758ec79b590cae1eab1d8478195ce4959f9e2e026cdfd6a307ba006de54cd5982593f5041cdf0d03d47911619cda SHA512 e4f8a02f000ef26be4a121b16d8ab421c8f0de198e5407980116d1b5f0caa83a214112ec8b3bda00b09d72872f8b5d95a3207a3a157d7eda8fbc456a224a4796
 EBUILD airbrussh-1.3.2.ebuild 777 BLAKE2B 5dd734a5cce7cf8383b107b92052cffbbada6c482f559113f50b290c0116f17811baccf95b7d00c4e1ceadf761c79a90b7ba9f9e6c6e804b23dcf9035a9505a8 SHA512 103addf008e005cf4c413f87a80261275bbdd2a8719651318efbf21fcf7525f6f8f6e852c8e5b36b23efa115c49958e0815611c14cef3484a43a9e5ced979154
+EBUILD airbrussh-1.3.3.ebuild 866 BLAKE2B 93549bd8ed892df49a1c1226810d06fcdd33598a2bbc1588c709873a68e22fb7cea951a034d4a47cfe8420058e2edefcb50a1e94ad4539a8f7c89e68a3dc0b60 SHA512 38a711f2db641d52727cdf888191c74fe11d6ba11004ce7470b607e7fa9bfcd4928fc107fbd30fb5229456aeabe61423e5e9e265c2f6ede72e39a471357a3c6d
 MISC metadata.xml 395 BLAKE2B de7df6f620f49f99e10fb18c145f58369dc5cbb85b70a2c10fa05c8bb12fd8700ee5fc57fe1c695fe8be2625f82d7b96e1b9bfb24af23eb7776231c763ac64c3 SHA512 c969db304610c45088a5efac1e694bc7ccfcf0360631fa43fe10f48ea045f6c400ec6cf3faa97e153b95133a1d1e1ebc9fca48c1d3ea1b63f73bb33d5546bc28
diff --git a/dev-ruby/airbrussh/airbrussh-1.3.0.ebuild b/dev-ruby/airbrussh/airbrussh-1.3.0.ebuild
deleted file mode 100644
index 377f79834d97..000000000000
--- a/dev-ruby/airbrussh/airbrussh-1.3.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-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=""
-
-# Tests appear to be incompatible with recent minitest and mocha leading to errors on the use of stubs.
-RESTRICT="test"
-
-ruby_add_rdepend ">dev-ruby/sshkit-1.7.0"
-
-ruby_add_bdepend "test? ( dev-ruby/mocha )"
-
-all_ruby_prepare() {
-	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.3.1.ebuild b/dev-ruby/airbrussh/airbrussh-1.3.3.ebuild
index f9785ac8413b..70f59a12905a 100644
--- a/dev-ruby/airbrussh/airbrussh-1.3.1.ebuild
+++ b/dev-ruby/airbrussh/airbrussh-1.3.3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+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"
@@ -24,6 +24,8 @@ 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