dev-lang/php: Add patch for newer freetype, drop punctuation in DESCRIPTION, drop firebird USE flag and DEPEND

Package-Manager: portage-2.2.11-r1

4 files changed, 22 insertions, 6 deletions

diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog
index b1804cf0..d53b13ae 100644
--- a/dev-lang/php/ChangeLog
+++ b/dev-lang/php/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  09 Aug 2014; Bertrand Jacquin <beber@meleeweb.net>
+  +files/5.2.17/freetype-include-path.diff, php-5.2.17.ebuild:
+  dev-lang/php: Add patch for newer freetype, drop punctuation in DESCRIPTION,
+  drop firebird USE flag and DEPEND
+
   04 Feb 2014; Bertrand Jacquin <beber@meleeweb.net>
   files/eblits/src_prepare-v2.eblit, php-5.2.17.ebuild:
   dev-lang/php: Move eautoreconf outside from eblits, inherit autotools
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index df8a6ce2..44dc1c35 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/freetype-include-path.diff 447 SHA256 4286f4695f5eabd35a6d5056546d9587e197d5ed156f44c4683133507bfbae06 WHIRLPOOL 14ef40a745228d7bc898a3c1cedb45d3170ece070028ec8fc6c0469107224092f018b5e38ff9b0200a403380beb43a3fb059c02cabc5dc7d32f16feae1abae4f
 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
@@ -11,6 +12,6 @@ AUX eblits/src_prepare-v2.eblit 2569 SHA256 0645b886cc7f5ac0446da7732f347f39b510
 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 11580 SHA256 11af509978912a0a15e9b10baa7645744bd785e16dbfa3cb90c1934723f3ac49 WHIRLPOOL a6cd7a32c0840f834ca2c118872a4b427d9f630746dfea7034537bf06b509cbd385106d19396de78cf8cb3334c1a95650c72ece60e58e4916a00301154f3e184
-MISC ChangeLog 1429 SHA256 bc66b58237861f19af41ffade52512173d173647ee96e1845ae272ced5217791 WHIRLPOOL 9219bd327137dab3e108d2784bdb52608a8ecd98d1860376e977280ef12c3849508ff2a12d4231d0109104e0162bd7990d375245e5e6be49cb9f787eaea95be7
+EBUILD php-5.2.17.ebuild 11562 SHA256 4bd3d81090345ff5accb96fcdc099f0ac0b63e265598521ca41dcebdd87eaab3 WHIRLPOOL 2bb75f3431348c663bb2c128af805cc81002c8c390f0a73bc7a9a5a46fc1b704c3ead59254ae75c0ef0bb505688a04d4696f7e246e9e9ed6534973b24c284a2d
+MISC ChangeLog 1661 SHA256 21229dba222b1c4d7a95a0d8f6291cb71199d67e7ec321977ee66447b002d2a5 WHIRLPOOL ec5aecc77ea3d65457e343d006b2607e3c28e48217984bc3ef8c956c22c2ccb0128f033b9fe4b5be09502b82cf66c2c9e9e97682e53fc60e401b2f9162b46bbb
 MISC metadata.xml 2622 SHA256 babdb0230e8097c0da21313b642965a48177f58ec11241aa1124906fd051d907 WHIRLPOOL 61bf714b5de3feaaa3e021e8d16b865c64069b083d9eb5179e554440cb4244ec333b9faf4ab0a2ccb3bcd68a3a0a5186688b493d1d5f22052e55ce7a1fed50c2
diff --git a/dev-lang/php/files/5.2.17/freetype-include-path.diff b/dev-lang/php/files/5.2.17/freetype-include-path.diff
new file mode 100644
index 00000000..eb7280d9
--- /dev/null
+++ b/dev-lang/php/files/5.2.17/freetype-include-path.diff
@@ -0,0 +1,11 @@
+--- ext/gd/config.m4	2014-08-09 01:46:02.524387766 +0200
++++ ext/gd/config.m4	2014-08-09 01:46:15.896777838 +0200
+@@ -204,7 +204,7 @@
+   if test "$PHP_FREETYPE_DIR" != "no"; then
+ 
+     for i in $PHP_FREETYPE_DIR /usr/local /usr; do
+-      if test -f "$i/include/freetype2/freetype/freetype.h"; then
++      if test -f "$i/include/freetype2/freetype.h"; then
+         FREETYPE2_DIR=$i
+         FREETYPE2_INC_DIR=$i/include/freetype2
+         break
diff --git a/dev-lang/php/php-5.2.17.ebuild b/dev-lang/php/php-5.2.17.ebuild
index a020d640..f3c41bdf 100644
--- a/dev-lang/php/php-5.2.17.ebuild
+++ b/dev-lang/php/php-5.2.17.ebuild
@@ -71,7 +71,7 @@ if [[ -n ${SUHOSIN_VERSION} ]]; then
 		suhosin? ( ${SUHOSIN_URI} )"
 fi
 
-DESCRIPTION="The PHP language runtime engine: CLI, CGI, Apache2 and embed SAPIs."
+DESCRIPTION="The PHP language runtime engine: CLI, CGI, Apache2 and embed SAPIs"
 HOMEPAGE="http://php.net/"
 LICENSE="PHP-3"
 
@@ -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 frontbase +filter firebird
+	empress-bcs esoob exif frontbase +filter
 	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
 	) ) )
-	firebird? ( dev-db/firebird )
 	gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib )
 	gd-external? ( media-libs/gd )
 	gdbm? ( >=sys-libs/gdbm-1.8.0 )
@@ -218,7 +217,6 @@ RDEPEND="${DEPEND}
 	qdbm? ( $php[-gdbm] )
 	readline? ( $php[-libedit] )
 	recode? ( $php[-imap,-mysql,-mysqli] )
-	firebird? ( $php[-interbase] )
 	sharedmem? ( $php[-threads] )
 
 	!cli? ( !cgi? ( !apache2? ( !embed? ( $php[cli] ) ) ) )
@@ -326,6 +324,7 @@ src_prepare() {
 	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"
+	epatch "${FILESDIR}/${PV}/freetype-include-path.diff"
 
 	eblit-run src_prepare v2
 	eautoreconf --force -W no-cross