Do not build the arpd binary if USE=-berkdb #81660 by Roy Marples.

Package-Manager: portage-2.0.51-r15

4 files changed, 18 insertions, 12 deletions

diff --git a/sys-apps/iproute2/ChangeLog b/sys-apps/iproute2/ChangeLog
index 31b1048af400..c7f3649b3e57 100644
--- a/sys-apps/iproute2/ChangeLog
+++ b/sys-apps/iproute2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/iproute2
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.28 2005/02/10 02:48:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.29 2005/02/12 03:42:56 vapier Exp $
+
+  11 Feb 2005; Mike Frysinger <vapier@gentoo.org>
+  iproute2-2.6.10.20050112-r1.ebuild, iproute2-2.6.10.20050124.ebuild:
+  Do not build the arpd binary if USE=-berkdb #81660 by Roy Marples.
 
 *iproute2-2.6.10.20050124 (09 Feb 2005)
 
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index b23aea40527a..a902ea055527 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -1,7 +1,7 @@
-MD5 ef87e4ab343babf6f4b05db24ed13ada ChangeLog 8377
+MD5 c6564e707be1a612b782681767c2dcad ChangeLog 8568
 MD5 d0dad7daa0e6d356fc35f778fed36006 metadata.xml 225
-MD5 2e28c97b4c01240101434a05a31c2f39 iproute2-2.6.10.20050124.ebuild 1661
-MD5 917d14912a7cc06c871821ac828fb08c iproute2-2.6.10.20050112-r1.ebuild 1670
+MD5 d6869d0cff1a30850dc0db41394ec9d8 iproute2-2.6.10.20050124.ebuild 1782
+MD5 d3cde7b6b34b2e85954f70dc2742ac63 iproute2-2.6.10.20050112-r1.ebuild 1791
 MD5 685740c0085d0dc14ae1f69d09e8d444 iproute2-2.6.7.20040608-r1.ebuild 2360
 MD5 b44fead085cc41126320e2bde31bc129 files/digest-iproute2-2.6.10.20050124 76
 MD5 d3a321fa8b70eef6df11d7343a14fd02 files/2.4.7.20020116-hfsc.patch 9507
diff --git a/sys-apps/iproute2/iproute2-2.6.10.20050112-r1.ebuild b/sys-apps/iproute2/iproute2-2.6.10.20050112-r1.ebuild
index 2daf0db0316e..c08d54fd9a68 100644
--- a/sys-apps/iproute2/iproute2-2.6.10.20050112-r1.ebuild
+++ b/sys-apps/iproute2/iproute2-2.6.10.20050112-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-2.6.10.20050112-r1.ebuild,v 1.7 2005/02/09 14:52:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-2.6.10.20050112-r1.ebuild,v 1.8 2005/02/12 03:42:56 vapier Exp $
 
 inherit eutils toolchain-funcs
 
@@ -14,10 +14,10 @@ SRC_URI="http://developer.osdl.org/dev/iproute2/download/${PN}-${MY_PV}-${SNAP}.
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
-IUSE="atm minimal"
+IUSE="atm berkdb minimal"
 
 RDEPEND="virtual/libc
-	!minimal? ( sys-libs/db )
+	!minimal? ( berkdb? ( sys-libs/db ) )
 	atm? ( net-dialup/linux-atm )"
 DEPEND="${RDEPEND}
 	>=virtual/os-headers-2.4.21
@@ -33,7 +33,8 @@ src_unpack() {
 	epatch \
 		${FILESDIR}/2.6.9.20041106-esfq.patch \
 		${FILESDIR}/2.6.9.20041019-wrr.patch
-
+	# don't build arpd if USE=-berkdb #81660
+	use berkdb || sed -i '/^TARGETS=/s: arpd : :' misc/Makefile
 	# Multilib fixes
 	sed -i "s:/usr/lib/tc:/usr/$(get_libdir)/tc:g" ${S}/tc/Makefile ${S}/tc/tc.c ${S}/tc/q_netem.c
 }
diff --git a/sys-apps/iproute2/iproute2-2.6.10.20050124.ebuild b/sys-apps/iproute2/iproute2-2.6.10.20050124.ebuild
index 474ff3072de5..1265e485607e 100644
--- a/sys-apps/iproute2/iproute2-2.6.10.20050124.ebuild
+++ b/sys-apps/iproute2/iproute2-2.6.10.20050124.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-2.6.10.20050124.ebuild,v 1.1 2005/02/10 02:48:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-2.6.10.20050124.ebuild,v 1.2 2005/02/12 03:42:56 vapier Exp $
 
 inherit eutils toolchain-funcs
 
@@ -14,10 +14,10 @@ SRC_URI="http://developer.osdl.org/dev/iproute2/download/${PN}-${MY_PV}-${SNAP}.
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="atm minimal"
+IUSE="atm berkdb minimal"
 
 RDEPEND="virtual/libc
-	!minimal? ( sys-libs/db )
+	!minimal? ( berkdb? ( sys-libs/db ) )
 	atm? ( net-dialup/linux-atm )"
 DEPEND="${RDEPEND}
 	>=virtual/os-headers-2.4.21
@@ -33,7 +33,8 @@ src_unpack() {
 	epatch \
 		${FILESDIR}/2.6.9.20041106-esfq.patch \
 		${FILESDIR}/2.6.9.20041019-wrr.patch
-
+	# don't build arpd if USE=-berkdb #81660
+	use berkdb || sed -i '/^TARGETS=/s: arpd : :' misc/Makefile
 	# Multilib fixes
 	sed -i "s:/usr/lib/tc:/usr/$(get_libdir)/tc:g" \
 		tc/Makefile tc/tc.c tc/q_netem.c