gentoo resync : 29.12.2022

2 files changed, 17 insertions, 7 deletions

diff --git a/www-apps/nanoc-core/Manifest b/www-apps/nanoc-core/Manifest
index 216c26ddc3ac..6dc4fefb2fdf 100644
--- a/www-apps/nanoc-core/Manifest
+++ b/www-apps/nanoc-core/Manifest
@@ -1,10 +1,10 @@
 AUX nanoc-core-4.12.2-contracts.patch 543 BLAKE2B 374bc86e4351627693d85517f24a82505454eb3eb52c6b12be1681e5bcc4f7a299b98ea72edca42a26e8d121219e6a76afe636b9b08da44e334c10f9fb5be47b SHA512 e8bfcfa6e49439734f6fe760dc46d5eaf6dee9d79a0be83e65dd450a769e0745422d76bf4067d475921b83a4534c9868aca9ef23f2a1fe6ff3ac7ba4b15fe3f6
-DIST nanoc-core-4.11.12.tar.gz 310160 BLAKE2B ef34bf6d28d5a9287053a939ef14bc59f99bde003d7bbcd7eee861ab882a6beaa48812137c8ad87fe464d27e371cfd40022467f8d10ac5f85ff16ef19215e340 SHA512 0503d0a6a0cf1ca9a9c57b831f320abb5102a3e7aa82c016d1f72c4d9f614ef53a0e4df30d50e05a98107fecacae4d70dfa5ee5c15910d575bc30df411430863
 DIST nanoc-core-4.12.2.tar.gz 331400 BLAKE2B f7a22b05a4805f15a8e93601ae21bffdc19fe17c6550378465d85e63c498c5773c1dcd49d685b7d4367488300394c2f5bf9e6a6dc6aea589617a27fe1bd6ed4a SHA512 3fe574c061d8d0dd034137800c88a34844d246e6ab9a7816aadb03cd2c43b5fe6d614f42e6b41bcd4df98be551edc69e35ca992f2d5ee8158f9c7eb3c7635750
 DIST nanoc-core-4.12.3.tar.gz 332692 BLAKE2B 8ae106366c66500ed06be841382bc1cc52c68ebc7ebec47a3f9dab278c7e17f886d0ce18c81ff73a83ec672353503155b447dfff5ba46f16bc2bfe891bb028a5 SHA512 737ce993c529643440d74e5072e2d63c2ce970d4d7637e7f225a79d3ac38907ced84928340d7bf5f11bcd02188b5cb1df0d4b03a8e000878ed924ab943db33a2
 DIST nanoc-core-4.12.5.tar.gz 333312 BLAKE2B bdc50ba2868313f7b427a8292c8614230e9dcf472c5290e8fff39917cd5cedad217acbc36ef8524254c9839d965d824a98c99f9effa1e8cfb549e387d69f1032 SHA512 2e533076f62605a701275fd7813b6dbe09c2530ad38fb86db3a5d999bccd8f5ac93cf684ac882f00d81bbe1ec8cce69d45ecef1488efe3caf22f6a6ffca300e2
-EBUILD nanoc-core-4.11.12.ebuild 1601 BLAKE2B ab3a233a247f06871d20933a6bb29a6068eda5ae147b0c6dc26ac3bcdb42a1fb81c7bfe4d15c986fc46f7be10067d798f69a63dd2d840c9dc8dfb24924b29202 SHA512 6d11d1cbbb7465dab60af40b2c83887397ca5948b138bbe169753c5a6d5e189127cb9662c064731d555757b792a0e4351aaa062b46e3602e34ccadfd5211f665
+DIST nanoc-core-4.12.6.tar.gz 333932 BLAKE2B f5ff12ddd583c4a672c34a63b7f325a3ef6c18713f4e351482eb3c2a3dd5999b67ee0e1b7e8ab85899591824d8c47f19f3aa074790ae15f4616d589f762f2bb8 SHA512 343ec620d96ca086612c4babcadf33c4edcc39a02082f762568feaf226566c6d9b5441f53355ea03544b285e9a5ddc32aae0e67cc321b28336665d453f47b070
 EBUILD nanoc-core-4.12.2.ebuild 1920 BLAKE2B 54f3f3f9651061564e236ebd37a5d48d84f3dfb37849d4c2872454ee376e478132baeddf2d78488507633ac16ffbdcb440e3e3a414f4a31c17c1ca509586a9f8 SHA512 98dff23360020f0d0ef1e351f15f4c9270b9d4d6a77b5e5fbad019c2b1134b5a795d34c9b71339fb02244c2e654b6252365ab65f485c9a6e8319fbfdca192fc9
 EBUILD nanoc-core-4.12.3.ebuild 1935 BLAKE2B e41f23641b20bbd234c59981df1bdb968764fea169c48e058886c3f81d32684f8fa09e2f1aa7a92194d936c8807cd5494b71ad06122984f0e61dbd0a055f8b52 SHA512 6f076de31c575e20d9b71703ad99bdd080adb9b3e103655ff11591a766461a36d20085c7acd37a8afe846a4365ea23b58d3f467755ef5696548d66c178c4e977
 EBUILD nanoc-core-4.12.5.ebuild 1941 BLAKE2B 703e9b630a575007537b6060daa44e1f3a6505a324d1106fc5cfabc68e61a39c420ab888d6434e6a78c2a08152a436ee79ffce9b63efd8a29f35060d8c0b638f SHA512 b6b4afb7493fc4631754f9b7fa70ca78cee405e5958cdb5c8decb22ac5544a2d8f61798c640d87267adfecad47699fc137606459b083feb2bbc36affba166f85
+EBUILD nanoc-core-4.12.6.ebuild 1948 BLAKE2B 2c4dbfba45b230a1b5c4178e8c568cdc6e0fe6d77b0f43438ded6fdbf88806ef66d179737751ce7bb9d6e33ed742697a0662ce490272b4fd10f901b52cd7b638 SHA512 208d52ca383c3cedf47272243c7855bd0dd111d705c4a554d088eb0bdf532fe38bd666706b298fc2b527f2ec7b577828afd8bb8f693e6d31881fa6a0f0cb3d59
 MISC metadata.xml 318 BLAKE2B 62f33f86cd5bcb675e9ac02fef339514b88000be788a7037416bf6594e3f27bb07c5f7b49adbc39aa6aae4fdc7f076ebbb7f0fe897807a8e4a0b2252d5238546 SHA512 1098cd34add4d21c0c10aa42a539cec14c56b1835701b73346a57cac7ea3964b776b95d76cdffd6300577682e3a29976d9b65a0e2b8f984ee1bfb7601f2d7ef2
diff --git a/www-apps/nanoc-core/nanoc-core-4.11.12.ebuild b/www-apps/nanoc-core/nanoc-core-4.12.6.ebuild
index ccc331cdd62d..8ae89b598904 100644
--- a/www-apps/nanoc-core/nanoc-core-4.11.12.ebuild
+++ b/www-apps/nanoc-core/nanoc-core-4.12.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
 
@@ -15,7 +15,7 @@ HOMEPAGE="https://nanoc.ws/"
 SRC_URI="https://github.com/nanoc/nanoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 SLOT="0"
 IUSE="${IUSE} minimal"
 
@@ -24,12 +24,14 @@ DEPEND+="test? ( app-text/asciidoc app-text/highlight )"
 RUBY_S="nanoc-${PV}/nanoc-core"
 
 ruby_add_rdepend "
-	dev-ruby/ddmemoize:1
+	>=dev-ruby/concurrent-ruby-1.1:1
 	dev-ruby/ddmetrics:1
 	dev-ruby/ddplugin:1
 	=dev-ruby/hamster-3*
 	>=dev-ruby/json_schema-0.19:0
+	>=dev-ruby/memo_wise-1.5:1
 	dev-ruby/slow_enumerator_tools:1
+	>=dev-ruby/tty-platform-0.2:0
 	>=dev-ruby/zeitwerk-2.1:2
 "
 
@@ -40,10 +42,14 @@ ruby_add_bdepend "test? (
 	dev-ruby/fuubar
 	dev-ruby/minitest
 	dev-ruby/timecop
+	dev-ruby/tty-command
 	dev-ruby/yard
+	www-apps/nanoc-spec
 )
 "
 
+PATCHES=( "${FILESDIR}/${PN}-4.12.2-contracts.patch" )
+
 all_ruby_prepare() {
 	# Avoid unneeded development dependencies
 	sed -i -e '/simplecov/I s:^:#:' \
@@ -58,6 +64,10 @@ all_ruby_prepare() {
 
 	# Use useable tmp dir
 	sed -i -e 's:/tmp/whatever:'${T}'/whatever:' spec/nanoc/core/checksummer_spec.rb || die
+
+	# Avoid circular dependency on www-apps/nanoc
+	sed -i -e '/.all_outdated/,/^  end/ s:^:#:' spec/nanoc/core/feature_spec.rb || die
+	rm -f spec/nanoc/core_spec.rb || die
 }
 
 each_ruby_test() {