gentoo auto-resync : 09:11:2023 - 16:32:23

4 files changed, 45 insertions, 75 deletions

diff --git a/dev-ruby/yard/Manifest b/dev-ruby/yard/Manifest
index 87e3bc223bd2..a5b4ca6cfe06 100644
--- a/dev-ruby/yard/Manifest
+++ b/dev-ruby/yard/Manifest
@@ -1,9 +1,7 @@
+AUX yard-0.9.34-beginless-range.patch 1588 BLAKE2B 08b63f291f017c63db9f1b7c88107075c9b928dabc650bae7710794ae81e14a39fd9307111d408a7450b8598697220cc07e47005fb3c2713cc433bfa14a82ae0 SHA512 f71491b057ec9f903ad67002489e2009cfbed8ddfe210f7305bdbb22900695c0c0fd58802335fb03f7523d8583043b3649603617ddcaf37241270f28b4427122
 DIST yard-0.9.28-git.tgz 932436 BLAKE2B 7340f6815698ddb85aa16752266af75ecd3e1f1a5f328e147dd8ea01a750c48259e6f3413bb5d00777d4e983b340b36b21110e058cf6b326973c0a7c3d756836 SHA512 f57ce1f63ab1763729c85121cf1ac5927d4f7c53eed2fb58b1ea7d700db22481e767926845558d3db31bcef50d0181f0b6cf449e558a5548243256cdda0cd355
-DIST yard-0.9.29-git.tgz 937893 BLAKE2B ccba7682aa071b6be570d0a47558107469ca2200fa2c83e93744e840e270c71d7b3fb31e9d51ddc72ede34daa741f2135e2950afd1927643e9129d0879e8f18e SHA512 fba71ae8d205595ce320143c962e9ce5ad496c158067412b20ddbfd7b5f30ed1eb3185a12997108847553ca65709bbbfb7c00e71cc6d46616e2e488bba22c2f0
-DIST yard-0.9.32-git.tgz 937946 BLAKE2B 757a4a4ab04fc88c4d0be06a33e56ffe04140e59655e91054f3222aba5a495c65692efa58289f7c6519ca78309c6cce53d9cdeb8ba5e3cd79b7da62b1056eebc SHA512 9cb8752cf079c185936b6d201f9118f40723ad3237aeac6eade163cfbfa8caa7725f8feec00f76c36fd4f92fa37c140a727b07ec852cdb4211cc854ff22adddb
 DIST yard-0.9.34-git.tgz 938057 BLAKE2B 0e5b96b29efc6b7ab6c52dc34a15d4df9b614eb56698eb76fc7d2dc1f1fcfa5f8883034697f5a3fbd76ff588a9ebf2c7ee164936809bfe4640663c996e9f648a SHA512 fb87e3706d2c1408a172e17cdb588aacb2c67b9e7ac8c9b2d2a4d2e8a67a0c571d05938f8a4a88357834f6dac13a38cf1faa086680d58380a65cc2fca93aad8f
 EBUILD yard-0.9.28.ebuild 2549 BLAKE2B 3410ebe0e7b501986ef87bf457748ba882532adbe5697747f416a78fc42c6cd117ee99dd59902352ae3373b326d7aca519366c275c9601a0578a0dffeda952d5 SHA512 e48120534028ad37dd4d5308fcd3b52a5b569217ec8236ba172f722664cc0fd53562eaa83b2201399ac4270b5f1fc8dac9d96109b777e1c04ff7576351cf91b0
-EBUILD yard-0.9.29.ebuild 2551 BLAKE2B 962743061999cef18adcfed8a895a409730f21ba520ecdf2ced19a4d2ade5d0e61451afee7a9c7f546552f2f364a1c7b6254d95d7f15f5b932bfc0ae859bdfcd SHA512 5f3ce543d937a16bb9d1643cd04664b306709082bf5d34be528098e7f0bd76048f728ac02dfc81b3941830b71a5117ed098ab0bf7b7e503ca3c8c146d8ef4af9
-EBUILD yard-0.9.32.ebuild 2551 BLAKE2B 962743061999cef18adcfed8a895a409730f21ba520ecdf2ced19a4d2ade5d0e61451afee7a9c7f546552f2f364a1c7b6254d95d7f15f5b932bfc0ae859bdfcd SHA512 5f3ce543d937a16bb9d1643cd04664b306709082bf5d34be528098e7f0bd76048f728ac02dfc81b3941830b71a5117ed098ab0bf7b7e503ca3c8c146d8ef4af9
+EBUILD yard-0.9.34-r1.ebuild 2621 BLAKE2B 5ce83c31a482d1d58a4d7ee0349f06ab6d7b7393585c393493d5bb78813860ee18d985adb34c2802d6a0308a0181f05d8f46ba151407f505aaecfc22c9cda3ec SHA512 109c822883393b5d9b1b539065209ff1452647a5ccad8c8129c0da19e379ca7c7ff185b94124f6394e8cf8458c115a6cf42660039af3750a027d5bff05f44289
 EBUILD yard-0.9.34.ebuild 2575 BLAKE2B a09e691d721671395b4aaace9a9aceb002e3e69f949739ab4aba74f2936127fd84c7a577e0feaa2409ac31244f824f06863325d8f53b85eeb8d759bdb39db1a6 SHA512 cb021d7f3cbe223c5f8cf0bb219fc9c963dfea5f4f3ca37baa75e3c558fb7f19fa02877be2a2d99b40f26a508b456bd74a42ebd4ee4d679aa7fcbac21124386f
 MISC metadata.xml 338 BLAKE2B 17efe658faab09d5935ba472a803a1267f7606a44b157f29bcdecc8cea8af90902ae47012fdd4426357a8ceba5526ca24d737be8fe161c34e28e5362ccc94f16 SHA512 d1f45e2202c86b247b1b872ada72fef392d20260bc3ccc78164c26614dc80b8fe05518356248e3e7f15e2c70b29a9c0909bc738267261eb808965bcb0ed4ebc9
diff --git a/dev-ruby/yard/files/yard-0.9.34-beginless-range.patch b/dev-ruby/yard/files/yard-0.9.34-beginless-range.patch
new file mode 100644
index 000000000000..4284ad83acb9
--- /dev/null
+++ b/dev-ruby/yard/files/yard-0.9.34-beginless-range.patch
@@ -0,0 +1,38 @@
+From 8481180b935922f76a36e29e83914ee6fad782cd Mon Sep 17 00:00:00 2001
+From: Brad Feehan <git@bradfeehan.com>
+Date: Tue, 21 Jun 2022 17:05:20 +1000
+Subject: [PATCH] Fix "cannot get the first element of beginless range" error
+
+This implements the fix suggested by @akimd:
+
+See https://github.com/lsegal/yard/issues/1434#issuecomment-1087817139
+
+Fixes lsegal/yard#1434.
+---
+ lib/yard/parser/ruby/ast_node.rb | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/lib/yard/parser/ruby/ast_node.rb b/lib/yard/parser/ruby/ast_node.rb
+index c9deb3ed1..d10bdfa3a 100644
+--- a/lib/yard/parser/ruby/ast_node.rb
++++ b/lib/yard/parser/ruby/ast_node.rb
+@@ -271,7 +271,7 @@ def has_line?
+ 
+         # @return [Fixnum] the starting line number of the node
+         def line
+-          line_range && line_range.first
++          line_range && line_range.begin || 1
+         end
+ 
+         # @return [String] the first line of source represented by the node.
+@@ -345,8 +345,8 @@ def reset_line_info
+           elsif !children.empty?
+             f = children.first
+             l = children.last
+-            self.line_range = Range.new(f.line_range.first, l.line_range.last)
+-            self.source_range = Range.new(f.source_range.first, l.source_range.last)
++            self.line_range = Range.new(f.line_range.begin || 1, l.line_range.last)
++            self.source_range = Range.new(f.source_range.begin || 1, l.source_range.last)
+           elsif @fallback_line || @fallback_source
+             self.line_range = @fallback_line
+             self.source_range = @fallback_source
diff --git a/dev-ruby/yard/yard-0.9.32.ebuild b/dev-ruby/yard/yard-0.9.32.ebuild
deleted file mode 100644
index a363776989eb..000000000000
--- a/dev-ruby/yard/yard-0.9.32.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby27 ruby30 ruby31 ruby32"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_TASK_DOC="yard"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_DOCDIR="doc docs"
-
-RUBY_FAKEGEM_EXTRAINSTALL="templates"
-
-RUBY_FAKEGEM_GEMSPEC="yard.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Documentation generation tool for the Ruby programming language"
-HOMEPAGE="https://yardoc.org/"
-
-# The gem lacks 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 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE=""
-
-ruby_add_bdepend "doc? ( || ( dev-ruby/maruku dev-ruby/rdiscount dev-ruby/kramdown ) )"
-
-ruby_add_bdepend "test? ( dev-ruby/rack:2.2 >=dev-ruby/rspec-3.11.0 )"
-
-all_ruby_prepare() {
-	sed -i -e '/[Bb]undler/ s:^:#:' -e '3igem "rack", "~> 2.2.0"' spec/spec_helper.rb || die
-
-	sed -i -e '/samus/I s:^:#:' Rakefile || die
-
-	sed -i -e 's/git ls-files/find/' ${RUBY_FAKEGEM_GEMSPEC} || 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
-	sed -e '/overwrites options with data in/askip "wrong assumptions on file access"' \
-		-e '/loads any gem plugins starting with/askip "wrong assumptions on file access"' \
-		-i spec/config_spec.rb || die
-
-	# Avoid specs making assumptions about how rubygems works internally
-	sed -i -e '/searches for .gem file/askip "rubygems internals"' spec/cli/diff_spec.rb || die
-
-	# Fix broken spec
-	sed -i -e '/:exist?/aallow(File).to receive(:exist?).and_call_original' spec/i18n/locale_spec.rb || die
-
-	# Avoid ruby31 failure on whitespace-only differences
-	sed -i -e '/shows a list of nodes/askip "Whitespace differences on ruby31"' spec/parser/ruby/ast_node_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
-
-	# Avoid asciidoc-specific spec that is not optional
-	sed -e '/\(AsciiDoc specific\|AsciiDoc header\)/askip "skipping asciidoc test"' \
-		-i spec/templates/helpers/html_helper_spec.rb || die
-}
diff --git a/dev-ruby/yard/yard-0.9.29.ebuild b/dev-ruby/yard/yard-0.9.34-r1.ebuild
index a363776989eb..e42ad56e8339 100644
--- a/dev-ruby/yard/yard-0.9.29.ebuild
+++ b/dev-ruby/yard/yard-0.9.34-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-USE_RUBY="ruby27 ruby30 ruby31 ruby32"
+USE_RUBY="ruby31 ruby32"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_TASK_DOC="yard"
@@ -11,7 +11,7 @@ RUBY_FAKEGEM_TASK_DOC="yard"
 RUBY_FAKEGEM_EXTRADOC="README.md"
 RUBY_FAKEGEM_DOCDIR="doc docs"
 
-RUBY_FAKEGEM_EXTRAINSTALL="templates"
+RUBY_FAKEGEM_EXTRAINSTALL="templates .yardopts"
 
 RUBY_FAKEGEM_GEMSPEC="yard.gemspec"
 
@@ -25,9 +25,11 @@ 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 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE=""
 
+PATCHES=( "${FILESDIR}/${P}-beginless-range.patch" )
+
 ruby_add_bdepend "doc? ( || ( dev-ruby/maruku dev-ruby/rdiscount dev-ruby/kramdown ) )"
 
 ruby_add_bdepend "test? ( dev-ruby/rack:2.2 >=dev-ruby/rspec-3.11.0 )"