Merge updates from master

7 files changed, 27 insertions, 24 deletions

diff --git a/sys-apps/tuned/Manifest b/sys-apps/tuned/Manifest
index 240dd15019d0..3cb4b265b98b 100644
--- a/sys-apps/tuned/Manifest
+++ b/sys-apps/tuned/Manifest
@@ -1,2 +1,2 @@
-DIST tuned-2.18.0.tar.gz 218252 BLAKE2B 25bf078ea4e616830fa8b125251e24afbe2a566fcdd1050b2e1ac95125e22e8276b61f23a0236380bf1aec5ce892e1832230a800356460b5af21346c8825269d SHA512 9508bfad6502b7b9a72fb84d29308cbc10b3cb663b367c821e79ad4d57c2349086c199bf884440c46d230d08d0ad3df17d4f31ebdc03b68c7ba2695b6e18bcc9
 DIST tuned-2.19.0.tar.gz 233481 BLAKE2B 9bbd759af69938c8a31b0bb7d746b54f035dc11e3fad2bf8e77d4b318e01f59f51af1d8a5bb8105bdbd9a1393932a27fa2664f529121c956081e92a5f96e2e45 SHA512 64ed338398f7ae73cdf4de04ce24dec6869abf3f399459f13de792edfd965da4efdab0fb1337749556f2868d1769dcb55df9e13983d1e0bc2769fb5fc791cfb8
+DIST tuned-2.20.0.tar.gz 241286 BLAKE2B 0057f41221dcf076c30cf1366cb94ffcc000d08b23f88c2af2488fee4cb43b2f06d0fdcd15d21c1984e08d0d8b31a1ee64029cf36cd3f398d3541f6ff327dc8c SHA512 c8b9fc5bdc684b3c518267875b3757fce5d607bec0df7946fe3a7d345683ea0baa2f8b9bbfb741083b82fd9ca7c825506ca86ea530551837b42c11b45f24ccea
diff --git a/sys-apps/tuned/tuned-2.18.0.ebuild b/sys-apps/tuned/tuned-2.20.0.ebuild
index 096c844a1c3d..3be0719a79c1 100644
--- a/sys-apps/tuned/tuned-2.18.0.ebuild
+++ b/sys-apps/tuned/tuned-2.20.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit optfeature python-single-r1 tmpfiles xdg-utils
 
diff --git a/www-apps/drupal/Manifest b/www-apps/drupal/Manifest
index da25d78a1b40..c0257cc9add7 100644
--- a/www-apps/drupal/Manifest
+++ b/www-apps/drupal/Manifest
@@ -1,4 +1,4 @@
-DIST drupal-7.89.tar.gz 3361853 BLAKE2B 5388c6c9ded2ce31caee1bea23976e2c2d53116f6e564fd47f4035e9815e28759bf4e56964754d01c165ae7c384527c3c1845ef6b9c3b1b029b9eca3c56e7442 SHA512 3f1f50b09bfd77afaad368c21a00d2fb52a4a3853bf288525a805fab992083ffb241c2b3bfef8db3b4351310b0a0d5d27470fa7adc191c687809f48464f18f0b
-DIST drupal-8.9.20.tar.gz 19837562 BLAKE2B 8246a96628eeb936c87d1c0ff58b507e432922ede550308b105066b4334e8e04e8f2dc9a7475fe9d4c5556b11e0e938191f453e74cac9ade11ce9369da696af6 SHA512 824ec2820a1071765fdb9f5d6195d906517d2d1a97f5cb0458e7417495f9c7c88717b931870bf46c0681787b54904a746770b8811c9deff3b05624415db032cf
-DIST drupal-9.1.15.tar.gz 18580086 BLAKE2B 500602e498de55d2163c53d2cb04effbdab24d343a2f04262275c6500d9329b12760dee846513efbddc37916973dc9ad4bf0f6f882b1b57b0ca97b40afb369be SHA512 1fd8cbdbf0de00ed6d85a004f61fb3897cfcbc1f71d1d72373c8acf108f21774f3a91138901d9a3d0043f6b65b29ae7f953dfce1428a96a4fe529aac907141c0
-DIST drupal-9.2.18.tar.gz 18882937 BLAKE2B 9e62b041c0d3cd634984fa29c72b35af9a1d9777d1b3c204fb55fd125d7270242177b30876a03e36aa3757b1445fd7763db82a2f038e7931d84df7f908150abb SHA512 ed91530280a6150070d4086a388084b6336526363fb56585c85e090f9e3fd1b3e90a82eb83b07a6c725eae3ba994228b5cf280d3c296650d9e2be9e97996aa31
+DIST drupal-10.0.2.tar.gz 17411661 BLAKE2B c7a9a98f1e8c120486c1a6bd17986b3e99c1e51113969413eb557f657fa3415f65b819a70d08be7c543b6609cba2881b18fa69ce77fe8b3764d9a4a12f569e04 SHA512 19f3f2459c8d2d54647f43db614cd493cb6f068d107678bb6c36823407fe815db71b7919fe755f40fb10c3697afb07e20c93fe47098de88f9248f18cf901da80
+DIST drupal-7.91.tar.gz 3369203 BLAKE2B 202b3cbcbb25bb92f056c15cb8f697038caacdd62497de02b7e0036dc5dd5ac6e9b12c67620b753a5fbe8440e5883aec3061a626d753d9cca4f48b6d6358b3fc SHA512 da38735563cf5a76f432907b61943339b9d7f218e5abe5b5187138a470b545db14e23bb708fa53adc0853f9b46b34242e7eae3222e53b62fdafef29b2b476169
+DIST drupal-9.4.10.tar.gz 21631038 BLAKE2B 635bca79c8ac0230205eb4eb11b4e790d49a3359c0fc1f535b936535b8541de71f0319806da221a9179b0b13c8f3d28ccf0f4d7c9088e459d9ff8274b3965b58 SHA512 befefe68ef0b6818ba9637fea2b007119483b431950cf0d81090d27b1e1672ab8c84be46ea1b083acf7dc4898bd4cfb294cd74a21cd5105cccef3d285c357739
+DIST drupal-9.5.2.tar.gz 22552415 BLAKE2B f364faefa537e43a908ad7a4aab689643ef1ddf036881a4167b0681eeb0e8d0fa657037f059475b854f5e1965e670834bdc49cbd7bc8b5e4123ae9fa00423351 SHA512 a78637076db8034abb26e8c271db363ce3f20aa095f44b411ed2c3556bf102278a002ede68a386761d22004c65b9524ed473ac1a6c4e41ac6969b360179afde6
diff --git a/www-apps/drupal/drupal-9.1.15.ebuild b/www-apps/drupal/drupal-10.0.2.ebuild
index 65376470ca05..6a27404d4a84 100644
--- a/www-apps/drupal/drupal-9.1.15.ebuild
+++ b/www-apps/drupal/drupal-10.0.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit webapp
 
@@ -17,10 +17,12 @@ LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
 IUSE="+mysql postgres sqlite +uploadprogress"
 
+# upstream supports php 8.1+, but dev-php/pecl-uploadprogress does not have 8.2
+# limit php to 8.1 for now
 RDEPEND="
-	dev-lang/php[gd,hash(+),mysql?,pdo,postgres?,simplexml,sqlite?,xml]
+	dev-lang/php:8.1[gd,hash(+),mysql?,pdo,postgres?,simplexml,sqlite?,xml]
 	virtual/httpd-php
-	uploadprogress? ( dev-php/pecl-uploadprogress )
+	uploadprogress? ( dev-php/pecl-uploadprogress[php_targets_php8-1] )
 "
 
 need_httpd_cgi
@@ -30,11 +32,12 @@ REQUIRED_USE="|| ( mysql postgres sqlite )"
 src_install() {
 	webapp_src_preinst
 
-	local docs="LICENSE.txt README.txt core/MAINTAINERS.txt core/INSTALL.txt core/CHANGELOG.txt \
-		core/INSTALL.mysql.txt core/INSTALL.pgsql.txt core/INSTALL.sqlite.txt core/UPDATE.txt "
+	local docs="LICENSE.txt README.md core/MAINTAINERS.txt core/INSTALL.txt core/CHANGELOG.txt \
+		core/INSTALL.mysql.txt core/INSTALL.pgsql.txt core/INSTALL.sqlite.txt core/UPDATE.txt \
+		core/USAGE.txt "
 
 	dodoc ${docs}
-	rm -f ${docs} core/INSTALL core/COPYRIGHT.txt core/LICENSE.txt || die
+	rm ${docs} core/COPYRIGHT.txt core/LICENSE.txt || die
 
 	cp sites/default/{default.settings.php,settings.php} || die
 	insinto "${MY_HTDOCSDIR}"
@@ -60,7 +63,7 @@ pkg_postinst() {
 	ewarn "If this is a new install, unless you want anyone with network access to your server to be"
 	ewarn "able to run the setup, you'll have to configure your web server to limit access to it."
 	echo
-	ewarn "If you're doing a new drupal-8 install, you'll have to copy /sites/default/default.services.yml"
+	ewarn "If you're doing a new drupal-10 install, you'll have to copy /sites/default/default.services.yml"
 	ewarn "to /sites/default/services.yml and grant it write permissions to your web server."
 	ewarn "Just follow the instructions of the drupal setup and be sure to resolve any permissions issue"
 	ewarn "reported by the setup."
diff --git a/www-apps/drupal/drupal-7.89.ebuild b/www-apps/drupal/drupal-7.91.ebuild
index f5302a46a2ad..83823c1abd94 100644
--- a/www-apps/drupal/drupal-7.89.ebuild
+++ b/www-apps/drupal/drupal-7.91.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/www-apps/drupal/drupal-9.2.18.ebuild b/www-apps/drupal/drupal-9.4.10.ebuild
index fd1b09540bcc..cfe37862af18 100644
--- a/www-apps/drupal/drupal-9.2.18.ebuild
+++ b/www-apps/drupal/drupal-9.4.10.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit webapp
 
@@ -34,7 +34,7 @@ src_install() {
 		core/INSTALL.mysql.txt core/INSTALL.pgsql.txt core/INSTALL.sqlite.txt core/UPDATE.txt "
 
 	dodoc ${docs}
-	rm -f ${docs} core/INSTALL core/COPYRIGHT.txt core/LICENSE.txt || die
+	rm ${docs} core/COPYRIGHT.txt core/LICENSE.txt || die
 
 	cp sites/default/{default.settings.php,settings.php} || die
 	insinto "${MY_HTDOCSDIR}"
@@ -60,7 +60,7 @@ pkg_postinst() {
 	ewarn "If this is a new install, unless you want anyone with network access to your server to be"
 	ewarn "able to run the setup, you'll have to configure your web server to limit access to it."
 	echo
-	ewarn "If you're doing a new drupal-8 install, you'll have to copy /sites/default/default.services.yml"
+	ewarn "If you're doing a new drupal-9 install, you'll have to copy /sites/default/default.services.yml"
 	ewarn "to /sites/default/services.yml and grant it write permissions to your web server."
 	ewarn "Just follow the instructions of the drupal setup and be sure to resolve any permissions issue"
 	ewarn "reported by the setup."
diff --git a/www-apps/drupal/drupal-8.9.20.ebuild b/www-apps/drupal/drupal-9.5.2.ebuild
index 65376470ca05..cfe37862af18 100644
--- a/www-apps/drupal/drupal-8.9.20.ebuild
+++ b/www-apps/drupal/drupal-9.5.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit webapp
 
@@ -30,11 +30,11 @@ REQUIRED_USE="|| ( mysql postgres sqlite )"
 src_install() {
 	webapp_src_preinst
 
-	local docs="LICENSE.txt README.txt core/MAINTAINERS.txt core/INSTALL.txt core/CHANGELOG.txt \
+	local docs="LICENSE.txt README.md core/MAINTAINERS.txt core/INSTALL.txt core/CHANGELOG.txt \
 		core/INSTALL.mysql.txt core/INSTALL.pgsql.txt core/INSTALL.sqlite.txt core/UPDATE.txt "
 
 	dodoc ${docs}
-	rm -f ${docs} core/INSTALL core/COPYRIGHT.txt core/LICENSE.txt || die
+	rm ${docs} core/COPYRIGHT.txt core/LICENSE.txt || die
 
 	cp sites/default/{default.settings.php,settings.php} || die
 	insinto "${MY_HTDOCSDIR}"
@@ -60,7 +60,7 @@ pkg_postinst() {
 	ewarn "If this is a new install, unless you want anyone with network access to your server to be"
 	ewarn "able to run the setup, you'll have to configure your web server to limit access to it."
 	echo
-	ewarn "If you're doing a new drupal-8 install, you'll have to copy /sites/default/default.services.yml"
+	ewarn "If you're doing a new drupal-9 install, you'll have to copy /sites/default/default.services.yml"
 	ewarn "to /sites/default/services.yml and grant it write permissions to your web server."
 	ewarn "Just follow the instructions of the drupal setup and be sure to resolve any permissions issue"
 	ewarn "reported by the setup."