dev-lang/php: Update to work with libxml 2.9.0, remove fdftk USE flag as app-text/fdftk is deprecated

Package-Manager: portage-2.2.8-r1

5 files changed, 80 insertions, 10 deletions

diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog
index 4c735a4d..4a99c5aa 100644
--- a/dev-lang/php/ChangeLog
+++ b/dev-lang/php/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for dev-lang/php
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  04 Feb 2014; Bertrand Jacquin <beber@meleeweb.net>
+  +files/5.2.17/libxml-2.9.patch, metadata.xml, php-5.2.17.ebuild:
+  dev-lang/php: Update to work with libxml 2.9.0, remove fdftk USE flag as app-
+  text/fdftk is deprecated
+
   10 Jun 2013; Bertrand Jacquin <beber@meleeweb.net> metadata.xml:
   Fix manifest
 
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 7a8bb745..7ab991f9 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,6 +1,7 @@
 AUX 20php5-envd 145 SHA256 efaae9e6ae5f7010e073c2ab6d8a9dda009f0707c7d7b0c027e142c94f7041a4 WHIRLPOOL b9cfe0e80ba437bbc6008223c268bdafcde306ba8083dce96815804f3e1ec0937706e0db091149785a0076a6c6eaab8f7dff28578b706e84b4bb4e67850a4ecd
 AUX 5.2.17/bug-60986-replace-deprecated-pcre_info.diff 1983 SHA256 c4ca67e8abb589fe22068e07f9dec26da1b04dc52234a934d75889eb27a83107 WHIRLPOOL b546746768d1d66871f53e00dd9c734fed0056b23770203c4275569a2c40fb5eaaac542f3a3951e78dfda0e59bf1d0e9d4bb841f843c154079b15385f28b4a31
 AUX 5.2.17/bug-60986-safer-pcre_fullinfo.diff 1239 SHA256 08f3bf9d79ed4ca9ab5f60062be1d83c9b6d441e99c59332956d465dcae6aed1 WHIRLPOOL 0b11784441c73066fe940aa901e608063339b4c36cf024599f97676702ea9feb2e0075f449711aac10b99fe01f3325db5838778851c3a45438cd49a91eefabc3
+AUX 5.2.17/libxml-2.9.patch 2251 SHA256 d1a54b5a0a52fb25fc6f37e6c11cf18828ac971855fcf6be5925d6276739acbf WHIRLPOOL 33ad90367c76f91fe61d407ae638112a1c671325331e85428c2d0325a4b8c3c18a0dd8b76cbed30b64448e80ea968489bfa7b1e79e7e46b22cb5f72ed4f5fc5a
 AUX 70_mod_php5.conf-apache2 348 SHA256 5bb8a45570582b4389a7d3feea0398e1c13ed4ced96e559b9406ed8c965dea8c WHIRLPOOL fd503ec904a3853b90f8f4cc2042cf9014fdb1383a508d22e680559009b5b1e0beb5a09909a393e53868a64712c63e35642915787fa4176af07cb594adedb441
 AUX eblits/common-v2.eblit 379 SHA256 8c15442b04b0216342ef6f2b8565cb3510f6850fe67745d5697861e2f7759194 WHIRLPOOL 1a4cd516d27034a99a4f4aff4334961556faa2c3f014070403faf27999060db4faae1fa7160ca94ab0465f9fc85b4b5eb9e2eb5e1880343e30daa0d3ff28fdae
 AUX eblits/src_compile-v1.eblit 1283 SHA256 5ec76ae24304c5f803a615a98394c219018da1b1ce2018f92f6ac8c5becf6c99 WHIRLPOOL 2971e61a6932a7c2c19bb40b26f67d529560d08116c37d7b645dc008710d7cc8cd75dcc8feca95eeb556687910968dbe90b20554ad0ca97a624cd7f9c9221482
@@ -10,6 +11,6 @@ AUX eblits/src_prepare-v2.eblit 2604 SHA256 fe7534260fb81a012b8021b5d555756ce873
 DIST php-5.2.17.tar.bz2 9092312 SHA256 e81beb13ec242ab700e56f366e9da52fd6cf18961d155b23304ca870e53f116c WHIRLPOOL 94657976927ff8d45dc17c2db59ac86a4320d6d7b2b6d5b43c4862060495a4011ad9b73d9b57ea4eb46a38418683ac2ff16e93fa10bd4ad5842c50accbac3536
 DIST php-patchset-5.2.17-r0.tar.bz2 8369 SHA256 fb159a02faf5120dd9bc620bd3f3094735f181aa6893273bb7dd29771b8b23b2 WHIRLPOOL 77aada53720272656d82d1e9fdade8e25fa6d7e409de546e9c3ac0d274308734a1d254665de97c54a8c14da79e49acdfb2bfb960fbd97bc24bc9db0bd8a348ac
 DIST suhosin-patch-5.2.16-0.9.7.patch.gz 23069 SHA256 aae115a318d80b3f32cedf876e7a8e4b932febb1b0c743c0b398003ebe122f91 WHIRLPOOL b3282acb99b48ad9edb89b45f12bf60b40bc9fd8d9bcf42a5402b8331e8d2e4a8fa52bd423c7a5fae2b7c1c93f0245d13019e6c85e1379d1749abb6d7f1a0a0c
-EBUILD php-5.2.17.ebuild 11525 SHA256 4f10c12de69d98327de5cb3b04099cd0db30c9cb2bd6c1bca94203f09bb59b34 WHIRLPOOL 4c16ffd821e0b8a6ede33cd687d15b70720fd04298187e41085bc94cd5d8cce0726cca9cb5d85ecbe21f3ecb0dbe7efe87f85166467d27035175b03b091bedc0
-MISC ChangeLog 1019 SHA256 3ff3e0cd8cddb90d9239a5accfa1ffa237e0414843ecb0956276c82c55366618 WHIRLPOOL a1d3af1201ebd974804504da37a493ed94882eeda3745e56228b869f5db6ca45107fd0c288a9ea6e16086df954022b604245b2ee04652b65795b3cad12e68163
-MISC metadata.xml 2694 SHA256 8ccecd6d5b1d9e43e311bcb9f86419a88cd9b40d5287cd163acdf73a0d864b76 WHIRLPOOL 41893263496d1b2623951a9ca98c5edbe33c6ca5e27ed5785ae4b7e2be7f7e1201a6d70738f4166ac2a326d17397da2f7d4b05c4e33e8639d292b7b499bbb5b4
+EBUILD php-5.2.17.ebuild 11537 SHA256 846a853810b7573163536b1b9fef63bea66e0d03930114e25e6ac345c99c1f78 WHIRLPOOL 231f9f31a22b3eaf4e52b75628e626796e0e69d5a26fd835494df2b5b832b0035f6f6eda1992080336cce7ef29447f2627b6d88b2bc676cc11409c70f208f8e5
+MISC ChangeLog 1247 SHA256 8bdee44837b7df76ea5ae26f794fbe1f5b1802df3c7e0cd0a5f3579ec3f321d7 WHIRLPOOL 7a634c79bc613a201a79f83812918f69ff58a716431fc0837a4802cb836c9011ee529bf4c53132cf5a1d1c08fe86e199e884d2ccde36bc6ebeb67b37735871b1
+MISC metadata.xml 2622 SHA256 babdb0230e8097c0da21313b642965a48177f58ec11241aa1124906fd051d907 WHIRLPOOL 61bf714b5de3feaaa3e021e8d16b865c64069b083d9eb5179e554440cb4244ec333b9faf4ab0a2ccb3bcd68a3a0a5186688b493d1d5f22052e55ce7a1fed50c2
diff --git a/dev-lang/php/files/5.2.17/libxml-2.9.patch b/dev-lang/php/files/5.2.17/libxml-2.9.patch
new file mode 100644
index 00000000..6304a8c3
--- /dev/null
+++ b/dev-lang/php/files/5.2.17/libxml-2.9.patch
@@ -0,0 +1,65 @@
+From c4b26cc1b0b0521c75e653fffec2a9e3b4bf8cbb Mon Sep 17 00:00:00 2001
+From: Daniel Veillard <veillard@redhat.com>
+Date: Thu, 9 Aug 2012 14:02:33 -0400
+Subject: [PATCH] Update to work with libxml 2.9.0
+
+---
+ ext/dom/documenttype.c    | 4 ++++
+ ext/dom/node.c            | 8 ++++++++
+ ext/simplexml/simplexml.c | 4 ++++
+ 3 files changed, 16 insertions(+)
+
+diff --git a/ext/dom/documenttype.c b/ext/dom/documenttype.c
+index d61ba79..eee3b5f 100644
+--- a/ext/dom/documenttype.c
++++ b/ext/dom/documenttype.c
+@@ -205,7 +205,11 @@ int dom_documenttype_internal_subset_read(dom_object *obj, zval **retval TSRMLS_
+ 		if (buff != NULL) {
+ 			xmlNodeDumpOutput (buff, NULL, (xmlNodePtr) intsubset, 0, 0, NULL);
+ 			xmlOutputBufferFlush(buff);
++#ifdef LIBXML2_NEW_BUFFER
++			ZVAL_STRINGL(*retval, xmlOutputBufferGetContent(buff), xmlOutputBufferGetSize(buff), 1);
++#else
+ 			ZVAL_STRINGL(*retval, buff->buffer->content, buff->buffer->use, 1);
++#endif
+ 			(void)xmlOutputBufferClose(buff);
+ 			return SUCCESS;
+ 		}
+diff --git a/ext/dom/node.c b/ext/dom/node.c
+index 5bcb234..727d1bc 100644
+--- a/ext/dom/node.c
++++ b/ext/dom/node.c
+@@ -1895,9 +1895,17 @@ static void dom_canonicalization(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{
+         RETVAL_FALSE;
+     } else {
+ 		if (mode == 0) {
++#ifdef LIBXML2_NEW_BUFFER
++			ret = xmlOutputBufferGetSize(buf);
++#else
+ 			ret = buf->buffer->use;
++#endif
+ 			if (ret > 0) {
++#ifdef LIBXML2_NEW_BUFFER
++				RETVAL_STRINGL((char *) xmlOutputBufferGetContent(buf), ret, 1);
++#else
+ 				RETVAL_STRINGL((char *) buf->buffer->content, ret, 1);
++#endif
+ 			} else {
+ 				RETVAL_EMPTY_STRING();
+ 			}
+diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c
+index a379111..2368596 100644
+--- a/ext/simplexml/simplexml.c
++++ b/ext/simplexml/simplexml.c
+@@ -1387,7 +1387,11 @@ SXE_METHOD(asXML)
+ 
+ 			xmlNodeDumpOutput(outbuf, (xmlDocPtr) sxe->document->ptr, node, 0, 0, ((xmlDocPtr) sxe->document->ptr)->encoding);
+ 			xmlOutputBufferFlush(outbuf);
++#ifdef LIBXML2_NEW_BUFFER
++			RETVAL_STRINGL((char *)xmlOutputBufferGetContent(outbuf), xmlOutputBufferGetSize(outbuf), 1);
++#else
+ 			RETVAL_STRINGL((char *)outbuf->buffer->content, outbuf->buffer->use, 1);
++#endif
+ 			xmlOutputBufferClose(outbuf);
+ 		}
+ 	} else {
diff --git a/dev-lang/php/metadata.xml b/dev-lang/php/metadata.xml
index 1e47a711..f7ddfbad 100644
--- a/dev-lang/php/metadata.xml
+++ b/dev-lang/php/metadata.xml
@@ -14,7 +14,6 @@
         <flag name='empress'>Adds support for the Empress database server</flag>
         <flag name='empress-bcs'>Adds local access support for the Empress database server</flag>
         <flag name='esoob'>Adds support for Easysoft OOD database</flag>
-        <flag name='fdftk'>Add supports for Adobe's FDF toolkit.</flag>
         <flag name='filter'>Add filter extension support</flag>
         <flag name='force-cgi-redirect'>Switch on common security setting for CGI SAPI</flag>
         <flag name='gd'>Adds support for gd (bundled with PHP)</flag>
diff --git a/dev-lang/php/php-5.2.17.ebuild b/dev-lang/php/php-5.2.17.ebuild
index 1c2f8172..c4858b65 100644
--- a/dev-lang/php/php-5.2.17.ebuild
+++ b/dev-lang/php/php-5.2.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-lang/php/Attic/php-5.2.17.ebuild,v 1.18 2012/01/21 09:49:56 olemarkus dead $
 
@@ -88,7 +88,7 @@ IUSE="${IUSE}
 
 IUSE="${IUSE} adabas bcmath berkdb birdstep bzip2 calendar cdb cjk
 	crypt +ctype curl curlwrappers db2 dbase dbmaker debug doc empress
-	empress-bcs esoob exif fdftk frontbase +filter firebird
+	empress-bcs esoob exif frontbase +filter firebird
 	flatfile ftp gd gd-external gdbm gmp +hash +iconv imap inifile
 	interbase iodbc ipv6 +json kerberos ldap ldap-sasl libedit
 	mhash msql mssql mysql mysqli ncurses nls oci8
@@ -126,7 +126,6 @@ DEPEND=">=app-admin/eselect-php-0.6.2
 		media-libs/libpng
 		sys-libs/zlib
 	) ) )
-	fdftk? ( app-text/fdftk )
 	firebird? ( dev-db/firebird )
 	gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib )
 	gd-external? ( media-libs/gd )
@@ -324,8 +323,9 @@ eblit-pkg() {
 eblit-pkg pkg_setup v2
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PV}/bug-60986-replace-deprecated-pcre_info.diff
-	epatch "${FILESDIR}"/${PV}/bug-60986-safer-pcre_fullinfo.diff
+	epatch "${FILESDIR}/${PV}/bug-60986-replace-deprecated-pcre_info.diff"
+	epatch "${FILESDIR}/${PV}/bug-60986-safer-pcre_fullinfo.diff"
+	epatch "${FILESDIR}/${PV}/libxml-2.9.patch"
 
 	eblit-run src_prepare v2
 }