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

[Michael Orlitzky]

commit:     5b18056584028956797b4edde938616618b7f2c9
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 28 15:23:19 2016 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Wed Dec 28 15:49:56 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b180565

dev-php/PHPMailer: new version 5.2.20 to fix CVE-2016-10045.

Package-Manager: portage-2.3.0

 dev-php/PHPMailer/Manifest                           |  2 +-
 ...PMailer-5.2.19.ebuild => PHPMailer-5.2.20.ebuild} | 20 ++++----------------
 2 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/dev-php/PHPMailer/Manifest b/dev-php/PHPMailer/Manifest
index d189355..a73ab40 100644
--- a/dev-php/PHPMailer/Manifest
+++ b/dev-php/PHPMailer/Manifest
@@ -1 +1 @@
-DIST PHPMailer-5.2.19.tar.gz 156311 SHA256 5c167f6d84bd74bff9de6b5594f2c262e748a021ce4686cadfc2ed273e71f82f SHA512 2eda1b856305c10017fe026f7de0e96796706216d64dce9ee9f3aa1bc8db4be277b8e8d88954d447e138f9d8701a7c7a86b75ba12b93160ff13ec65d1c0131ba WHIRLPOOL 37a8cc78bc207f25998352ad2460e2035cc53e4d9d33b9279fcae044ef2c75c43bf6702f518ea34f93ddf9e06746ea5e34fd51341be4fa9ec1cebaee8fea36ac
+DIST PHPMailer-5.2.20.tar.gz 156793 SHA256 4716acef60503f345323849842f3138a8453c178d3829477553bf1e347664976 SHA512 c8dab5decd5012687b2e1d7a4ce2a3a605a6c3589b1f747960faa6080fb1c65580c1dd0f0cba52fc3735e4cf357c31237b51a6ade00c5dbffc57c27328d15018 WHIRLPOOL 9d490758ac09accf3f30645615a34a39a5c7ec542f5eceaa6327d3119ff35bf5c14f420dd731ee47f84cfb6409f5f26d6f7d9979031343172778b59825b7d08d

diff --git a/dev-php/PHPMailer/PHPMailer-5.2.19.ebuild b/dev-php/PHPMailer/PHPMailer-5.2.20.ebuild
similarity index 74%
rename from dev-php/PHPMailer/PHPMailer-5.2.19.ebuild
rename to dev-php/PHPMailer/PHPMailer-5.2.20.ebuild
index 2210a19..936fe31 100644
--- a/dev-php/PHPMailer/PHPMailer-5.2.19.ebuild
+++ b/dev-php/PHPMailer/PHPMailer-5.2.20.ebuild
@@ -11,15 +11,11 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc +examples test"
+IUSE="doc +examples"
 
 RDEPEND="dev-lang/php:*"
 DEPEND="${RDEPEND}
-	doc? ( dev-php/phpDocumentor )
-	test? ( ${RDEPEND} dev-php/phpunit )"
-
-# The test suite requires network access.
-RESTRICT=test
+	doc? ( dev-php/phpDocumentor )"
 
 src_compile(){
 	if use doc; then
@@ -35,23 +31,15 @@ src_compile(){
 }
 
 src_install(){
+	# To help out the Composer kids, most of the documentation and
+	# tests are missing from the release tarballs.
 	insinto "/usr/share/php/${PN}"
 	doins -r *.php language extras
 
-	# Fixed in the next version, I hope.
-	# https://github.com/PHPMailer/PHPMailer/issues/919
-	#dodoc README.md SECURITY.md changelog.md
-	#dodoc docs/*
 	use examples && dodoc -r examples
-
 	use doc && dodoc -r html/*
 }
 
-src_test(){
-	cd test/ || die
-	phpunit . || die "test suite failed"
-}
-
 pkg_postinst(){
 	elog "${PN} has been installed in /usr/share/php/${PN}/."
 	elog "To use it in a script, require('${PN}/${PN}Autoload.php'),"