gentoo resync : 12.07.2021

24 files changed, 491 insertions, 15 deletions

diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index cf6eb0a5effd..934ab79a89c5 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index 39b496ebbc8c..ebe710c8e34e 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1,4 +1,4 @@
 DIST icingaweb2-2.8.2.tar.gz 8514166 BLAKE2B 7e6a44574999967a6a728c5818999ac6f15234f1cfd1415132e1a8219e897affddd4d4ec488bb90ced82a0ce5403220463ccfa0424014a4c090176d85fd968a9 SHA512 252ecb36751add239897b6344dd622542f892b1850398fe724d0ab91e8d691cefe0b33c727c28aa630c93b76b381aabe69721db034c4de0518f346bbd5b698de
-EBUILD icingaweb2-2.8.2.ebuild 2623 BLAKE2B 736fa48788b446a025eb21d7530e7e4c4d4363010e36517ecdcd42472d01a52cbe3e29f0a30482be2b480451779fb94a797d9230e1259abc90c16e35349df4d2 SHA512 14a11a69353394b321740ee8868afefaafe685d84856dd8833723d6b0285ea75cc895a98e9c60865b83f32389e027a46adfd051e126e255fff992b71c4586073
-EBUILD icingaweb2-9999.ebuild 2522 BLAKE2B 1fcab354bf9f2c4943759898c35d0e9a21892751f5e145151ed43495ed593d77bd0c26870b314e6fa81af9a7408a4a243a4f3f1237d504a7912dcec17796fbf9 SHA512 53f7c82c885ce3e97dfc1a99739589664f1990cd93a101dbd71f7ecb75f81be8577c19a34ff87318e52d2f832f7f52dbed44642f0a8c164edfbaf952915f37b9
+EBUILD icingaweb2-2.8.2-r1.ebuild 2309 BLAKE2B 3fcaed75fcbb6cd194810b19f9a1f47394a4a4e41aff82598152b224f937faa156a8142e63018e140c430be2fc38deb2f86e09001540fd2ea85dd252d9f21882 SHA512 ce4a4933dc9c5e6a05639be9c92199cf83a5a9690f5fde5fac7a9ba68c816308d7c0977544bdf8b0d04124ebd5df13ef54393c0e984d15fdc937f735e7327a0a
+EBUILD icingaweb2-9999.ebuild 2311 BLAKE2B fa669bbc37e8a8445563d4a1b248be139030ab8807b272efdd720abaeb2aa2904c4befbb2699582114232bb247673e46589800b7e74cb53bf9803f4af6bf0c65 SHA512 b68aacddeba57332a45ea1382d4e8d1272f5ab38611e175865836335b382a27fda740aa834b777b0a070abc3d1a38b560426bf2455adddd020346e727d9f0ffb
 MISC metadata.xml 443 BLAKE2B 408760755558425f54f2a06aace2d16f0dfb1f585b9226d5745e69dddd020116ffe8f64f475205ed5454f1cac25b3c3ade29aad2e404d39bccc0697be89287f1 SHA512 81020a9b2ca89e23526a3d46de4f845ab433c66989db2483a9cfdfb8ae998c00b24b7acb8211c3041d43685742bd6f2f58762d0ac93608263c0cdfe83bba4128
diff --git a/www-apps/icingaweb2/icingaweb2-2.8.2.ebuild b/www-apps/icingaweb2/icingaweb2-2.8.2-r1.ebuild
index 2fbd8e31845e..8ce454622665 100644
--- a/www-apps/icingaweb2/icingaweb2-2.8.2.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-2.8.2-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
 inherit depend.apache multilib
 
@@ -28,9 +28,6 @@ DEPEND=">=net-analyzer/icinga2-2.1.1
 		apache2-server? ( >=www-servers/apache-2.4.0 )
 		nginx? ( >=www-servers/nginx-1.7.0:* )
 		|| (
-			dev-lang/php:5.6[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-			dev-lang/php:7.1[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-			dev-lang/php:7.2[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
 			dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
 			dev-lang/php:7.4[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
 		)
diff --git a/www-apps/icingaweb2/icingaweb2-9999.ebuild b/www-apps/icingaweb2/icingaweb2-9999.ebuild
index 70eeef62f5d0..c5f119e375d9 100644
--- a/www-apps/icingaweb2/icingaweb2-9999.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
-inherit depend.apache multilib user
+inherit depend.apache multilib
 
 DESCRIPTION="Icinga Web 2 - Frontend for icinga2"
 HOMEPAGE="http://www.icinga.org/"
@@ -28,11 +28,11 @@ DEPEND=">=net-analyzer/icinga2-2.1.1
 		apache2-server? ( >=www-servers/apache-2.4.0 )
 		nginx? ( >=www-servers/nginx-1.7.0:* )
 		|| (
-			dev-lang/php:5.6[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-			dev-lang/php:7.1[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-			dev-lang/php:7.2[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
 			dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-		)"
+			dev-lang/php:7.4[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+		)
+		acct-group/icingacmd
+		acct-group/icingaweb2"
 RDEPEND="${DEPEND}"
 
 want_apache2
@@ -40,8 +40,6 @@ want_apache2
 pkg_setup() {
 	depend.apache_pkg_setup
 
-	enewgroup icingaweb2
-	enewgroup icingacmd
 	use nginx && usermod -a -G icingacmd,icingaweb2 nginx
 	use apache2 && usermod -a -G icingacmd,icingaweb2 apache
 }
diff --git a/www-apps/nanoc-checking/Manifest b/www-apps/nanoc-checking/Manifest
new file mode 100644
index 000000000000..2e5b857df369
--- /dev/null
+++ b/www-apps/nanoc-checking/Manifest
@@ -0,0 +1,3 @@
+DIST nanoc-checking-1.0.1.gem 10752 BLAKE2B 6f6f10cf97ab17cc328d827ab19490fa6e9d6f744594c167b4d9bf050c1288a7d5657d290402efbfa8d61d8e81550feae5022720464814e27af06d5025dfde96 SHA512 ef2b5a9c044f9bef19e4c75cc9ee99747a2ff0f8bece23c56d763f59c622488ccd980a19a3563207948fdb0d9edb91e86703778f7233bc0de76adf385c5694b0
+EBUILD nanoc-checking-1.0.1.ebuild 582 BLAKE2B 901e88e9204f0472bbc6163b7b9fe428f7a408ead220bd1418766f6a4d32a845c0b83c3642b0583d76ea0e9b3a45ee48a086955ff14919a366f7fec7c355daa4 SHA512 57cb6cc5ee370709068a7a9cadd3a7d3cde1d6c896d08a19c6ce93146b394f6bc7048505c1c28976dea91272ed3194cfd1d47683522a3d82b5f616f6f38422d6
+MISC metadata.xml 317 BLAKE2B c6af48dcdb56be1e50ef78910bc5150112d2914bbd13b576883eeeecdcc2a47f6360ffcf7a83432266bc737891527f4f1cacaf90b62e7b38d75a0c74c87bb0d8 SHA512 5394c6280515d4728d6b30f6eff872dd1d3dc283fe125aa8b5bc7f1206d967b74864bd144c6b2623ea63db19f78b5a94d13261464b35b4056cf92cccf374db1e
diff --git a/www-apps/nanoc-checking/metadata.xml b/www-apps/nanoc-checking/metadata.xml
new file mode 100644
index 000000000000..9abf9c6b8ec2
--- /dev/null
+++ b/www-apps/nanoc-checking/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person"><email>graaff@gentoo.org</email></maintainer>
+<maintainer type="project">
+<email>ruby@gentoo.org</email>
+<name>Gentoo Ruby Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/www-apps/nanoc-checking/nanoc-checking-1.0.1.ebuild b/www-apps/nanoc-checking/nanoc-checking-1.0.1.ebuild
new file mode 100644
index 000000000000..63b0d6c7e17d
--- /dev/null
+++ b/www-apps/nanoc-checking/nanoc-checking-1.0.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby26 ruby27"
+
+# Upstream has specs but they are not available in the gem and the
+# repository upstream is not tagged for this.
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provides checking functionality for Nanoc"
+HOMEPAGE="https://nanoc.ws/"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="$(ver_cut 1)"
+IUSE=""
+
+ruby_add_rdepend "
+	>=www-apps/nanoc-cli-4.11.15:0
+	>=www-apps/nanoc-core-4.11.15:0
+"
diff --git a/www-apps/nanoc-cli/Manifest b/www-apps/nanoc-cli/Manifest
new file mode 100644
index 000000000000..3cfb7621a2b1
--- /dev/null
+++ b/www-apps/nanoc-cli/Manifest
@@ -0,0 +1,3 @@
+DIST nanoc-4.12.2.tar.gz 331400 BLAKE2B f7a22b05a4805f15a8e93601ae21bffdc19fe17c6550378465d85e63c498c5773c1dcd49d685b7d4367488300394c2f5bf9e6a6dc6aea589617a27fe1bd6ed4a SHA512 3fe574c061d8d0dd034137800c88a34844d246e6ab9a7816aadb03cd2c43b5fe6d614f42e6b41bcd4df98be551edc69e35ca992f2d5ee8158f9c7eb3c7635750
+EBUILD nanoc-cli-4.12.2.ebuild 2029 BLAKE2B fda269aacc8243a30aebe529c8b0d8cadb2db6f06408c47dd9cfe11714cbebf11ba83d646f5d4319776636add2c24dec403864ae4a49b990bc5a82aecd8b6d12 SHA512 ca60a110fa12c27a43ff232785db3a94c9121b6a86b5e6508f06ffcf3f96fffe8db077030b691e0e238099c838acbe1a049042b04ab97e5a81d98fbf2e6fc33c
+MISC metadata.xml 317 BLAKE2B c6af48dcdb56be1e50ef78910bc5150112d2914bbd13b576883eeeecdcc2a47f6360ffcf7a83432266bc737891527f4f1cacaf90b62e7b38d75a0c74c87bb0d8 SHA512 5394c6280515d4728d6b30f6eff872dd1d3dc283fe125aa8b5bc7f1206d967b74864bd144c6b2623ea63db19f78b5a94d13261464b35b4056cf92cccf374db1e
diff --git a/www-apps/nanoc-cli/metadata.xml b/www-apps/nanoc-cli/metadata.xml
new file mode 100644
index 000000000000..9abf9c6b8ec2
--- /dev/null
+++ b/www-apps/nanoc-cli/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person"><email>graaff@gentoo.org</email></maintainer>
+<maintainer type="project">
+<email>ruby@gentoo.org</email>
+<name>Gentoo Ruby Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/www-apps/nanoc-cli/nanoc-cli-4.12.2.ebuild b/www-apps/nanoc-cli/nanoc-cli-4.12.2.ebuild
new file mode 100644
index 000000000000..77ad8311c5fe
--- /dev/null
+++ b/www-apps/nanoc-cli/nanoc-cli-4.12.2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="nanoc is a simple but very flexible static site generator written in Ruby"
+HOMEPAGE="https://nanoc.ws/"
+SRC_URI="https://github.com/nanoc/nanoc/archive/${PV}.tar.gz -> nanoc-${PV}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE="${IUSE} minimal"
+
+RUBY_S="nanoc-${PV}/nanoc-cli"
+
+ruby_add_rdepend "
+	>=dev-ruby/cri-2.15:0
+	>=dev-ruby/diff-lcs-1.3:0
+	~www-apps/nanoc-core-${PV}
+	>=dev-ruby/zeitwerk-2.1:2
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/bundler
+	dev-ruby/rspec:3
+	dev-ruby/rspec-its
+	dev-ruby/fuubar
+	dev-ruby/minitest
+	dev-ruby/timecop
+	dev-ruby/tty-command
+	dev-ruby/yard
+	www-apps/nanoc-spec
+)
+"
+
+all_ruby_prepare() {
+	# Avoid unneeded development dependencies
+	sed -i -e '/simplecov/I s:^:#:' \
+		-e '/codecov/I s:^:#:' ../common/spec/spec_helper_head_core.rb || die
+	sed -i -e '/coverall/I s:^:#:' \
+		-e '/rubocop/ s:^:#:' Rakefile || die
+	sed -i -e '2i require "tmpdir"; require "pathname"' spec/spec_helper.rb || die
+
+	echo "-r ./spec/spec_helper.rb" > .rspec || die
+
+	sed -i -e "s:require_relative 'lib:require './lib:" ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid error handler specs failing due to different (rubygems?)
+	# output, meta_spec is affected by this.
+	rm -f spec/nanoc/cli/error_handler_spec.rb spec/meta_spec.rb || die
+
+	# Avoid test requiring a network interface
+	sed -i -e '/does not listen on non-local interfaces/askip "Needs network"' spec/nanoc/cli/commands/view_spec.rb || die
+
+	# Avoid tests requiring an additional dependency on nanoc-live
+	sed -i -e '/--live-reload is given/askip "Unpackaged nanoc-live"' spec/nanoc/cli/commands/view_spec.rb || die
+	sed -i -e '/watches with --watch/askip "Unpackaged nanoc-live"' spec/nanoc/cli/commands/compile_spec.rb || die
+}
+
+each_ruby_test() {
+	RUBYLIB="${S}/lib" ${RUBY} -S rake spec || die
+}
diff --git a/www-apps/nanoc-core/Manifest b/www-apps/nanoc-core/Manifest
index 7c85bf42def5..4b09e60b13a7 100644
--- a/www-apps/nanoc-core/Manifest
+++ b/www-apps/nanoc-core/Manifest
@@ -1,3 +1,6 @@
+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
 EBUILD nanoc-core-4.11.12.ebuild 1601 BLAKE2B ab3a233a247f06871d20933a6bb29a6068eda5ae147b0c6dc26ac3bcdb42a1fb81c7bfe4d15c986fc46f7be10067d798f69a63dd2d840c9dc8dfb24924b29202 SHA512 6d11d1cbbb7465dab60af40b2c83887397ca5948b138bbe169753c5a6d5e189127cb9662c064731d555757b792a0e4351aaa062b46e3602e34ccadfd5211f665
+EBUILD nanoc-core-4.12.2.ebuild 1920 BLAKE2B 54f3f3f9651061564e236ebd37a5d48d84f3dfb37849d4c2872454ee376e478132baeddf2d78488507633ac16ffbdcb440e3e3a414f4a31c17c1ca509586a9f8 SHA512 98dff23360020f0d0ef1e351f15f4c9270b9d4d6a77b5e5fbad019c2b1134b5a795d34c9b71339fb02244c2e654b6252365ab65f485c9a6e8319fbfdca192fc9
 MISC metadata.xml 317 BLAKE2B c6af48dcdb56be1e50ef78910bc5150112d2914bbd13b576883eeeecdcc2a47f6360ffcf7a83432266bc737891527f4f1cacaf90b62e7b38d75a0c74c87bb0d8 SHA512 5394c6280515d4728d6b30f6eff872dd1d3dc283fe125aa8b5bc7f1206d967b74864bd144c6b2623ea63db19f78b5a94d13261464b35b4056cf92cccf374db1e
diff --git a/www-apps/nanoc-core/files/nanoc-core-4.12.2-contracts.patch b/www-apps/nanoc-core/files/nanoc-core-4.12.2-contracts.patch
new file mode 100644
index 000000000000..ec3e11df41b2
--- /dev/null
+++ b/www-apps/nanoc-core/files/nanoc-core-4.12.2-contracts.patch
@@ -0,0 +1,16 @@
+Support for contracts is a development-only mechanism which impacts performance.
+It produces a warning on each run that is not easy to act on for our users,
+so patch this out altogether.
+
+--- a/lib/nanoc/core/contracts_support.rb	2021-07-11 08:54:09.979327770 +0200
++++ b/lib/nanoc/core/contracts_support.rb	2021-05-28 11:33:52.000000000 +0200
+@@ -90,8 +90,7 @@
+ 
+         contracts_loadable =
+           begin
++            false
+-            require 'contracts'
+-            true
+           rescue LoadError
+             false
+           end
diff --git a/www-apps/nanoc-core/nanoc-core-4.12.2.ebuild b/www-apps/nanoc-core/nanoc-core-4.12.2.ebuild
new file mode 100644
index 000000000000..a20f4d762fa3
--- /dev/null
+++ b/www-apps/nanoc-core/nanoc-core-4.12.2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="nanoc is a simple but very flexible static site generator written in Ruby"
+HOMEPAGE="https://nanoc.ws/"
+SRC_URI="https://github.com/nanoc/nanoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE="${IUSE} minimal"
+
+DEPEND+="test? ( app-text/asciidoc app-text/highlight )"
+
+RUBY_S="nanoc-${PV}/nanoc-core"
+
+ruby_add_rdepend "
+	>=dev-ruby/concurrent-ruby-1.1:1
+	dev-ruby/ddmemoize:1
+	dev-ruby/ddmetrics:1
+	dev-ruby/ddplugin:1
+	=dev-ruby/hamster-3*
+	>=dev-ruby/json_schema-0.19:0
+	dev-ruby/slow_enumerator_tools:1
+	>=dev-ruby/tty-platform-0.2:0
+	>=dev-ruby/zeitwerk-2.1:2
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/bundler
+	dev-ruby/rspec:3
+	dev-ruby/rspec-its
+	dev-ruby/fuubar
+	dev-ruby/minitest
+	dev-ruby/timecop
+	dev-ruby/tty-command
+	dev-ruby/yard
+	www-apps/nanoc-spec
+)
+"
+
+PATCHES=( "${FILESDIR}/${P}-contracts.patch" )
+
+all_ruby_prepare() {
+	# Avoid unneeded development dependencies
+	sed -i -e '/simplecov/I s:^:#:' \
+		-e '/codecov/I s:^:#:' ../common/spec/spec_helper_head_core.rb || die
+	sed -i -e '/coverall/I s:^:#:' \
+		-e '/rubocop/ s:^:#:' Rakefile || die
+	sed -i -e '1i require "tmpdir"; require "pathname"' spec/spec_helper.rb || die
+
+	echo "-r ./spec/spec_helper.rb" > .rspec || die
+
+	sed -i -e "s:require_relative 'lib:require './lib:" ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# 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() {
+	RUBYLIB="${S}/lib" ${RUBY} -S rake spec || die
+}
diff --git a/www-apps/nanoc-deploying/Manifest b/www-apps/nanoc-deploying/Manifest
new file mode 100644
index 000000000000..b02ebb974e23
--- /dev/null
+++ b/www-apps/nanoc-deploying/Manifest
@@ -0,0 +1,3 @@
+DIST nanoc-deploying-1.0.1.gem 9728 BLAKE2B d646f56eada30fc5059069627f6b07fc6620cc952605086100e954aa9b79e7f696ecfe87ad85f1951fca1de75482943af869a28f6f4465fffc3497af9db36b7f SHA512 78e4247021b9e0ba717cf4b41bb913bbbafd7e0b149d16e681d7312f60cd0d2277de5e957f938c3194a521036da21b38696fe4ced5cd0b14cdce01aee207a744
+EBUILD nanoc-deploying-1.0.1.ebuild 610 BLAKE2B a0d36264cf192ec1512e1f484430b136ba77ec7e62af4170b802f6660a58e48807355a167c8ac26967a4d656633a52e0211b9c40c3c5cdbbe9802089bda0f064 SHA512 51eac7bceea9a9a37ec1a4abe4b24c1e018052f8738e736ce0ad4d1ea38b0d0eaac91ecbbeaa437d3f7880eb825be2820a074a97ef2358c698b3227ec8e70c99
+MISC metadata.xml 317 BLAKE2B c6af48dcdb56be1e50ef78910bc5150112d2914bbd13b576883eeeecdcc2a47f6360ffcf7a83432266bc737891527f4f1cacaf90b62e7b38d75a0c74c87bb0d8 SHA512 5394c6280515d4728d6b30f6eff872dd1d3dc283fe125aa8b5bc7f1206d967b74864bd144c6b2623ea63db19f78b5a94d13261464b35b4056cf92cccf374db1e
diff --git a/www-apps/nanoc-deploying/metadata.xml b/www-apps/nanoc-deploying/metadata.xml
new file mode 100644
index 000000000000..9abf9c6b8ec2
--- /dev/null
+++ b/www-apps/nanoc-deploying/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person"><email>graaff@gentoo.org</email></maintainer>
+<maintainer type="project">
+<email>ruby@gentoo.org</email>
+<name>Gentoo Ruby Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/www-apps/nanoc-deploying/nanoc-deploying-1.0.1.ebuild b/www-apps/nanoc-deploying/nanoc-deploying-1.0.1.ebuild
new file mode 100644
index 000000000000..2cb1647c2ef6
--- /dev/null
+++ b/www-apps/nanoc-deploying/nanoc-deploying-1.0.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby26 ruby27"
+
+# Upstream has specs but they are not available in the gem and the
+# repository upstream is not tagged for this.
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provides deploying functionality for Nanoc"
+HOMEPAGE="https://nanoc.ws/"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="$(ver_cut 1)"
+IUSE=""
+
+ruby_add_rdepend "
+	www-apps/nanoc-checking:1
+	>=www-apps/nanoc-cli-4.11.15:0
+	>=www-apps/nanoc-core-4.11.15:0
+"
diff --git a/www-apps/nanoc-spec/Manifest b/www-apps/nanoc-spec/Manifest
new file mode 100644
index 000000000000..02cc4ade9c42
--- /dev/null
+++ b/www-apps/nanoc-spec/Manifest
@@ -0,0 +1,3 @@
+DIST nanoc-spec-0.0.2.gem 6656 BLAKE2B de90b2f63a15a7168d491cd33f8994a9ef8f7b13b23f6e32d50c2bdf8467a68e4205c24c9ca79efccc1a5076d2af25cf1a31c49c946e2ff0e7add9d5bcb99d1f SHA512 78202adfcc1e9b414a1b2f8d85bf5a0ab3e52473cc490145d0b63f5c6cbd4c29c1c56b06b343ad6bd6ba2818f464abc7ece3c3a0ccd9c2dd38771110ef573d7c
+EBUILD nanoc-spec-0.0.2.ebuild 474 BLAKE2B c444ccf782d3440d00d189bde7f157edb5d72a19b46e329a30e7732f4620531129e7bde05dbd61dbf5e110af9dcb7b1b8d4fed987e2ae4f757faaac3bbab362b SHA512 83ee5f50eed0e7f2e444c13646559441d336e30f58539c9d80c99c672cb492a5fac921080afeb041027723b763b4af67cc6b30e4f5afbef5f12d8ae749168da4
+MISC metadata.xml 317 BLAKE2B c6af48dcdb56be1e50ef78910bc5150112d2914bbd13b576883eeeecdcc2a47f6360ffcf7a83432266bc737891527f4f1cacaf90b62e7b38d75a0c74c87bb0d8 SHA512 5394c6280515d4728d6b30f6eff872dd1d3dc283fe125aa8b5bc7f1206d967b74864bd144c6b2623ea63db19f78b5a94d13261464b35b4056cf92cccf374db1e
diff --git a/www-apps/nanoc-spec/metadata.xml b/www-apps/nanoc-spec/metadata.xml
new file mode 100644
index 000000000000..9abf9c6b8ec2
--- /dev/null
+++ b/www-apps/nanoc-spec/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person"><email>graaff@gentoo.org</email></maintainer>
+<maintainer type="project">
+<email>ruby@gentoo.org</email>
+<name>Gentoo Ruby Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/www-apps/nanoc-spec/nanoc-spec-0.0.2.ebuild b/www-apps/nanoc-spec/nanoc-spec-0.0.2.ebuild
new file mode 100644
index 000000000000..1c524f55b21e
--- /dev/null
+++ b/www-apps/nanoc-spec/nanoc-spec-0.0.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provides Nanoc::Spec, containing functionality for writing tests for Nanoc"
+HOMEPAGE="https://nanoc.ws/"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE="${IUSE} minimal"
+
+ruby_add_rdepend "
+	>=www-apps/nanoc-core-4.11.13:0
+"
diff --git a/www-apps/nanoc/Manifest b/www-apps/nanoc/Manifest
index c481d24cc853..ccf9603f5125 100644
--- a/www-apps/nanoc/Manifest
+++ b/www-apps/nanoc/Manifest
@@ -1,3 +1,5 @@
 DIST nanoc-4.11.12.tar.gz 310160 BLAKE2B ef34bf6d28d5a9287053a939ef14bc59f99bde003d7bbcd7eee861ab882a6beaa48812137c8ad87fe464d27e371cfd40022467f8d10ac5f85ff16ef19215e340 SHA512 0503d0a6a0cf1ca9a9c57b831f320abb5102a3e7aa82c016d1f72c4d9f614ef53a0e4df30d50e05a98107fecacae4d70dfa5ee5c15910d575bc30df411430863
+DIST nanoc-4.12.2.tar.gz 331400 BLAKE2B f7a22b05a4805f15a8e93601ae21bffdc19fe17c6550378465d85e63c498c5773c1dcd49d685b7d4367488300394c2f5bf9e6a6dc6aea589617a27fe1bd6ed4a SHA512 3fe574c061d8d0dd034137800c88a34844d246e6ab9a7816aadb03cd2c43b5fe6d614f42e6b41bcd4df98be551edc69e35ca992f2d5ee8158f9c7eb3c7635750
 EBUILD nanoc-4.11.12.ebuild 2670 BLAKE2B e129567600ce751c5c7c7e0e27370212d266a1346a057c639d75b1d70a3fcf3a1edbf6075d188cab9327eb3960cb98e6b9914423894991021ee55ef4f5784f5d SHA512 360ae7ed9f0352fe767e5e24b0cc30ac583c328563164eda854b00e73c8513b8b6184c67aab9beabadc30e14c624a043781781c99397ef14999e6c0a7d4064fe
+EBUILD nanoc-4.12.2.ebuild 2602 BLAKE2B 3d4ea73021b5fbff30c9ace8db0419a47be7017fd7770ea8e3596c1ff8408fabf45b5998bd3f86553a9d24393b75ffbc96363ed6981c80f2c0fd4bb8c7d68dd7 SHA512 55c25a24e2c0593cf8c18fcb574648cdf03e9f2470ab899b68dfaa4b5b3d36c3e7bbe526b43756863da5e90451129e7d55cd7b3dd69d40b5a4116cc71e648a14
 MISC metadata.xml 317 BLAKE2B c6af48dcdb56be1e50ef78910bc5150112d2914bbd13b576883eeeecdcc2a47f6360ffcf7a83432266bc737891527f4f1cacaf90b62e7b38d75a0c74c87bb0d8 SHA512 5394c6280515d4728d6b30f6eff872dd1d3dc283fe125aa8b5bc7f1206d967b74864bd144c6b2623ea63db19f78b5a94d13261464b35b4056cf92cccf374db1e
diff --git a/www-apps/nanoc/nanoc-4.12.2.ebuild b/www-apps/nanoc/nanoc-4.12.2.ebuild
new file mode 100644
index 000000000000..dc3d92d1356c
--- /dev/null
+++ b/www-apps/nanoc/nanoc-4.12.2.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="nanoc.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="nanoc is a simple but very flexible static site generator written in Ruby"
+HOMEPAGE="https://nanoc.ws/"
+SRC_URI="https://github.com/nanoc/nanoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE="${IUSE} minimal"
+
+DEPEND+="test? ( app-text/asciidoc app-text/highlight )"
+
+RUBY_S="${P}/nanoc"
+
+ruby_add_rdepend "!minimal? (
+	dev-ruby/mime-types:*
+	dev-ruby/rack:*
+	www-servers/adsf
+)
+	>=dev-ruby/addressable-2.5
+	>=dev-ruby/colored-1.2:0
+	www-apps/nanoc-checking:1
+	~www-apps/nanoc-cli-${PV}
+	~www-apps/nanoc-core-${PV}
+	www-apps/nanoc-deploying:1
+	>=dev-ruby/parallel-1.12:1
+	>=dev-ruby/tty-command-0.8:0
+	>=dev-ruby/tty-which-0.4:0
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/rspec:3
+	dev-ruby/asciidoctor
+	dev-ruby/fuubar
+	dev-ruby/haml
+	dev-ruby/maruku
+	>=dev-ruby/mocha-0.13
+	dev-ruby/minitest
+	dev-ruby/mustache
+	dev-ruby/pry
+	dev-ruby/rdoc
+	>=dev-ruby/rouge-3.5.1:2
+	dev-ruby/rubypants
+	dev-ruby/systemu
+	dev-ruby/timecop
+	dev-ruby/vcr
+	dev-ruby/webmock
+	dev-ruby/yard
+)
+doc? (
+	dev-ruby/kramdown
+	dev-ruby/rdiscount
+	dev-ruby/yard
+)"
+
+all_ruby_prepare() {
+	# Avoid unneeded development dependencies
+	sed -i -e '/simplecov/,/SimpleCov.formatter/ s:^:#:' test/helper.rb || die
+	sed -i -e '/simplecov/I s:^:#:' \
+		-e '/codecov/I s:^:#:' ../common/spec/spec_helper_head_core.rb || die
+	sed -i -e '/coverall/I s:^:#:' \
+		-e '/rubocop/ s:^:#:' Rakefile || die
+
+	echo "-r ./spec/spec_helper.rb" > .rspec || die
+
+	# Avoid basepath issues when generating gemspec
+	sed -i -e "s:require_relative ':require './:" ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid tests requiring a network connection or make assumptions
+	# about the local network environment.
+	rm -f test/checking/checks/test_{css,html}.rb spec/nanoc/cli/commands/view_spec.rb || die
+
+	# Avoid tests for unpackaged dependencies
+	rm spec/nanoc/filters/less_spec.rb \
+	   test/filters/test_{markaby,rainpress}.rb || die
+
+	# Avoid non-fatal failing tests due to specifics in the environment
+	#sed -i -e '145askip "gentoo"' spec/nanoc/cli/error_handler_spec.rb || die
+	#sed -i -e '/watches with --watch/askip "gentoo"' spec/nanoc/cli/commands/compile_spec.rb || die
+	sed -i -e '124askip "ordering issues"' -e '168askip "ordering issues"' spec/nanoc/data_sources/filesystem_spec.rb || die
+}
+
+each_ruby_test() {
+	RUBYLIB="${S}/lib" ${RUBY} -S rake spec test_all || die
+}
diff --git a/www-apps/roundup/Manifest b/www-apps/roundup/Manifest
index f74ccfb61a06..bda27fc1ddb2 100644
--- a/www-apps/roundup/Manifest
+++ b/www-apps/roundup/Manifest
@@ -1,3 +1,4 @@
+AUX roundup-2.0.0-test-pyjwt.patch 4712 BLAKE2B e1b8dcd070feec087f5d00eb8f71d5eaa389d543d03b671d327a9e3b23458aa97cf5681fc62be128b852a305e71efae27f12277aba61ac8ffc6d4ba2dbd23f8b SHA512 0d8d34f79b55fe48b5df9b6f1894eda22d68e0faf53b1b1ece5d7904ba98a761b4f28d9bed1e28be2342341b144d72182097d0afc9cc9884923e106b06c34e72
 DIST roundup-2.0.0.tar.gz 3495554 BLAKE2B 98b7cbfebe969411282ddf6b4bd7b94ea1efb7b1d929daf44ae5f30dc23c05cb327d0f4653b22a5594f7b198dd16a172c45568a15f8704b187cd4c355455ca9c SHA512 5adb0d96be260e70fe098fd37af27bd0abee38cb8fde4ba2e130d2caac7f64af86a3b0ab09de931a693dca8bfbe15c68444db343ccf718d9d25576d49c6d6cbf
-EBUILD roundup-2.0.0.ebuild 1490 BLAKE2B d2159d6b6a905dd3dea3d32660a3d9fd7e75ee4e58c2a7d83783780897fcf029e87ea14adf7b646d5d78fcca34826b2d92432da47cb93ab3147ec11acdaebc5f SHA512 e737399d5c181f8849c9a5e3b52c7d72993df65572a1ece70b9046a539c787980af1fb37b913285924d9814444433e9db14b633fa814a81f7653e1d6eaf03eb2
+EBUILD roundup-2.0.0.ebuild 1539 BLAKE2B ef3818b72421e7e2a1dd162c4459df6a4d2ba7cfab2b9d6bc044ab112609a8f66da7dd64f2bd990b64b0fc3ae380f2d083856a7b93c70cc40458e4cd09ffdc44 SHA512 2f7b448c154a87449af51f67b4b2be181b1c1934101f50600b0ef538bd0e16c9e72da4bbb0ebea4708e42f3a1f9064091f5e1db6a6685c67ad74d125e92599f6
 MISC metadata.xml 858 BLAKE2B d2ad7fcf833fd7fd31c463c737d9b5c811c7dbe042afc8a39ba03dedbbb1f5b9eda13a1a14a6c39108005f4a4d7a5f7e4ebf31de7023338354dad1f919978b0f SHA512 fa11616c74a9a43934c356ad56e39ed99610bebca86a34c936400d9b59aab39336213a2df3248c7fdb8886ac6c9bfd4918322ea8d99111dd8a21014d5b549db7
diff --git a/www-apps/roundup/files/roundup-2.0.0-test-pyjwt.patch b/www-apps/roundup/files/roundup-2.0.0-test-pyjwt.patch
new file mode 100644
index 000000000000..74f71dab57ff
--- /dev/null
+++ b/www-apps/roundup/files/roundup-2.0.0-test-pyjwt.patch
@@ -0,0 +1,91 @@
+# HG changeset patch
+# User John Rouillard <rouilj@ieee.org>
+# Date 1609557405 18000
+#      Fri Jan 01 22:16:45 2021 -0500
+# Node ID a2fbd3592322379f0c54a75446d2a282c6f40075
+# Parent  e3edb0b44d94df71f46094cdda9ed4e51e6c1de4
+pyjwt 2.00 changed return type of jwt.encode from byte to str
+
+Need to change tests to only do b2s conversion if using version before
+2.0.0.  Note 2.0.0 drops support for python 2. Also it is not
+installed for the python 3.4 ci test by pip install.
+
+diff --git a/test/rest_common.py b/test/rest_common.py
+--- a/test/rest_common.py
++++ b/test/rest_common.py
+@@ -68,6 +68,8 @@ class TestCase():
+     url_pfx = 'http://tracker.example/cgi-bin/roundup.cgi/bugs/rest/data/'
+ 
+     def setUp(self):
++        from packaging import version
++
+         self.dirname = '_test_rest'
+         # set up and open a tracker
+         # Set optimize=True as code under test (Client.main()::determine_user)
+@@ -162,50 +164,58 @@ class TestCase():
+                      'iat': now_ts,
+                      'exp': plus1min_ts,
+             }
++
++            # in version 2.0.0 and newer jwt.encode returns string
++            # not bytestring. So we have to skip b2s conversion
+             
++            if version.parse(jwt.__version__) >= version.parse('2.0.0'):
++                tostr = lambda x: x
++            else:
++                tostr = b2s
++
+             self.jwt = {}
+             self.claim = {}
+             # generate invalid claim with expired timestamp
+             self.claim['expired'] = copy(claim)
+             self.claim['expired']['exp'] = expired_ts
+-            self.jwt['expired'] = b2s(jwt.encode(self.claim['expired'], secret,
++            self.jwt['expired'] = tostr(jwt.encode(self.claim['expired'], secret,
+                                              algorithm='HS256'))
+          
+             # generate valid claim with user role
+             self.claim['user'] = copy(claim)
+             self.claim['user']['exp'] = plus1min_ts
+-            self.jwt['user'] = b2s(jwt.encode(self.claim['user'], secret,
++            self.jwt['user'] = tostr(jwt.encode(self.claim['user'], secret,
+                                           algorithm='HS256'))
+             # generate invalid claim bad issuer
+             self.claim['badiss'] = copy(claim)
+             self.claim['badiss']['iss'] = "http://someissuer/bugs"
+-            self.jwt['badiss'] = b2s(jwt.encode(self.claim['badiss'], secret,
++            self.jwt['badiss'] = tostr(jwt.encode(self.claim['badiss'], secret,
+                                           algorithm='HS256'))
+             # generate invalid claim bad aud(ience)
+             self.claim['badaud'] = copy(claim)
+             self.claim['badaud']['aud'] = "http://someaudience/bugs"
+-            self.jwt['badaud'] = b2s(jwt.encode(self.claim['badaud'], secret,
++            self.jwt['badaud'] = tostr(jwt.encode(self.claim['badaud'], secret,
+                                           algorithm='HS256'))            
+             # generate invalid claim bad sub(ject)
+             self.claim['badsub'] = copy(claim)
+             self.claim['badsub']['sub'] = str("99")
+-            self.jwt['badsub'] = b2s(jwt.encode(self.claim['badsub'], secret,
++            self.jwt['badsub'] = tostr(jwt.encode(self.claim['badsub'], secret,
+                                           algorithm='HS256'))            
+             # generate invalid claim bad roles
+             self.claim['badroles'] = copy(claim)
+             self.claim['badroles']['roles'] = [ "badrole1", "badrole2" ]
+-            self.jwt['badroles'] = b2s(jwt.encode(self.claim['badroles'], secret,
++            self.jwt['badroles'] = tostr(jwt.encode(self.claim['badroles'], secret,
+                                           algorithm='HS256'))            
+             # generate valid claim with limited user:email role
+             self.claim['user:email'] = copy(claim)
+             self.claim['user:email']['roles'] = [ "user:email" ]
+-            self.jwt['user:email'] = b2s(jwt.encode(self.claim['user:email'], secret,
++            self.jwt['user:email'] = tostr(jwt.encode(self.claim['user:email'], secret,
+                                           algorithm='HS256'))
+ 
+             # generate valid claim with limited user:emailnorest role
+             self.claim['user:emailnorest'] = copy(claim)
+             self.claim['user:emailnorest']['roles'] = [ "user:emailnorest" ]
+-            self.jwt['user:emailnorest'] = b2s(jwt.encode(self.claim['user:emailnorest'], secret,
++            self.jwt['user:emailnorest'] = tostr(jwt.encode(self.claim['user:emailnorest'], secret,
+                                           algorithm='HS256'))
+ 
+         self.db.tx_Source = 'web'
diff --git a/www-apps/roundup/roundup-2.0.0.ebuild b/www-apps/roundup/roundup-2.0.0.ebuild
index 335af1be6ac9..a66c26f72f10 100644
--- a/www-apps/roundup/roundup-2.0.0.ebuild
+++ b/www-apps/roundup/roundup-2.0.0.ebuild
@@ -36,6 +36,9 @@ RDEPEND="${DEPEND}
 		)"
 
 DOCS="CHANGES.txt doc/*.txt"
+PATCHES=(
+	"${FILESDIR}/${P}-test-pyjwt.patch"
+)
 
 distutils_enable_tests pytest