gentoo resync : 25.12.2017

3 files changed, 2 insertions, 49 deletions

diff --git a/dev-ruby/rack/Manifest b/dev-ruby/rack/Manifest
index 5d260d9e3a66..079f9c830400 100644
--- a/dev-ruby/rack/Manifest
+++ b/dev-ruby/rack/Manifest
@@ -3,12 +3,10 @@ AUX rack-1.4.5-fix-test-ruby20.patch 1043 BLAKE2B 0855e3e996b26d961fef09cb12254a
 AUX rack-1.6-rewindable-ruby23.patch 1360 BLAKE2B 062c4a474959c4dce61969583b6aec1ae98acff38c1e72f5e22440c4c8938dbaa2142d70a0354948c151eede2b23ca5accadc72aeab366ca1457216d9725292a SHA512 3cb110af584cc3f767a0d3976acb66f37423559865af0726109419728ce6fbe9f484ac2340b1816ae89c1a59ca64330c1bfe4be3910bf6a8ecb05784115a1cda
 DIST rack-1.4.7.gem 204800 BLAKE2B 4572e736215025900c254781e98de91ea4d533b039215c3dc268f111e8bf6c87a4bd73dbd7c4d4cb90a8d2c6375dc3c5a4792a15c6992addecaca516c470c0d4 SHA512 26391faec30b12981413eb1f433bfc9be5d124689bc3ae6e32de7d544917f2330fa4f9255c6879632f2edae5a05a4198454b8fe1310bcdb3d2e0b8b336a20359
 DIST rack-1.5.5.gem 216576 BLAKE2B 4fd13cb14630f6f3afbaac76bb554f46520c125b50d4bdb12fbd939c83af1e189e6f2fb55565a4d3790258e28bc830dbcaa0465622eb9f78b8b9220ae0c9e11d SHA512 7b8ea669c55fa94801aae20612076db702837194bc602c64bec1085836712806a081504b37e4c545bcccf0337e7afc0ad9dca3c1258260fde5f3ec505247056a
-DIST rack-1.6.4.gem 228864 BLAKE2B 609bc7671947c2abfd00f0848e1870fcf46d5a92320427bea4b7104c1dbd6d4a9d0a89e3846e774c409d570ecc8fdb8d8099e553c5d73384f10a9f6e636765ca SHA512 304a6ae21bfd38008fd7d147f82c44397f3a1d2e689bd01de689aedc6ea0e8784605207fd314bc796974edc5dfcab81636664ea2becb0489302999f99501d41a
 DIST rack-1.6.7.gem 229888 BLAKE2B b4ea51d9a0606c92c6cc199bcaf3f7068e6360dd972417af7fe8784a5b23a8de1288347431f08d9af1d19f1409f18035d668d6e80f0b2080d761a3e703259d0c SHA512 e1cc22d78a61998c034bbf9217cad5cc0e614697e787f58aed9cfb1c3a12f69b557c9e95a4b09fcc1509cb607332a8655a66159b2492ea6fdc2bda21f588a59e
 DIST rack-2.0.3.gem 254464 BLAKE2B c7052ae0210d2c8d9aeaa6e3b5b10b272ea48d6c2601aecd524eeab141d3987b7905d9511814d0ac7a62413ef5eb01e847168a278bafb5a0e8f882c526cdfcc9 SHA512 c48e6681544c2f37797ee697f5c4f0d4de6008a3df2506665b52c248fca1ef7321a892dd28475e4d7b461a0b2d12112903a67e1bed7c7397742833fce85167e1
 EBUILD rack-1.4.7.ebuild 1557 BLAKE2B cbc32e320f170ee5347549eac30dc2dfd47ff5d7de2277ed2ad2d0f09fef14f41b98194369afacf21179ffc00fe1d28a09c5ce2710918cee500720f6ee96a68f SHA512 b239eb29871e63a8833c59f38d32703ca11463040f2606dadacf43b382b52cb706b0e1e9e223ed1c956d28470c51b8b038492304c657214e7fb8c7b45b61bf74
 EBUILD rack-1.5.5.ebuild 1390 BLAKE2B d02e9894ac29f189ef11dc64c3388dc9e1bc1f160c27f0c0800f6a2fbfc6fe97f91d4d34aff5cd5e61fb237a15dd91fb0bf06377de81609707a32a8d1c8db2ab SHA512 e71a13d85c2bd8513a14fc805ed3ae4795be5de773e9cf9982e7ba3309695f97b221de9a84856ee9e2465c28de88509a1a48e0af5d33b209a0341ad5fcc62ca1
-EBUILD rack-1.6.4.ebuild 1578 BLAKE2B e6393d0b939a4712960970e2e7913fab078bc751e6c0c06509d69f31aa89e1bbb998e2f09f8c4b33fe9255dd8e75b3060aac3086617f79df0923106985aaba8f SHA512 f7daa34fa1b88935c1bc0c9643f25de06ebb2bd8eec906da6ea7a5b9728b4ff7df4f615b16aa356b67b6de7733cce3d5f10cb2ae7a385ec3ba6612c109bf8c3b
-EBUILD rack-1.6.7.ebuild 1651 BLAKE2B 0d84cd97f9bcf6f615a8bf9fd24906ac4fe78172252af90d890d2d3ce8dbed26d2e5c3e031fd3bae4763641500400481b170cd60aee5bcdf2930698897559301 SHA512 e44b59772e1ba1ac2d0abcdbb1b14e3d94f0c2ca3bd2ae3bed0516d382e53691e62997cf685b0a2c01ea712c6f625357ff1251d43a838a33a3526aecfa7baa24
+EBUILD rack-1.6.7.ebuild 1650 BLAKE2B 33d989d656b6b63de13a30e8ba021596107bb19457e3a04142d478a11bc1d45414e5adfcb7b1ce6164049cd3bac6736e59ee9d6d515be92cf4f119b44bc04f09 SHA512 19bf31a91818bb58322c68978825af255fc32a75aa81906de61f436f477b6ab75a96949079de2c68753fed5743b937d2190330fe19f1eaf16fa9d157709a0053
 EBUILD rack-2.0.3.ebuild 1509 BLAKE2B 8274c24575c14793b5f1f30de1ebc66a06020cf8d00c0fc964365ec7ab6ef3a87c2cb189a6ac022007ecfb8d80c5bb78ae5e1806ed50b36e684d2abe5803b6fa SHA512 28f4f90c15376a6a21c9e76b59a4f5040cab78e1b37606d23ff3ebeab0e29f18b27ea8cfd8e9062fc562788f8da96ece43d43bbbbaee45a552f4d8b1a10c43c4
 MISC metadata.xml 391 BLAKE2B 5ed2f863a5fd68cf57f25afc2c2efa63df1eb25c4e01087130f70edbbd1b79c655ff7455b73ecdd31e083cd35381331fceef52856f946d24fc3d313705fbaef3 SHA512 7ffff4c4cc64855b0c95e2364fa9cfd1e3b06946155cc8244444f5f4e450abda8d8387aabddc224b94a55ff3d5e42391970e5541923e5aae24f408113a65a5c7
diff --git a/dev-ruby/rack/rack-1.6.4.ebuild b/dev-ruby/rack/rack-1.6.4.ebuild
deleted file mode 100644
index a427b5a133d8..000000000000
--- a/dev-ruby/rack/rack-1.6.4.ebuild
+++ /dev/null
@@ -1,45 +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"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="HISTORY.md KNOWN-ISSUES README.rdoc SPEC"
-
-inherit ruby-fakegem eutils versionator
-
-DESCRIPTION="A modular Ruby webserver interface"
-HOMEPAGE="https://rack.github.com/"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RUBY_PATCHES=( ${PN}-1.2.1-gentoo.patch )
-
-ruby_add_rdepend "virtual/ruby-ssl"
-
-# The gem has automagic dependencies over mongrel, ruby-openid,
-# memcache-client, thin, mongrel and camping; not sure if we should
-# make them dependencies at all.
-ruby_add_bdepend "test? ( dev-ruby/bacon )"
-
-# Block against versions in older slots that also try to install a binary.
-RDEPEND="${RDEPEND} !<dev-ruby/rack-1.4.5-r1:1.4 !<dev-ruby/rack-1.5.2-r4:1.5"
-
-all_ruby_prepare() {
-	# The build system tries to generate the ChangeLog from git. Create
-	# an empty file to avoid a needless dependency on git.
-	touch ChangeLog || die
-}
-
-each_ruby_test() {
-	# Since the Rakefile calls specrb directly rather than loading it, we
-	# cannot use it to launch the tests or only the currently-selected
-	# RUBY interpreter will be tested.
-	${RUBY} -S bacon -Ilib -w -a \
-		-q -t '^(?!Rack::Handler|Rack::Adapter|Rack::Session::Memcache|Rack::Server)' \
-		|| die "test failed for ${RUBY}"
-}
diff --git a/dev-ruby/rack/rack-1.6.7.ebuild b/dev-ruby/rack/rack-1.6.7.ebuild
index b5212723bfae..74a13913f372 100644
--- a/dev-ruby/rack/rack-1.6.7.ebuild
+++ b/dev-ruby/rack/rack-1.6.7.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://rack.github.com/"
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RUBY_PATCHES=( ${PN}-1.2.1-gentoo.patch ${PN}-1.6-rewindable-ruby23.patch )