gentoo resync : 08.07.2021

18 files changed, 9 insertions, 416 deletions

diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 2329786235fe..cf6eb0a5effd 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/icingaweb2-module-director/Manifest b/www-apps/icingaweb2-module-director/Manifest
index 8e299de15acf..95199c1c621e 100644
--- a/www-apps/icingaweb2-module-director/Manifest
+++ b/www-apps/icingaweb2-module-director/Manifest
@@ -1,6 +1,6 @@
 DIST icingaweb2-module-director-1.6.2.tar.gz 2772722 BLAKE2B 3d51f68469cd4ddf45f6bc62f76ad1f4c8d7d7bec36cc33022f1e0761334707bb345c87bc9f0e1276010e4a643867f1e1a6ea7c53a6fa28dd33e810089b7840b SHA512 693a2aca10e25f99fcf9ada4babb031d682b577b82098185259991214ac7d7662c494b58cf52284569dbca90c8eafa522177b6c64dd817912dafd20b4d7109cb
 DIST icingaweb2-module-director-1.8.0.tar.gz 3042572 BLAKE2B e29ac535c8975f79abfa086ce54e2b78e3f1a992858ec83e902c5e8e72a447f7436a1a9876c1b7237a14d08c54dec12069e9c57231b23c4fd203be3f6f2635b8 SHA512 e33cc49c8255aa3693f73693d874ca5e00a9d95fe3d737c457473d8c5b37f36faf44bbc7f608ba03be79d5a6fd032e5ffd8fbc824eda1831422f837040b0c400
 EBUILD icingaweb2-module-director-1.6.2.ebuild 850 BLAKE2B f803f56f1f577ab0912792d406ece4fdde9497d78ad4a61ddc3e7c6f8f14fb2f8ebe70250a8a8bb077a08af5a0056e1daf93bdece40fd67d3de49fecea9da2cc SHA512 7f8fb69603207dc61ff73ffc81c4e7f605db6f1c5664a6a0e494ba3765caef5b87cfa297d5190e3d84110047b6c73f0b9b8f419576c28552aa906865d293e876
-EBUILD icingaweb2-module-director-1.8.0.ebuild 852 BLAKE2B 84302f79199422a707a33dc3b974690921ab65296912d74a33a5fea729c80ef977ba5a43d8f753241a9a80c11d7fa41f579a8491eeecbb6f0547047d6f247685 SHA512 0a9741a54d08f930399c0818b93a0ee22c527dc18051ccfb34009b0bcdb32fdcfde1598fb28a9deae8ef8230c7c5038791544f3a92c45c8362fc3742df08f1be
+EBUILD icingaweb2-module-director-1.8.0.ebuild 850 BLAKE2B 22fffaad05127803aaa4e4c8ef6a2dc469022a19860f8099da3c1f3105bc66c1ee0f6596f29185e6b24416c74b54e15fb047118d93e2ac01ab244fb36adc2cbe SHA512 41dce56439bcc6908f5b08347ba6e9ff9c12cf8b06d25d47dec2c823de9bb45d0310681091c63b1be34ebc9b34a7a40c7ac6b15d3ac654866a843b6d7101819c
 EBUILD icingaweb2-module-director-9999.ebuild 852 BLAKE2B 1ea6bb826157c55611c75431ad8479d165174a0f741bed61f9de0e21b4c719080182aa671d7c8751d9c350e796da9647ca44fc916de70266f5cab8d8542665aa SHA512 16f2166e547f92549aa815710e78da502b2e958a7568d2ec73591c0e025cd0ef48c82cc10672cc7e6b09cc7d96a6ec42df6666cd0d4d420056080336310545e8
 MISC metadata.xml 254 BLAKE2B 731c7015b1415180253ab851fc24ad031153050aa0feff41781a5c16ced70787ca132b4fe53adaa8a189de944dda987c65081162895f1f03d68dc77405308fa7 SHA512 49faa8aa0aef31db638fe291aa55ff114f96fd9f9b2c733f88b326b44f3e9dbf627e825de7c41d45f208b2b7e5e6cd5c03e6fee3fa6013625ce7ce158bbc9a31
diff --git a/www-apps/icingaweb2-module-director/icingaweb2-module-director-1.8.0.ebuild b/www-apps/icingaweb2-module-director/icingaweb2-module-director-1.8.0.ebuild
index 890743ae7e0e..3d7195bd09f8 100644
--- a/www-apps/icingaweb2-module-director/icingaweb2-module-director-1.8.0.ebuild
+++ b/www-apps/icingaweb2-module-director/icingaweb2-module-director-1.8.0.ebuild
@@ -9,7 +9,7 @@ if [[ "${PV}" == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/Icinga/icingaweb2-module-director.git"
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	MY_PN="icingaweb2-module-director"
 	SRC_URI="https://codeload.github.com/Icinga/${MY_PN}/tar.gz/v${PV} -> ${P}.tar.gz"
 	S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/www-apps/icingaweb2-module-graphite/Manifest b/www-apps/icingaweb2-module-graphite/Manifest
index b9c2e0ffa098..65522778377a 100644
--- a/www-apps/icingaweb2-module-graphite/Manifest
+++ b/www-apps/icingaweb2-module-graphite/Manifest
@@ -1,6 +1,6 @@
 DIST icingaweb2-module-graphite-1.0.1.tar.gz 329327 BLAKE2B e53f9ea0e3ca061fdec80da71b6624f97eeda04d78975ac198a6e75ae5300eabf50db3e95802e6d0108ee0314ad9af6108daa24d5b99228c7d9c2fcecfc80cac SHA512 1270d2e7768d3f9181950f08c703236042a9c99d337bd2964396890cdb645b72afabe387d35d232fb123d9f635cc27fc09ac374ec2c5707fa83706b0ba67ac2a
 DIST icingaweb2-module-graphite-1.1.0.tar.gz 331879 BLAKE2B 11e34a5daf5aab583e349297aa612880c782b3cba4514c87e5c2f025fda52e98db1e81eeea3652c070cf075fda87c37a1dc6f5cf870fc57e2fb7594a3e39dfaf SHA512 3c37ef9571f086373e063f8397953605005ae5eeceadc7bfc6beb10168b71f5fbe4e58f3dc6ba9fd5a5e274097c8d881489f8d2772985343b9c8a0f5db9558ed
 EBUILD icingaweb2-module-graphite-1.0.1-r1.ebuild 653 BLAKE2B 3778e56284628d38ff027223be38ac404a1988dd9500103e71f53ce12a334100f3c8c988d9e9b52b120e1240f77e50d32df379393743a3c94bcea634e135cda6 SHA512 7a77e5f7fe1a8d4abb38ca2defba9b4800d7b07681238695a430c2905aecd8f3acc7398a4d70976b9b42f3f7e66534076407f8677d833ef148de7018e2181554
-EBUILD icingaweb2-module-graphite-1.1.0.ebuild 652 BLAKE2B 45cc48ceda4385a9367b4be20630761e8558e594f6dab9a97f2dff223e973ae954f232af7e1f625e522038354826234790503d72e565239b92723ecf22643eb0 SHA512 8ef4c95c9c47d5ce474dd7bc3c5783038fe8aa891653fcc0e9c27d9c197316fa88c33f1e0e8b537950732d7c466dff2f87653c4194b108091bc1ddc25be93517
+EBUILD icingaweb2-module-graphite-1.1.0.ebuild 650 BLAKE2B be23d500907a3a381a04c98388e13da820fc312d37d9d661206bfe75af2ba866edc1c6ad0d8c7400048cc10b049bfbd0506493a9bd5599e90214eed67655bf9d SHA512 9c29b1c46ad832a890da8b76d31a75677c49a56d32fdf0d7029409fe2cd20d2056e7fb4f7e9c0a99b639a9f9ed69863a3af9c841d65b6d536e14e171992874b8
 EBUILD icingaweb2-module-graphite-9999.ebuild 655 BLAKE2B e78227eaa1fe9f89451867b77143fe33cee1e9452219490e4f4374e64a67342dd18c07db8fb11fc9df8097df303c7298f0a63ac8b59e34b6ddee47608c940558 SHA512 a75ef3143b498cb55b965c9c937a59bd53c7f4c95227668f08a69511af9bb67989bb26c44e03a2fa2f7bc791580515f76f90432142c296bc220f65775f06e7ed
 MISC metadata.xml 433 BLAKE2B e4b486abac016ae60b7cc2f9f8893bd55f4de4b126ae87a3497d689ffe269cc42d1f6b873febe506aad55ec5a5dc780fdec51dc638aea2152e32e51c65bfd60c SHA512 86d44590ce1d15251e1fc03ff7fc769651fadd0769eb709b0607f61d253de7513fbe4616c4d6a0dd5498f089882d6c362c7e4a768ba4c86e7a6f86368f688591
diff --git a/www-apps/icingaweb2-module-graphite/icingaweb2-module-graphite-1.1.0.ebuild b/www-apps/icingaweb2-module-graphite/icingaweb2-module-graphite-1.1.0.ebuild
index 507832c1b08c..82bd6e6ed2cd 100644
--- a/www-apps/icingaweb2-module-graphite/icingaweb2-module-graphite-1.1.0.ebuild
+++ b/www-apps/icingaweb2-module-graphite/icingaweb2-module-graphite-1.1.0.ebuild
@@ -9,7 +9,7 @@ if [[ "${PV}" == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/Icinga/icingaweb2-module-graphite.git"
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	SRC_URI="https://github.com/Icinga/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
diff --git a/www-apps/jekyll-watch/Manifest b/www-apps/jekyll-watch/Manifest
index d70c024d1bc6..ac9a185bf757 100644
--- a/www-apps/jekyll-watch/Manifest
+++ b/www-apps/jekyll-watch/Manifest
@@ -1,4 +1,3 @@
 DIST jekyll-watch-2.2.1.tar.gz 16631 BLAKE2B 2311802227206b76d1f7b18ccc6360514164c6148f549490bd4df69e56e4d7a8c944c828e950bb156929081ea8ac15bdc37099eba5af3e0f3e1c20b403828f60 SHA512 55867bedf0f453aad7df267d21cc2a49857916b51ed70e727718c9ed18dedd474bc45c446abcbc803ab4b8b26f8afb1f0e05e6655441186788fbace869c74b6d
 EBUILD jekyll-watch-2.2.1-r1.ebuild 793 BLAKE2B a90e5c7f30cc833b015eb111022ab3967d99108b2b89cde037aedb61c14a0c040186cd87833db8faf5a3dee1fc133ee9c5339d1c3d3b187a9905d36acf929cd1 SHA512 d609c22f0593e0b5e34c26829b7b2b81a2ef3cabf8f9109f8df61fab28a0961089d27dca6307b14e492d6025a0a0512627fff4f60798fd02ede60680fcd0aea3
-EBUILD jekyll-watch-2.2.1.ebuild 678 BLAKE2B 64803ff784392d70473d4a608bae7d08d44ff3655958bf952251fcb70093f6a930ecbb670289874a50bfbdc19290859200d2b4daff861709fdd0792da856593d SHA512 43f8ed4995e2812ca2a616ce8d8771e52ee5e562550ceff09bdab84f03eeeaae445a228216936d7031dd03ac3e0885cd16a6692554dd6afd17e32627450087a7
 MISC metadata.xml 327 BLAKE2B 50cb91b71c974b0f1f6795876897226afed3ed9b5c22b905154e85e51de24790a9773d7a6c052792374603c7bc84052af01a6b5f5e549198e8c8984d9b4e0a59 SHA512 55b40dc2e4f9cb4b2a88931875614ce93b26423e86ec69926b458535bca185345f85129e75d9f9a4bd665245b4ec321d3f8642084f04c0311cf304b338c6ef3a
diff --git a/www-apps/jekyll-watch/jekyll-watch-2.2.1.ebuild b/www-apps/jekyll-watch/jekyll-watch-2.2.1.ebuild
deleted file mode 100644
index 00fa650ff7b0..000000000000
--- a/www-apps/jekyll-watch/jekyll-watch-2.2.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md History.markdown"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Rebuild your Jekyll site when a file changes with the --watch switch"
-HOMEPAGE="https://github.com/jekyll/jekyll-watch"
-SRC_URI="https://github.com/jekyll/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/listen:3"
-ruby_add_bdepend "test? ( >=www-apps/jekyll-2 )"
-
-all_ruby_prepare() {
-	rm Rakefile || die
-}
diff --git a/www-apps/nanoc-core/Manifest b/www-apps/nanoc-core/Manifest
index f6521beb8e3c..7c85bf42def5 100644
--- a/www-apps/nanoc-core/Manifest
+++ b/www-apps/nanoc-core/Manifest
@@ -1,7 +1,3 @@
-DIST nanoc-core-4.11.10.tar.gz 308049 BLAKE2B 8b587245d9935dad34bc0912ba65200cc6f3e8ebda00e21fc3c30e367264076d17d64fe9cc762c5ec11ab9624695f66132d5a69b29dcbf9f85fc7b0d57828592 SHA512 f4997b03834966fbda5aa28c392712ed53dda4f3d3b70b52d73e96c39612158c88f24543e0bcf74cea8ba24d108e2d64026ce3d4364f6eabbc9034ca5adf4814
-DIST nanoc-core-4.11.11.tar.gz 308375 BLAKE2B aed881153fb57561b62e5c5efb771777e3944232f5963dcf8bf5461802c7767b14776c161aa19bd0905b6ff5f91932d6b2ef2f0a90594e530beeac201e413568 SHA512 6db50ffb5b91e74e3d830fc8c154dcadec35376c18d8c8b909799b1d51031d307f70113f2319b1a5163ba746a2304a1aa3949e414a50e02e7396d5fd26e15a3f
 DIST nanoc-core-4.11.12.tar.gz 310160 BLAKE2B ef34bf6d28d5a9287053a939ef14bc59f99bde003d7bbcd7eee861ab882a6beaa48812137c8ad87fe464d27e371cfd40022467f8d10ac5f85ff16ef19215e340 SHA512 0503d0a6a0cf1ca9a9c57b831f320abb5102a3e7aa82c016d1f72c4d9f614ef53a0e4df30d50e05a98107fecacae4d70dfa5ee5c15910d575bc30df411430863
-EBUILD nanoc-core-4.11.10.ebuild 1601 BLAKE2B ab3a233a247f06871d20933a6bb29a6068eda5ae147b0c6dc26ac3bcdb42a1fb81c7bfe4d15c986fc46f7be10067d798f69a63dd2d840c9dc8dfb24924b29202 SHA512 6d11d1cbbb7465dab60af40b2c83887397ca5948b138bbe169753c5a6d5e189127cb9662c064731d555757b792a0e4351aaa062b46e3602e34ccadfd5211f665
-EBUILD nanoc-core-4.11.11.ebuild 1601 BLAKE2B ab3a233a247f06871d20933a6bb29a6068eda5ae147b0c6dc26ac3bcdb42a1fb81c7bfe4d15c986fc46f7be10067d798f69a63dd2d840c9dc8dfb24924b29202 SHA512 6d11d1cbbb7465dab60af40b2c83887397ca5948b138bbe169753c5a6d5e189127cb9662c064731d555757b792a0e4351aaa062b46e3602e34ccadfd5211f665
 EBUILD nanoc-core-4.11.12.ebuild 1601 BLAKE2B ab3a233a247f06871d20933a6bb29a6068eda5ae147b0c6dc26ac3bcdb42a1fb81c7bfe4d15c986fc46f7be10067d798f69a63dd2d840c9dc8dfb24924b29202 SHA512 6d11d1cbbb7465dab60af40b2c83887397ca5948b138bbe169753c5a6d5e189127cb9662c064731d555757b792a0e4351aaa062b46e3602e34ccadfd5211f665
 MISC metadata.xml 317 BLAKE2B c6af48dcdb56be1e50ef78910bc5150112d2914bbd13b576883eeeecdcc2a47f6360ffcf7a83432266bc737891527f4f1cacaf90b62e7b38d75a0c74c87bb0d8 SHA512 5394c6280515d4728d6b30f6eff872dd1d3dc283fe125aa8b5bc7f1206d967b74864bd144c6b2623ea63db19f78b5a94d13261464b35b4056cf92cccf374db1e
diff --git a/www-apps/nanoc-core/nanoc-core-4.11.10.ebuild b/www-apps/nanoc-core/nanoc-core-4.11.10.ebuild
deleted file mode 100644
index ccc331cdd62d..000000000000
--- a/www-apps/nanoc-core/nanoc-core-4.11.10.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
-
-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/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/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/yard
-)
-"
-
-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
-}
-
-each_ruby_test() {
-	RUBYLIB="${S}/lib" ${RUBY} -S rake spec || die
-}
diff --git a/www-apps/nanoc-core/nanoc-core-4.11.11.ebuild b/www-apps/nanoc-core/nanoc-core-4.11.11.ebuild
deleted file mode 100644
index ccc331cdd62d..000000000000
--- a/www-apps/nanoc-core/nanoc-core-4.11.11.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
-
-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/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/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/yard
-)
-"
-
-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
-}
-
-each_ruby_test() {
-	RUBYLIB="${S}/lib" ${RUBY} -S rake spec || die
-}
diff --git a/www-apps/nanoc/Manifest b/www-apps/nanoc/Manifest
index d877859bba74..c481d24cc853 100644
--- a/www-apps/nanoc/Manifest
+++ b/www-apps/nanoc/Manifest
@@ -1,7 +1,3 @@
-DIST nanoc-4.11.10.tar.gz 308049 BLAKE2B 8b587245d9935dad34bc0912ba65200cc6f3e8ebda00e21fc3c30e367264076d17d64fe9cc762c5ec11ab9624695f66132d5a69b29dcbf9f85fc7b0d57828592 SHA512 f4997b03834966fbda5aa28c392712ed53dda4f3d3b70b52d73e96c39612158c88f24543e0bcf74cea8ba24d108e2d64026ce3d4364f6eabbc9034ca5adf4814
-DIST nanoc-4.11.11.tar.gz 308375 BLAKE2B aed881153fb57561b62e5c5efb771777e3944232f5963dcf8bf5461802c7767b14776c161aa19bd0905b6ff5f91932d6b2ef2f0a90594e530beeac201e413568 SHA512 6db50ffb5b91e74e3d830fc8c154dcadec35376c18d8c8b909799b1d51031d307f70113f2319b1a5163ba746a2304a1aa3949e414a50e02e7396d5fd26e15a3f
 DIST nanoc-4.11.12.tar.gz 310160 BLAKE2B ef34bf6d28d5a9287053a939ef14bc59f99bde003d7bbcd7eee861ab882a6beaa48812137c8ad87fe464d27e371cfd40022467f8d10ac5f85ff16ef19215e340 SHA512 0503d0a6a0cf1ca9a9c57b831f320abb5102a3e7aa82c016d1f72c4d9f614ef53a0e4df30d50e05a98107fecacae4d70dfa5ee5c15910d575bc30df411430863
-EBUILD nanoc-4.11.10.ebuild 2670 BLAKE2B e129567600ce751c5c7c7e0e27370212d266a1346a057c639d75b1d70a3fcf3a1edbf6075d188cab9327eb3960cb98e6b9914423894991021ee55ef4f5784f5d SHA512 360ae7ed9f0352fe767e5e24b0cc30ac583c328563164eda854b00e73c8513b8b6184c67aab9beabadc30e14c624a043781781c99397ef14999e6c0a7d4064fe
-EBUILD nanoc-4.11.11.ebuild 2670 BLAKE2B e129567600ce751c5c7c7e0e27370212d266a1346a057c639d75b1d70a3fcf3a1edbf6075d188cab9327eb3960cb98e6b9914423894991021ee55ef4f5784f5d SHA512 360ae7ed9f0352fe767e5e24b0cc30ac583c328563164eda854b00e73c8513b8b6184c67aab9beabadc30e14c624a043781781c99397ef14999e6c0a7d4064fe
 EBUILD nanoc-4.11.12.ebuild 2670 BLAKE2B e129567600ce751c5c7c7e0e27370212d266a1346a057c639d75b1d70a3fcf3a1edbf6075d188cab9327eb3960cb98e6b9914423894991021ee55ef4f5784f5d SHA512 360ae7ed9f0352fe767e5e24b0cc30ac583c328563164eda854b00e73c8513b8b6184c67aab9beabadc30e14c624a043781781c99397ef14999e6c0a7d4064fe
 MISC metadata.xml 317 BLAKE2B c6af48dcdb56be1e50ef78910bc5150112d2914bbd13b576883eeeecdcc2a47f6360ffcf7a83432266bc737891527f4f1cacaf90b62e7b38d75a0c74c87bb0d8 SHA512 5394c6280515d4728d6b30f6eff872dd1d3dc283fe125aa8b5bc7f1206d967b74864bd144c6b2623ea63db19f78b5a94d13261464b35b4056cf92cccf374db1e
diff --git a/www-apps/nanoc/nanoc-4.11.10.ebuild b/www-apps/nanoc/nanoc-4.11.10.ebuild
deleted file mode 100644
index de28a28b1206..000000000000
--- a/www-apps/nanoc/nanoc-4.11.10.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
-
-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
-	>=dev-ruby/cri-2.15:0
-	~www-apps/nanoc-core-${PV}
-	>=dev-ruby/parallel-1.12:1
-	>=dev-ruby/tomlrb-1.2:1
-	>=dev-ruby/tty-command-0.8:0
-	>=dev-ruby/tty-file-0.7:0
-	>=dev-ruby/tty-platform-0.2: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/deploying/fog_spec.rb \
-	   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/nanoc/nanoc-4.11.11.ebuild b/www-apps/nanoc/nanoc-4.11.11.ebuild
deleted file mode 100644
index de28a28b1206..000000000000
--- a/www-apps/nanoc/nanoc-4.11.11.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
-
-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
-	>=dev-ruby/cri-2.15:0
-	~www-apps/nanoc-core-${PV}
-	>=dev-ruby/parallel-1.12:1
-	>=dev-ruby/tomlrb-1.2:1
-	>=dev-ruby/tty-command-0.8:0
-	>=dev-ruby/tty-file-0.7:0
-	>=dev-ruby/tty-platform-0.2: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/deploying/fog_spec.rb \
-	   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/nextcloud/Manifest b/www-apps/nextcloud/Manifest
index 840ad60e6f0b..e7734767cd91 100644
--- a/www-apps/nextcloud/Manifest
+++ b/www-apps/nextcloud/Manifest
@@ -1,14 +1,12 @@
 AUX php-argon2-en.txt 416 BLAKE2B 9940a3e218d1db382790f4754352594c9098eccce7426729e75471f017e15bb45b50cc885609e54817077e36d9feb4484bcff5b40c4f669ad80d4d5a643da8bc SHA512 076bbbfb9305a2608b60fb7f9802a5a455c5d049d39c8f209eadac1a306ba2015d11a30b4544d8cdf43025077a3c3087f3e9922cd9b530a08c089a7818590115
-DIST nextcloud-19.0.12.tar.bz2 95471173 BLAKE2B 662afe90817d02a76ca2bcd2f1070bd9c34a07e8da88b49cb8b096717bd0efd993f7e84672a226747c2a510c229edf609be681a7ef9f5b743b6a05c3f7f56401 SHA512 9e182e8b85f62d001b937379bb628a723ecf38701b24f314548feb79c1a4492fcac3a8c1d68b3a2fe9d8c53dacea1915846275820fd48765288743e267c223c4
-DIST nextcloud-19.0.13.tar.bz2 96869599 BLAKE2B a73d8237ff0b4134fa88d562141f7924ed210d1789246b83dbfc29e8ad8451bc96d203260700d6d87f864dd498546f69c42127a7cd9ba8b98dbfd510d3bb3679 SHA512 fd144a0d42617b33388bf1127673adb2e523ef04804021ac90e8e679abcb61d839dcba61270108c8ac62093712e6bffcb83a1caef0c810598a108a57d8bd85d9
 DIST nextcloud-20.0.10.tar.bz2 123375030 BLAKE2B 881777f0ee0489e14ae67eef5d7eaa37b8b7b6e047eb3953467470e7e39268c7680b0ccd43f10426de1668cde3f4ad82ec57148e93a84142d1cfbee7c1ee354f SHA512 a65a4c19894d61ac7d168f03a7aae489e39eb53f42cd02301800fe511483df056afab15a9d8708effa0109af6c451c9cb13ab3502ccea7447ec3cdb10367fcf1
 DIST nextcloud-20.0.11.tar.bz2 123339332 BLAKE2B f89dd1c81a9fcac46bb270a646df89d43064bac73e96209e379a5a60b204bdc44ade6b265c870138bc35a0a3aa2a52f4797166c03c1d156ac49336e48c1372d7 SHA512 4863a7819a564655db0a7b49a7ca9be642ab5383cdeada5c3ce6fc4529fda522a4427eb4b3ba5e00e4719232fed6c1f9e606e11f38c35f8838f82247359f335b
 DIST nextcloud-21.0.2.tar.bz2 129247099 BLAKE2B 282f79e9f764f1444dfe339e73fb955a7c77ad9335304ce0d9f8f7353769f3d11ee455ab01aea03ea04f5f8a029b3e97e49845fe6490d5db4d07324460626917 SHA512 a222c55c7ff515b96b7c826da13ff1770f82bebda2e73df6bb31df635338155dff611a560b665b0e9b17f2d8f33132abf75ffa80e84f5a115ee5d8a4737b6795
 DIST nextcloud-21.0.3.tar.bz2 129433656 BLAKE2B 75df0e3363e606fb4406aca7e37ab0a373d390f50966405c59e620b683979855c05f16548bb14e9ac7b4ffa756562679e5d6f1a8e4cd1d46aeda0756f235facd SHA512 e618dc400659a2aca37857c446d31296e64d7671a66bf077969b3194ae35242c6de11eabd1547791067c0edc43e93149fadf102bd4022cffb92802ad9d7e4ef7
-EBUILD nextcloud-19.0.12.ebuild 1083 BLAKE2B 0e18f62655dfa0bdf7a81f5280be99c34c876a8c57e66e206e1c7e43e0cf93745cda3247f05da592fc5882e872e8249dac9391f22648940fe95e8cd2bc158422 SHA512 e0d8a192c51901913a40521b5259c7276356b8c15246c5df193c4a4a5b0652034148dd971c5014a72f378d4449b778e5867030f9ec3d8ad9bf42efa955ce63c5
-EBUILD nextcloud-19.0.13.ebuild 1083 BLAKE2B 0e18f62655dfa0bdf7a81f5280be99c34c876a8c57e66e206e1c7e43e0cf93745cda3247f05da592fc5882e872e8249dac9391f22648940fe95e8cd2bc158422 SHA512 e0d8a192c51901913a40521b5259c7276356b8c15246c5df193c4a4a5b0652034148dd971c5014a72f378d4449b778e5867030f9ec3d8ad9bf42efa955ce63c5
+DIST nextcloud-22.0.0.tar.bz2 144386509 BLAKE2B 5d41337a7577d33f4be2ce5900b97df5582542bf4b51a4de4eff2f62726bcf014d99456ebc775feb16fd625582760e31ee434a23874451a1072822dcd21d5cd6 SHA512 ced81296d1080cb224ac96df501721c1a16a8a83f9784ab281d97202ec6611173d60a6a87279e7f36b735a92dd010ed81b0c7561fc7dadde00df10f9b7711cec
 EBUILD nextcloud-20.0.10.ebuild 1081 BLAKE2B 51166655fca8673a06762990e4cd9770655e2fe027e51a2a51b4ae3a1a05f020f5a863d415d132ef7d0974654170205879c4d4eded787195490d8abb7cf2249a SHA512 a198ebbb7005113bb1f2eec73ef7ca56e7c1831da6dc1eacc5a942ae59344d8d10f1c6f8467db6e430359e9dcdc807de21e90ea7269f795d088ec9618708ea5a
 EBUILD nextcloud-20.0.11.ebuild 1083 BLAKE2B 0e18f62655dfa0bdf7a81f5280be99c34c876a8c57e66e206e1c7e43e0cf93745cda3247f05da592fc5882e872e8249dac9391f22648940fe95e8cd2bc158422 SHA512 e0d8a192c51901913a40521b5259c7276356b8c15246c5df193c4a4a5b0652034148dd971c5014a72f378d4449b778e5867030f9ec3d8ad9bf42efa955ce63c5
 EBUILD nextcloud-21.0.2.ebuild 1083 BLAKE2B e6abe80192e7a00277126f901c655f1eab03544572da0071c0734ece0a4a5574d2fcbd7f06f935ccf61a91640a8ca549c3bc359c68103f7f46632fef89d62322 SHA512 9fe6b70447bd9e4d3678eaaca5174586a1a96c0e4763ccd30f9749410892b78c59087c06c0fe42372e6126bf5c7fb5973ed0ead0c664c2040abffd5e7951dfe6
 EBUILD nextcloud-21.0.3.ebuild 1083 BLAKE2B e6abe80192e7a00277126f901c655f1eab03544572da0071c0734ece0a4a5574d2fcbd7f06f935ccf61a91640a8ca549c3bc359c68103f7f46632fef89d62322 SHA512 9fe6b70447bd9e4d3678eaaca5174586a1a96c0e4763ccd30f9749410892b78c59087c06c0fe42372e6126bf5c7fb5973ed0ead0c664c2040abffd5e7951dfe6
+EBUILD nextcloud-22.0.0.ebuild 1083 BLAKE2B e6abe80192e7a00277126f901c655f1eab03544572da0071c0734ece0a4a5574d2fcbd7f06f935ccf61a91640a8ca549c3bc359c68103f7f46632fef89d62322 SHA512 9fe6b70447bd9e4d3678eaaca5174586a1a96c0e4763ccd30f9749410892b78c59087c06c0fe42372e6126bf5c7fb5973ed0ead0c664c2040abffd5e7951dfe6
 MISC metadata.xml 644 BLAKE2B 893952d31b289d07befd82be0d9998df95149363a0bfcfbb64626d8679b67048017a520fe65e5eb14224432a98efbb726e866c95562de23f2dc650df90df5371 SHA512 ec4bcd3ea472df2201830ac14e6dbc01a8317fc8ad8eadd5231014c49a07151ed7647b6d87c22a62df9a2f67d8c2911d44b504a612c9f446228f9a227e6bed7b
diff --git a/www-apps/nextcloud/nextcloud-19.0.12.ebuild b/www-apps/nextcloud/nextcloud-19.0.12.ebuild
deleted file mode 100644
index 2aebb2320d5d..000000000000
--- a/www-apps/nextcloud/nextcloud-19.0.12.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit webapp
-
-DESCRIPTION="Personal cloud that runs on your own server"
-HOMEPAGE="https://nextcloud.com/"
-SRC_URI="https://download.nextcloud.com/server/releases/${P}.tar.bz2"
-LICENSE="AGPL-3"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="+curl +imagemagick mysql postgres +sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND=""
-RDEPEND="<dev-lang/php-8[curl?,filter,gd,hash(+),intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
-	imagemagick? ( dev-php/pecl-imagick )
-	virtual/httpd-php"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	dodir "${MY_HTDOCSDIR}"/data
-
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_postinst_txt en "${FILESDIR}"/php-argon2-en.txt
-
-	webapp_src_install
-}
diff --git a/www-apps/nextcloud/nextcloud-19.0.13.ebuild b/www-apps/nextcloud/nextcloud-22.0.0.ebuild
index 2aebb2320d5d..ab3ba8e01bc4 100644
--- a/www-apps/nextcloud/nextcloud-19.0.13.ebuild
+++ b/www-apps/nextcloud/nextcloud-22.0.0.ebuild
@@ -15,7 +15,7 @@ IUSE="+curl +imagemagick mysql postgres +sqlite"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
 DEPEND=""
-RDEPEND="<dev-lang/php-8[curl?,filter,gd,hash(+),intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
+RDEPEND="dev-lang/php[curl?,filter,gd,hash(+),intl,json(+),mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
 	imagemagick? ( dev-php/pecl-imagick )
 	virtual/httpd-php"
 
diff --git a/www-apps/piwigo/Manifest b/www-apps/piwigo/Manifest
index f5b56117a4f2..c43c1c60f59e 100644
--- a/www-apps/piwigo/Manifest
+++ b/www-apps/piwigo/Manifest
@@ -1,3 +1,3 @@
 DIST piwigo-11.5.0.zip 17742118 BLAKE2B f27bbe445cf93051196270ac1464400f1d74bc8ac2a05129e43065cd3fa60d8d82131ccf50e1d5c16fac9ceac06f1a888d10576857b8c9ede74e67cc61b2a805 SHA512 cc6a2f0dc745e2cd33884b5967a9077095f4848c11996edb73bcace53cf7f87c29e177777096e13d86a83f4e9296dc230fa4bef992ecc394ebbdba7fe0d5280c
-EBUILD piwigo-11.5.0-r1.ebuild 1149 BLAKE2B 9ba013150a70796a183a972dc8d787afbc2ea536b76956b68aa31dc069718ae2438df6bf8cfb2a1a168924b22ec277eaf194485473c233af62ef3a014b48488a SHA512 3f132af707f60334deefcd2f7ce4f8044dbbfb58319b7620ea3d86b5cd733b23a3243fd2645a1d28122b2ac83174c23eb1e94af6557084245bb90926e362a66b
+EBUILD piwigo-11.5.0-r1.ebuild 1152 BLAKE2B 17f6f5ae1d75eb1a95c9c9c1ad0f25e21caf58588972bc4315492011f28d896c6efdeabef615ad12c2e8922568f8ab4354396270ce4f04e001e9803cafcfe263 SHA512 59fb3cebddaac9e54c55dd52e2da4171bc3524c1b8c4845c7dc0d876ffb42a2a89c32eb723e3742134ce8a73364129b15f05da14afbf4278aef999b659f44bd4
 MISC metadata.xml 1022 BLAKE2B 88bca793744995b53bf2c0a5061d47798d4f2b42a8025f7bc2f1cf7dc11234d5a8c5df9ed08b9d63b99465e06015bd5dcefaa87d1daf39f8b795ab89e264a563 SHA512 8d011157201c6e25b0252239cf6bc87f596a414a37fbf990c44dfc419b5bb28b4796b4a0c9e00d78154bdbb5dd7e6f0e99b99df56fa4736a7cc55a6ccecdbf09
diff --git a/www-apps/piwigo/piwigo-11.5.0-r1.ebuild b/www-apps/piwigo/piwigo-11.5.0-r1.ebuild
index 71cbdf15e5c3..02714c2e9e3a 100644
--- a/www-apps/piwigo/piwigo-11.5.0-r1.ebuild
+++ b/www-apps/piwigo/piwigo-11.5.0-r1.ebuild
@@ -15,7 +15,7 @@ IUSE="+exif +gd imagemagick"
 DEPEND=""
 RDEPEND="
 	imagemagick? ( virtual/imagemagick-tools )
-	dev-lang/php[ctype,exif?,gd?,filter,iconv,json(+),mysqli]
+	<dev-lang/php-8[ctype,exif?,gd?,filter,iconv,json(+),mysqli]
 	>=virtual/mysql-5.0
 	virtual/httpd-php"
 BDEPEND="app-arch/unzip"