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].

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

3 files changed, 16 insertions, 21 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/Manifest b/media-gfx/graphviz/Manifest
index f7c7ce04df06..6352d35c9b0e 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX graphviz-2.12-bindings.patch 4589 RMD160 129ec88bc42df0555ac96abfa9bf8d4e48378b6c SHA1 1f591d4a9e884fdc6181aad822eab9f06832901b SHA256 75120e3c7d9636fc35e2802d7c1b9902faa5e901a17ab88f939a020970776820
 AUX graphviz-2.12-configure.patch 856 RMD160 3d1fe3d11498629bb7738d5219a824857830a5e9 SHA1 d420c55e28bbcdbf030ff203f0581b40bbceca3e SHA256 660a8df758487f21810e6d7fa647221d4443463eca2c2053399b2e782b208348
 AUX graphviz-2.12-find-system-libgd.patch 379 RMD160 0e9fc08b07c038986955353f7063fd954e70b5ab SHA1 b1a6f1f950a0e7484960f6604e9b0d9469e71633 SHA256 b578b083ae55b959f6aac0208296aaa5513627802441e5a4a79ed4f09d26ccb8
@@ -20,13 +17,6 @@ EBUILD graphviz-2.20.3.ebuild 6335 RMD160 562ffc55fb3b59306358ea39e59309a9a7b9dc
 EBUILD graphviz-2.22.1.ebuild 5492 RMD160 9dcc131c8ef257911817b2fa5f4bfb57ad8c5599 SHA1 b47222afb3b93c8c7fe367239efd6792bbb44ccc SHA256 c2dce3dd348ede60186c28bc27c9adbca96c1c4e27372cf1158eb5be4bab74fe
 EBUILD graphviz-2.22.2-r1.ebuild 5770 RMD160 c8fee1949b25cedaa2198519b7f444d1836cffdb SHA1 6aafee750a8d0db28d34f7f355ba1ac172805b5e SHA256 3e8f8a74b6bae7f03c2194290e550e51b45d90d0e6ed556302f42433021468f5
 EBUILD graphviz-2.22.2.ebuild 5492 RMD160 845030570dbe8af6ef3f9e8f0c57bff5ae5c531b SHA1 88130d74b14c3bb09c20ad535912c6537b7fd7c5 SHA256 4112282e8bc0b1003090cf32f270156ae3af72bbffd5854f6b3ed251dacd0522
-EBUILD graphviz-2.24.0.ebuild 5626 RMD160 9c7beba483da7bbbd8755079d8e6e5551ca2b0ee SHA1 18ec3e841a7b85a5cf221792d076a29c07cda224 SHA256 edd3e72f15088aa771d649b1ce48b5e5cf6a32dbfeda8c2a916c8db21751784a
-MISC ChangeLog 28914 RMD160 df21bc876d3d7b3547340ac93b3b91ee274d9b81 SHA1 67d97b57675cb026f66df083ce81dd4f228960d8 SHA256 8e420154a35100f81a2d6e5e6e871554932404ae4051b55b6ca921b641f23924
+EBUILD graphviz-2.24.0.ebuild 5670 RMD160 a3140da16348bec908260a2c320f74376547e12e SHA1 0e5d27015cf33caadbfaf3ca29b824a9eb94e058 SHA256 b78dc6741df12ec25e9403059f4c9d2e85a38789c38563ddd47ddae192607945
+MISC ChangeLog 29186 RMD160 74c6cd0325b53262d77de91cfb97a562ea57009c SHA1 1bf1580c6f134c9e8219a25b4b4c185e3eb2ae34 SHA256 56b2169fa4c78e481fcf0761181a4e78bb2c6eb33acf2c2ff181dc0c3a972459
 MISC metadata.xml 1860 RMD160 81088772ed3740ea2203e44658810083131f73b1 SHA1 693e6bee10a852950747df9a9eebc19e560bcc8e SHA256 6356eef06b745c3f8275d10df402d635f4470be57e426c2a5efb6dd898fc26aa
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.12 (GNU/Linux)
-
-iEYEARECAAYFAkpQfNQACgkQkKaRLQcq0GIpFgCbBL31NI2uJIsrSAYO7+vGKEY8
-uYsAoJ3Kal5cdB/VYEsYfm4jzGxGDuWY
-=FyVT
------END PGP SIGNATURE-----
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