gentoo resync : 20.12.2017

7 files changed, 79 insertions, 10 deletions

diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index f9b43f6ba2ab..9d800d62af23 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/PHPMailer/Manifest b/dev-php/PHPMailer/Manifest
index a8406632e57d..2ff008183215 100644
--- a/dev-php/PHPMailer/Manifest
+++ b/dev-php/PHPMailer/Manifest
@@ -1,3 +1,3 @@
-DIST PHPMailer-5.2.23.tar.gz 157335 BLAKE2B 55f4d4ed09dcff6caf00491102232c211be912b8ea450e35833a0006b408c7de586c58b02b614079c4ede2bbc648548a020f94193b4f54d98d7102fd4d78d62e SHA512 6442538a5a9bfbe704379cd7dbc1634b4d8d6865421b7fac4c67e8ced03173f6b533651033681c2e8814ad9b22b2b3276c23169cdd7ba04878b710533cade65f
-EBUILD PHPMailer-5.2.23-r1.ebuild 1396 BLAKE2B 767cfdaeb10189841dec7fef492f63940bd10ced903d1040a4e4cdfa4952fd932524a822ffe4bb937b46c63c560d1819988f53c5b2600dc0e08a28a18e4d31e3 SHA512 d05a31af926ce852b396ba9a1d78e578a4e220d296d3cef15f93ea000b9d9cf184b052d8f5be63733fb23f47eda4ec685276468f7398cee2d8ddc867b79c6a95
+DIST PHPMailer-5.2.26.tar.gz 159174 BLAKE2B 989ee85f6ca374bd7f4accf3d18fbd173bbbd3176e6846c9a2aec68f3bfca4ead4e0197f6287e2bc8ed4a125bf7fcb53240a1f8ce6a1813eaffb66067c2c4e9e SHA512 4c3e324ecd1dd23eb40f14ee785fb9b353b742ff4fb26fe0586622038157e60d64560f5ba4a625f16fad6568954d685ebbe436d88bc427d5bd260c056815b656
+EBUILD PHPMailer-5.2.26-r1.ebuild 1292 BLAKE2B 0921338c180891ebf675e10e697eb335bb86d459c682bc43f2da2623dc3a47c640450c49dd560f3f20689d467a081d9cd2fb6e43e810ef8533d80321dccf11b9 SHA512 4628a6c21f0d5d23cfc0ee9754377576044e1302cc69609c9232a74c49c6083f02132ee265b477ca33d333b8627c8adc447d9627cc4168fd59eb2ed055031471
 MISC metadata.xml 446 BLAKE2B 178ea98081e664641c7a8632a1c7dac9b5cac8992b0b945208f5ef654633340daced2473bbdc342b70d8b168ac2206ba132f7ab9601f61b5436f3eb3e0441ca1 SHA512 3dfce858cb0e00b526f04a5764a6173d4711db4f21f52b6d827b82f1cddea4e33f533e645dae95d0bb6a69699b00520a414f2e322c76b56aee1e4ea047bb4bb5
diff --git a/dev-php/PHPMailer/PHPMailer-5.2.23-r1.ebuild b/dev-php/PHPMailer/PHPMailer-5.2.26-r1.ebuild
index e5e14253a059..152762c2a1fb 100644
--- a/dev-php/PHPMailer/PHPMailer-5.2.23-r1.ebuild
+++ b/dev-php/PHPMailer/PHPMailer-5.2.26-r1.ebuild
@@ -12,17 +12,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc +examples"
 
-RDEPEND="dev-lang/php:*"
+RDEPEND="dev-lang/php:*[ctype,filter,ssl]"
 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" \
diff --git a/dev-php/PHP_CodeSniffer/Manifest b/dev-php/PHP_CodeSniffer/Manifest
index f2d8f6580a0b..5a2751c98acf 100644
--- a/dev-php/PHP_CodeSniffer/Manifest
+++ b/dev-php/PHP_CodeSniffer/Manifest
@@ -1,5 +1,7 @@
 DIST PHP_CodeSniffer-2.6.2.tgz 497234 BLAKE2B 66479e8371f2fe9bdf48acc1c459239b3c7a79a598d486737ff1d41265f992d376ada660bb12fa605fb838b0620a7fedac2c13d50827b61108c0ca9eac191552 SHA512 8e74ca2035f25647c836c6cacb6da6c1a3d0d280077cc6b31f5abf01843546c7370a96cba4f3a1b56fe8bac6954e10ce6570352ae67b14f717bab6a30bd2c865
 DIST PHP_CodeSniffer-3.0.2.tgz 529486 BLAKE2B 569de0abec306663ac94876bde3bcda3aca4409b2f74558c72b986a18f08c98e3a365b11d47d11986084d9b7da87caae3594ab412bab6be5aabd3c9b6e769f7b SHA512 ff32e6e88be1927a662f2d1d453f9c071220e168007ccc3ec7cfd3e766ea68ea0c69d537aa37ddb75d103792d1877e0af2d4710f8f6c6d4e957f0d4c482db68c
+DIST PHP_CodeSniffer-3.2.1.tgz 554343 BLAKE2B a43e253e7cdf6085ff1cfdec110878c99b61a69d80415a40cf670b7ce9ddce82f7254c34995c67084d5aa7aef8d775e6cfef5e9fcab90771f09244c1442e319d SHA512 69a4d70c6a567d262142f7f3d42507a7501ca3d5213f5b90d5893863e3d75e947a7b41e8bb08e85975677b606522b8f73df33dd35cde85c28016389f3c2ae63c
 EBUILD PHP_CodeSniffer-2.6.2-r2.ebuild 1194 BLAKE2B f4f1fa5e4efa3443a791f66ddb45e1c2b3de883d16fc04497b602f9b17896c45966e0c3816e7874fc023c16a5982126f580209980384a600a5ffe4c242c42212 SHA512 73bd2cd9a05021c279b8147cd566a68b639475fc4cc9cd2a57d46bd6e4b296ee989e5e6bb4d815ac68b4f8ad0f09e47e3e48c77100d20bfd6980cfafb77fa0a7
 EBUILD PHP_CodeSniffer-3.0.2.ebuild 1406 BLAKE2B d8d5e47a52cadf8855c982913344569bf39ec3f6d0c92bcac3da4a1c873bb9b539b5dda228c4cbe3d054bd6711f13025b6df8a315e9dc15b1d6b7a75b8050c7b SHA512 3f351f529e8f32824c1026447c6631b0f58e9f14b48463f6e9417a90728ad776f4e8077698b8fcbdf45cf169c1614af8c03631366de8e2902d3fa75f290aad13
+EBUILD PHP_CodeSniffer-3.2.1.ebuild 1406 BLAKE2B d8d5e47a52cadf8855c982913344569bf39ec3f6d0c92bcac3da4a1c873bb9b539b5dda228c4cbe3d054bd6711f13025b6df8a315e9dc15b1d6b7a75b8050c7b SHA512 3f351f529e8f32824c1026447c6631b0f58e9f14b48463f6e9417a90728ad776f4e8077698b8fcbdf45cf169c1614af8c03631366de8e2902d3fa75f290aad13
 MISC metadata.xml 329 BLAKE2B 786efd240520e1b8b5ec8fde8fe4772defb0dbae2bf69358710c227454f5de1bc831600eb81d605053163d78e0129cd657b3229a74d30bcec7ffe6ce960d87d8 SHA512 5a983e0b393c626d49f7b3b8757cb68e73a7f292ebc861ca5e6f83c20b5c6f79918422aee7830ad3dccacda719c6d42d6bfcc5eb7ddca7ed29785ef1dd9e0f30
diff --git a/dev-php/PHP_CodeSniffer/PHP_CodeSniffer-3.2.1.ebuild b/dev-php/PHP_CodeSniffer/PHP_CodeSniffer-3.2.1.ebuild
new file mode 100644
index 000000000000..c460fcdcb741
--- /dev/null
+++ b/dev-php/PHP_CodeSniffer/PHP_CodeSniffer-3.2.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Detect violations of PHP code standards"
+HOMEPAGE="https://github.com/squizlabs/PHP_CodeSniffer"
+
+# The test suite isn't part of the Github tarball at the moment. Keep an
+# eye on https://github.com/squizlabs/PHP_CodeSniffer/issues/548
+SRC_URI="http://download.pear.php.net/package/${P}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="test? ( >=dev-php/phpunit-4 )"
+RDEPEND="dev-lang/php:*[cli,tokenizer,xmlwriter]"
+
+DOCS=( CONTRIBUTING.md README.md )
+
+src_prepare() {
+	sed -i "s~@data_dir@~${EPREFIX}/usr/share/php/data~" src/Config.php || die
+	eapply_user
+}
+
+src_install() {
+	local MY_PN="PHP/CodeSniffer" script
+	# The PEAR eclass would install everything into the wrong location.
+	insinto "/usr/share/php/${MY_PN}"
+	doins -r src autoload.php
+
+	insinto "/usr/share/php/data/${MY_PN}"
+	doins CodeSniffer.conf.dist
+	# These load code via relative paths, so they have to be symlinked
+	# and not dobin'd.
+	exeinto "/usr/share/php/${MY_PN}/bin"
+	for script in phpcbf phpcs; do
+		doexe "bin/${script}"
+		dosym "../share/php/${MY_PN}/bin/${script}" "/usr/bin/${script}"
+	done
+
+	einstalldocs
+}
+
+src_test() {
+	# The test suite will fail if date.timezone isn't set in php.ini.
+	phpunit -d date.timezone=UTC tests/AllTests.php \
+		|| die "test suite failed"
+}
diff --git a/dev-php/pecl-geoip/Manifest b/dev-php/pecl-geoip/Manifest
index 275300e5a364..10f06ced24cf 100644
--- a/dev-php/pecl-geoip/Manifest
+++ b/dev-php/pecl-geoip/Manifest
@@ -2,4 +2,5 @@ AUX fix-failing-tests-1.1.1.patch 1250 BLAKE2B 587561ec400fe54b21333d09d2ad721b6
 DIST geoip-1.1.1.tgz 13004 BLAKE2B fe073b9459c434751ea0291ce6802041db47254f9d2d5b930db51751b3a66ce5cf925dc4bd07764920748b1735f26ba8bd136654e08ed9c24ac3b520e842f45d SHA512 395715297726aa8e7ed71297d403bea9cb08417a03adfca29dc6ea68bbc738c176f71ea621f9026109e07cd5a2adc647e2af8e140e18a6af1c8f0fe4ed1a9c6b
 EBUILD pecl-geoip-1.1.1-r2.ebuild 435 BLAKE2B cced9315a5c7677b01bd46c9d0c794dc7cc816b02c90052d886ccd297a137fed49e99c49b2a84a289871c223fd12974cc7942dee89bcfd673dbcf737ee7fca23 SHA512 a52159f326db3500060304b7a1300e0e8eb29afb160e404037d01168fdf05b651ba68f8131750fea7e9b59a228cae98cdd2077b9eebe8bcbf07497c98ad41393
 EBUILD pecl-geoip-1.1.1-r3.ebuild 443 BLAKE2B 0253e5a8add73c694932b708bdd364b07b90fdeba91345d4e5cd065b200d6a7cb21b707ec8c59e79d390175796f69e816e38a0391afe5862554b883d4447b35b SHA512 a43618bd317d96131a27c08442111de17daea9b5472344bf13a3252803e4c5767ce91d415a2e5ffb16f68439a884f44e3dcd5fefa955dfba7fdea7eaace31b83
+EBUILD pecl-geoip-1.1.1-r4.ebuild 451 BLAKE2B 9af37a08d093f6569c2a8d1d2c3aa3c238215fc6122ac8ae6c6b88877c99c8a1090b04fa8a7e2e21857fb1879f776f739472ce9f27a54fff97b8757f1fe9fe2f SHA512 c359ae7ad851e763412420607c9bd853a4f7dbaff36e5f49f56f262fdab83d2f762850707360c54fdd976ef8acf69799bf5d225436459e3134f2ca6fb47e0f00
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-geoip/pecl-geoip-1.1.1-r4.ebuild b/dev-php/pecl-geoip/pecl-geoip-1.1.1-r4.ebuild
new file mode 100644
index 000000000000..865b4ebe7166
--- /dev/null
+++ b/dev-php/pecl-geoip/pecl-geoip-1.1.1-r4.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME="geoip"
+DOCS="README ChangeLog"
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="PHP extension to map IP address to geographic places"
+LICENSE="PHP-3"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-libs/geoip"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/fix-failing-tests-1.1.1.patch" )