gentoo resync : 29.10.2017

3 files changed, 2 insertions, 43 deletions

diff --git a/dev-ruby/rr/Manifest b/dev-ruby/rr/Manifest
index 3dc53124c162..a3ad9a1b319a 100644
--- a/dev-ruby/rr/Manifest
+++ b/dev-ruby/rr/Manifest
@@ -1,9 +1,7 @@
 DIST rr-1.1.2.tar.gz 89970 SHA256 17396ac98c63d57ef83dea3904de2e86f5b78c9893b8f64e66d434dcd2e32438 SHA512 e0954206b8118cf0acd785cc300e267556cd62bc73dbbca885848205df6456e43463cc46ed1fc47c672574bdf33c42d288c403e550a89c74cac452a54c30a384 WHIRLPOOL bb6a7c128a84f17a690a35f904822324664471b366cb8d6a3677c45f025cebbd38f2f5afbd2bdafe861a979b6260fd21204395a61abc37e75c18b93efc7c07d4
-DIST rr-1.2.0.tar.gz 137694 SHA256 80d78995ebc7be2ce07ba9415597d10cf1a018205accb7853ce1610da4b40942 SHA512 d693dd720067c6d2cf04da6e980ec4d34fdb461fc9d316b4740d7c19047e349ddc7938e2965890dfe5ee35d7d45b7d53185e37460b202fd3108214ef894f17c4 WHIRLPOOL 92fb38b89851422ff25c33f7fbf7e083407b49d1e716baf3aeb086e8c3582166c8109267dc7b3ca60cc910fcb8a8c161d1961c3eadab610781cbef1bffec1c99
 DIST rr-1.2.1.tar.gz 137497 SHA256 b0dda83de6713d631a3bd5782f974dfb736639fcc5cb1f9eae029a696f7ce05f SHA512 df2d05ff732908da55878cb89cb7d1c4442a18c19f71940244f5bd7dc55632467a1824f55d7fade4b5122486a61277090d7ad05df9f99098030c21aa45b36dd2 WHIRLPOOL 1650fc24e410d8c7034427655ef86bdd2ce0a09d6f5ee82ac5870638040c83e80f1c7fc2a16cb1a429c47832bc473546c06d2aac7465abed4b81c46b9fd97ccf
 EBUILD rr-1.1.2-r1.ebuild 1125 SHA256 ae1b296414d23b17523d6f892b4b752672b90031aa6e138f62e6efdaaf9355ff SHA512 320b74a0df7659811497d428bb2953ddb21f299580506dbbba36d14b6477d32854ef4126c7234a24287194674dcdb409acf7d15e2e72cc73b4ef9b392114e8c4 WHIRLPOOL 27270f4c3aad5cc18f3ad4f9d24d03ca75553aab6fef85c5148889e681ad31358a8ead7333fb915364ec24ca3d678c800e0c1a51312b36700489bde06483c00c
-EBUILD rr-1.2.0.ebuild 1140 SHA256 97f3d3121c4fa6e7c3ac85af2499ed2b85a3d3d0908274c40f3aef838e258da6 SHA512 ecafd28e51b1e2c981b095b562591aa626e7c6e2df6f107ce5fa9d09942187b29a274c9b88344b685533e3c257968dc384f415372c1e50eee0ad94800998050e WHIRLPOOL bf703e3f5b2401dd8175a809451b0539cb1dbbe8da7e81bddcd16c05245204a34725107a7ccf9e554235dd6b3a80cc12beb73dd6b3c46a4844787b2aa584a028
-EBUILD rr-1.2.1.ebuild 1134 SHA256 e1137602cdd52837ca5475d46cc4c76924c25508b7334a6e58475e2a10fb39b8 SHA512 fb6324aee93e4e083535b3ddbf0b1bebeed6a2160de3d89216751cfa5767bb2208e039c746c08af4903b9e419a9bd6a7ad85dea742dfab4ceb0a4ed81984a91b WHIRLPOOL d37cf14a2e601480973ac002393c6f7d6485ef16f29a471781973cfd12feaeac4f07a7795683cd106a178c56df12698da308378307843b0cc9e31e01a90db0ad
+EBUILD rr-1.2.1.ebuild 1132 SHA256 0e7f74c048073008978c8a68e5836d11e72c8e344143493b70af2368d9f3c074 SHA512 e523589e1f80bb57f1b2813e1727d37ddd506757d15afc61333cf4e89b89445b64697e678fc329375a7f185d037ba97a616b7f4c5965dfe8c88a52edea2b660e WHIRLPOOL 09e04c794f7e2ea72175e5078963c44714f232815af539e2e0968a4feba8452cc8ea34c2740cb45625791b685960b33bc41341c8a540f6d2a7a00e72c217c22e
 MISC ChangeLog 3279 SHA256 81884e0a05866d5852892e5389653f3f4ebc4b02e889c94435c411a66220fd5b SHA512 8a44987a9c34606153249f3ae3ce574fd036409dc40947d7c5db98fdc8ad35edbbbcbc306a7e007ea3373914f198a75e06d51298c2a64c5a2ff5e1af5ac22b0c WHIRLPOOL 9f8fdc7337275ab4823a684d98d28a0fd02db4dd92cc5784601190551b4512f547df809dd80da7793a736d052958d381706bef33942e7a746e5f9a7c1a8e8231
 MISC ChangeLog-2015 6172 SHA256 976bd9f232eabe98f981721e66a72d37f6e112474a3c546a235b7393cf4b8472 SHA512 03f9e089bf92765f3a24e11b4f80640e99443361a6710e63aa24abec931933fe0efe8528ab6fce514a8ad3f6613171e036fec532c928bc62c4bdc9ee06a6b82d WHIRLPOOL 295b4f9bdbaeb94ca0d3a20cc927bb51f8c03fb4b6f0fdf541e7dd1cade3c72e0ceef509a9a9441f5fdc483d43a848d7dfd9cddf8b323349cc3f6df8db2f6681
 MISC metadata.xml 331 SHA256 b997ef379e148a1a9199be7e917696815d1c9a71b1ab8ea92dd5942bcaf1e488 SHA512 3a7b57e7e43fad3270e91950256d20839fa2a4a2d7e7c8a9b82ca9e5bb72bd465427925b7994ece2f882c37b8ba5984bf8949ebe28c3bb0875c8af6cba3cec39 WHIRLPOOL 8841b3d7370c18b906a491942af0644a3b3da0748e83d7d5436f1b35281c8e4f73365ceb328e21c461a3db522ea84ff15bbb27765e655545528978be5fb69687
diff --git a/dev-ruby/rr/rr-1.2.0.ebuild b/dev-ruby/rr/rr-1.2.0.ebuild
deleted file mode 100644
index 345fe529c64a..000000000000
--- a/dev-ruby/rr/rr-1.2.0.ebuild
+++ /dev/null
@@ -1,39 +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="none"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A double framework featuring a selection of double techniques and a terse syntax"
-HOMEPAGE="http://pivotallabs.com/"
-SRC_URI="https://github.com/rr/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "test? (
-		dev-ruby/rspec:2
-		dev-ruby/minitest
-		dev-ruby/session
-		dev-ruby/diff-lcs )"
-
-all_ruby_prepare() {
-	rm Gemfile || die
-	sed -i -e '1,2 s:^:#:' spec/suites/rspec_2/spec_helper.rb || die
-}
-
-each_ruby_test() {
-	# Only run the rspec 2 case since we don't have appraisals. Setting
-	# up everything correctly without it seems very complicated.
-	ruby-ng_rspec --format progress spec/suites/rspec_2/unit || die
-}
diff --git a/dev-ruby/rr/rr-1.2.1.ebuild b/dev-ruby/rr/rr-1.2.1.ebuild
index 1c60c993f2a1..8ce43bc2e7e3 100644
--- a/dev-ruby/rr/rr-1.2.1.ebuild
+++ b/dev-ruby/rr/rr-1.2.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/rr/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha ~amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "test? (