10 files changed, 104 insertions, 185 deletions
diff --git a/dev-php/PEAR-PEAR/Manifest b/dev-php/PEAR-PEAR/Manifest
index 4c5d2a6b24f1..b8a0524643ea 100644
--- a/dev-php/PEAR-PEAR/Manifest
+++ b/dev-php/PEAR-PEAR/Manifest
@@ -1,2 +1 @@
-DIST PEAR-1.10.16.tgz 293781 BLAKE2B 0525e5ac748c5f2690e04b009618fdf3b65d37822844c553f87e50a7356833121b43d95d4ccae394a0ebd388ca078e17e344b9f7ddebc385715e091eb2f3cd9c SHA512 274e642a1c606e0caa9f4c9e4c5fcca69b92b8bcc952dfcb7b8bc1e249eaf04eed2d2caddafe3f722760a723fc1a7d851a404d32115a95f3c3157c91300f0b7b
 DIST PEAR-1.10.18.tgz 294251 BLAKE2B 9a651afbb311b93cc4e86641775287d84cac974bc688e5ca07489b5396b67eb9e4e7161f3e9cc8f71ef3725a6b9597aa2cc10a88258820a5c2692fb525a073bb SHA512 869ca2caa158d6044625c3f4a1edd0acd6bc4096506617d3e1b2b54618c6465120a8197604271e7d4745ea7060658b81b25d5fdc91e07d055909977c7c831ce9
diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.16.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.16.ebuild
deleted file mode 100644
index 4d9cb6e7e16c..000000000000
--- a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.16.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN="${PN/PEAR-/}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="PEAR Base System"
-HOMEPAGE="https://pear.php.net/package/PEAR"
-SRC_URI="https://pear.php.net/get/${MY_P}.tgz"
-S="${WORKDIR}/${MY_P}"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ppc64 ~riscv ~s390 ~sparc x86"
-
-RDEPEND="dev-lang/php:*[cli(-),xml(-),zlib(-)]
-	dev-php/PEAR-Archive_Tar
-	dev-php/PEAR-Console_Getopt
-	dev-php/PEAR-Exception
-	dev-php/PEAR-Structures_Graph
-	dev-php/PEAR-XML_Util"
-
-PATCHES=( "${FILESDIR}/gentoo-libtool-mismatch-fix-v2.patch" )
-
-pkg_setup() {
-	[[ -z "${PEAR_CACHEDIR}" ]] && PEAR_CACHEDIR="${EPREFIX}/var/cache/pear"
-	[[ -z "${PEAR_DOWNLOADDIR}" ]] && PEAR_DOWNLOADDIR="${EPREFIX}/var/tmp/pear"
-	[[ -z "${PEAR_TEMPDIR}" ]] && PEAR_TEMPDIR="${EPREFIX}/tmp"
-
-	elog
-	elog "cache_dir is set to: ${PEAR_CACHEDIR}"
-	elog "download_dir is set to: ${PEAR_DOWNLOADDIR}"
-	elog "temp_dir is set to: ${PEAR_TEMPDIR}"
-	elog
-	elog "If you want to change the above values, you need to set"
-	elog "PEAR_CACHEDIR, PEAR_DOWNLOADDIR and PEAR_TEMPDIR variable(s)"
-	elog "accordingly in /etc/portage/make.conf and re-emerge ${PN}."
-	elog
-}
-
-src_prepare() {
-	default
-	# Exception.php is part of dev-php/PEAR-Exception.
-	rm PEAR/Exception.php || die "failed to remove PEAR/Exception.php"
-}
-
-src_install() {
-	insinto /usr/share/php
-	doins -r PEAR/
-	doins -r OS/
-	doins PEAR.php System.php
-	doins scripts/pearcmd.php
-	doins scripts/peclcmd.php
-
-	newbin scripts/pear.sh pear
-	newbin scripts/peardev.sh peardev
-	newbin scripts/pecl.sh pecl
-
-	# adjust some scripts for current version
-	[[ -z "${PEAR}" ]] && PEAR="${PV}"
-	for i in pearcmd.php peclcmd.php ; do
-		sed "s:@pear_version@:${PEAR}:g" -i "${D}/usr/share/php/${i}" \
-			|| die "failed to sed pear_version"
-	done
-
-	for i in pear peardev pecl ; do
-		sed "s:@bin_dir@:${EPREFIX}/usr/bin:g" -i "${D}/usr/bin/${i}" \
-			|| die "failed to sed @bin_dir@ in ${i}"
-		sed "s:@php_dir@:${EPREFIX}/usr/share/php:g" -i "${D}/usr/bin/${i}" \
-			|| die "failed to sed @php_dir@ in ${i}"
-	done
-
-	sed "s:-d output_buffering=1:-d output_buffering=1 -d memory_limit=32M:g" \
-		-i "${D}/usr/bin/pear" \
-		|| die "failed to set PHP ini values in pear executable"
-
-	sed "s:@package_version@:${PEAR}:g" \
-		-i "${D}/usr/share/php/PEAR/Command/Package.php" \
-		|| die "failed to sed @package_version@"
-
-	sed "s:@PEAR-VER@:${PEAR}:g" \
-		-i "${D}/usr/share/php/PEAR/Dependency2.php" \
-		|| die "failed to sed @PEAR-VER@ in Dependency2.php"
-
-	sed "s:@PEAR-VER@:${PEAR}:g" \
-		-i "${D}/usr/share/php/PEAR/PackageFile/Parser/v1.php" \
-		|| die "failed to sed @PEAR-VER@ in v1.php"
-
-	sed "s:@PEAR-VER@:${PEAR}:g" \
-		-i "${D}/usr/share/php/PEAR/PackageFile/Parser/v2.php" \
-		|| die "failed to sed @PEAR-VER@ in v2.php"
-
-	# finalize install
-	insinto /etc
-	newins "${FILESDIR}"/pear.conf-r2 pear.conf
-
-	sed "s|s:PHPCLILEN:\"PHPCLI\"|s:${#PHPCLI}:\"${PHPCLI}\"|g" \
-		-i "${D}/etc/pear.conf" \
-		|| die "failed to sed PHPCLILEN in pear.conf"
-
-	sed "s|s:CACHEDIRLEN:\"CACHEDIR\"|s:${#PEAR_CACHEDIR}:\"${PEAR_CACHEDIR}\"|g" \
-		-i "${D}/etc/pear.conf" \
-		|| die "failed to sed CACHEDIRLEN in pear.conf"
-
-	sed "s|s:DOWNLOADDIRLEN:\"DOWNLOADDIR\"|s:${#PEAR_DOWNLOADDIR}:\"${PEAR_DOWNLOADDIR}\"|g" \
-		-i "${D}/etc/pear.conf" \
-		|| die "failed to sed DOWNLOADDIRLEN in pear.conf"
-
-	sed "s|s:TEMPDIRLEN:\"TEMPDIR\"|s:${#PEAR_TEMPDIR}:\"${PEAR_TEMPDIR}\"|g" \
-		-i "${D}/etc/pear.conf" \
-		|| die "failed to sed TEMPDIRLEN in pear.conf"
-
-	# Change the paths for eprefix!
-	sed "s|s:19:\"/usr/share/php/docs\"|s:$(( ${#EPREFIX}+19 )):\"${EPREFIX}/usr/share/php/docs\"|g" \
-		-i "${D}/etc/pear.conf" \
-		|| die "failed to sed the docs path (prefix) in pear.conf"
-
-	sed "s|s:19:\"/usr/share/php/data\"|s:$(( ${#EPREFIX}+19 )):\"${EPREFIX}/usr/share/php/data\"|g" \
-		-i "${D}/etc/pear.conf" \
-		|| die "failed to sed the data path (prefix) in pear.conf"
-
-	sed "s|s:20:\"/usr/share/php/tests\"|s:$(( ${#EPREFIX}+20 )):\"${EPREFIX}/usr/share/php/tests\"|g" \
-		-i "${D}/etc/pear.conf" \
-		|| die "failed to sed the tests path (prefix) in pear.conf"
-
-	sed "s|s:14:\"/usr/share/php\"|s:$(( ${#EPREFIX}+14 )):\"${EPREFIX}/usr/share/php\"|g" \
-		-i "${D}/etc/pear.conf" \
-		|| die "failed to sed the PHP include path (prefix) in pear.conf"
-
-	sed "s|s:8:\"/usr/bin\"|s:$(( ${#EPREFIX}+8 )):\"${EPREFIX}/usr/bin\"|g" \
-		-i "${D}/etc/pear.conf" \
-		|| die "failed to sed the bin path (prefix) in pear.conf"
-
-	[[ "${PEAR_TEMPDIR}" != "/tmp" ]] && keepdir "${PEAR_TEMPDIR#"${EPREFIX}"}"
-	keepdir "${PEAR_CACHEDIR#"${EPREFIX}"}"
-	diropts -m1777
-	keepdir "${PEAR_DOWNLOADDIR#"${EPREFIX}"}"
-
-	insinto /usr/share/php/.packagexml
-	newins "${WORKDIR}/package.xml" "${MY_P}.xml"
-}
-
-pkg_config() {
-	# Update PEAR/PECL channels as needed, add new ones to the list if needed
-	elog "Updating PEAR/PECL channels"
-	local pearchans="pear.php.net pecl.php.net pear.symfony-project.com"
-
-	for chan in ${pearchans} ; do
-		# The first command may fail if, for example, the channels have
-		# already been initialized.
-		pear channel-discover ${chan}
-		pear channel-update ${chan} || die "failed to update channels: ${chan}"
-	done
-}
-
-pkg_postinst() {
-	pear clear-cache || die "failed to clear PEAR cache"
-
-	elog "Run 'emerge --config =${PF}' to automatically update the PEAR/PECL channels while online."
-
-	# Register the package from the package.xml file
-	# It is not critical to complete so only warn on failure
-	if [[ -f "${EROOT}/usr/share/php/.packagexml/${MY_P}.xml" ]] ; then
-		"${EROOT}/usr/bin/peardev" install -nrO --force \
-			"${EROOT}/usr/share/php/.packagexml/${MY_P}.xml" 2> /dev/null \
-			|| ewarn "Failed to insert package into local PEAR database"
-	fi
-}
-
-pkg_prerm() {
-	# Uninstall known dependency
-	"${EROOT}/usr/bin/peardev" uninstall -nrO "pear.php.net/PEAR"
-}
diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.18.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.18.ebuild
index ce8ef66bdbda..4d9cb6e7e16c 100644
--- a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.18.ebuild
+++ b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.18.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://pear.php.net/get/${MY_P}.tgz"
 S="${WORKDIR}/${MY_P}"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="dev-lang/php:*[cli(-),xml(-),zlib(-)]
 	dev-php/PEAR-Archive_Tar
diff --git a/dev-php/PHPMailer/Manifest b/dev-php/PHPMailer/Manifest
index f3163143f556..03a599751104 100644
--- a/dev-php/PHPMailer/Manifest
+++ b/dev-php/PHPMailer/Manifest
@@ -1 +1 @@
-DIST PHPMailer-6.9.1.tar.gz 109263 BLAKE2B 97820b1fb941e120839d89d928661b218555ebb58f2ccd25ed4236a656f4f48f518e7522ad5d2eb60a9d038e5e0ebdc9198597d6f1c82eb91de8953c71adeced SHA512 a02d95405ffbfdc26d214d091508c8cd61e07b7285f264cc1c7bdf6bb1427b6cdde759b627710fb20cb988ded9299bfec85e61e5749932c245e79262d6f21c06
+DIST PHPMailer-7.1.1.tar.gz 120033 BLAKE2B f4baa3d9ec29f73c8dbaae292441a70432f499f97d0834adcf9e7c26d61db9110b0f0a27b52681d931a06d9145678310dd1293495c01b657fd1c6defcd9ec29c SHA512 931bf115f70fc545c41b4611b3366ad138720131624d8abc720e801182f2376102676a8a89389abd76ad8293c1804c5c747b083b43f2513ade156d52dcd64a94
diff --git a/dev-php/PHPMailer/PHPMailer-6.9.1.ebuild b/dev-php/PHPMailer/PHPMailer-7.1.1.ebuild
index ebb698c6a0d5..f839bd142dcb 100644
--- a/dev-php/PHPMailer/PHPMailer-6.9.1.ebuild
+++ b/dev-php/PHPMailer/PHPMailer-7.1.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=8
+EAPI=9
 
 DESCRIPTION="Full-featured email creation and transfer class for PHP"
 HOMEPAGE="https://github.com/PHPMailer/PHPMailer"
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 
 # To help out the Composer children, the tests and examples are missing
 # from the release tarballs.
@@ -40,7 +40,8 @@ src_install() {
 	insinto "/usr/share/php/${PN}"
 	doins -r language src
 
-	dodoc README.md SECURITY.md
+	# UPGRADING.md and changelog.md are missing
+	dodoc README.md SECURITY.md SMTPUTF8.md
 }
 
 pkg_postinst() {
diff --git a/dev-php/adodb/Manifest b/dev-php/adodb/Manifest
index 51262f31db99..4228f863f32c 100644
--- a/dev-php/adodb/Manifest
+++ b/dev-php/adodb/Manifest
@@ -1 +1,2 @@
+DIST adodb-5.22.12.tar.gz 451313 BLAKE2B f59a770d6686a99805faebefd20fdaba04efe1789ec3c21f8db48ffc26a8621ef8b69a70186c6a6756def171e5c3b1ad902d5152a9cff2aa60ad24da38479d35 SHA512 7517a879b48be6a276cf3662a0878edffd8a3c4bfbb70cb7fc739db96b8e1c20bf05da72bfd2d80b73ccf652290330c079cb6a0c3eb7f998f4eb4958e901fb4b
 DIST adodb-5.22.7.tar.gz 447580 BLAKE2B 1d8e6518155585f7e82f697e463832c4d798dce0bc59fb4a068aef7430945fe7cbfb7112b150f36fc91fb9555189276032da420bec68a71c6438c1d513dd3594 SHA512 731e5def40699bc445b9ef44585b7db6f890d977aaafaac58ea1fcfadd9d89d00871a279549f6e8ff683fe56f7061d78cdc2457e99ed0636a8497cae44bddc99
diff --git a/dev-php/adodb/adodb-5.22.12.ebuild b/dev-php/adodb/adodb-5.22.12.ebuild
new file mode 100644
index 000000000000..47bb25b8bdaf
--- /dev/null
+++ b/dev-php/adodb/adodb-5.22.12.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=9
+
+MY_PN="ADOdb"
+DESCRIPTION="Database abstraction layer for PHP"
+HOMEPAGE="https://adodb.org/ https://github.com/ADOdb/ADOdb"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="BSD LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~riscv ~sparc ~x86"
+
+# If you want to be picky, we should require that PHP be built with at
+# least one database driver enabled; otherwise adodb isn't going to be
+# able to do anything. But, the database USE flags for dev-lang/php are
+# a mess. What we would *like* to do is have a set of USE flags for
+# adodb that then propagate to PHP itself... for example, adodb[mysql]
+# could require php[mysql]. To do that would require that we duplicate
+# the database USE flag mess for adodb -- not desirable. Instead we punt
+# and let the user install adodb unconditionally. If he doesn't have
+# database support in PHP, it just won't work.
+RDEPEND="dev-lang/php:*"
+
+src_install() {
+	DOCS="README.md docs/changelog*.md xmlschema*.dtd session/*.sql"
+	DOCS+=" session/*.txt session/*.xml pear/auth_adodb_example.php"
+	DOCS+=" pear/readme.Auth.txt"
+
+	dodoc ${DOCS}
+	rm -f ${DOCS} || die "failed to remove docs before installation"
+
+	insinto "/usr/share/php/${PN}"
+	doins *.php
+	doins -r datadict drivers lang pear perf session xsl
+}
diff --git a/dev-php/adodb/metadata.xml b/dev-php/adodb/metadata.xml
index 3a6bd95fbdf5..ba8317ff47ce 100644
--- a/dev-php/adodb/metadata.xml
+++ b/dev-php/adodb/metadata.xml
@@ -5,9 +5,5 @@
     <email>php-bugs@gentoo.org</email>
     <name>PHP</name>
   </maintainer>
-  <maintainer type="person">
-    <email>mjo@gentoo.org</email>
-    <name>Michael Orlitzky</name>
-  </maintainer>
   <origin>srcux</origin>
 </pkgmetadata>
diff --git a/dev-php/smarty/Manifest b/dev-php/smarty/Manifest
index bf76715a4a1c..18ad341aecd4 100644
--- a/dev-php/smarty/Manifest
+++ b/dev-php/smarty/Manifest
@@ -1 +1,2 @@
 DIST smarty-4.3.1.tar.gz 361248 BLAKE2B b09ab14742b9ebdfd1e31ec9d2ac79016ce8869403da67ea241b735875ef25f40c2936a41bda5647ca697b708b91b02a29f5d17ebbc7d6049bf468851f0bc70f SHA512 03a42007fd1c03ba502b7a2255071638e978a54e5d75d4542a033e9f490c7c41587b5593316269107fe904a7b96a1a3337bf9525e038a5bb4051cc9aef13940f
+DIST smarty-5.8.5.tar.gz 345251 BLAKE2B 7091e6597795360dc5e84bd85109b680f56fbaead2e2cbd72b52e0cc88e02d90f3721b353f835efa0fc1cbf99f9085f042aac53cac22fe56fea8823cfffa2f20 SHA512 c9cb7f893b66e271fac14db88a1b15d321023417079414ceb33ec03bf77e3ec80bb6db88007e3f8a7ef242d0dd50d831228f26ed43eaa30a0a0777fcee9dce88
diff --git a/dev-php/smarty/smarty-5.8.5.ebuild b/dev-php/smarty/smarty-5.8.5.ebuild
new file mode 100644
index 000000000000..531fc842611f
--- /dev/null
+++ b/dev-php/smarty/smarty-5.8.5.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=9
+
+DESCRIPTION="A template engine for PHP"
+HOMEPAGE="https://www.smarty.net/ https://github.com/smarty-php/smarty/"
+SRC_URI="https://github.com/smarty-php/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc64 ~riscv ~sparc ~x86"
+IUSE="doc examples"
+
+# PHP unicode support is detected at runtime, and the cached templates
+# that smarty generates depend on it. If, later on, PHP is reinstalled
+# without unicode support, all of the previously-generated cached
+# templates will begin to throw 500 errrors for missing mb_foo
+# functions. See bug #532618.
+RDEPEND="dev-lang/php:*[unicode]"
+
+src_prepare() {
+	default
+
+	# Prepare the docs and examples for easy dodocing.
+	rm docs/_config.yml || die
+	mv -v demo examples || die
+}
+
+src_install() {
+	insinto "/usr/share/php/${PN}"
+	doins -r libs src
+
+	local DOCS=(
+		CHANGELOG.md
+		CONTRIBUTING.md
+		README.md
+		SECURITY.md
+		TODO.txt
+	)
+
+	use doc && dodoc -r docs/*
+	use examples && dodoc -r examples
+	einstalldocs
+}
+
+pkg_postinst() {
+	elog "${PN} has been installed in /usr/share/php/${PN}/."
+	elog
+	elog 'To use it in your scripts, include the Smarty.class.php file'
+	elog "from the \"${PN}\" directory; for example,"
+	elog
+	elog "  require('${PN}/libs/Smarty.class.php');"
+	elog
+	elog 'After that, the Smarty class will be available to you.'
+}