diff options
| author |   Matti Bickel <mabi@gentoo.org> | 2010-05-30 10:05:20 +0000 |
|---|---|---|
| committer | Matti Bickel <mabi@gentoo.org> | 2010-05-30 10:05:20 +0000 |
| commit | 3ca8f9a8aa0e2702c1902f264ae6ad3e5ab51f1d (patch) | |
| tree | d31bad1875f41b3d076b35c7e3529d457161f2c2 /dev-lang | |
| parent | Initial commit of telepathy-qt4. Fixes bug #300397 (diff) | |
| download | gentoo-2-3ca8f9a8aa0e2702c1902f264ae6ad3e5ab51f1d.tar.gz gentoo-2-3ca8f9a8aa0e2702c1902f264ae6ad3e5ab51f1d.tar.bz2 gentoo-2-3ca8f9a8aa0e2702c1902f264ae6ad3e5ab51f1d.zip | |
fix #285419 properly, include --as-needed patch in patches
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/php/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/php/files/20php4-envd | 2 | ||||
| -rw-r--r-- | dev-lang/php/files/php4-ldvs | 1 | ||||
| -rw-r--r-- | dev-lang/php/php-5.3.2.ebuild | 4 |
4 files changed, 7 insertions, 6 deletions
diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog index 3e372e7c8391..441e87999e9a 100644 --- a/dev-lang/php/ChangeLog +++ b/dev-lang/php/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/php # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.380 2010/05/28 20:07:53 mabi Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.381 2010/05/30 10:05:20 mabi Exp $ + + 30 May 2010; <mabi@gentoo.org> -files/20php4-envd, php-5.3.2.ebuild, + -files/php4-ldvs: + fix iodbc USE dep (bug #285419), remove unneeded php4 files 28 May 2010; <mabi@gentoo.org> php-5.3.2.ebuild: add flex dependency (bug #221357) diff --git a/dev-lang/php/files/20php4-envd b/dev-lang/php/files/20php4-envd deleted file mode 100644 index ac444e9677aa..000000000000 --- a/dev-lang/php/files/20php4-envd +++ /dev/null @@ -1,2 +0,0 @@ -MANPATH="/usr/lib/php4/man/" -CONFIG_PROTECT_MASK="/etc/php/cli-php4/ext-active/ /etc/php/cgi-php4/ext-active/ /etc/php/apache2-php4/ext-active/" diff --git a/dev-lang/php/files/php4-ldvs b/dev-lang/php/files/php4-ldvs deleted file mode 100644 index 01b4eebed95f..000000000000 --- a/dev-lang/php/files/php4-ldvs +++ /dev/null @@ -1 +0,0 @@ -PHP_4 { global: *; }; diff --git a/dev-lang/php/php-5.3.2.ebuild b/dev-lang/php/php-5.3.2.ebuild index a2bd78f6e33b..e317b7394fcf 100644 --- a/dev-lang/php/php-5.3.2.ebuild +++ b/dev-lang/php/php-5.3.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.2.ebuild,v 1.2 2010/05/28 20:07:53 mabi Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.2.ebuild,v 1.3 2010/05/30 10:05:20 mabi Exp $ EAPI=2 @@ -129,7 +129,7 @@ DEPEND="app-admin/php-toolkit virtual/imap-c-client[kolab=] ) intl? ( dev-libs/icu ) - iodbc? ( dev-db/libiodbc >=dev-db/unixODBC-1.8.13 ) + iodbc? ( || ( dev-db/libiodbc >=dev-db/unixODBC-1.8.13 ) ) kerberos? ( virtual/krb5 ) kolab? ( >=net-libs/c-client-2004g-r1 ) ldap? ( !oci8? ( >=net-nds/openldap-1.2.11 ) ) |