Non-maintainer commit: Revbump to provide php5.4 and php5.5 support (only one at a time) using patch from https://github.com/mapserver/mapserver/issues/4309

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xD1F781EFF9F4A3B6

4 files changed, 107 insertions, 25 deletions

diff --git a/sci-geosciences/mapserver/ChangeLog b/sci-geosciences/mapserver/ChangeLog
index d25fff12e22a..1fbf0f931f43 100644
--- a/sci-geosciences/mapserver/ChangeLog
+++ b/sci-geosciences/mapserver/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-geosciences/mapserver
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/ChangeLog,v 1.53 2014/11/26 00:08:10 dilfridge Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/ChangeLog,v 1.54 2015/02/04 19:58:49 grknight Exp $
+
+*mapserver-6.0.1-r2 (04 Feb 2015)
+
+  04 Feb 2015; Brian Evans <grknight@gentoo.org> +files/6.1.0-php-5.4.patch,
+  +mapserver-6.0.1-r2.ebuild, -mapserver-6.0.1-r1.ebuild:
+  Non-maintainer commit: Revbump to provide php5.4 and php5.5 support (only one
+  at a time) using patch from https://github.com/mapserver/mapserver/issues/4309
 
   26 Nov 2014; Andreas K. Huettel <dilfridge@gentoo.org>
   mapserver-6.0.1-r1.ebuild:
diff --git a/sci-geosciences/mapserver/Manifest b/sci-geosciences/mapserver/Manifest
index 9d3f91b7e423..e4c0034cb06e 100644
--- a/sci-geosciences/mapserver/Manifest
+++ b/sci-geosciences/mapserver/Manifest
@@ -5,27 +5,26 @@ AUX 5.4.2-ldflags.patch 3851 SHA256 518ebe8e12b590001571110d521939a44a1fc74d82cd
 AUX 6.0.0_rc1-bool.patch 862 SHA256 59ce6a605768fd849c33fbb7093802f2906315f9abe520b78a985891d39508a6 SHA512 630d59ab77bb70a0d249ffaa6eab3ae3b9fd17c40d3075e141631df070dfdcc50c03be77211825dca8fc70e3a924cdedecd4e2589c5eef2c9268e16a76e2eedf WHIRLPOOL 3b8b137dffd61ad67298b2fbd7bda20ab9a08745b9bb3262e355bf077af55f2faa13f380dd00e3ebe1eee273066f8872830f796a990d5b7df5e736f2799c4f80
 AUX 6.0.0_rc1-ldflags.patch 3954 SHA256 09ec9d68eccc100a315c60527bd51623ff03caa7b4721434aedb972aa96aa3b7 SHA512 326e9d6143322c57c233745a2315f33bb2a60f252743be9a19a331fc03311cdb6c5ec88a270eb1dfcafc4fde4419169b7d9c2e57ccfd0057f0c1a3117dc1450a WHIRLPOOL f7b4def2ca93f43eb6202c7ad8f9680a2bce063a91c18f45f5a24f931b0bbb467a3e48793b7aa8edde17b30ee5178fe0a98be6a9b8aeec62b7de2c2fc6d0efde
 AUX 6.0.0_rc1-php_ldflags.patch 551 SHA256 50023a92811b2856bdb04d8e2d241c4e424c4b00557c1d70615a3940f664fd59 SHA512 de3b98388c14ab9fdac1494b37d9ec7f0276c608d173e657f700d1b52250107f991adcd453a355d883218cbee0cbaf4b1a193c435d235fcf6e19a3e0161d74a6 WHIRLPOOL cea9b871b3cd3e23358ef2a4222bf657436df7ca176d451ab7a1b294cbeb9cc15810229580d8ce0ed8607e1d1b0b40c81714039c8ca4d954fc5224008c73f81e
+AUX 6.1.0-php-5.4.patch 3074 SHA256 829a504a956fe79436ed3c1c36eebc47f0c6b58c456356efa8e194d50c14ef8c SHA512 50b5a945754fb3ca30ebe6838dbdde4d6de9108854829097424e49dd540915f9bb9f3cc44b0c81ee0c0f8dbc07547e726d324bd6ef5804940ddca24b00f7c555 WHIRLPOOL 93576c228727f1b9725b781c02959a0f1fd217182742f0a8697035231fd0fbe1b7cc7e0736c69bdf089d69511d451b482e823d48aa155f173b15427d0e6a6d54
 AUX mapserver_tcl.patch-r1 1985 SHA256 725c7e5dd9dc6ae6372d9c4a334ce13fc8ea2ab6afbf569a6db786f2caa7a31f SHA512 d98a9885f934974412a10e2cb1aeb59f5c1b2dab1740d0cec408ecd67d47bb8ed44893c0aec4c7bd788683dc8a64ab8335f9565ea8e6e530e5d8db4acf7ad877 WHIRLPOOL a82fb5b5acd0f2f0e747c4cc3bd5dbbdb0013636e75b410c3a48be035b9e756392351b67b2f83e78d4440edcabb5c6646ea72321a88d17c5bff641674d3b3e7a
 DIST mapserver-6.0.1.tar.gz 2430064 SHA256 dd6821917aa7030381442f5e092e4f46f44b9deb9425ec92729e5819e9b61d65 SHA512 0fd9da9d6452fbfbaf0c815e6d15309e185119a4ab33cab2f1c6839bfb8c3a75ce6e7e7779b0eb2aa6e80d1a623ca6e0e58a02049b0db0bfa3f7b0f29117d5dc WHIRLPOOL e4846d40b93c22f7b5dcce1c242b4d88db253be9185194b45c4acddf9066d10c2ec2fbe667941dfe15702838690517a0e57719b1937169e55517e43ed1c225b8
-EBUILD mapserver-6.0.1-r1.ebuild 5789 SHA256 ba619cd18ad57c7457d8747502dabf3e46feba77bed219dda6c22f88391afff2 SHA512 ac8577367ce0de766a92d2df4208872b342a43476f70d466d9ce0867438c2251f63261f4c89b4c247c8f00cef698c2978ff84ea4e1e5f1b7c3ded4ddbf93b702 WHIRLPOOL 8794f2c29ef9299620d7bbbc72134e0f9752ba5fdfef1396a7e4c5da3344faa85aae9894ce05d013e62bab543c9079b56c1699ff2901506cd5387bff86c003c7
-MISC ChangeLog 9684 SHA256 cae4bf7e9915c4b0ba3b6006f7c0aba22d807c8b839d8024db0a395cb4d4029a SHA512 8e10b695b0185adfc2a71673bf84f024c206722880fbcf80a4a09dd9ed2e4c0e77e29d4d44def3d4782046f2ef1ee8311e6a92d88e6c8e2f7d3bc48744adfcde WHIRLPOOL 121af1dfc4953c82b323579d5db295515a410d2e0f9356a2737cbe3e28993c481d36ad39642475258b5c9918b39b48ea8943a9e8c55d3ab17d1df32f3342a680
+EBUILD mapserver-6.0.1-r2.ebuild 6037 SHA256 673d67effb68182ae58923a253fe9e17cfd06fe27e71ca7a1ff981af6a880057 SHA512 20c51f041ade35ab5e2d960d265c704bca6175e54326178b8ec03b7a866d7f09789d2d50b8fff892c93a202edbaaf13dd43013c286ebabec6a0610e5367d13eb WHIRLPOOL 062145d3a50c89aa5dfd67b447399cea204d40b08f7a8b19abea48a08b328a33b91668bb865515f9fe2afea4d83467dca8096bf9a0c55c13b67cdedfeb0cf497
+MISC ChangeLog 10015 SHA256 54c4cf7fcd1b9aa4e46527771def512c1e8d59b699cefa3726fa9326e6d9b760 SHA512 ab4af14821dc107deb02e5332c0c3ba614db74f24f7981b7ccd40162f97cd7bd5caecaad8bc977c6d6ac73668b511aeddc2f12f0fd4e5210575dda4aa0ea316f WHIRLPOOL f4e49e1eb25ec142d547409989d522b6feb8c7db1901ea370169fbcc8101e26520e2b6a54e109f4e49ee863d11adc8a3309352fbae3012c0f7fbfe392ae9917e
 MISC metadata.xml 582 SHA256 14f7d9d6360046985e8dcb1e486faaa0d7616ba3e3f7daea8b291219b53305b0 SHA512 84a7e0adb9f9118377184c1f018645c9c4902e7c8e85c62f55c12f6c54a018a828c4024386e1379eea943a7f228fde3427aa1e679c8c85e4cea717806087e86f WHIRLPOOL e0fe6f9f515efb3c4f64929e5740b8a377bc1278e3c4402d100f9bf107cef35b5d2b0b64055c043d9981b79ab6e30f671e8dbf4846ab51cd11d74f16fcbf1579
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJUdRnsXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
-QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcojkQAKwrTW9+58YT7e0xFdY4aueh
-mSD0azfXa5NH6ZI7S5C4rN1GkeylpJ2t2KR0Gt45nR9LpPlCHES5S30IAuiHXVwY
-lEP9Zh6bM7R6snPLfo2BVQ+PLpd/PMAvLwwmcf0T0cY1Z5d++RWOtp4zZinN5YFI
-JKdYaAfmOSSzMRGU3S2Zpbm06tEPY/pUxF7/L7xn5FdvSQJLuEul5gPt7VgsQlLx
-3rfFW3AcHW2AbY0fZxgbCvM0IfugG2kjbykobRjSQucAEiE5H0ADsSBgU9QHFQ+C
-L6lMgM0zyX1tJH2sqAVdBSe0TKqOqLL8g6OiLtp4ha46HAqXNl4FlkEdnzj9m8d+
-fOrLyXme/S89c4oZ6vLRK+Qn+Ye4gGTLx3F9FqMLXQtLnxWbWL3byzMtl7IftHXD
-PIeP8hbfI+b4+yqP/gx86XDoRHHvBFxpdmnuYFHrQOAai1meovPbbqPky7yAfj57
-jSmuShdHOZpT2DnjsvJLZ31+CJf3liYdOHsQXt8y2CJJiHkSw6o09TOVx4O3H5U4
-lKyKhSfxKrzml6OPm85+1PjNcQ/Gj9eK27cLJC78mzMwbvvjZf1VfVVvxOtt0d6c
-lZeaz0D0E0Fn27dr2ZUpSnTajJx5fXD4H7LQQTPiBvuCe7TBwze4XQSAM8SkJ7Mj
-eV1On1Lz7TRJ4x5GvIOD
-=Hkp2
+iQIcBAEBCAAGBQJU0noEAAoJENH3ge/59KO2xp8QAKJX8E+CUpyPTP80FEFUGRsA
+52TzihN/T/s6mYwZLxmqjElcbwL6QWzuATOYEMGrumCZF4aOkcNm8mzdskQzOLi+
+grb5stPLNWh1EYQ9Rz2HvqVuCmDlLJz5C09PwZ/aewW06KgODXz+wCbmxCeD+/kN
+zml2SaVhV+O8nfp/y9ButU5KTJnGMtXIPYlNUs8Ccuse7alL/VbKIjS+6W/zm2u/
+VEiKnKuFF14z+dknxrlV0tjCeqncZfJ5p7UZOA3WAdWjcqJt2z0qvYMnGYKXBJKJ
+uQpYU7bTwqGjqHdRzc8GCVTGBZtQwkGJ4m+ngvFM4rkM9Wg1hG9Yc4V8FlKEpkHX
+TeS231ef9mj06bEor13T/Lm/WviH4Zq7YEUfq+SVR6i4pyNGRTE4JFNMO4u3ItTx
+vEPIFCV18fD0aLAIGw1zCNBhon0llw+bd8ORvm3Bq8ZZnOazwljTeNYWEsNbJ0lu
+ANXuckHA1mUwi0LWAXCdaX+aG7dAJUWTo6c09u2zDjfLsaK9UQqfsxaV23xbs9SA
+w0ujuBE23iFvSV60lK7zaJq2yv9LIt5fzyM3dhlbTZfd5dAv6Vl89cl19A4Dt8fF
+Q4Wm6Hqivlt0M2bufpXPkmhs5Ut44IvtLLyblyRmsJ+vRNIMyixz3oFHcKcOitPh
+BpzyJkzKb6/t26K7OiDt
+=/D5q
 -----END PGP SIGNATURE-----
diff --git a/sci-geosciences/mapserver/files/6.1.0-php-5.4.patch b/sci-geosciences/mapserver/files/6.1.0-php-5.4.patch
new file mode 100644
index 000000000000..e81fd90195f9
--- /dev/null
+++ b/sci-geosciences/mapserver/files/6.1.0-php-5.4.patch
@@ -0,0 +1,69 @@
+diff -aurN mapserver-6.0.1.orig/mapscript/php/image.c mapserver-6.0.1/mapscript/php/image.c
+--- mapserver-6.0.1.orig/mapscript/php/image.c	2011-04-05 11:15:06.000000000 -0400
++++ mapserver-6.0.1/mapscript/php/image.c	2015-02-04 14:29:03.164357015 -0500
+@@ -303,10 +303,18 @@
+     /* no filename - read stdout */
+ 
+     /* if there is no output buffer active, set the header */
+-    if (OG(ob_nesting_level)<=0)
+-    {
+-        php_header(TSRMLS_C);
+-    }
++    //handle changes in PHP 5.4.x
++    #if PHP_VERSION_ID < 50399
++      if (OG(ob_nesting_level)<=0)
++      {
++          php_header(TSRMLS_C);
++      }
++    #else
++      if (php_output_get_level(TSRMLS_C)<=0)
++      {
++          php_header(TSRMLS_C);
++      }
++    #endif
+    
+ 
+     if (MS_RENDERER_PLUGIN(php_image->image->format))
+diff -aurN mapserver-6.0.1.orig/mapscript/php/php_mapscript.c mapserver-6.0.1/mapscript/php/php_mapscript.c
+--- mapserver-6.0.1.orig/mapscript/php/php_mapscript.c	2011-04-05 23:05:02.000000000 -0400
++++ mapserver-6.0.1/mapscript/php/php_mapscript.c	2015-02-04 14:27:52.296567202 -0500
+@@ -899,7 +899,7 @@
+ 
+ }
+ 
+-function_entry mapscript_functions[] = {
++zend_function_entry mapscript_functions[] = {
+     PHP_FE(ms_GetVersion, NULL)
+     PHP_FE(ms_GetVersionInt,  NULL)
+     PHP_FE(ms_newLineObj, NULL)
+diff -aurN mapserver-6.0.1.orig/mapscript/php/php_mapscript_util.c mapserver-6.0.1/mapscript/php/php_mapscript_util.c
+--- mapserver-6.0.1.orig/mapscript/php/php_mapscript_util.c	2011-04-04 13:50:20.000000000 -0400
++++ mapserver-6.0.1/mapscript/php/php_mapscript_util.c	2015-02-04 14:27:27.477341249 -0500
+@@ -42,7 +42,12 @@
+     zobj->ce = ce;
+     ALLOC_HASHTABLE(zobj->properties);
+     zend_hash_init(zobj->properties, 0, NULL, ZVAL_PTR_DTOR, 0);
+-    zend_hash_copy(zobj->properties, &ce->default_properties, (copy_ctor_func_t) zval_add_ref,(void *) &temp, sizeof(zval *));
++    //handle changes in PHP 5.4.x
++    #if PHP_VERSION_ID < 50399
++      zend_hash_copy(zobj->properties, &ce->default_properties, (copy_ctor_func_t) zval_add_ref,(void *) &temp, sizeof(zval *));
++    #else
++      object_properties_init(zobj, ce);
++    #endif
+     retval.handle = zend_objects_store_put(zobj, NULL, (zend_objects_free_object_storage_t)zend_objects_free_object, NULL TSRMLS_CC);
+     retval.handlers = &mapscript_std_object_handlers;
+     return retval;
+@@ -59,7 +64,12 @@
+     zobj->ce = ce;
+     ALLOC_HASHTABLE(zobj->properties);
+     zend_hash_init(zobj->properties, 0, NULL, ZVAL_PTR_DTOR, 0);
+-    zend_hash_copy(zobj->properties, &ce->default_properties, (copy_ctor_func_t) zval_add_ref,(void *) &temp, sizeof(zval *));
++    //handle changes in PHP 5.4.x
++    #if PHP_VERSION_ID < 50399
++      zend_hash_copy(zobj->properties, &ce->default_properties, (copy_ctor_func_t) zval_add_ref,(void *) &temp, sizeof(zval *));
++    #else
++      object_properties_init(zobj, ce);
++    #endif
+     retval.handle = zend_objects_store_put(zobj, NULL, (zend_objects_free_object_storage_t)zend_objects_free_object, NULL TSRMLS_CC);
+     retval.handlers = object_handlers;
+     return retval;
diff --git a/sci-geosciences/mapserver/mapserver-6.0.1-r1.ebuild b/sci-geosciences/mapserver/mapserver-6.0.1-r2.ebuild
index 37bae8a86a26..16417fd15c92 100644
--- a/sci-geosciences/mapserver/mapserver-6.0.1-r1.ebuild
+++ b/sci-geosciences/mapserver/mapserver-6.0.1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/mapserver-6.0.1-r1.ebuild,v 1.7 2014/11/26 00:08:10 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/mapserver-6.0.1-r2.ebuild,v 1.1 2015/02/04 19:58:49 grknight Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ PHP_EXT_OPTIONAL_USE="php"
 PHP_EXT_NAME="php_mapscript"
 PHP_EXT_S="${WORKDIR}/${MY_P}/mapscript/php/"
 PHP_EXT_SKIP_PHPIZE="no"
-USE_PHP="php5-3"
+USE_PHP="php5-4 php5-5"
 
 PYTHON_DEPEND="python? 2"
 SUPPORT_PYTHON_ABIS="1"
@@ -33,6 +33,8 @@ KEYWORDS="~amd64 ~x86"
 SLOT="0"
 IUSE="bidi cairo gdal geos mysql opengl perl php postgis proj python threads tiff xml xslt" # ruby php tcl
 
+REQUIRED_USE="php? ( ^^ ( php_targets_php5-4 php_targets_php5-5 ) )"
+
 RDEPEND="
 	!${CATEGORY}/${PN}:${PV}
 	dev-libs/expat
@@ -117,7 +119,9 @@ src_unpack() {
 src_prepare() {
 	epatch "${FILESDIR}/6.0.0_rc1-ldflags.patch" \
 		"${FILESDIR}/6.0.0_rc1-bool.patch" \
-		"${FILESDIR}/6.0.0_rc1-php_ldflags.patch"
+		"${FILESDIR}/6.0.0_rc1-php_ldflags.patch" \
+		"${FILESDIR}/6.1.0-php-5.4.patch"
+
 	eautoreconf
 }
 
@@ -135,7 +139,10 @@ src_configure() {
 	fi
 
 	# some scripts require configure time options so place it here
-	use php && myopts+=" --with-php=${EPREFIX}/usr/$(get_libdir)/php5.3/include/php/"
+	if use php ; then
+		use php_targets_php5-4 && myopts+=" --with-php=${EPREFIX}/usr/$(get_libdir)/php5.4/include/php/"
+		use php_targets_php5-5 && myopts+=" --with-php=${EPREFIX}/usr/$(get_libdir)/php5.5/include/php/"
+	fi
 
 	# sde is ESRI package that you have to buy first
 	# oraclespatial needs oracle server for testing/usage
@@ -174,7 +181,7 @@ src_configure() {
 }
 
 src_compile() {
-	emake || die
+	default
 	use python && _enter_build_dir "${S}/mapscript/python" "distutils_src_compile"
 	use perl && _enter_build_dir "${S}/mapscript/perl" "perl-module_src_prep"
 	use perl && _enter_build_dir "${S}/mapscript/perl" "perl-module_src_compile"