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.

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

3 files changed, 21 insertions, 11 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/Manifest b/net-misc/dhcp/Manifest
index 60f32f3c0575..c82f36e9eb3c 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX dhcp-3.0-fix-perms.patch 485 RMD160 3857270dffed5feee95609aeb37d0c9ef8844945 SHA1 1217265a8a7f1416b781e9f79e8dfb8304268e6c SHA256 a805a60b36e148886887aebb797e80f642386b3e55ef4a0b5132f96a2877e018
 AUX dhcp-3.0-paranoia.patch 5366 RMD160 7c64e3dac5b07ff3859fcaa7a8b0e52a0c50446c SHA1 a30103c138e480766f84644fffb1d0897709c27d SHA256 a8db9eb98397a9c1b3a0de07fc107c39dc4f6a4a331d404fc6fcc4a8dbc7aeae
@@ -41,14 +41,14 @@ DIST dhcp-4.2.2.tar.gz 8764108 RMD160 a7d0a66a6156cc2194a784b120587ffd5e8e200e S
 EBUILD dhcp-3.1.2_p1.ebuild 7582 RMD160 d7f42417b80f9f17e0c8c217c978707506802a22 SHA1 be9987191d730c6065c74fc8c9e8835e5d229561 SHA256 4ebe414e6dc4ce6f6b9ebf4f0bfd44b6af03330ff48c39ad7c9987ac1cae624f
 EBUILD dhcp-3.1.3_p1.ebuild 7741 RMD160 62ef4cf524beadef2847675416ea5982f23a3f8e SHA1 3995b5c53d6b11fde440cf43c0dacac31f084d72 SHA256 7a71c86e1685858826a09f28dff77d69a98ec1d37c93bbb6e4dd216af00ce96c
 EBUILD dhcp-4.2.1_p1.ebuild 6610 RMD160 0d058e755de185a58fc62a3d047021671de9a54a SHA1 5cf96d94250ba44b3120ae6a961c04e4f01996b5 SHA256 70534d654d5a2d02ea009d87f77bf86724ee94b7587f5b6959eef90475e5062a
-EBUILD dhcp-4.2.2-r1.ebuild 7690 RMD160 860df856e851e6e42e88efbe90df84c3b91be3be SHA1 6419f2c216bb72334249ff156a763bdf21a3179e SHA256 afe394e0d037a73c92743620125cd9eec794965f23c858018bb0333ede742f9c
+EBUILD dhcp-4.2.2-r1.ebuild 7894 RMD160 13f3a4e2a9ea39fbd76dd6e6b2fd0794643a86c9 SHA1 0495e7fc318b19242a61e78b6179ff61700e7d99 SHA256 6787973217634489e3e45e67c212ff60ce80bd721a198cf3348b2961ddd17e8e
 EBUILD dhcp-4.2.2.ebuild 7474 RMD160 a80b1fb2eb31ba8dc20f9d6fb914e37a5cf12174 SHA1 089b6bb9e87f07c950d7ee4261e081ba59f29fa5 SHA256 9f15f5b2d35d9ff4372250886f3751b94abb0fbebc99ea4d16e5abd74ccf9755
-MISC ChangeLog 31672 RMD160 7722280ac44f1a37bf93b58b4c87414edda5f052 SHA1 d3bb2f4c1950ba7d9690511abe16f52f7f6bd3e8 SHA256 6b337ac01f18229f43e99a90d89dfd1b40e505baf6afd547c6563bbda8ee3934
+MISC ChangeLog 31966 RMD160 72d9f7ddf43d0343c56bddf0183cd33c608cd3f9 SHA1 97dd0b21488d0d25f2e7a3a910c5e8e9ccf9f375 SHA256 25cb8f378ccd3d67109ae7a4b47116a6873dc52a37beeda1f85b1dce6e981d43
 MISC metadata.xml 500 RMD160 b5ad909ab2b12acd20e78039e33fda0a27383c9e SHA1 2fc5cee8e105e75a251195254c96085a0f3fa9a3 SHA256 e9e4edcf7671391ee2f2af0917a75fc07883f1401aaa22b72dd0133bef81601c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk5ZEDUACgkQaC/OocHi7Jb29gD8D6sOTj++1Ho7tkJT6kc3GgHQ
-N2z368EHEb6gWvsb7UwA/2FOg/cHHi4Rljc7gNSdok7N4Wfxk3o1N+B+lgXqswuQ
-=WsjR
+iEYEARECAAYFAk5b/8IACgkQAiZjviIA2XjJWgCfV7FjS0ohvroaUhF7zOyWR9PQ
+GQcAn3MBY7DfL4YD3sfzs8KPG8LPhKXt
+=1WFC
 -----END PGP SIGNATURE-----
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"