9 files changed, 167 insertions, 52 deletions
diff --git a/dev-ruby/rouge/Manifest b/dev-ruby/rouge/Manifest
index 33cb81aac381..51d1a0f3f827 100644
--- a/dev-ruby/rouge/Manifest
+++ b/dev-ruby/rouge/Manifest
@@ -1,2 +1,5 @@
+DIST rouge-3.29.0.tar.gz 1024187 BLAKE2B ee29f9d22211dec38ec2fdd49da4dbd28957876e2324c72e6d4d58748adc4fac8ad1b0788537e0e49fb80ca41a7e2c788ab91d435d71a85e8b42858c2a19d975 SHA512 632b8c5e1454981842984b42626139b2f0041449301b706d884f347ca247d40dccd9bbab9e30c1af379e1d47b8b5c29a1ba30d28c5ecd6f47d00a3ee5af8ce92
+DIST rouge-3.30.0.tar.gz 1036048 BLAKE2B 79dde9ed8a282b22aa044bef1a17cdde705e5361aa9298789d1de155260a69a200d8039c400d22db5719039d67f0d9179c31574190684da50ea64fba92c63ec8 SHA512 f21ff96d2d1f248dfffb02ea2312b4c01090b2b5664588e00763d0ede0d8af701efe0cdabb551a2debff26a301dfaffa7a07aa579d73806c6635f03dd15dcfe1
+DIST rouge-4.0.0.tar.gz 1036030 BLAKE2B 7f446bd6a84d8eed28faf5b873ede459aff5c7a73328b71ceb50bd939d76281daca77d60ab6ff47aee5f7e7b120f8c0ee0010364679196d7d41373b860e76920 SHA512 9917a9f913373371ba11abb90389273b5d97e7287fa6c265ce40dbaad040a29a900c6843cfc1688315a489c2e32d188840d23052190783eb353f5ffd098b895b
 DIST rouge-4.0.1.tar.gz 1041393 BLAKE2B f2c26a918b0365a1b65d938e8835fbe96cdedaeaad5d06e24972f79b0dd8b27bd301ec7ccc7de603f64fbdda5ddd06fdca870a06e0365eeb6adf7f0e7a4cfb2c SHA512 1a7f564d27c2c12c060eeb29f1fdb38e01c1c4c22424b78cfb7b0b19e61e50e9266f21aa6972694a654111cdf6205e2326650ac3e5ef4d0fa182732bd3609494
 DIST rouge-4.1.0.tar.gz 1045005 BLAKE2B 4cbff8d855d36e2d4ab79bc7c125eb2e757f11dabfc5501f59687d7203d3ca1ac503a44caa938de05a99676b4fbe885dd7c012139dbbbfe110d5409e7d3ffc1a SHA512 02bcdcf57d3eb896a006513439930791e4a7486c83e1124fff8d8d2abe211d151b238b52dac1a14019dfed061a44ab249ce7979b94602df730c5684522320252
diff --git a/dev-ruby/rouge/metadata.xml b/dev-ruby/rouge/metadata.xml
index 36acccda7221..665fb8b34010 100644
--- a/dev-ruby/rouge/metadata.xml
+++ b/dev-ruby/rouge/metadata.xml
@@ -2,9 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="project">
-  <email>dev@liguros.net</email>
-  <name>Development</name>
+  <email>ruby@gentoo.org</email>
+  <name>Gentoo Ruby Project</name>
  </maintainer>
- 
- <origin>ports</origin>
+ <upstream>
+  <remote-id type="rubygems">rouge</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
 </pkgmetadata>
 \ No newline at end of file
diff --git a/dev-ruby/rouge/rouge-3.29.0.ebuild b/dev-ruby/rouge/rouge-3.29.0.ebuild
new file mode 100644
index 000000000000..7650a50485e4
--- /dev/null
+++ b/dev-ruby/rouge/rouge-3.29.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_TASK_TEST="spec"
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+
+RUBY_FAKEGEM_GEMSPEC="rouge.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Yet-another-markdown-parser using a strict syntax definition in pure Ruby"
+HOMEPAGE="https://github.com/jneen/rouge"
+SRC_URI="https://github.com/jneen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+
+SLOT="2"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE=""
+
+ruby_add_bdepend "doc? ( dev-ruby/redcarpet )
+	test? ( dev-ruby/minitest-power_assert )
+	dev-ruby/yard
+"
+
+ruby_add_rdepend "dev-ruby/redcarpet"
+
+all_ruby_prepare() {
+	rm -f tasks/{check/style,update/changelog}.rake || die
+
+	sed -i -e '/bundler/I s:^:#: ; 5irequire "minitest-power_assert"' spec/spec_helper.rb || die
+	sed -i -e '/\(changelog\|bundler\|rubocop\)/ s:^:#: ; 1irequire "pathname"' Rakefile || die
+}
diff --git a/dev-ruby/rouge/rouge-3.30.0-r1.ebuild b/dev-ruby/rouge/rouge-3.30.0-r1.ebuild
new file mode 100644
index 000000000000..38fe6658eae0
--- /dev/null
+++ b/dev-ruby/rouge/rouge-3.30.0-r1.ebuild
@@ -0,0 +1,37 @@
+# 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_BINWRAP=""
+RUBY_FAKEGEM_TASK_TEST="spec"
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+
+RUBY_FAKEGEM_GEMSPEC="rouge.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Yet-another-markdown-parser using a strict syntax definition in pure Ruby"
+HOMEPAGE="https://github.com/jneen/rouge"
+SRC_URI="https://github.com/jneen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE=""
+
+ruby_add_bdepend "doc? ( dev-ruby/redcarpet )
+	test? ( dev-ruby/minitest-power_assert )
+	dev-ruby/yard
+"
+
+ruby_add_rdepend "dev-ruby/redcarpet"
+
+all_ruby_prepare() {
+	rm -f tasks/{check/style,update/changelog}.rake || die
+
+	sed -i -e '/bundler/I s:^:#: ; 5irequire "minitest-power_assert"' spec/spec_helper.rb || die
+	sed -i -e '/\(changelog\|bundler\|rubocop\)/ s:^:#: ; 1irequire "pathname"' Rakefile || die
+}
diff --git a/dev-ruby/rouge/rouge-3.30.0.ebuild b/dev-ruby/rouge/rouge-3.30.0.ebuild
new file mode 100644
index 000000000000..87576fcd19e2
--- /dev/null
+++ b/dev-ruby/rouge/rouge-3.30.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_TASK_TEST="spec"
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+
+RUBY_FAKEGEM_GEMSPEC="rouge.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Yet-another-markdown-parser using a strict syntax definition in pure Ruby"
+HOMEPAGE="https://github.com/jneen/rouge"
+SRC_URI="https://github.com/jneen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+
+SLOT="2"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86"
+IUSE=""
+
+ruby_add_bdepend "doc? ( dev-ruby/redcarpet )
+	test? ( dev-ruby/minitest-power_assert )
+	dev-ruby/yard
+"
+
+ruby_add_rdepend "dev-ruby/redcarpet"
+
+all_ruby_prepare() {
+	rm -f tasks/{check/style,update/changelog}.rake || die
+
+	sed -i -e '/bundler/I s:^:#: ; 5irequire "minitest-power_assert"' spec/spec_helper.rb || die
+	sed -i -e '/\(changelog\|bundler\|rubocop\)/ s:^:#: ; 1irequire "pathname"' Rakefile || die
+}
diff --git a/dev-ruby/rouge/rouge-4.0.0.ebuild b/dev-ruby/rouge/rouge-4.0.0.ebuild
new file mode 100644
index 000000000000..4d36fc3162b8
--- /dev/null
+++ b/dev-ruby/rouge/rouge-4.0.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_TASK_TEST="spec"
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+
+RUBY_FAKEGEM_GEMSPEC="rouge.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Yet-another-markdown-parser using a strict syntax definition in pure Ruby"
+HOMEPAGE="https://github.com/jneen/rouge"
+SRC_URI="https://github.com/jneen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE=""
+
+ruby_add_bdepend "doc? ( dev-ruby/redcarpet )
+	test? ( dev-ruby/minitest-power_assert )
+	dev-ruby/yard
+"
+
+ruby_add_rdepend "dev-ruby/redcarpet !<dev-ruby/rouge-3.30.0-r1"
+
+all_ruby_prepare() {
+	rm -f tasks/{check/style,update/changelog}.rake || die
+
+	sed -i -e '/bundler/I s:^:#: ; 5irequire "minitest-power_assert"' spec/spec_helper.rb || die
+	sed -i -e '/\(changelog\|bundler\|rubocop\)/ s:^:#: ; 1irequire "pathname"' Rakefile || die
+}
diff --git a/dev-ruby/rouge/rouge-4.0.1.ebuild b/dev-ruby/rouge/rouge-4.0.1.ebuild
index 5490b301c695..4d36fc3162b8 100644
--- a/dev-ruby/rouge/rouge-4.0.1.ebuild
+++ b/dev-ruby/rouge/rouge-4.0.1.ebuild
@@ -1,5 +1,6 @@
-# Copyright 2021-2022 Liguros Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI=8
 USE_RUBY="ruby27 ruby30 ruby31"
 
@@ -16,8 +17,8 @@ SRC_URI="https://github.com/jneen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 
-SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE=""
 
 ruby_add_bdepend "doc? ( dev-ruby/redcarpet )
@@ -25,7 +26,7 @@ ruby_add_bdepend "doc? ( dev-ruby/redcarpet )
 	dev-ruby/yard
 "
 
-ruby_add_rdepend "dev-ruby/redcarpet"
+ruby_add_rdepend "dev-ruby/redcarpet !<dev-ruby/rouge-3.30.0-r1"
 
 all_ruby_prepare() {
 	rm -f tasks/{check/style,update/changelog}.rake || die
diff --git a/dev-ruby/rouge/rouge-4.1.0.ebuild b/dev-ruby/rouge/rouge-4.1.0.ebuild
index 9d97db3c6c16..f14940d79bfa 100644
--- a/dev-ruby/rouge/rouge-4.1.0.ebuild
+++ b/dev-ruby/rouge/rouge-4.1.0.ebuild
@@ -1,7 +1,8 @@
-# Copyright 2021-2023 Liguros Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI=8
-USE_RUBY="ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_TASK_TEST="spec"
 RUBY_FAKEGEM_RECIPE_DOC="yard"
@@ -11,13 +12,13 @@ RUBY_FAKEGEM_GEMSPEC="rouge.gemspec"
 inherit ruby-fakegem
 
 DESCRIPTION="Yet-another-markdown-parser using a strict syntax definition in pure Ruby"
-HOMEPAGE="https://github.com/jneen/rouge"
-SRC_URI="https://github.com/jneen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/rouge-ruby/rouge"
+SRC_URI="https://github.com/rouge-ruby/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 
-SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+SLOT="$(ver_cut 1)"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE=""
 
 ruby_add_bdepend "doc? ( dev-ruby/redcarpet )
@@ -25,7 +26,7 @@ ruby_add_bdepend "doc? ( dev-ruby/redcarpet )
 	dev-ruby/yard
 "
 
-ruby_add_rdepend "dev-ruby/redcarpet"
+ruby_add_rdepend "dev-ruby/redcarpet !<dev-ruby/rouge-3.30.0-r1"
 
 all_ruby_prepare() {
 	rm -f tasks/{check/style,update/changelog}.rake || die
diff --git a/dev-ruby/safe_yaml/safe_yaml-1.0.5-r1.ebuild b/dev-ruby/safe_yaml/safe_yaml-1.0.5-r1.ebuild
deleted file mode 100644
index 6c605c412659..000000000000
--- a/dev-ruby/safe_yaml/safe_yaml-1.0.5-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Broken with ruby30: https://github.com/dtao/safe_yaml/issues/100
-# Broken with newer psych: https://github.com/dtao/safe_yaml/pull/101
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Parse YAML safely, alternative implementation of YAML.load"
-HOMEPAGE="https://github.com/dtao/safe_yaml"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-ruby_add_bdepend "test? ( dev-ruby/hashie
-	dev-ruby/heredoc_unindent
-	dev-ruby/rspec:3 )"
-
-all_ruby_prepare() {
-	sed -i -e '/local timezone/askip "timezone"' spec/transform/to_date_spec.rb || die
-}
-
-each_ruby_test() {
-	# Run specs with monkeypatch
-	${RUBY} -S rspec-3 spec --tag ~libraries || die
-
-	# Running specs without monkeypatch
-	${RUBY} -S rspec-3 spec --tag libraries || die
-}