Fix cross-compilation (bug #266570) by exporting BUILD_CC and forcing-enabled epoll on Linux builds. Also change the libiconv dependency on idn. Note that USE=ssl fails because there is another AC_TRY_RUN call that is not short-circuitable.

Package-Manager: portage-2.2.0_alpha37/cvs/Linux x86_64

3 files changed, 19 insertions, 14 deletions

diff --git a/net-dns/bind-tools/ChangeLog b/net-dns/bind-tools/ChangeLog
index 65f8265b740a..5f8e6dda8bdf 100644
--- a/net-dns/bind-tools/ChangeLog
+++ b/net-dns/bind-tools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dns/bind-tools
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind-tools/ChangeLog,v 1.195 2011/05/27 19:03:47 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind-tools/ChangeLog,v 1.196 2011/06/02 10:54:16 flameeyes Exp $
+
+  02 Jun 2011; Diego E. Pettenò <flameeyes@gentoo.org>
+  bind-tools-9.8.0.ebuild:
+  Fix cross-compilation (bug #266570) by exporting BUILD_CC and forcing-enabled
+  epoll on Linux builds. Also change the libiconv dependency on idn. Note that
+  USE=ssl fails because there is another AC_TRY_RUN call that is not
+  short-circuitable.
 
   27 May 2011; Christian Ruppert <idl0r@gentoo.org>
   -bind-tools-9.6.2_p2-r2.ebuild, -bind-tools-9.6.3.ebuild,
diff --git a/net-dns/bind-tools/Manifest b/net-dns/bind-tools/Manifest
index dccb9cc5bfb7..46a23b8c3d65 100644
--- a/net-dns/bind-tools/Manifest
+++ b/net-dns/bind-tools/Manifest
@@ -1,22 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX bind-tools-9.5.0_p1-lwconfig.patch 1856 RMD160 c14e44da385b69d80e0635f56a3d3a3eda7471d9 SHA1 9297301e6b43d5887b3d40b7a97c1ee6c015cd38 SHA256 5e39cd20da4f2b3bf5ee352d73249c105de1e182c595afb20a15e950f2f88f02
 AUX bind-tools-configure.patch 1686 RMD160 4ff8355af81705058fd411910dfae94887bcd884 SHA1 67ae0deff73689cb39cd6e7451262bdda9c25a39 SHA256 dc9386b88eac48c282d63d0be7e7be81d4a0a08035a8b97138a61133e057bcea
 DIST bind-9.7.3.tar.gz 7653584 RMD160 9e53c9cefa2e8261bc52b5d6d7ed550891d9dce5 SHA1 78e14b3d3e653a8c21b098361b645dee5ed66238 SHA256 7c584ca838da4adb6e94e4507b97b180248ca2b1e6aec1513336b58b344a29f7
 DIST bind-9.8.0.tar.gz 7760161 RMD160 648ed29a16a0bb3202e177ea3762301ed00f1cde SHA1 33019694ef3119d9daa1e8ff5117a6688e188528 SHA256 e44183f5a4ab7d3deb3c08171c4821c391d6b10ed8d4bc6485a1fc3ba6490c06
 EBUILD bind-tools-9.7.3.ebuild 2147 RMD160 9f242789eeb1e2e6575dcb93420967eff81680a7 SHA1 9a7d0574190cbcef267da6b0d1739f828ed16063 SHA256 717d44766969ebd19b7b2a79ffe243011d313d35a1225ec6c3a7671b694b9cf1
-EBUILD bind-tools-9.8.0.ebuild 2179 RMD160 69b57f58775876a636d9b236d5f80ffeecc84f29 SHA1 f3854c889185e641e99d640153324ef4de341e8a SHA256 32b00fbeb493d16d73e8b60838deceb25add46de574c1eee9d032066c15c9ff5
-MISC ChangeLog 28688 RMD160 ee51f8bb57b82c319f36f8406c1a058c9d0c171d SHA1 668e57cc931bfa7864152329c8dddf48e8088b3d SHA256 151d3509b80bbd1234078c9e499da06a4709e66e05a8aa7691ab4a4b6854762f
+EBUILD bind-tools-9.8.0.ebuild 2233 RMD160 e0d3b5e958c382a0a8d83f0aa1901a65c30ae90c SHA1 2ee151481efd7adf0cad9960d02c1fe250909538 SHA256 9ba5f8cf17e82379a1e81b4be629be09ddb442d83d4d36111ebd40dce92a8807
+MISC ChangeLog 29025 RMD160 4ad3ca0200d40b5dbe46fc78858203de3cafcfe3 SHA1 00c581cfdaa4a6ec4523b08c0f79ee046029a9de SHA256 133cd61b00a455d56057fc5fb27c9c238ec3615dfe9cbf9cc853b92012acb004
 MISC metadata.xml 404 RMD160 195b3b18d3e39f54752a237fb4cb5a3b81711693 SHA1 efcb09b5b1b373bfc8752ceb0e2d3c8a0ddf3406 SHA256 154ff8de1840636e48824951b20e2d2f3246f33f83abe2651f9d61ec5cd24d60
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBCAAGBQJN3/WYAAoJEMOx0zmdw4Z1Ja8IAIZ2u4TgMkuEExjvWoBuhlN1
-pKFpNJ6Uw9DblO97zT0nzhRzyPJQrXDLns/0a9mD+Dhr9piVD/6VBqWGJOo4h4Qg
-zvASoWEENsX415Zws8EITfQqxVAHat380PVpEf62MleHpUDtVO/ojolXrH/jwe2o
-OkZ/ZTpCgjqQgDHhsxOSHZrKwlb67jjEMni52G0s8c+YjLe7cvUbAQpdECka8n/X
-f6jxTRnawEjkB6t1XXYpo2514xeSDQ1GHUMPwxWjoTY64V2NyQb1rtpTJ0tNxC5z
-+LlwEwc9bim/l3aFbt1flNwqrNeZtBol8INbj0qq1z2jxjtOqWLam0D/+HgqyZs=
-=O1Kh
+iEYEARECAAYFAk3na7cACgkQAiZjviIA2XhmYwCfe7OeYjcvwBhgQPX7+Cq4Dk+b
+TykAnA/IVIH02C37wrrAjVmfyh2PSx6l
+=St/s
 -----END PGP SIGNATURE-----
diff --git a/net-dns/bind-tools/bind-tools-9.8.0.ebuild b/net-dns/bind-tools/bind-tools-9.8.0.ebuild
index c3894eedcd73..c786aa0921c0 100644
--- a/net-dns/bind-tools/bind-tools-9.8.0.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.8.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 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.8.0.ebuild,v 1.1 2011/03/01 17:52:18 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind-tools/bind-tools-9.8.0.ebuild,v 1.2 2011/06/02 10:54:16 flameeyes Exp $
 
 EAPI="3"
 
-inherit eutils autotools flag-o-matic
+inherit eutils autotools flag-o-matic toolchain-funcs
 
 MY_PN=${PN//-tools}
 MY_PV=${PV/_p/-P}
@@ -23,7 +23,7 @@ IUSE="doc idn ipv6 ssl urandom xml"
 DEPEND="ssl? ( dev-libs/openssl )
 	xml? ( dev-libs/libxml2 )
 	idn? (
-		|| ( sys-libs/glibc dev-libs/libiconv )
+		virtual/libiconv
 		net-dns/idnkit
 		)"
 RDEPEND="${DEPEND}"
@@ -58,8 +58,10 @@ src_configure() {
 	# bug 344029
 	append-cflags "-DDIG_SIGCHASE"
 
+	tc-export BUILD_CC
 	econf \
 		$(use_enable ipv6) \
+		$(use_enable kernel_linux epoll) \
 		$(use_with idn) \
 		$(use_with ssl openssl) \
 		$(use_with xml libxml2) \