gentoo resync : 25.01.2018

5 files changed, 7 insertions, 83 deletions

diff --git a/dev-ruby/mocha/Manifest b/dev-ruby/mocha/Manifest
index 06f9776e934a..c0b0c920fc49 100644
--- a/dev-ruby/mocha/Manifest
+++ b/dev-ruby/mocha/Manifest
@@ -4,16 +4,12 @@ DIST mocha-0.12.10.gem 77312 BLAKE2B b71ddfa79149d33d7a5c21655e2bbd7b80aa1296c08
 DIST mocha-0.13.3.gem 82432 BLAKE2B e5d8f495db5df3b51b2be9d294f2c9354de979d2547e1cb1d6e70cda4a36b0170cd934b3e17e8d3fa38d4a380a12ccdb49ddf2d34662dc0dc8029faae4463d8c SHA512 4c013565644d4b3af9bdc515c7b9b5be39c606c53d0b5da4569bd7c3fd98db3f2a7e6b88e566b32277c8e8d0ea6c83340e6afd1e80cdec0dfabd41e4fe5dbf27
 DIST mocha-0.14.0.gem 82944 BLAKE2B 50a066e2f5007df08a7f76785fd4c2b12327b4969c11324a0574c707bea3219d51edb9ab40635378c16b46ad826ec7eff42434a27cd61113a6f40251fa2e6930 SHA512 918e45f2ee761c7dc399c7958e4d406f9e186c90f479fd01a421aa542944b47e9b2c5e938f4fc5292a7da345726447b2d47dc5f417e114201f8a4d9893c4d461
 DIST mocha-1.1.0.gem 87552 BLAKE2B b09721474520b57472bc54eece8ea27f0172e49ffbf43802854c111632673d05f35931150fe83cf83862471b606c70e8667327f491d280f3cc3d059e752ff0b2 SHA512 5a07c8364ae649a6be821c4b61c349d79e1dbf1e574ed95b07848f5dae3a2860e2f2e06499fc15b8352ec2146f273cc40ee8e65e670214f0f0669b6eedf698bb
-DIST mocha-1.2.0.gem 90112 BLAKE2B afbf191380cb36b84dca7ceb9b1d638112797f64d9a8c03421123b5804313f322f542e94fc46b2057eb7ed87ae8dd9a974a27d0858e843449129bea24e39f895 SHA512 cedbbafb095ebc54b74cdb848d11acddaf44333c6f844282fc217906c551f1ec7f0d33bc881e1c410e59917bcfc0b2b7d15d8c549d56ef9c6663907d0d7c0a87
-DIST mocha-1.2.1.gem 90624 BLAKE2B 6c543c2e0d2f86cc6d4353308871486ad7a4e288e43d5c0c9f66159b021281ce964070a6857b3859729f3a3c367b79baeba542ec7d07a499884c5b03e2bd0a24 SHA512 318fc7275b7ef14b6839ce68beb4a6dcd2a06325bcc5e69d82bd6842dc39c78b8a09d6d06d36dbf0f43e59bbcf441be9a6b1d3037f0cbde25be9d04ae44b2aed
 DIST mocha-1.3.0.gem 92160 BLAKE2B 10ffd1bd9b1ecb99555490b17451ae883986ef17856fb401165bb5239a2c07af2532b20bd62a5b1d8dbdeabda830c01179a025174b890be7ceff238fd9a67dad SHA512 a24de9129da65f6b37f06ad888fdb80ae987f51594980991a6ac3ffd23e9dafeedd7a2e758835f33f4de59e07b7c39449e3a49228159710bd87a3de7d3df6a3c
-EBUILD mocha-0.10.5-r2.ebuild 1189 BLAKE2B 87c937da8dce9992d985727e3640ba5fae32fd5011c605f40c2cb4383653156d68a02c7b0980603265db84386a0007a1c2f543fa052e4f11cdbb932824fce6a5 SHA512 96a13c3e12a67666ed519a8371c0fd93fb4ed42c492e066de3664351bc730df5c8aebb94c157d666c039a9c01976f5ccc4840101324a0128c1f5a6dec789c158
-EBUILD mocha-0.11.4-r1.ebuild 1102 BLAKE2B be117388abc6d74944b1308649feb1559f5efa16ff51f81973cb9a7991fb3d4ff0c61d8730ef6a584102bfe6fb7ac8e3adaa2458e8fea91adfcfaad32e249d70 SHA512 df891065ba65d4949305b4fcbc017f48728569a15375aa8d073e70369f7f596710ac0fb67513e78d3be86cc33b9645deeb8bc99461bce8c238af2585c040a247
+EBUILD mocha-0.10.5-r2.ebuild 1189 BLAKE2B e2f7ad7e9a1427076462906dd1a56dbca10d2de77aa5092a2249301319ed29b6fac9f563f5549dcdbafb82d1d062c1d25a9f25813f8006a24f75639551cea219 SHA512 6e2e346028954787b176dc3de5188c852cfa0231bc442b902059d014780011b52bf7d079b63e826d3da76efc87669b2cc74df9a983ad45417f153bbaa7e67bf3
+EBUILD mocha-0.11.4-r1.ebuild 1104 BLAKE2B 56408bd162417ec1ddca77d6c16ab99be2ef67337bfa0e0e268e1e7874c23a565b8526a6ba83c06e631902e0fb61de7b6bdefdd19ed646d9d4b63d82b0779e1a SHA512 8239c9d49d50a3a9636c215099dc3917db1eccd7cef08c96a7a34352cf2885ae78652dbe30928dd6d393cb831d9312c88a959ca8b982421eaa237d9dc66d274e
 EBUILD mocha-0.12.10-r1.ebuild 1150 BLAKE2B d24d4aa4b07c2aa432c609b9d94939c26ce8a551fb9698af0c91a7b9909c88d966770966eebb0a641626b2aa617f0ad4a2c2ac1d2b2d6396c87fff87b6cfb58b SHA512 a832c6e25857b6aea86be90bffeedd9ef22431a11d97185388428488196569a10a70c2085d545f55a50512120b64edfaf3b66b6c8eb125beeb5ba8678a30d3b0
 EBUILD mocha-0.13.3-r2.ebuild 970 BLAKE2B 44c99d61d386231f1c5b1cf0bbcae7942d7c4a1d74ccb20ae3a4567430c2a4f7e9c7c974cdb59b83bb0a725676f6577e3da45bce054f02dafb0ee25b0e748d2c SHA512 da30332becf147dd12ab3939dad77185c9b650009404bd6e299e744a06a759bbba3ec70c9b2b88a35495e0bbd7143345647a874f3e069721f3ae99de71930a86
 EBUILD mocha-0.14.0.ebuild 891 BLAKE2B ea0c96b43633f7b6dcb242224146aecea671121c49049b96f1816b76259fbefc0916dd88c3a25d9484016ce1639c9a4796f3ef7e3c582c9d95bcfa925ea6df1d SHA512 1d03a7eb194ffe9b086ea3cead434824effcb92a9b927ee8938d052e36663283037d9a88604082ca4646c139ff3228208bbc494877a9f0d562141c9409097f70
 EBUILD mocha-1.1.0.ebuild 853 BLAKE2B 1e239f2abd34221cee9af37f775c07ed22285c3db09695e6a175a86bbbec786046e80efdaa490959144ca5e5853ffd40faae3e1743991de9df1636da153314f5 SHA512 a1f48fa4bb83754b1d6af4e5d50ed63c404c6b1e788a4d83ec2c190813b72916d73de541ad97cedf14073444aeb4bdf4174411be1fa6aa66eaf28b124b9a67ab
-EBUILD mocha-1.2.0.ebuild 861 BLAKE2B 691cd0dacacde916d60069b7097f60dfab5d25e79d335eba1eadbc94b98dbc39f37f57f14f0450b72178b26c86ebeba8954085e19047b58116d190a3ebf5f7ef SHA512 0be815d7e7d31f89732cc995c98106a753e0b5421b573968c60ffd38261a58c762dd936cfdde63541b8f7169bfad7a53616a5cf53a9f4f0a0c32be153091c9d3
-EBUILD mocha-1.2.1.ebuild 868 BLAKE2B c04f1cb6204c30149ddf48e1b66adb55ab00fd8be2c37dbf9ef0adf19238f7e0aae11142bfae6db77a188b10279556c4288f7217fc5959a87e7daa5811be8bec SHA512 3c152d838a7faeb2aa722eb0bdcb34e7141fbc4eb681b4edee722a8efcc940e49a6b0f0dc7dc1f716c5633b95cf628e89c3b5f3f123350cd5bcb594ee4a25790
 EBUILD mocha-1.3.0.ebuild 861 BLAKE2B 087b553954eae1c73a77ddd5fb50d96951e58a42ac35f5c76de92606f49253eb64aaba9822709402501f7f88d0a1d5498a60033e81bb14fcb3750712ffc35ae7 SHA512 f06e0d7a05935b6605b4e2a9916b684d0fbe12e25b73d6042fc8185a870f07982f8f0088fc0fc17cdeff9aa73e00d9044f95c721f3de1d453193c8eb628524c0
 MISC metadata.xml 251 BLAKE2B e8bf2b70161d425791d65052583fd8be03b19ef3bb2a2cde34605bc93224fea9d8c6a91f0f2d630a00094ef54c0871e210da0e0134f52401bc80cb6b2358c13d SHA512 17d4dbd64468a524311a24ca065537a5b21560388efd282f3fa873e6722f70db6f83e3e5615556450905c29d5df2cf0a0855f9c0b38bf23f0f8112501456d4ea
diff --git a/dev-ruby/mocha/mocha-0.10.5-r2.ebuild b/dev-ruby/mocha/mocha-0.10.5-r2.ebuild
index ad0f32c8ab58..1c5367b78581 100644
--- a/dev-ruby/mocha/mocha-0.10.5-r2.ebuild
+++ b/dev-ruby/mocha/mocha-0.10.5-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_TASK_TEST="test:units"
 
diff --git a/dev-ruby/mocha/mocha-0.11.4-r1.ebuild b/dev-ruby/mocha/mocha-0.11.4-r1.ebuild
index 7c9fe8d25c01..8b18f1331b27 100644
--- a/dev-ruby/mocha/mocha-0.11.4-r1.ebuild
+++ b/dev-ruby/mocha/mocha-0.11.4-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_TASK_TEST="test:units"
 
@@ -37,7 +37,7 @@ all_ruby_compile() {
 }
 
 each_ruby_test() {
-	${RUBY} -Ilib -S testrb test/unit/* || die
+	${RUBY} -Ilib -S testrb-2 test/unit/* || die
 }
 
 all_ruby_install() {
diff --git a/dev-ruby/mocha/mocha-1.2.0.ebuild b/dev-ruby/mocha/mocha-1.2.0.ebuild
deleted file mode 100644
index 49b6731baf92..000000000000
--- a/dev-ruby/mocha/mocha-1.2.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_TASK_TEST="test:units"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md RELEASE.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="init.rb"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Mocking and stubbing using a syntax like that of JMock and SchMock"
-HOMEPAGE="http://gofreerange.com/mocha/docs/"
-
-LICENSE="MIT"
-SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-ruby_add_bdepend "
-	test? ( >=dev-ruby/test-unit-2.5.1-r1 dev-ruby/introspection )"
-
-ruby_add_rdepend "=dev-ruby/metaclass-0.0*"
-
-all_ruby_prepare() {
-	sed -i -e '/[Bb]undler/ s:^:#:' -e '1iload "lib/mocha/version.rb"' Rakefile || die
-}
-
-each_ruby_test() {
-	export MOCHA_NO_DOCS=true
-	each_fakegem_test
-}
diff --git a/dev-ruby/mocha/mocha-1.2.1.ebuild b/dev-ruby/mocha/mocha-1.2.1.ebuild
deleted file mode 100644
index cb3828914f50..000000000000
--- a/dev-ruby/mocha/mocha-1.2.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_TASK_TEST="test:units"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md RELEASE.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="init.rb"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Mocking and stubbing using a syntax like that of JMock and SchMock"
-HOMEPAGE="http://gofreerange.com/mocha/docs/"
-
-LICENSE="MIT"
-SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-ruby_add_bdepend "
-	test? ( >=dev-ruby/test-unit-2.5.1-r1 dev-ruby/introspection )"
-
-ruby_add_rdepend "=dev-ruby/metaclass-0.0*"
-
-all_ruby_prepare() {
-	sed -i -e '/[Bb]undler/ s:^:#:' -e '1iload "lib/mocha/version.rb"' Rakefile || die
-}
-
-each_ruby_test() {
-	export MOCHA_NO_DOCS=true
-	each_fakegem_test
-}