8 files changed, 7 insertions, 83 deletions
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 8caa5abad520..bebe7d3cde88 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/PHPMailer/Manifest b/dev-php/PHPMailer/Manifest
index 8eb9d6aeb19e..051b0faa160f 100644
--- a/dev-php/PHPMailer/Manifest
+++ b/dev-php/PHPMailer/Manifest
@@ -1,5 +1,3 @@
-DIST PHPMailer-6.5.0.tar.gz 99073 BLAKE2B dcb917233da29ab45305f7cf0405f9bb384bd4f98f062a74d94a168868d0cd92017e555bf8e7139130dd669e0a04917e3789c548b5165112d591aa403bfd56b8 SHA512 0632ec8b80c30393b00aebbadde7dd032eb2553232a100a74d69b6ed6465adf1eb3a4acca0aaf040665a978e7507aee9350b092336056ccb5306fbaea4640376
-DIST PHPMailer-6.6.4.tar.gz 102883 BLAKE2B d05eca221b3058e6632ab47c3d93d5f5cc76333351c75af537642a7850c5fb77c825e53a77321e4a63d7b06e41afb468e4dd5fe2f9b5f045ae8ed6f8543ef2ac SHA512 94ef038b59f8cf840205993d994070228a4237a19c153a0a9486e68a0289468cd882b2450482bdafb15f163c526c723dff3903919de872c6888b49273b718e87
-EBUILD PHPMailer-6.5.0.ebuild 2195 BLAKE2B 54fd8e6fb8cf1e7907a2055e2e8b035638c46c8c0136be68b5889b1dbcfe82206575b02f1302a5a22dca3171d9b79a03cb71ebbfe9565aaf7c298eca4ec47b20 SHA512 71791e9219d29b6006e0092fa82f646770b8703891be17bc6559f8c0ce4441c3efa37ec2619d807ee51185a54da259919261e94b2d38372a766c57624cca6600
-EBUILD PHPMailer-6.6.4.ebuild 1652 BLAKE2B 0f9c349e45be6d1ac24bd379242ee9173617fb3150207abc095eb6bcab9a8fd88b53b5d6ae90b5a825a3100ca9406b99a4ccc5f30129cdb41bd54ea9f02129e2 SHA512 ef2f7e28eb2144f799378a532a470670f832f5fa617b6c44707c1062268ec46652962f8ff79c25a1a1455e7a602a24df2ad8a6cd6231b552118fed5fe114e539
+DIST PHPMailer-6.9.1.tar.gz 109263 BLAKE2B 97820b1fb941e120839d89d928661b218555ebb58f2ccd25ed4236a656f4f48f518e7522ad5d2eb60a9d038e5e0ebdc9198597d6f1c82eb91de8953c71adeced SHA512 a02d95405ffbfdc26d214d091508c8cd61e07b7285f264cc1c7bdf6bb1427b6cdde759b627710fb20cb988ded9299bfec85e61e5749932c245e79262d6f21c06
+EBUILD PHPMailer-6.9.1.ebuild 1652 BLAKE2B 8b2c399150567017dbb5f77872e1980fcc348baab43e9220495057041fff62081118c084660fc4319fc99804813b96784c8f9f2954cf5039fec5b3ccffd19249 SHA512 af2a47e0aec93136047a00406996e17e1cf61c0eac6799761a768c3637c779caaf77fdc7a8a8dccd2c69b16c49687032bcdd05ada2e53b7964bbded927d6bf36
 MISC metadata.xml 447 BLAKE2B 267c5bf8eba34e8fd47ff627f3cfc985cbff2b04e7b7817fc469e56448e8cc33963e6d3d3ffce03c59c3683150ac7058fa7cac673007473b4f71fe444712dd2b SHA512 fe99f30e2478b07b6da9d964a5486945199e65851cc9d9b174581bec0bc6c0f457ed0619a1f5868cbf23c07a78b6c68fe70e2686ab88a496c88f908865ce7cdf
diff --git a/dev-php/PHPMailer/PHPMailer-6.5.0.ebuild b/dev-php/PHPMailer/PHPMailer-6.5.0.ebuild
deleted file mode 100644
index 48dc349297f3..000000000000
--- a/dev-php/PHPMailer/PHPMailer-6.5.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Full-featured email creation and transfer class for PHP"
-HOMEPAGE="https://github.com/PHPMailer/PHPMailer"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# To help out the Composer children, the tests and examples are missing
-# from the release tarballs.
-IUSE="doc idn ssl"
-
-# The ctype and filter extensions get used unconditionally, with no
-# fallback and no "extension missing" exception. All of the other
-# extensions are technically optional, depending on how you use
-# PHPMailer and whether or not you're willing to settle for fallback
-# implementations.
-#
-# The insane dependency string is to prevent the ctype and filter
-# extensions from being provided by one version (i.e. slot) of PHP,
-# while intl and unicode are provided by another.
-RDEPEND="
-	ssl? (
-		idn?  ( dev-lang/php:*[ctype,filter,intl,ssl,unicode] )
-		!idn? ( dev-lang/php:*[ctype,filter,ssl] )
-	)
-	!ssl? (
-		idn?  ( dev-lang/php:*[ctype,filter,intl,unicode] )
-		!idn? ( dev-lang/php:*[ctype,filter] )
-	)"
-BDEPEND="doc? ( dev-php/phpDocumentor )"
-
-src_prepare() {
-	default
-
-	# OAuth.php relies on a (now non-nonexistent) autoloader. We remove
-	# it early so that we don't generate documentation for it later on.
-	rm src/OAuth.php || die 'failed to remove src/OAuth.php'
-}
-
-src_compile() {
-	if use doc; then
-		phpdoc --filename="src/*.php" \
-			--target="./html" \
-			--cache-folder="${T}" \
-			--title="${PN}" \
-			--sourcecode \
-			--force \
-			--progressbar \
-			|| die "failed to generate API documentation"
-	fi
-}
-
-src_install() {
-	# The PHPMailer class loads its language files
-	# using a relative path, so we need to keep the "src" here.
-	insinto "/usr/share/php/${PN}"
-	doins -r language src
-
-	dodoc README.md SECURITY.md
-	use doc && dodoc -r html/*
-}
-
-pkg_postinst() {
-	elog "${PN} has been installed in /usr/share/php/${PN}/."
-	elog "Upstream no longer provides an autoloader, so you will need"
-	elog "to include each source file (for example: PHPMailer.php,"
-	elog "Exception.php,...) that you need."
-}
diff --git a/dev-php/PHPMailer/PHPMailer-6.6.4.ebuild b/dev-php/PHPMailer/PHPMailer-6.9.1.ebuild
index ec7c08d4385e..ebb698c6a0d5 100644
--- a/dev-php/PHPMailer/PHPMailer-6.6.4.ebuild
+++ b/dev-php/PHPMailer/PHPMailer-6.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-php/maxmind-db-reader/Manifest b/dev-php/maxmind-db-reader/Manifest
index 7faed580c5d8..2d2d5f5a4b71 100644
--- a/dev-php/maxmind-db-reader/Manifest
+++ b/dev-php/maxmind-db-reader/Manifest
@@ -1,3 +1,3 @@
 DIST MaxMind-DB-Reader-php-1.11.1.tar.gz 23346 BLAKE2B ad783bbca018befa0f4c6f282bb440baf70ad2c91da0af8fb799ae727a5fc7f9acc1f004972ccc8f358272be2d9fbe4233b0d3526347db175ccc5eb140d139d3 SHA512 86b5cf523d0036a55e79f0721b7df923236146e0d29a9dc37affd61a4ba4bc0587a724aef0654239d009bb85eae4be6e42c2d63a5d2edf682fa90abdfbd234f0
-EBUILD maxmind-db-reader-1.11.1.ebuild 2223 BLAKE2B 9eeffd69d3791e23f27ba5960e02805f7e80f48d936a85dc814c25aacbb2b81d5394db84b5347d7bfe1d5ef1e2b28e73d6d12dd1e8d21b4bec8e543141a8ba94 SHA512 d03d0f55379d48d518cf559d0aa2cb33180da20a085b57e5d1c084f863e11c8317c9386ddd016acdbba58d5d8d3588784240862ae4e81ddc01acb5b9e9995c7d
+EBUILD maxmind-db-reader-1.11.1.ebuild 2222 BLAKE2B 2f7c4b696b24ac0a206044131967929c8326deb89de6f401877c7b74f17937c87f6af3537fcc0d69479ab373238f389d16c45093e9b072a9e95f198891192a03 SHA512 d6cd88b1b15e93685ec4624540fdb58314438215f5c0e4d3cdbf5b28ca2c69785f4b1c954dd3f8a5098f544057bbb3a2547e47e9a592924e94cfd48854bd9b5d
 MISC metadata.xml 586 BLAKE2B 69b8c42dc80e3b164f2287e0c65732ad0d5bc53ab1062e651dd85e21d5fdfb6a1e9990cd4d78077f2dcf73e2c8689e7be6a34c11cfd3ed8690a41a8a737e6246 SHA512 5604ac300486eaeb0bfd52d5a95438843b031eef15162438374e6126ace92327a64cb692a549d301f245fd6622856e973c9dbde60d2dcd398c667a9f8fa1fd5b
diff --git a/dev-php/maxmind-db-reader/maxmind-db-reader-1.11.1.ebuild b/dev-php/maxmind-db-reader/maxmind-db-reader-1.11.1.ebuild
index 4486a2880177..1c8ee77c1c80 100644
--- a/dev-php/maxmind-db-reader/maxmind-db-reader-1.11.1.ebuild
+++ b/dev-php/maxmind-db-reader/maxmind-db-reader-1.11.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/maxmind/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.ta
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="extension test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-php/pecl-uploadprogress/Manifest b/dev-php/pecl-uploadprogress/Manifest
index 74f8e9ad4542..32cd5ece9938 100644
--- a/dev-php/pecl-uploadprogress/Manifest
+++ b/dev-php/pecl-uploadprogress/Manifest
@@ -1,4 +1,4 @@
 AUX php-debug-testfix.patch 3125 BLAKE2B b7481ae979c468d0770d6ad2452cbac58b04a32845a0aa447eadf762f752cf6e363777760104d810a0ace60166f00ad003a23fa1363d0e1213c8cbada3288981 SHA512 de822c759a901c66ba9834090911703cf71623d5499723fc0ddc87e45176393ed94edc15b41029ce9d725320b8588646d877d060f8425cf1f77821b382a3ccf7
 DIST uploadprogress-2.0.2.tgz 19969 BLAKE2B 148cac83b00eb6b4f23861a04829280346957cdfc5bdbe94d687d0efb5da97b5f48162c59b07e0830a67350c7a2aa9a3085a4575f07b32016b01845301f04843 SHA512 b9ee5a09c3de78d58abd34da2d25d7b0cad38416309a9a69192f07e0c3fe2259de261bb3dee571e64e042753f861738ebcd67fa7fafeb595ec32ed3034c773cd
-EBUILD pecl-uploadprogress-2.0.2-r1.ebuild 604 BLAKE2B 6cb5553df7e1464f6581e9e42dbe0fec0c03418e901e54fd87a4f124bdf41155dbb6a36b3b5215f4d02a1d35193a3f71770eb5be6ccfc0cf55dfeb3616e364d0 SHA512 c169d5e153a259f149b47383b2aac15ae43c6e2b49eb047fc0858a233442487b89170f056dbcf93bb017850226034619b75b5cbb21fc08b03edd6b0b63d0ba2b
+EBUILD pecl-uploadprogress-2.0.2-r1.ebuild 603 BLAKE2B 1df3aeeebc661e588e285980f3d7fee3225aa6f84401b15ed4f3eb97dd8d7d47bf39f023587f95ff2162c7de4f1f7012d6416e08e3715ef8c2892db2e360bf8b SHA512 0819dac0bc45d783c5b8284305dd7f58fb474ab03060e59955923b6d28472ed854b683cfa6b77ef93c40bb91f0e912e84d7403fea7614b41704d775a1c5be39f
 MISC metadata.xml 711 BLAKE2B 6f64caf4b0734172e21382f36ea71f7e9f07e998eaad39045ef975dc16c75201508532056d15b3d1f87b241651a2d4d207e23f9c04494954f09a1c0e2d6536c2 SHA512 9edb41bdb677b1a9360676db7bb54dcf00860a1c71c9129fffe75944f6f7b02473911088bb759009d33f7aa72c388d9c73a0a6c1935ee0426aef706dbbe1818e
diff --git a/dev-php/pecl-uploadprogress/pecl-uploadprogress-2.0.2-r1.ebuild b/dev-php/pecl-uploadprogress/pecl-uploadprogress-2.0.2-r1.ebuild
index 0c9d9f1e1d73..8f0ce73861dc 100644
--- a/dev-php/pecl-uploadprogress/pecl-uploadprogress-2.0.2-r1.ebuild
+++ b/dev-php/pecl-uploadprogress/pecl-uploadprogress-2.0.2-r1.ebuild
@@ -11,7 +11,7 @@ inherit php-ext-pecl-r3
 DESCRIPTION="An extension to track progress of a file upload"
 LICENSE="PHP-3.01"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="examples"
 
 PATCHES=( "${FILESDIR}/php-debug-testfix.patch" )