gentoo resync : 14.08.2021

5 files changed, 68 insertions, 9 deletions

diff --git a/www-apps/drupal/Manifest b/www-apps/drupal/Manifest
index 34cd0b3524c7..f7eda23d9506 100644
--- a/www-apps/drupal/Manifest
+++ b/www-apps/drupal/Manifest
@@ -1,10 +1,11 @@
 AUX postinstall-en.txt 1730 BLAKE2B b335309795d753c7689338c5e94b596efa5f66dc8dee17ad30b1a2d10b694a7bc288597b526239ea1d443887b45b8cd8ef89b499b79e86ab5df1c195ee85d4a0 SHA512 4ae14616c49e6aa61dc781350b5a75defefc2f894b98422a5b69a5827e367eb00fce140e6a45bcc02c90f068fc31970512d2632bbbf398cbe34f947933990050
 DIST drupal-7.82.tar.gz 3348407 BLAKE2B c01c93fda768d587a009c9007a019f01461ae3fed1010c80a4636971fcdf4ce97e1cad61a60b447698d8e2d6d39217ead52de3cf915f04ad620357aafb3209a0 SHA512 41b844df868971ea21fa574daf46502edcb78f4287c223694fe967541da72dfe9b360e1764441eddafb64b782d14408eac58ecff7eaed4bc1fd832b35f0c7e2d
-DIST drupal-8.9.17.tar.gz 19829635 BLAKE2B 58ff2623121ab1a283e5d89bc5983154f5c040c024ceaa3728d5a54b1a519b72d4c834b9535f5de38df11217a2e25f8e18225d6ea521b0e5f51fa9c7b29f337f SHA512 7c805092a182d660dec9d060662cb510debb4732ddce616089c32df8c12e4c945b25c904c8bf3b186e868e2a33615cb5483651e9aea0b51f5cb47ec55e8ab55d
-DIST drupal-9.1.11.tar.gz 18572070 BLAKE2B b1c2ad47bb9d36b47b6a74569b825fbf0ecb4e1ad951397778fd14c8eed9e633b685bbcbadae15b346d8c5944e53a4001c55e85d54a512aa639427054b90d0d3 SHA512 ac20865dc9791883fd684a455e753baedd1abc4f77617af5d1f57ba547a2c21f93909724919393a26058654592d68210d493fba9a593700239aa58b9f7939ddd
-DIST drupal-9.2.3.tar.gz 18860238 BLAKE2B c5a482d3a46aea128e92525d2339b26d68d3e92f11588643e5010dd4f36fab15df06203d02797badad0dd7519dfec0403b30bc02aa7ec72c8099c2281eb54f8f SHA512 9caaf1fe050ba1727f036a8aa0ecc0adde55ea37a66bd6e437602a86bedf368be86d0d0577ebc05d56615d161f93229026067f8c10ac6a656bd564a29229621d
+DIST drupal-8.9.18.tar.gz 19831928 BLAKE2B e8f42a00e8efe1c3a0b7a995bb9f55b37c590945f12268e86887f0243ab2691222449acce5f61d4ec853e0d13bb81b2d8d39a7702c2651368adaaa2438004114 SHA512 2c3103489d4b7ecee432fba1a1ef597b07701e46920a4cf82fc9d078368a0259a28e62e92a96550b23950c4ff6ae943877f7b8f6ef556381bf633daa3d4d0846
+DIST drupal-9.1.12.tar.gz 18568186 BLAKE2B 74f20477867adc92eb6a87d2e3f4bd9449a69c66c723a03af9789d99f913a839324406aedaca1c731b5616fbde70bbd8e1a5fc469b2cc259385655fae0209176 SHA512 43335b11cddfd73271afa66c825316d48b0dece4d221119c571629ee8d61aeeea85d48674bc53a479b954d3f24648cd7571c4b6c84e560abae8bb682abf3468e
+DIST drupal-9.2.4.tar.gz 18860644 BLAKE2B f7ed7f5bd4131c0a167fe5c51c54fa7499bf4cecab9ce41fed1516eba842e40ea1191e51a1e2cb4a0f5426d86803b511a57d08f056ad8635ca2a55496e0b1237 SHA512 956a1c62fd9294f7d5fa1de3d620fea71db08c4ccea6c8d575e5c2cd6f06afd8380601be5a66d7f3ed4c78bfde9a1d2fd662a7fcd2f16b4484fee298b8cdd93b
+EBUILD drupal-7.82-r1.ebuild 1546 BLAKE2B e9a5f5e2cffc4d3fa64a077a45b61e6cf0550f02eb993cd0d6247ed18a98ee88d2c72af9dff61ddd5a027cc868f3cf7ae80c3b01eb04729c1a44e81538bc4523 SHA512 58927bb745f64c642c819af3192a21ea1e944b03aed1c30c15c82101db55aaf1241b764366cf175688776bbbe30ec120d0c0a2314ca85265bb06c1db597c8258
 EBUILD drupal-7.82.ebuild 1546 BLAKE2B 4049ed833958fdfebbf89a1ec584c06a66d92297b1cf71978cbb3956455959c91b920716a14cbf893d59bc1c2b97e324c97f3aa70f276ceff8ee6de8f1d992ee SHA512 902f0456f711369d90eb172e2049a1af86aade03293712208b13635fefce0786550d1b16a6bd88dccfedf4f3431993bec03b874c975016697911f1610dd23ceb
-EBUILD drupal-8.9.17.ebuild 2084 BLAKE2B 9eb091e4672abddd5dddcaebacef7a1c08ec965ed95d7fe2e7c145ba8c0a6a5d2a9fb3f16ca6a51b6b8609784891bccd1b5478d1fa8bfef7a1a099b3670b0948 SHA512 1bee0a01ca06ff0b31361a31e246e3ce045b7a833e86f219d9fa66cbd7ec188e075e1f0e554b89c2a6ab2d0f90b8d7dcb9b0c06b0e78087dc261196ae5965516
-EBUILD drupal-9.1.11.ebuild 2084 BLAKE2B 9eb091e4672abddd5dddcaebacef7a1c08ec965ed95d7fe2e7c145ba8c0a6a5d2a9fb3f16ca6a51b6b8609784891bccd1b5478d1fa8bfef7a1a099b3670b0948 SHA512 1bee0a01ca06ff0b31361a31e246e3ce045b7a833e86f219d9fa66cbd7ec188e075e1f0e554b89c2a6ab2d0f90b8d7dcb9b0c06b0e78087dc261196ae5965516
-EBUILD drupal-9.2.3.ebuild 2083 BLAKE2B 80ecce0204acf38f4d736e1c6196e14fabef35bf119f82f19a47eb14e24a7b02ee57f505918019da0774bd7cf399980caafb0c7de18ba577f3d80d1ec2476283 SHA512 6c9272dbb28754e98726a6cb189e74d42497c5f67b53852a3945c1d7d74b514f34efd3b3b0488c136f643028162dcd5cbdb82890e62b219395d21487ebdb5871
+EBUILD drupal-8.9.18.ebuild 2084 BLAKE2B 5a3b2579563ff0e2060f89fa436dbf0853e4377d9aca0f5e656a344c1fb1ef6ea844adda1e8ca49738e25b0e633ce198df167b5582c02277799c6a703080852a SHA512 faaca53d7a6196ea8ff850d3c4fc9a9751d6f1e8b2e7ccd5ae9507ddefe6a4a585b666f03fe9b7d1276a38fd57fd1ac5b05b5b74b0fe9d29ae35fe079d5644d0
+EBUILD drupal-9.1.12.ebuild 2084 BLAKE2B 5a3b2579563ff0e2060f89fa436dbf0853e4377d9aca0f5e656a344c1fb1ef6ea844adda1e8ca49738e25b0e633ce198df167b5582c02277799c6a703080852a SHA512 faaca53d7a6196ea8ff850d3c4fc9a9751d6f1e8b2e7ccd5ae9507ddefe6a4a585b666f03fe9b7d1276a38fd57fd1ac5b05b5b74b0fe9d29ae35fe079d5644d0
+EBUILD drupal-9.2.4.ebuild 2083 BLAKE2B 512d1f32d328c2d45d079230861b93bf4acd41123f1c1ba9806d7e4c1f6f21eca1580dc4933fad882ba89c15c5558fa22def3eb697d9b10f331f8968d9d01531 SHA512 213b9364b57d673d3ef572cd0257b3017cf1fdb38e31991a8b1faa7898269df4e0f28ad517f719132265447c5631f00cb04b2d914f52964f28fee7f2abcccca1
 MISC metadata.xml 381 BLAKE2B 3c01944b3e66963bbd236a45dfb708c17e9d80e050a245316cc0d9ed2c94db2f882fe57ee2f7e0ec6285da21bb860b1eae48f470f449d1f4129ac83669a8d2bc SHA512 9b69d4241578d4e3e972d2910df1eea4506092e0f6511f30df5c7b2136db05b3a0b34978875f12cc3fe5c40f165da33fde01bd831271b928ebefbaf3a8231444
diff --git a/www-apps/drupal/drupal-7.82-r1.ebuild b/www-apps/drupal/drupal-7.82-r1.ebuild
new file mode 100644
index 000000000000..fab5db976ab2
--- /dev/null
+++ b/www-apps/drupal/drupal-7.82-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit webapp
+
+MY_PV=${PV:0:3}.0
+
+DESCRIPTION="PHP-based open-source platform and content management system"
+HOMEPAGE="https://www.drupal.org/"
+SRC_URI="https://ftp.drupal.org/files/projects/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="+mysql postgres sqlite +uploadprogress"
+
+RDEPEND="
+	dev-lang/php[gd,hash(+),mysql?,pdo,postgres?,simplexml,sqlite?,xml]
+	virtual/httpd-php
+	uploadprogress? ( dev-php/pecl-uploadprogress )
+"
+
+need_httpd_cgi
+
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+src_install() {
+	webapp_src_preinst
+
+	local docs="MAINTAINERS.txt LICENSE.txt INSTALL.txt CHANGELOG.txt INSTALL.mysql.txt INSTALL.pgsql.txt INSTALL.sqlite.txt UPGRADE.txt "
+	dodoc ${docs}
+	rm -f ${docs} INSTALL COPYRIGHT.txt || die
+
+	cp sites/default/{default.settings.php,settings.php} || die
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	dodir "${MY_HTDOCSDIR}"/files
+	webapp_serverowned "${MY_HTDOCSDIR}"/files
+	webapp_serverowned "${MY_HTDOCSDIR}"/sites/default
+	webapp_serverowned "${MY_HTDOCSDIR}"/sites/default/settings.php
+
+	webapp_configfile "${MY_HTDOCSDIR}"/sites/default/settings.php
+	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	echo
+	ewarn "SECURITY NOTICE"
+	ewarn "If you plan on using SSL on your Drupal site, please consult the postinstall information:"
+	ewarn "\t# webapp-config --show-postinst ${PN} ${PV}"
+	echo
+}
diff --git a/www-apps/drupal/drupal-8.9.17.ebuild b/www-apps/drupal/drupal-8.9.18.ebuild
index 1fa351c0c00f..421034d30ee7 100644
--- a/www-apps/drupal/drupal-8.9.17.ebuild
+++ b/www-apps/drupal/drupal-8.9.18.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 webapp
 
diff --git a/www-apps/drupal/drupal-9.1.11.ebuild b/www-apps/drupal/drupal-9.1.12.ebuild
index 1fa351c0c00f..421034d30ee7 100644
--- a/www-apps/drupal/drupal-9.1.11.ebuild
+++ b/www-apps/drupal/drupal-9.1.12.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 webapp
 
diff --git a/www-apps/drupal/drupal-9.2.3.ebuild b/www-apps/drupal/drupal-9.2.4.ebuild
index 23610d15a891..2830cbc4184c 100644
--- a/www-apps/drupal/drupal-9.2.3.ebuild
+++ b/www-apps/drupal/drupal-9.2.4.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 webapp