dev-lang/php: Drop empress USE flag

Package-Manager: portage-2.2.12

5 files changed, 12 insertions, 18 deletions

diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog
index d53b13ae..da6814e3 100644
--- a/dev-lang/php/ChangeLog
+++ b/dev-lang/php/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  27 Aug 2014; Bertrand Jacquin <beber@meleeweb.net>
+  files/eblits/src_configure-v521.eblit, metadata.xml, php-5.2.17.ebuild:
+  dev-lang/php: Drop empress USE flag
+
   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,
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 44dc1c35..068ada48 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -6,12 +6,12 @@ AUX 5.2.17/libxml-2.9.patch 2251 SHA256 d1a54b5a0a52fb25fc6f37e6c11cf18828ac9718
 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
-AUX eblits/src_configure-v521.eblit 10844 SHA256 ad875ca45e9ad975c0d7a3cbedc27c5035aa048d7aa935221a15e47cbca63c3d WHIRLPOOL 80e4f15c6dcee14634e52d454ee8d359d37eca711f19ae9f0d7c2534ddf8c45d406a1928a855fb92d0af3caed7f5f2986fc76fb40480debaa4788a64098a1a53
+AUX eblits/src_configure-v521.eblit 10700 SHA256 2336e380b3bfd7d31c85c3e81029c71eed7ff28953dbe910aeaad24a8a11004c WHIRLPOOL 70b9bd3f58d2a4fc9a7bbbe5574381f4065d25cd9b835e3b83356f5723715b6ba19b9a5c96cd538c4caa6a7a98d226207797e3b89f7936ea1043f234b746ac18
 AUX eblits/src_install-v2.eblit 5237 SHA256 860bf8ada8a4900d6a4bdd29bab3e65aff29ba8ddbbba4bec50d9d29c6990ca4 WHIRLPOOL 100fe0d603ae2105ad5897390c774d93b015f81651369d94ea187aa7e2d37dbbe0a64094dd66e7aad2de0ff7f869c1481c688bde9a8156bb659141ae1681f073
 AUX eblits/src_prepare-v2.eblit 2569 SHA256 0645b886cc7f5ac0446da7732f347f39b5102982ae21722ef084ebbbda9f0bba WHIRLPOOL e4851940e62f6a01b76c5a1a0c8a6699e5098d471a039dc6825d537674f1cfcad5f39cda10e487fb0b0d9b1e8e1695347518252f2d22907b4892a06cedb5fefc
 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 11562 SHA256 4bd3d81090345ff5accb96fcdc099f0ac0b63e265598521ca41dcebdd87eaab3 WHIRLPOOL 2bb75f3431348c663bb2c128af805cc81002c8c390f0a73bc7a9a5a46fc1b704c3ead59254ae75c0ef0bb505688a04d4696f7e246e9e9ed6534973b24c284a2d
-MISC ChangeLog 1661 SHA256 21229dba222b1c4d7a95a0d8f6291cb71199d67e7ec321977ee66447b002d2a5 WHIRLPOOL ec5aecc77ea3d65457e343d006b2607e3c28e48217984bc3ef8c956c22c2ccb0128f033b9fe4b5be09502b82cf66c2c9e9e97682e53fc60e401b2f9162b46bbb
-MISC metadata.xml 2622 SHA256 babdb0230e8097c0da21313b642965a48177f58ec11241aa1124906fd051d907 WHIRLPOOL 61bf714b5de3feaaa3e021e8d16b865c64069b083d9eb5179e554440cb4244ec333b9faf4ab0a2ccb3bcd68a3a0a5186688b493d1d5f22052e55ce7a1fed50c2
+EBUILD php-5.2.17.ebuild 11383 SHA256 c88ac099e90efa940d597312867f4bb6239d1c6589f41ba549874c363f94e0e0 WHIRLPOOL 376ee5c524ade17c3a29d2e68ab7c22ccd3940baccf16f1b340607734074d053787eee57f8f711ff28238d4bf8a56a54c1712f7864a912d05473729957ad21b0
+MISC ChangeLog 1827 SHA256 56c1a9c21238857efad64b66305ac8f62e9aaece22743a87cdfb57eceb2eb240 WHIRLPOOL d435fcdb2be8dcbcd00c966990044349b4e3a74d40f9d821be20b1e367284d8f65ac1c2b43783119bccb91ddcfefbda2e1a90b6b83b0ed5a67658f978f7dde4c
+MISC metadata.xml 2443 SHA256 2c4d5dee40e32a57aa3eca7b7e3aff95e870422ef2be4a9b813996be0949934b WHIRLPOOL e437db27468fd0ff7ec9ce32d8b0103b668b41c16c94759b931d600c19d7c5e8089da9774312010cc8eead83672577d81c5ead96105bae74215846d70f537253
diff --git a/dev-lang/php/files/eblits/src_configure-v521.eblit b/dev-lang/php/files/eblits/src_configure-v521.eblit
index 61e63891..66990120 100644
--- a/dev-lang/php/files/eblits/src_configure-v521.eblit
+++ b/dev-lang/php/files/eblits/src_configure-v521.eblit
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 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/files/eblits/src_configure-v521.eblit,v 1.1 2010/10/08 18:25:10 olemarkus Exp $
 
@@ -144,10 +144,6 @@ eblit-php-src_configure() {
 		phpconfutils_extension_with "adabas"   "adabas"   1
 		phpconfutils_extension_with "birdstep" "birdstep" 1
 		phpconfutils_extension_with "dbmaker"  "dbmaker"  1
-		phpconfutils_extension_with "empress"  "empress"  1
-		if use empress ; then
-			phpconfutils_extension_with "empress-bcs" "empress-bcs" 0
-		fi
 		phpconfutils_extension_with "esoob"   "esoob" 1
 		# Needed to run conftest for IBM DB2
 		[[ -n ${DB2_HOME} ]] && export LD_LIBRARY_PATH="${DB2_HOME}/`get_libdir`"
diff --git a/dev-lang/php/metadata.xml b/dev-lang/php/metadata.xml
index f7ddfbad..6b4bbceb 100644
--- a/dev-lang/php/metadata.xml
+++ b/dev-lang/php/metadata.xml
@@ -11,8 +11,6 @@
         <flag name='dbase'>Adds support for dbase file format</flag>
         <flag name='dbmaker'>Adds support for dbmaker database server</flag>
         <flag name='db2'>Enables support for IBM DB2 database server</flag>
-        <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='filter'>Add filter extension support</flag>
         <flag name='force-cgi-redirect'>Switch on common security setting for CGI SAPI</flag>
diff --git a/dev-lang/php/php-5.2.17.ebuild b/dev-lang/php/php-5.2.17.ebuild
index f3c41bdf..2cfcdbd5 100644
--- a/dev-lang/php/php-5.2.17.ebuild
+++ b/dev-lang/php/php-5.2.17.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=2
 
-PHPCONFUTILS_MISSING_DEPS="adabas birdstep db2 dbmaker empress empress-bcs esoob
+PHPCONFUTILS_MISSING_DEPS="adabas birdstep db2 dbmaker esoob
 interbase msql oci8 sapdb solid"
 
 inherit autotools eutils flag-o-matic versionator depend.apache apache-module db-use phpconfutils php-common-r1 libtool
@@ -87,8 +87,8 @@ IUSE="${IUSE}
 	threads force-cgi-redirect discard-path"
 
 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
+	crypt +ctype curl curlwrappers db2 dbase dbmaker debug doc
+	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
@@ -118,8 +118,6 @@ DEPEND=">=app-admin/eselect-php-0.6.2
 	curl? ( >=net-misc/curl-7.10.5 )
 	db2? ( >=dev-db/unixODBC-1.8.13 )
 	dbmaker? ( >=dev-db/unixODBC-1.8.13 )
-	empress? ( >=dev-db/unixODBC-1.8.13 )
-	empress-bcs? ( >=dev-db/unixODBC-1.8.13 )
 	esoob? ( >=dev-db/unixODBC-1.8.13 )
 	exif? ( !gd? ( !gd-external? (
 		virtual/jpeg
@@ -203,8 +201,6 @@ RDEPEND="${DEPEND}
 	adabas? ( $php[odbc] )
 	birdstep? ( $php[odbc] )
 	dbmaker? ( $php[odbc] )
-	empress-bcs? ( $php[empress] )
-	empress? ( $php[odbc] )
 	esoob? ( $php[odbc] )
 	db2? ( $php[odbc] )
 	sapdb? ( $php[odbc] )