Remove AM_ICONV macro from configure on non-nls builds, bug #155791

Package-Manager: portage-2.1.2-r9

3 files changed, 17 insertions, 11 deletions

diff --git a/media-gfx/graphviz/ChangeLog b/media-gfx/graphviz/ChangeLog
index 6d00321116be..5a6db897eb59 100644
--- a/media-gfx/graphviz/ChangeLog
+++ b/media-gfx/graphviz/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-gfx/graphviz
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.107 2007/02/19 18:17:42 chrb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.108 2007/02/19 18:47:35 chrb Exp $
+
+  19 Feb 2007; Chris Bainbridge <chrb@gentoo.org> graphviz-2.12.ebuild:
+  Remove AM_ICONV macro from configure on non-nls builds, bug #155791
 
   19 Feb 2007; Chris Bainbridge <chrb@gentoo.org> graphviz-2.12.ebuild:
   Add depend on glib, bug #167235
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 534256df3a81..6416dcc65c6b 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -35,10 +35,10 @@ EBUILD graphviz-1.16-r1.ebuild 2128 RMD160 206e1c95874235517ad621d7a5ca93751b658
 MD5 054c435dd77aa5b94fdaae88f83140f6 graphviz-1.16-r1.ebuild 2128
 RMD160 206e1c95874235517ad621d7a5ca93751b658433 graphviz-1.16-r1.ebuild 2128
 SHA256 d0e254b507965e6853ed2489e087202dc04d90c32a97aba740cdefd56b651a56 graphviz-1.16-r1.ebuild 2128
-EBUILD graphviz-2.12.ebuild 3144 RMD160 a544c4d855b6725d4705c080bc8f1413f058dda5 SHA1 6fee5966a674ad9e61b8c47e0ad70a9bb0caa191 SHA256 200200554e393f80febd511095f77c5038e6f68997965d13876fae9a7dab4a3e
-MD5 3fac8a933dcd430b5273ac013d935372 graphviz-2.12.ebuild 3144
-RMD160 a544c4d855b6725d4705c080bc8f1413f058dda5 graphviz-2.12.ebuild 3144
-SHA256 200200554e393f80febd511095f77c5038e6f68997965d13876fae9a7dab4a3e graphviz-2.12.ebuild 3144
+EBUILD graphviz-2.12.ebuild 3249 RMD160 e1a10ab3b6db04019348786d08b222a0beb327e9 SHA1 4670a5b76052ce3edd5aa1287a6c3858b050a22b SHA256 d224c4b7c6e28967d67a4fdb91ac3cf3d50ae4b88f9f15a170731c8e3cfb331c
+MD5 8d4f4c92842d6b92dd54b82e3f9094e2 graphviz-2.12.ebuild 3249
+RMD160 e1a10ab3b6db04019348786d08b222a0beb327e9 graphviz-2.12.ebuild 3249
+SHA256 d224c4b7c6e28967d67a4fdb91ac3cf3d50ae4b88f9f15a170731c8e3cfb331c graphviz-2.12.ebuild 3249
 EBUILD graphviz-2.6-r1.ebuild 1638 RMD160 1382f4a7e7ac3654b0b71c3e36fd87e57c911f84 SHA1 e1f0b5296e700d5974ce136d73c740b4d287f38c SHA256 37a43a33bd0a53d4053634066f3c99183d665c343d3601d733b25dcac7bc25da
 MD5 308666689ed931d9984235894a7e5319 graphviz-2.6-r1.ebuild 1638
 RMD160 1382f4a7e7ac3654b0b71c3e36fd87e57c911f84 graphviz-2.6-r1.ebuild 1638
@@ -51,10 +51,10 @@ EBUILD graphviz-2.8-r2.ebuild 2698 RMD160 7bc5e8f1214db82441914579fa9fc414debd37
 MD5 845131c4d20080da2cea6df0fb345921 graphviz-2.8-r2.ebuild 2698
 RMD160 7bc5e8f1214db82441914579fa9fc414debd37e6 graphviz-2.8-r2.ebuild 2698
 SHA256 d2cf4e84d900fc8fa5632c6916eef57e7eb22a28ce3b3b41f14df206e663e881 graphviz-2.8-r2.ebuild 2698
-MISC ChangeLog 16274 RMD160 cc91ae182230bdf57167d60ff6f0b1773e6d267e SHA1 ca7ff6e75b3dcd14aff655852945c3fc8445c9f6 SHA256 1e5745ba51df695dd5de0924101c64dd447250bf4d80ad3788ef152a9ab7a130
-MD5 5023280c3c188913dc4ff3aea59f99b3 ChangeLog 16274
-RMD160 cc91ae182230bdf57167d60ff6f0b1773e6d267e ChangeLog 16274
-SHA256 1e5745ba51df695dd5de0924101c64dd447250bf4d80ad3788ef152a9ab7a130 ChangeLog 16274
+MISC ChangeLog 16417 RMD160 555674ff88aba2eff2819b6a9355d3c6cb8b20d9 SHA1 f60bb0a319d2a85d0665acf5ee2f9de216aa5f51 SHA256 2c3ca3e5982972f90e028f5406ab2aeb391a18486be79bc48126c49fbe02af85
+MD5 42fcd459be80e39c0780b36615b8a13d ChangeLog 16417
+RMD160 555674ff88aba2eff2819b6a9355d3c6cb8b20d9 ChangeLog 16417
+SHA256 2c3ca3e5982972f90e028f5406ab2aeb391a18486be79bc48126c49fbe02af85 ChangeLog 16417
 MISC metadata.xml 1540 RMD160 4652a8cc1044e37e34e06be5480a9ee6f842c333 SHA1 b493bbaade7ae395c87ada0bbef0b0f0e7f7fb08 SHA256 c2a220f962a3048cc026e4c376b6555bfd0be7b401206d0ae3d265d628f231a1
 MD5 e98595ce89ff0da26058b1e6e0ce3d31 metadata.xml 1540
 RMD160 4652a8cc1044e37e34e06be5480a9ee6f842c333 metadata.xml 1540
diff --git a/media-gfx/graphviz/graphviz-2.12.ebuild b/media-gfx/graphviz/graphviz-2.12.ebuild
index ffc08d5be135..113e64a95125 100644
--- a/media-gfx/graphviz/graphviz-2.12.ebuild
+++ b/media-gfx/graphviz/graphviz-2.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.12.ebuild,v 1.5 2007/02/19 18:17:42 chrb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.12.ebuild,v 1.6 2007/02/19 18:47:35 chrb Exp $
 
 WANT_AUTOCONF=latest
 WANT_AUTOMAKE=latest
@@ -14,7 +14,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 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
-IUSE="cairo doc examples gtk tcl tk X guile java lua pango perl php python ruby ocaml"
+IUSE="cairo doc examples gtk tcl tk X guile java lua pango perl php python ruby ocaml nls"
 
 RDEPEND="
 	>=media-libs/gd-2.0.28
@@ -75,6 +75,9 @@ src_unpack() {
 	# Make sure SWIG interface is rebuilt
 	touch tclpkg/gv/gv.i
 
+	# no nls, no gettext, no iconv macro, so disable it
+	use nls || sed -i '/^AM_ICONV/d' configure.ac
+
 	eautoreconf
 }