[gentoo-commits] repo/gentoo:master commit in: dev-php/PHPMailer/

[Michael Orlitzky]

commit:     220b539b6c9b45ab4790003a634c7963028a3e25
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 19 21:27:35 2017 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Tue Dec 19 21:33:46 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=220b539b

dev-php/PHPMailer: new version 5.2.26.

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 dev-php/PHPMailer/Manifest                                    |  2 +-
 .../{PHPMailer-5.2.23-r1.ebuild => PHPMailer-5.2.26.ebuild}   | 11 +++--------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/dev-php/PHPMailer/Manifest b/dev-php/PHPMailer/Manifest
index 55816c0f23d..405e395db4f 100644
--- a/dev-php/PHPMailer/Manifest
+++ b/dev-php/PHPMailer/Manifest
@@ -1 +1 @@
-DIST PHPMailer-5.2.23.tar.gz 157335 BLAKE2B 
55f4d4ed09dcff6caf00491102232c211be912b8ea450e35833a0006b408c7de586c58b02b614079c4ede2bbc648548a020f94193b4f54d98d7102fd4d78d62e
 SHA512 
6442538a5a9bfbe704379cd7dbc1634b4d8d6865421b7fac4c67e8ced03173f6b533651033681c2e8814ad9b22b2b3276c23169cdd7ba04878b710533cade65f
+DIST PHPMailer-5.2.26.tar.gz 159174 BLAKE2B 
989ee85f6ca374bd7f4accf3d18fbd173bbbd3176e6846c9a2aec68f3bfca4ead4e0197f6287e2bc8ed4a125bf7fcb53240a1f8ce6a1813eaffb66067c2c4e9e
 SHA512 
4c3e324ecd1dd23eb40f14ee785fb9b353b742ff4fb26fe0586622038157e60d64560f5ba4a625f16fad6568954d685ebbe436d88bc427d5bd260c056815b656

diff --git a/dev-php/PHPMailer/PHPMailer-5.2.23-r1.ebuild 
b/dev-php/PHPMailer/PHPMailer-5.2.26.ebuild
similarity index 88%
rename from dev-php/PHPMailer/PHPMailer-5.2.23-r1.ebuild
rename to dev-php/PHPMailer/PHPMailer-5.2.26.ebuild
index e5e14253a05..aad616dc2ce 100644
--- a/dev-php/PHPMailer/PHPMailer-5.2.23-r1.ebuild
+++ b/dev-php/PHPMailer/PHPMailer-5.2.26.ebuild
@@ -12,17 +12,12 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc +examples"
 
-RDEPEND="dev-lang/php:*"
+# The ctype and filter dependencies can be verified by grepping the
+# code... composer.json isn't always up-to-date.
+RDEPEND="dev-lang/php:*[ctype,filter]"
 DEPEND="${RDEPEND}
        doc? ( dev-php/phpDocumentor )"
 
-src_prepare() {
-       default
-
-       # Bug 626060 (CVE-2017-11503) temporary workaround.
-       rm examples/code_generator.phps || die
-}
-
 src_compile(){
        if use doc; then
                phpdoc --filename="class.*.php" \