Make sure the bind sub-build doesn't find libcap or it can rely on it for the build process (disrupting cross-compilation). Also make the vim syntax package a runtime dependency only, not a build-time one.

(Portage version: 2.2.0_alpha51/cvs/Linux x86_64)

2 files changed, 14 insertions, 4 deletions

diff --git a/net-misc/dhcp/ChangeLog b/net-misc/dhcp/ChangeLog
index 6e18b298ca50..61c013a4427b 100644
--- a/net-misc/dhcp/ChangeLog
+++ b/net-misc/dhcp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/dhcp
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.184 2011/08/27 15:41:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.185 2011/08/29 21:08:27 flameeyes Exp $
+
+  29 Aug 2011; Diego E. Pettenò <flameeyes@gentoo.org> dhcp-4.2.2-r1.ebuild:
+  Make sure the bind sub-build doesn't find libcap or it can rely on it for the
+  build process (disrupting cross-compilation). Also make the vim syntax
+  package a runtime dependency only, not a build-time one.
 
 *dhcp-4.2.2-r1 (27 Aug 2011)
 
diff --git a/net-misc/dhcp/dhcp-4.2.2-r1.ebuild b/net-misc/dhcp/dhcp-4.2.2-r1.ebuild
index 55f86bec7db3..218f1d387ada 100644
--- a/net-misc/dhcp/dhcp-4.2.2-r1.ebuild
+++ b/net-misc/dhcp/dhcp-4.2.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.2.2-r1.ebuild,v 1.1 2011/08/27 15:41:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.2.2-r1.ebuild,v 1.2 2011/08/29 21:08:27 flameeyes Exp $
 
 EAPI="2"
 
@@ -22,12 +22,12 @@ IUSE="+client ipv6 kernel_linux ldap selinux +server ssl vim-syntax"
 
 DEPEND="selinux? ( sec-policy/selinux-dhcp )
 	kernel_linux? ( sys-apps/net-tools )
-	vim-syntax? ( app-vim/dhcpd-syntax )
 	ldap? (
 		net-nds/openldap
 		ssl? ( dev-libs/openssl )
 	)"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	vim-syntax? ( app-vim/dhcpd-syntax )"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -121,6 +121,11 @@ src_configure() {
 	tc-export AR BUILD_CC
 	export ac_cv_path_AR=${AR}
 
+	# this is tested for by the bind build system, and can cause trouble
+	# when cross-building; since dhcp itself doesn't make use of libcap,
+	# simply disable it.
+	export ac_cv_lib_cap_cap_set_proc=no
+
 	# Use FHS sane paths ... some of these have configure options,
 	# but not all, so just do it all here.
 	local e="/etc/dhcp" r="/var/run/dhcp" l="/var/lib/dhcp"