gentoo resync : 21.07.2018

4 files changed, 59 insertions, 5 deletions

diff --git a/dev-ruby/yard/Manifest b/dev-ruby/yard/Manifest
index 7e3200ab3340..9fb791331bf3 100644
--- a/dev-ruby/yard/Manifest
+++ b/dev-ruby/yard/Manifest
@@ -1,5 +1,7 @@
 DIST yard-0.9.11-git.tgz 916355 BLAKE2B e9f27fe129cf93c51dbf83f4a7d5745d385252ba63c90f85223f2e9436c22a55aaba296f263072069d39e4beaca3e0830775a8be121c64cdc2a15afd3539a73f SHA512 375a4878e61888cf73aaa06e9300195ae48b9898d8cd639fa796a067e5fa0b89d6ef62d327a388ee83953e80177515f4d8c070042188e3a1e597f48b82b3a72e
 DIST yard-0.9.14-git.tgz 917830 BLAKE2B dd0d1d6dbc5aa9b549bd4c110f1abd57edc76b85e7c936bca8f7d35761d705ba86cd169c3c2b2141095dda68a8ab350b46bcbeb978d655addff78b110fbd2b71 SHA512 7974d431b2c1ef4830f225fd2012592405e7fb63546aeb52b74f4ad8b498926be979f3010bd315877bb4f738f6aa6c31f54b71832b461ebd3fa54fe1a1fccf5f
-EBUILD yard-0.9.11.ebuild 1317 BLAKE2B 491c69e138eae9ce9b3e8c80b266910414bea131d6dffc6788534f2519b674125fe316f1d7c5c4a56bfb9e6bb10042eeea3a08e6243a3fd5d2992900b0e7a6ba SHA512 7461bdb4de4b211037e2f616e5614c995a8f62f691777348c8f549b58d22b395df6b29e0d625bc3e308a7bdd2cb707bb09dcc4d3fc451fabbed04f1635328b30
-EBUILD yard-0.9.14.ebuild 1440 BLAKE2B 1130caaab8d43bf4cad4c7669d6b5a6b93b5703ef1020d18eb52d32fac14a4e330c69d05746462df7f9a8a3fce4d74ae6b14a03dcd9bd63d77ef764cae353fb4 SHA512 be5266e5244726469c82fb2a133f4b54fb1080886b051de5edebdbb0d3856bb157c6e442e9c24a796b27bbd601e386559c8f1334be0b83bfc4bc628936dcca11
+DIST yard-0.9.15-git.tgz 918280 BLAKE2B f7ae54298cfb8d19e006ad5e18525c3e73e423894e37c3af1fbf555227c4f66bbbcdae781addf7ad30ac900d2af7458550558fe75d876d9fa4c0cd5a2a1a3668 SHA512 45e3a6e170c06c0f7e7ff508d33e87ed9922be3e8fca19d272553b84e678fa209c44460665b86e508145b147dbbc6d4664b95694dbcf91c421988b233e63dd40
+EBUILD yard-0.9.11.ebuild 1464 BLAKE2B 0e4ee9f923c5a7fdfa905a50fe8a69b2273795c19e4c0665d015807e283b8cfee92ce936dcc1d08ca2d5c3c1001452ccc7d2e4b9fb1b9097e008de723db048d2 SHA512 0eb51531a2c15800b4af27f4174abd3fe161448f7d275e63673ccd4e6787fdbfd18ab50563b454495e7707d68df90281c3e7b97f82be977095c41ac9ec74dbdc
+EBUILD yard-0.9.14.ebuild 1588 BLAKE2B 52adfcc822cfd56271195f6814091ae790477cdfa30574bc1a23862f0c6d8d61725b5e75540057b6da305842fb77a9b26dd82a21c4e75e90c00ce980438c70c3 SHA512 93ca7b3a3771f5c1df77f5ebb2e9d12cefe45ce6fb05f32a8b4035df555e72b03ddce7b29b3a7a0e687ef6e7368518e5a874d8f570f557ba979b16740f4b6d2f
+EBUILD yard-0.9.15.ebuild 1588 BLAKE2B 52adfcc822cfd56271195f6814091ae790477cdfa30574bc1a23862f0c6d8d61725b5e75540057b6da305842fb77a9b26dd82a21c4e75e90c00ce980438c70c3 SHA512 93ca7b3a3771f5c1df77f5ebb2e9d12cefe45ce6fb05f32a8b4035df555e72b03ddce7b29b3a7a0e687ef6e7368518e5a874d8f570f557ba979b16740f4b6d2f
 MISC metadata.xml 337 BLAKE2B 1aedede1271d1f9a566743dd25b1fd9961e429b78bb5f9f36bd6ea66f631f376a273d7a094fba7121d099f3a4a3f0e7738753078e2a1a554cfe6cf32acc6e2b6 SHA512 0de30cc9c4a9d08649f141cb6df0ee9c05703831603c77a0605f0bf8e2f49b8324a782d092aaa690581e23d6d948fda9781b98770a3ba89ed6bfc0de351c11bb
diff --git a/dev-ruby/yard/yard-0.9.11.ebuild b/dev-ruby/yard/yard-0.9.11.ebuild
index b70b4dd17ad5..20374f2b0f8d 100644
--- a/dev-ruby/yard/yard-0.9.11.ebuild
+++ b/dev-ruby/yard/yard-0.9.11.ebuild
@@ -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 ~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_add_bdepend "doc? ( || ( dev-ruby/maruku dev-ruby/rdiscount dev-ruby/bluecloth dev-ruby/kramdown ) )"
 
-ruby_add_bdepend "test? ( >=dev-ruby/ruby-gettext-2.3.8 dev-ruby/rack dev-ruby/redcloth )"
+ruby_add_bdepend "test? ( >=dev-ruby/ruby-gettext-2.3.8 dev-ruby/rack )"
 
 all_ruby_prepare() {
 	sed -i -e '/[Bb]undler/ s:^:#:' spec/spec_helper.rb || die
@@ -37,4 +37,7 @@ all_ruby_prepare() {
 	# true for us. This may be related to how we install in Gentoo. This
 	# also drops a test requirement on dev-ruby/rack.
 	rm -f spec/cli/server_spec.rb || die
+
+	# Avoid redcarpet-specific spec that is not optional
+	sed -i -e '/autolinks URLs/askip "make redcarpet optional"' spec/templates/helpers/html_helper_spec.rb || die
 }
diff --git a/dev-ruby/yard/yard-0.9.14.ebuild b/dev-ruby/yard/yard-0.9.14.ebuild
index 878b62659879..4270103786c4 100644
--- a/dev-ruby/yard/yard-0.9.14.ebuild
+++ b/dev-ruby/yard/yard-0.9.14.ebuild
@@ -28,7 +28,7 @@ IUSE=""
 
 ruby_add_bdepend "doc? ( || ( dev-ruby/maruku dev-ruby/rdiscount dev-ruby/bluecloth dev-ruby/kramdown ) )"
 
-ruby_add_bdepend "test? ( >=dev-ruby/ruby-gettext-2.3.8 dev-ruby/rack dev-ruby/redcloth )"
+ruby_add_bdepend "test? ( >=dev-ruby/ruby-gettext-2.3.8 dev-ruby/rack )"
 
 all_ruby_prepare() {
 	sed -i -e '/[Bb]undler/ s:^:#:' spec/spec_helper.rb || die
@@ -40,4 +40,7 @@ all_ruby_prepare() {
 
 	# Avoid specs that only work with bundler
 	sed -i -e '/#initialize/,/^  end/ s:^:#:' spec/cli/yri_spec.rb || die
+
+	# Avoid redcarpet-specific spec that is not optional
+	sed -i -e '/autolinks URLs/askip "make redcarpet optional"' spec/templates/helpers/html_helper_spec.rb || die
 }
diff --git a/dev-ruby/yard/yard-0.9.15.ebuild b/dev-ruby/yard/yard-0.9.15.ebuild
new file mode 100644
index 000000000000..4270103786c4
--- /dev/null
+++ b/dev-ruby/yard/yard-0.9.15.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+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="https://yardoc.org/"
+
+# The gem lakes the gemspec file needed to pass tests.
+SRC_URI="https://github.com/lsegal/yard/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="0"
+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_add_bdepend "doc? ( || ( dev-ruby/maruku dev-ruby/rdiscount dev-ruby/bluecloth dev-ruby/kramdown ) )"
+
+ruby_add_bdepend "test? ( >=dev-ruby/ruby-gettext-2.3.8 dev-ruby/rack )"
+
+all_ruby_prepare() {
+	sed -i -e '/[Bb]undler/ s:^:#:' spec/spec_helper.rb || die
+
+	# Avoid specs that make assumptions on load ordering that are not
+	# true for us. This may be related to how we install in Gentoo. This
+	# also drops a test requirement on dev-ruby/rack.
+	rm -f spec/cli/server_spec.rb || die
+
+	# Avoid specs that only work with bundler
+	sed -i -e '/#initialize/,/^  end/ s:^:#:' spec/cli/yri_spec.rb || die
+
+	# Avoid redcarpet-specific spec that is not optional
+	sed -i -e '/autolinks URLs/askip "make redcarpet optional"' spec/templates/helpers/html_helper_spec.rb || die
+}