idn requires iconv, which is in a separate library for non glibc systems.

  Fixes #171043.
Package-Manager: portage-2.1.2.2

3 files changed, 19 insertions, 22 deletions

diff --git a/net-dns/bind-tools/ChangeLog b/net-dns/bind-tools/ChangeLog
index ec01d782e291..b580b529f9fa 100644
--- a/net-dns/bind-tools/ChangeLog
+++ b/net-dns/bind-tools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dns/bind-tools
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind-tools/ChangeLog,v 1.68 2007/02/28 15:04:04 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind-tools/ChangeLog,v 1.69 2007/03/16 11:55:50 uberlord Exp $
+
+  16 Mar 2007; Roy Marples <uberlord@gentoo.org> bind-tools-9.4.0.ebuild:
+  idn requires iconv, which is in a separate library for non glibc systems.
+  Fixes #171043.
 
 *bind-tools-9.4.0 (28 Feb 2007)
 
diff --git a/net-dns/bind-tools/Manifest b/net-dns/bind-tools/Manifest
index 0096c5d88c20..db2cc0506525 100644
--- a/net-dns/bind-tools/Manifest
+++ b/net-dns/bind-tools/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX bind-tools-configure.patch 1686 RMD160 4ff8355af81705058fd411910dfae94887bcd884 SHA1 67ae0deff73689cb39cd6e7451262bdda9c25a39 SHA256 dc9386b88eac48c282d63d0be7e7be81d4a0a08035a8b97138a61133e057bcea
 MD5 e0ebf10eb8bf4542ae57ba591daa68a4 files/bind-tools-configure.patch 1686
 RMD160 4ff8355af81705058fd411910dfae94887bcd884 files/bind-tools-configure.patch 1686
@@ -53,14 +50,14 @@ EBUILD bind-tools-9.3.4.ebuild 1745 RMD160 48e29adb50774c3237ced4b0111c93c8d7f24
 MD5 6bf343935cf4d06fbbf81d426929fd44 bind-tools-9.3.4.ebuild 1745
 RMD160 48e29adb50774c3237ced4b0111c93c8d7f2403b bind-tools-9.3.4.ebuild 1745
 SHA256 b02e867161eb7e18f08ae9680a86aefd60cd1030e11f194623f6071e32423dce bind-tools-9.3.4.ebuild 1745
-EBUILD bind-tools-9.4.0.ebuild 1735 RMD160 5b1a4645cd120842137fa833ccdcc6532daa5c91 SHA1 b8cbee5da67cfd138ccacfdd8b7d20e2ba955fcb SHA256 5dbb86a67b29923eed9545f1c382bf17b300b0d42c685878826f3bcda7494c40
-MD5 0fd7883e5d4d950971409d3d503c7abe bind-tools-9.4.0.ebuild 1735
-RMD160 5b1a4645cd120842137fa833ccdcc6532daa5c91 bind-tools-9.4.0.ebuild 1735
-SHA256 5dbb86a67b29923eed9545f1c382bf17b300b0d42c685878826f3bcda7494c40 bind-tools-9.4.0.ebuild 1735
-MISC ChangeLog 9600 RMD160 1200304ff93b4229d8a7dec7b2cc161e6a39d8ff SHA1 f15439545af88a2a7bcbf0f0eac7621cc8ce3a19 SHA256 6bfb1ec8f968dc55500377d25804c7802f7497d0195fe393b85c0cec7f84c4bd
-MD5 60ddcb66ce4e55bc27367924e47494b1 ChangeLog 9600
-RMD160 1200304ff93b4229d8a7dec7b2cc161e6a39d8ff ChangeLog 9600
-SHA256 6bfb1ec8f968dc55500377d25804c7802f7497d0195fe393b85c0cec7f84c4bd ChangeLog 9600
+EBUILD bind-tools-9.4.0.ebuild 1891 RMD160 42415cbe1a08dffc82ff727cff5f1c3cb3455ac0 SHA1 6c96b3ca586e6790c3d68d8de20b3ca791edd939 SHA256 e930b89a0c7464fd76566515e333193e24142ec46ccea8cb3bd29df82a13e3c5
+MD5 b519830ade357dcb1d622e67fd10bda9 bind-tools-9.4.0.ebuild 1891
+RMD160 42415cbe1a08dffc82ff727cff5f1c3cb3455ac0 bind-tools-9.4.0.ebuild 1891
+SHA256 e930b89a0c7464fd76566515e333193e24142ec46ccea8cb3bd29df82a13e3c5 bind-tools-9.4.0.ebuild 1891
+MISC ChangeLog 9771 RMD160 4feea1817d4454f914b74590d1366c02e5bdc8cc SHA1 25b5d3d1ca5265c7f6d1a565c3676498def1cb6e SHA256 4572a37fc9c4cf39df9051e51c9838131e4fdb24c14b8bfbef7abba65b92a4f6
+MD5 1621e7c6287bd5e135e25273b4da651b ChangeLog 9771
+RMD160 4feea1817d4454f914b74590d1366c02e5bdc8cc ChangeLog 9771
+SHA256 4572a37fc9c4cf39df9051e51c9838131e4fdb24c14b8bfbef7abba65b92a4f6 ChangeLog 9771
 MISC metadata.xml 334 RMD160 5bf93af61fefc6ad5d6c78fa595fcd70bd35c3a9 SHA1 0f537e70e9ddba477f8cd430f6d24589ba268755 SHA256 5a6b75435f504f86c0ff197f0374e59fbb00c9eb351e39336d07ed67ed54b92d
 MD5 8506aec044ae36f266ab8923eb2a111e metadata.xml 334
 RMD160 5bf93af61fefc6ad5d6c78fa595fcd70bd35c3a9 metadata.xml 334
@@ -95,10 +92,3 @@ SHA256 09af10a11578547923d7517ecdc7acad7ee53ab097a92ff61a282bf7168cd1b4 files/di
 MD5 ce02dcdd2d1e01fb89cdf0d324bb58b1 files/digest-bind-tools-9.4.0 235
 RMD160 77795c134c74d3f57c62a27ae46b89471a8d7dd3 files/digest-bind-tools-9.4.0 235
 SHA256 8df195dd08524ded532708b3875e34cadcd9f525ffc89172cd91c866c6175fce files/digest-bind-tools-9.4.0 235
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
-
-iD8DBQFF5ZmubwxeDFj+ScoRAsp0AJ93o964crCCrLhsF0QXDnCWb6FXMACgq9OW
-qdM6azL/O7i5DQPxjgo+0Cc=
-=If1C
------END PGP SIGNATURE-----
diff --git a/net-dns/bind-tools/bind-tools-9.4.0.ebuild b/net-dns/bind-tools/bind-tools-9.4.0.ebuild
index d39879248dda..9eb56f769c86 100644
--- a/net-dns/bind-tools/bind-tools-9.4.0.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.4.0.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/net-dns/bind-tools/bind-tools-9.4.0.ebuild,v 1.1 2007/02/28 15:04:04 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind-tools/bind-tools-9.4.0.ebuild,v 1.2 2007/03/16 11:55:50 uberlord Exp $
 
 inherit flag-o-matic
 
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="idn ipv6"
 
-DEPEND=""
+DEPEND="idn? ( || ( sys-libs/glibc dev-libs/libiconv ) )"
 
 src_unpack() {
 	unpack "${A}" || die
@@ -37,6 +37,7 @@ src_unpack() {
 }
 
 src_compile() {
+	local myconf=
 	use ipv6 && myconf="${myconf} --enable-ipv6" || myconf="${myconf} --enable-ipv6=no"
 
 	econf ${myconf} || die "Configure failed"
@@ -55,7 +56,9 @@ src_compile() {
 
 	use idn && {
 		cd ${S}/contrib/idn/idnkit-1.0-src
-		econf || die "idn econf failed"
+		local myconf=
+		has_version sys-libs/glibc || myconf="${myconf} --with-iconv"
+		econf ${myconf} || die "idn econf failed"
 		emake -j1 || die "idn emake failed"
 	}
 }