dev-lang/php: version bump the 5.6.x series.

This is a straightforward version bump, and also removes a patch
against 5.6.15 that was fixed in 5.6.16.

Package-Manager: portage-2.2.20.1

3 files changed, 1 insertions, 64 deletions

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 19f3bbc96d23..5b666469f972 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,7 +1,7 @@
 DIST php-5.4.45.tar.bz2 12703324 SHA256 4e0d28b1554c95cfaea6fa2b64aac85433f158ce72bb571bcd5574f98f4c6582 SHA512 ba22207da70e5e8ddf9a1f41bbeb54ef4917630006c3412db8f858782baaa3ff49d7e5ca59bed76c37fc11dc518c475b81f33f0f32c533c8f00be338e0b0d9c5 WHIRLPOOL b34e465dd193e9c1f5dedd7c6f279bb10471e31120f2a84246927f160adb1e54ea56563c719e59ed0654e2fd0805cebcc00198d6f6153791edef52fd0f2288a7
 DIST php-5.5.30.tar.bz2 13699702 SHA256 e7332a713cecdd1cb44a1b1336739885c9789f633f0f51236b25e48ab03c3b29 SHA512 9458126f579ace9e2aebdfa7ad7f8d097f1fd502f443d8fd66263ba3c542d579ca9c705e227725fae57e452649a3be7cb717a0330d339b93d3c6c94fa80dbc1f WHIRLPOOL 2aa6c61a48a231d81f6c746f94e42589d87b93d0526f02d6d15f731cbbca4aecdee84b443f7ec1891f2a524939c542ac6f94e15db90a23a8b19523463025d395
 DIST php-5.6.14.tar.bz2 14073920 SHA256 36f295f11641c1839a5df00e693f685fd134c65e8a1d46e8ee0abae8662b2eb0 SHA512 af0c7fa5c7be15839b1189b2544ff725b935228030087c206f83727e7885750030b10bf2bfbd27adea6f18af90d4ecd3ced9defec88c5f98f7ed26b4e4c57981 WHIRLPOOL 8e31fc3dbeb22fa2a59112d2dcbe28f8102c8d5a14fd716d17f909399c06d27a10ea32d43ebd1a12cea78d9fd949ae7c7882628ae0c3abd7354d165107fa0c9d
-DIST php-5.6.15.tar.bz2 14060562 SHA256 11a0645c4d4b749e256da1e0d6df89dd886b5b06b83c914d942653661dbd1c38 SHA512 3841b1b64bbe1b3bdbbbf2591f2ca81754f1e7391dae593f45302ea7a4157dd8032e0f525308a13769938aadbfca9e25cbe15ac9bf8eed1427263fefcbede2aa WHIRLPOOL 6d5a6b860d0db887c09d1bfb8304a39d44f1c5966bab3f881c277e3aa0331cd794f1bff02cbac2bdba23fd9bc4fe71a8e1d4b51cbb4c1dfe1ceadca15ec38665
+DIST php-5.6.16.tar.bz2 14066209 SHA256 4fe6f40964c1bfaba05fc144ba20a2cdad33e11685f4f101ea5a48b98bbcd2ae SHA512 08ceb48277785e2075a1bd8035cb32eb8bdddeff6695734d3f1f0721415beddc58413257a490852a93df445d2d342badea46801e46d96f0b85517124ba4020c9 WHIRLPOOL d8669398d03288e9cf0f519a2e76eeb6b7e79f85f60b9f9fbdcc40ae313a3d9fa01b9f173cd354ab8b328b7178a433f54e4f0cf06152ec023c11f00bb98cc5b0
 DIST php-7.0.0RC7.tar.bz2 13472595 SHA256 0b1773df54b2ed2aaa8ed04188d02fa28189045f8893c3b59afd8aacf9a7db9c SHA512 58d03d83f2dd5dabcb468df42b3b31502dcdedca2463f7cbd9609ef611fe3bf7a64cc78505b52b2c7c6bf859a66ee6bc887462d1c5557edfe99ee83f398c2e47 WHIRLPOOL 624e7b606ff5f5a36140167538c7a224ff61c4a8639f348a3848d8fda6260a72d06707d055d7727417477067bd0346f631235f5dc68541a549747ca72b2570c9
 DIST php-7.0.0RC8.tar.bz2 13975805 SHA256 8c46621e80b610749d2d31439e9b6db7b881c0249d1df1f4c3e05fdd46a2d108 SHA512 5066966cd2e7f011c20a17a427b74db84c74035182b4de1d991d2b76060a33c84da9b3b75dafc83fb40f0de0649ba0568454b90d48e4b2356524bc6ff0444138 WHIRLPOOL 6b1f8192f83250b140c39e266c74f428f1f7258f8128483380656a3139b6344a66637bec87a4cfe593bc0f3df8cfde5b3f562f96dbfb83c8a5d8acf9fc2838a8
 DIST php-patchset-5.4-r2.tar.bz2 5824 SHA256 4a47f4d31f50a244f85349486cdb3474cf315562e097ed4c116c2b9b5730ecef SHA512 3c2523458a627373da7acb93fb2cd621f50b19fe2ba1d30beb62eeaaa39045262b917cfd0b631046fec9c8027cfa99bd0426a079ab45eb172b21d25d6e085dde WHIRLPOOL fe4f015e2f0dc66cc23ef16fb5bb33117952593ae0770d4bcd37ecc1c431cbcc7874189d265696305c60b4e395e7ce902667e38203db46867304868271affdea
diff --git a/dev-lang/php/files/fix-5.6.15-fpm-const-crash.patch b/dev-lang/php/files/fix-5.6.15-fpm-const-crash.patch
deleted file mode 100644
index 29876a9f97f6..000000000000
--- a/dev-lang/php/files/fix-5.6.15-fpm-const-crash.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 37ed0dafe47fb1053aee7822113bacc1f213337a Mon Sep 17 00:00:00 2001
-From: Xinchen Hui <laruence@gmail.com>
-Date: Mon, 2 Nov 2015 10:47:02 +0800
-Subject: [PATCH] Fixed bug #70828 (php-fpm 5.6 with opcache crashes when
- referencing a non-existent constant)
-
----
- NEWS                     |  2 ++
- Zend/tests/bug70828.phpt | 24 ++++++++++++++++++++++++
- Zend/zend_compile.c      |  2 +-
- 3 files changed, 27 insertions(+), 1 deletion(-)
- create mode 100644 Zend/tests/bug70828.phpt
-
-diff --git a/Zend/tests/bug70828.phpt b/Zend/tests/bug70828.phpt
-new file mode 100644
-index 0000000..dd285b5
---- /dev/null
-+++ b/Zend/tests/bug70828.phpt
-@@ -0,0 +1,24 @@
-+--TEST--
-+Bug #70828 (php-fpm 5.6 with opcache crashes when referencing a non-existent constant)
-+--FILE--
-+<?php
-+
-+namespace test {
-+	use const nonexistent;
-+
-+	class test {
-+		static function run(){
-+			var_dump(nonexistent);
-+			existent;
-+		}
-+	}
-+}
-+
-+namespace {
-+	define("test\\existent", "bug!", 1);
-+	test\test::run();
-+}
-+?>
-+--EXPECTF--
-+Notice: Use of undefined constant nonexistent - assumed 'nonexistent' in /home/huixinchen/opensource/php-5.6/Zend/tests/bug70828.php on line 8
-+string(11) "nonexistent"
-diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
-index 5ff1b04..fca4e2a 100644
---- a/Zend/zend_compile.c
-+++ b/Zend/zend_compile.c
-@@ -5804,7 +5804,7 @@ void zend_do_fetch_constant(znode *result, znode *constant_container, znode *con
- 				opline->op2.constant = zend_add_const_name_literal(CG(active_op_array), &constant_name->u.constant, 0 TSRMLS_CC);
- 			} else {
- 				opline->extended_value = IS_CONSTANT_UNQUALIFIED;
--				if (CG(current_namespace)) {
-+				if (check_namespace && CG(current_namespace)) {
- 					opline->extended_value |= IS_CONSTANT_IN_NAMESPACE;
- 					opline->op2.constant = zend_add_const_name_literal(CG(active_op_array), &constant_name->u.constant, 1 TSRMLS_CC);
- 				} else {
--- 
-2.1.4
-
diff --git a/dev-lang/php/php-5.6.15-r4.ebuild b/dev-lang/php/php-5.6.16.ebuild
index 0925fd39e8b6..3e4ec34b10c4 100644
--- a/dev-lang/php/php-5.6.15-r4.ebuild
+++ b/dev-lang/php/php-5.6.16.ebuild
@@ -304,10 +304,6 @@ src_prepare() {
 			|| die "Failed to fix heimdal crypt library reference"
 	fi
 
-	# Fix a const crash in php-fpm, bug #564690.
-	# Only applies to php-5.6.15 and should be fixed in 5.6.16.
-	epatch "${FILESDIR}/fix-5.6.15-fpm-const-crash.patch"
-
 	# Add user patches #357637
 	epatch_user