gentoo auto-resync : 11:03:2023 - 12:07:11

5 files changed, 29 insertions, 26 deletions

diff --git a/www-apps/drupal/Manifest b/www-apps/drupal/Manifest
index 934c6b5385da..6c5f675c475f 100644
--- a/www-apps/drupal/Manifest
+++ b/www-apps/drupal/Manifest
@@ -1,10 +1,10 @@
 AUX postinstall-en.txt 1730 BLAKE2B b335309795d753c7689338c5e94b596efa5f66dc8dee17ad30b1a2d10b694a7bc288597b526239ea1d443887b45b8cd8ef89b499b79e86ab5df1c195ee85d4a0 SHA512 4ae14616c49e6aa61dc781350b5a75defefc2f894b98422a5b69a5827e367eb00fce140e6a45bcc02c90f068fc31970512d2632bbbf398cbe34f947933990050
-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
-EBUILD drupal-7.89.ebuild 1546 BLAKE2B f58ac28e02fb6ff19414968559bd7855d46fff6279b145f7c375f42ce36a7d6f3f372235d64435893ccc57d043155f67099991a896c7bcf9d211deec85ec21c4 SHA512 fe3b2504cd874d2d468ba323cbe8a9dfd0e602a0145b2048f92b19b7f0b40e036e0e8bd1f220ed7674db17643864de98075967d9735cb6686319f6017b40c8d7
-EBUILD drupal-8.9.20.ebuild 2084 BLAKE2B 2053adf94a106651a8ddbfdad020ada0f9c77ae92385010b06951eeec155f57d17e58bfb998d9352ea5c018dc58fec8496c2139d41eece9b38c9b7bbd976f34e SHA512 49887557a87456fbadbc526308089e8f7cf734df537dc43447bb264da605502f16f6ceb555f9c8b9220c22cf1feca8666d570eaad0b609690c2cbb178ecb33fd
-EBUILD drupal-9.1.15.ebuild 2084 BLAKE2B 2053adf94a106651a8ddbfdad020ada0f9c77ae92385010b06951eeec155f57d17e58bfb998d9352ea5c018dc58fec8496c2139d41eece9b38c9b7bbd976f34e SHA512 49887557a87456fbadbc526308089e8f7cf734df537dc43447bb264da605502f16f6ceb555f9c8b9220c22cf1feca8666d570eaad0b609690c2cbb178ecb33fd
-EBUILD drupal-9.2.18.ebuild 2083 BLAKE2B f525394e91bfa12ef20be53214504f3a42922340a328a936d3fb9b366b36f6a218164cef8ca7902d0755f54682774d0ee3f9b4087236fe0ebb9eea28b8da3a44 SHA512 8f96f3a0aeded37f8f0d9f2a8152bccc4d07a2397ff050a8221bee57bf75a0b78eca431604c7240ca1db271b8448d201fdb265ea6aafeee11b9cfc1041d24d48
+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
+EBUILD drupal-10.0.2.ebuild 2218 BLAKE2B b451ecec0fff28ac11635145d3ad3dabdab79fd87fb91ce1086136456e9df5769ea347777b6b2432e24c31623e4eb6ccc1a1e7c62ddb07a73c74206ab2d52372 SHA512 7aa2a930f68342691d17493aa9deb9f817623f8582ce153af9a571ab1d8800840353e1c68173211f499a8ac40b12f0a5c52670ebbefbae3d7b456091208d2608
+EBUILD drupal-7.91.ebuild 1546 BLAKE2B 807a97c0eb24a6c6e1cac6f3132bb5ca61c3df24ec4b2f2aee7d18cd43ed8eb67b312b978e934e1962cd024f9cff7eb114071b0cba384fbfaff80e8ce794b2b3 SHA512 19bd15a3163738dd03372668fdb621a1a914b4fa54d8eae1dfaf37c1cab2b952c5087f000695e6b5857469c1235f52ccc5ae856a4b00c681bce5729a0b72cc7d
+EBUILD drupal-9.4.10.ebuild 2067 BLAKE2B 19a4b56c9002b352e7743607cd7355bbe084bc1f1af41d5e8766ebdc5cc0abcf6e9869f54edecf08e79fba5c25b39e683860ddd8fee675c9fcb28b83d7674cbb SHA512 45ccf8af32619440774e7d3022854204d8ff68a4dea1429cf4c248e1f59f40323b0f87f5b5d477b826c62dcee5a1a8a002d01000a2cabdb7ba7562ac008b8c06
+EBUILD drupal-9.5.2.ebuild 2067 BLAKE2B 19a4b56c9002b352e7743607cd7355bbe084bc1f1af41d5e8766ebdc5cc0abcf6e9869f54edecf08e79fba5c25b39e683860ddd8fee675c9fcb28b83d7674cbb SHA512 45ccf8af32619440774e7d3022854204d8ff68a4dea1429cf4c248e1f59f40323b0f87f5b5d477b826c62dcee5a1a8a002d01000a2cabdb7ba7562ac008b8c06
 MISC metadata.xml 382 BLAKE2B 1aadacb731da32a7f383c9d265880568cd74a67c79fdfea2b45bdad9dd55e09b074b6f71097bfc9dd43349f826af4b87a81c4f6ab6647eca5d85d07f9afa9638 SHA512 6a9f00eb8cbfcf407738e3702d14ef8c52c75c4d28f5ce3f25e41fa062dc73a777b344b2a225727e0c1c75c34d1f4ea1eadabdbdd58c296a9d41b64120607a0b
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."