gentoo resync : 21.01.2018

3 files changed, 3 insertions, 44 deletions

diff --git a/dev-ruby/rr/Manifest b/dev-ruby/rr/Manifest
index edede57aac63..6e420cc69ba0 100644
--- a/dev-ruby/rr/Manifest
+++ b/dev-ruby/rr/Manifest
@@ -1,5 +1,3 @@
-DIST rr-1.1.2.tar.gz 89970 BLAKE2B 33481a1d947628ae99e53beeb998a9197a6e9298b0635d149ea13e7c29bfcebb29c0631e5838b0dcbe41d1a6fe9d9b9f34e95f2037b43dbc79bec370475066d1 SHA512 e0954206b8118cf0acd785cc300e267556cd62bc73dbbca885848205df6456e43463cc46ed1fc47c672574bdf33c42d288c403e550a89c74cac452a54c30a384
 DIST rr-1.2.1.tar.gz 137497 BLAKE2B 3db6751d15e54da6ee6777fb7d383c1bfea2e68482dda03ceda9a70f66382cf9aa7c39f27fca9f0ce92b19858b5324bdbb5811809b3ae146e213bb03ddca0772 SHA512 df2d05ff732908da55878cb89cb7d1c4442a18c19f71940244f5bd7dc55632467a1824f55d7fade4b5122486a61277090d7ad05df9f99098030c21aa45b36dd2
-EBUILD rr-1.1.2-r1.ebuild 1125 BLAKE2B 1d34c014795d370e6040509c87a3abf1dcf0a742b84ecf0488826601bbec9b0f794849ba8753fb66ef047cdf63863956003c22e5d24364d042fc3de6ca981c56 SHA512 320b74a0df7659811497d428bb2953ddb21f299580506dbbba36d14b6477d32854ef4126c7234a24287194674dcdb409acf7d15e2e72cc73b4ef9b392114e8c4
-EBUILD rr-1.2.1.ebuild 1131 BLAKE2B e9df5507800946a6de2ebc5c4f9ba25fc381373c88ca86b1be1decea3bd57c804c9a43b537ffc0fdddf6cec612b1df61e37f0c7241f71047937639f34e3d06db SHA512 457f2a540426a597feff3a10e7cd4ec3c11c2ef5e98712542f214c1a50fc13ecd8a9cfc1487af11365e65a236fb096f8d202e50b94857a9c95c47c7193f8c514
+EBUILD rr-1.2.1.ebuild 1132 BLAKE2B 07471337937e5cc9962b1c8fe93ae728d446867040b1104eda9350cedc8d6d4a15ed1e6204d425034f2a0aff56bd66d1d25ddd56537a3e053d542a6ee29e40a7 SHA512 1aa08b567ed621d42af1c0b7e000355768071cb6b83d42e4065bfff0e14d4da6ea55499708319d53bcfd207ac1662bb98f08cf5712bebcfdbb530b8fddd9be9a
 MISC metadata.xml 331 BLAKE2B bb2b9b8afc411541f4cbc3f3ae7034761b8424dc81bcfce4c47d945a974a13c1519c2b46968dee270bc76beeca6902fc42cb0f8ac1ba3d944d96e4146993094c SHA512 3a7b57e7e43fad3270e91950256d20839fa2a4a2d7e7c8a9b82ca9e5bb72bd465427925b7994ece2f882c37b8ba5984bf8949ebe28c3bb0875c8af6cba3cec39
diff --git a/dev-ruby/rr/rr-1.1.2-r1.ebuild b/dev-ruby/rr/rr-1.1.2-r1.ebuild
deleted file mode 100644
index 47f0ba8ea906..000000000000
--- a/dev-ruby/rr/rr-1.1.2-r1.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="ruby20 ruby21 ruby22 ruby23"
-
-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 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 07344203c3eb..59d78f399c79 100644
--- a/dev-ruby/rr/rr-1.2.1.ebuild
+++ b/dev-ruby/rr/rr-1.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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? (