gentoo resync : 01.12.2017

3 files changed, 8 insertions, 55 deletions

diff --git a/dev-ruby/yard/Manifest b/dev-ruby/yard/Manifest
index a81081950929..f5a80b53404b 100644
--- a/dev-ruby/yard/Manifest
+++ b/dev-ruby/yard/Manifest
@@ -1,12 +1,10 @@
-DIST yard-0.8.7.3-git.tgz 854557 BLAKE2B a509aca8a37795d600767fc115671fbac6de3b1bd179f1e925136904730c3329c76856715ee8af7a3adc1fab1a6be080ea7c37c1e22497ecae369cfdf0630e5a SHA512 96b8a128bacd005e64c3a863ac6cc7377755397c7532b5541809c8a0f5b157cd7433644887823e2d3c4435a0bded59fc2785992fdcf5ebcbf616a4ffd912f6fa
-DIST yard-0.8.7.6-git.tgz 859257 BLAKE2B 044d0a42432fd4614593670388a4d02014d143dd3700974f0fa5a7185270800356d8e8da8e579993af6426de71a4a1c842ebec16c2bd2b2a14ce0802f2177602 SHA512 7f9d4100183e51a2059f01a06a77d9856961390975fd9981b81bf9ea55f047cfd9056c78b5400df277b8230f28990cb421216c4506bbeea797651f37ae2e5db1
 DIST yard-0.9.11-git.tgz 916355 BLAKE2B e9f27fe129cf93c51dbf83f4a7d5745d385252ba63c90f85223f2e9436c22a55aaba296f263072069d39e4beaca3e0830775a8be121c64cdc2a15afd3539a73f SHA512 375a4878e61888cf73aaa06e9300195ae48b9898d8cd639fa796a067e5fa0b89d6ef62d327a388ee83953e80177515f4d8c070042188e3a1e597f48b82b3a72e
+DIST yard-0.9.12-git.tgz 916462 BLAKE2B 905f0e4408f7829ca599b578344d695e4c7b68d46b982f39277dcd69ee726a9ac283910e1031d635917b149f182fb302cae537ff8a8a81960fa27965fda82a0c SHA512 f987da7e46bb3dafb9ba8c761b51345ee67102e21d05181c3090f31ff37179505134c93e83efdd39bb35cf6fe6dfa530d0017ce4680a08f858e78cbb073b239f
 DIST yard-0.9.4-git.tgz 884608 BLAKE2B 9d17d7cdfa0432d769026f6bc12354be236b5d07d65bc510bfd6bdd5add12d87f77808832f9f011d327f13b495d499e395c232a3d77c7e779dd0ed40a676d911 SHA512 2255c56498dc147ee5ede5e4898ce7aad78e9350f317e5d5c942f6b12262e9e1d0893ffd985a6bf3822d6af902e8ff555c489e1d847049ba51a472ad3c4aa140
 DIST yard-0.9.8-git.tgz 897925 BLAKE2B 55179a3adcdcbb59f3e6eacf5a946aa28a0d13de0b9e0c5e0844deacbcbe91142927a4ab1ed0e385696cd5e2e484bd8c20fe1656515114d4d55e14c2f1d9e257 SHA512 f2e340bb90e5da456f622aadbc12278a6db486ed8b5a2f9a7b4408d6201cb6388a1f4fe0f3ca7584fdab9d73533e49015f465fb39b5049fe2c27c18e1d6cd41e
 DIST yard-0.9.9-git.tgz 898576 BLAKE2B 04abc3d72f87666ce7c636202621a4ae88ed8809e79fe748fca98a0f980b9dad4a719e0ac709494a63406aef8d1621f535f59c3400f7bce0c96d29f3d58892d3 SHA512 1ca970c9a1207fd12855659b98f3fc233bad76cc6afb8a7524d98c67b9190d0469173ab911cf813b6e7817e6c95da518fe4e285b72a48e09fd8ab12db84dfc98
-EBUILD yard-0.8.7.3.ebuild 1097 BLAKE2B 10aa88e32744d56b3af54574d998e2c07377d8e71d5645d0e2bc5a4eafc6cba9d9b42c65351ff78b8e6944ec65f470b39350250e33770df4e8cfa9cbb52b650f SHA512 a01dcb4d7cd7b5f95a2ba9641ba4f67e5fd0527965d2f278195f928c02cd78b69569a1769446733a444923ae343df518d3f9299e15f144d84f8516d36e6f41d0
-EBUILD yard-0.8.7.6.ebuild 1566 BLAKE2B b5c2fc901979321b718536d6ec1792c4e42ba7fdcc48411571ee0c3a8b2bad0f68deb1d659e055f3803eacad51b16e1821631a66f4cb944756a05ea307400ab7 SHA512 99f17c13c835a47cd51c36f7d27c1367a8a29c0388ee957e42e98892b0a4dfef4d9692d729da72b53a37b1cb4dc421272182b00771fb76cea229e853a2936ccc
 EBUILD yard-0.9.11.ebuild 1285 BLAKE2B 73feeb381e397653ebd2361ca4e4d3c1f7d056fc73059a691f7c166d8b7c8517d1c5fae67fed15646757460e9cc4984bb977fb06de93125b887bc8b3a96ad5ce SHA512 11950cd03ff8d582b6c8ea0ca82276ae35f4af83c1302d7c7f9fbfec9f240a3be4e92c23a39910d498473efc68b2916d77a1d3ff3fb932a00ec876991ffa7ae0
+EBUILD yard-0.9.12.ebuild 1285 BLAKE2B 73feeb381e397653ebd2361ca4e4d3c1f7d056fc73059a691f7c166d8b7c8517d1c5fae67fed15646757460e9cc4984bb977fb06de93125b887bc8b3a96ad5ce SHA512 11950cd03ff8d582b6c8ea0ca82276ae35f4af83c1302d7c7f9fbfec9f240a3be4e92c23a39910d498473efc68b2916d77a1d3ff3fb932a00ec876991ffa7ae0
 EBUILD yard-0.9.4.ebuild 1316 BLAKE2B c1f9b2e880648300b34516c4a3ae7f63a51dcfb245be4237be7c4ec582a276f333231d79d50b5720c332d5d0c31f06ed3e4ae40c7c7fc700c3401788a5c26ed1 SHA512 999695d04608dd86062574814e1c02ddbf5c1a6ce3727c3da3c1137805e05a28c0b373f6c3eae13b94f398c99ac67978ae2f82a5d65550d27712755ffa0e14eb
 EBUILD yard-0.9.8.ebuild 1297 BLAKE2B 3f61f7f3347c942a35c8f4a80c3c83473c8beddc708e247a60851b73895adc661e864c958f755bf009c807261d365b7d34d7b0296ef6f938d2fe85a3307fd917 SHA512 1f5ac270bd5e97c2f693055824dc245fac219593bda8bee8d500f7816d96a6c51ccaf894ae60579e1abc181fa58e70b116535e74961ffe6faceb42df9f692ad1
 EBUILD yard-0.9.9.ebuild 1324 BLAKE2B eb86633cfc79564cb0cbe82f771921b36da5ff521af95f69753a9ec88fbc4fd177856b39cc897c930010db698db50b965553ebd94617138dd167941d218c4ca5 SHA512 fdfa5eaa6e6086919d03272143a6f0048da970d23d16ce4be027de0555aacb0d3d57292a5ddbdfd99dbf8f68bee052a0e6bc4ba83a90e635e74f555ae65d172d
diff --git a/dev-ruby/yard/yard-0.8.7.3.ebuild b/dev-ruby/yard/yard-0.8.7.3.ebuild
deleted file mode 100644
index 385a4f72fd9e..000000000000
--- a/dev-ruby/yard/yard-0.8.7.3.ebuild
+++ /dev/null
@@ -1,35 +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_RECIPE_TEST="rspec"
-RUBY_FAKEGEM_TASK_DOC="yard"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_DOCDIR="doc docs"
-
-RUBY_FAKEGEM_EXTRAINSTALL="templates"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Documentation generation tool for the Ruby programming language"
-HOMEPAGE="http://yardoc.org/"
-
-# The gem lakes the gemspec file needed to pass tests.
-SRC_URI="https://github.com/lsegal/yard/archive/${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-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_add_bdepend "doc? ( || ( dev-ruby/bluecloth dev-ruby/maruku dev-ruby/rdiscount dev-ruby/kramdown ) )
-	test? ( dev-ruby/rack )"
-
-all_ruby_prepare() {
-	sed -i -e '/[Bb]undler/ s:^:#:' spec/spec_helper.rb || die
-	sed -i -e "s/require 'bundler'; rescue LoadError//" spec/cli/server_spec.rb || die
-}
diff --git a/dev-ruby/yard/yard-0.8.7.6.ebuild b/dev-ruby/yard/yard-0.9.12.ebuild
index 2e44ba6e8a42..37824a405d76 100644
--- a/dev-ruby/yard/yard-0.8.7.6.ebuild
+++ b/dev-ruby/yard/yard-0.9.12.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24"
 
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_TASK_DOC="yard"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
@@ -23,12 +23,12 @@ SRC_URI="https://github.com/lsegal/yard/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "doc? ( || ( dev-ruby/maruku dev-ruby/rdiscount dev-ruby/bluecloth dev-ruby/kramdown ) )"
 
-USE_RUBY="ruby20 ruby21" ruby_add_bdepend "test? ( >=dev-ruby/ruby-gettext-2.3.8 )"
+ruby_add_bdepend "test? ( >=dev-ruby/ruby-gettext-2.3.8 )"
 
 all_ruby_prepare() {
 	sed -i -e '/[Bb]undler/ s:^:#:' spec/spec_helper.rb || die
@@ -38,13 +38,3 @@ all_ruby_prepare() {
 	# also drops a test requirement on dev-ruby/rack.
 	rm -f spec/cli/server_spec.rb || die
 }
-
-each_ruby_prepare() {
-	case ${RUBY} in
-		*ruby23)
-			# Avoid possible brittle test
-			# https://github.com/lsegal/yard/issues/927
-			sed -i -e '/should find lone comments/,/^    end/ s:^:#:' spec/parser/ruby/ruby_parser_spec.rb || die
-			;;
-	esac
-}