summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2009-07-12 19:34:50 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2009-07-12 19:34:50 +0000
commita34956843e609df8b7349bcb129109994e97b360 (patch)
treeba52e10a86cca34e1e296bab5cb600b6b3ccae1e /media-gfx/graphviz
parentVersion bump and remove old (diff)
downloadgentoo-2-a34956843e609df8b7349bcb129109994e97b360.tar.gz
gentoo-2-a34956843e609df8b7349bcb129109994e97b360.tar.bz2
gentoo-2-a34956843e609df8b7349bcb129109994e97b360.zip
Pass --disable-ltdl-install to econf wrt #276609. Remove USE jpeg and png because the ebuild has a harddep on them, and having gd with USE=-png breaks the build, thanks to Tommy[D].
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx/graphviz')
-rw-r--r--media-gfx/graphviz/ChangeLog8
-rw-r--r--media-gfx/graphviz/graphviz-2.24.0.ebuild15
2 files changed, 14 insertions, 9 deletions
diff --git a/media-gfx/graphviz/ChangeLog b/media-gfx/graphviz/ChangeLog
index 044f7898a905..576f5883374a 100644
--- a/media-gfx/graphviz/ChangeLog
+++ b/media-gfx/graphviz/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for media-gfx/graphviz
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.198 2009/07/05 10:11:54 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.199 2009/07/12 19:34:50 ssuominen Exp $
+
+ 12 Jul 2009; Samuli Suominen <ssuominen@gentoo.org>
+ graphviz-2.24.0.ebuild:
+ Pass --disable-ltdl-install to econf wrt #276609. Remove USE jpeg and png
+ because the ebuild has a harddep on them, and having gd with USE=-png
+ breaks the build, thanks to Tommy[D].
*graphviz-2.24.0 (05 Jul 2009)
diff --git a/media-gfx/graphviz/graphviz-2.24.0.ebuild b/media-gfx/graphviz/graphviz-2.24.0.ebuild
index 34ef7e53d226..98f977369fa0 100644
--- a/media-gfx/graphviz/graphviz-2.24.0.ebuild
+++ b/media-gfx/graphviz/graphviz-2.24.0.ebuild
@@ -1,9 +1,8 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.24.0.ebuild,v 1.1 2009/07/05 10:11:54 maekke Exp $
-
-EAPI="2"
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.24.0.ebuild,v 1.2 2009/07/12 19:34:50 ssuominen Exp $
+EAPI=2
inherit eutils autotools multilib python
DESCRIPTION="Open Source Graph Visualization Software"
@@ -13,7 +12,7 @@ SRC_URI="http://www.graphviz.org/pub/graphviz/ARCHIVE/${P}.tar.gz"
LICENSE="CPL-1.0"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="cairo doc examples gtk java jpeg lasi nls perl png python ruby tcl"
+IUSE="cairo doc examples gtk java lasi nls perl python ruby tcl"
# Requires ksh
RESTRICT="test"
@@ -23,7 +22,7 @@ RDEPEND="
>=dev-libs/glib-2.11.1
>=media-libs/fontconfig-2.3.95
>=media-libs/freetype-2.1.10
- >=media-libs/gd-2.0.28[png?,jpeg?]
+ >=media-libs/gd-2.0.28[png,jpeg]
>=media-libs/jpeg-6b
>=media-libs/libpng-1.2.10
virtual/libiconv
@@ -41,9 +40,8 @@ RDEPEND="
lasi? ( media-libs/lasi )
ruby? ( dev-lang/ruby )
tcl? ( >=dev-lang/tcl-8.3 )"
-
DEPEND="${RDEPEND}
- >=dev-util/pkgconfig-0.20
+ dev-util/pkgconfig
sys-devel/flex
java? ( dev-lang/swig )
nls? ( >=sys-devel/gettext-0.14.5 )
@@ -131,7 +129,8 @@ src_prepare() {
}
src_configure() {
- local myconf
+ # libtool file collision, bug 276609
+ local myconf="--disable-ltdl-install"
# Core functionality:
# All of X, cairo-output, gtk need the pango+cairo functionality