summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatti Bickel <mabi@gentoo.org>2010-09-16 11:21:06 +0000
committerMatti Bickel <mabi@gentoo.org>2010-09-16 11:21:06 +0000
commit5a85fa407bdc7f02e1708c55098d44105118c3d4 (patch)
tree15bb44c76fc3fc09fc03f3302527fe83b68db690 /net-analyzer
parentRemoval as part of java 1.5 removal, bug #292001. Use dev-java/tijmp for 1.6 ... (diff)
downloadgentoo-2-5a85fa407bdc7f02e1708c55098d44105118c3d4.tar.gz
gentoo-2-5a85fa407bdc7f02e1708c55098d44105118c3d4.tar.bz2
gentoo-2-5a85fa407bdc7f02e1708c55098d44105118c3d4.zip
fix php/gd dependency (bug #337034)
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'net-analyzer')
-rw-r--r--net-analyzer/base/ChangeLog5
-rw-r--r--net-analyzer/base/base-1.4.1-r1.ebuild4
2 files changed, 6 insertions, 3 deletions
diff --git a/net-analyzer/base/ChangeLog b/net-analyzer/base/ChangeLog
index 872c334d7e8d..18a537497914 100644
--- a/net-analyzer/base/ChangeLog
+++ b/net-analyzer/base/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-analyzer/base
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/base/ChangeLog,v 1.21 2010/09/11 14:49:57 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/base/ChangeLog,v 1.22 2010/09/16 11:21:06 mabi Exp $
+
+ 16 Sep 2010; Matti Bickel <mabi@gentoo.org> base-1.4.1-r1.ebuild:
+ fix php/gd dependency (bug #337034)
*base-1.4.1-r1 (11 Sep 2010)
diff --git a/net-analyzer/base/base-1.4.1-r1.ebuild b/net-analyzer/base/base-1.4.1-r1.ebuild
index 5f2503649e94..ae1714f8daca 100644
--- a/net-analyzer/base/base-1.4.1-r1.ebuild
+++ b/net-analyzer/base/base-1.4.1-r1.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/net-analyzer/base/base-1.4.1-r1.ebuild,v 1.1 2010/09/11 14:49:57 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/base/base-1.4.1-r1.ebuild,v 1.2 2010/09/16 11:21:06 mabi Exp $
EAPI="2"
@@ -29,7 +29,7 @@ want_apache
DEPEND=">=sys-libs/zlib-1.2.1-r3"
RDEPEND="${DEPEND}
dev-lang/php:5[session,mssql?,mysql?,postgres?]
- gd? ( dev-lang/php[gd] dev-lang/php[gd-external] )
+ gd? ( || ( dev-lang/php[gd] dev-lang/php[gd-external] ) )
dev-lang/php
dev-php/adodb
dev-php/PEAR-Mail