Replace opts with extra_commands in init.d script. Use append-flags -D__ARCH__=64 the way the Debian patch was intended (fixes bug #398243 by Zsolti).

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

3 files changed, 17 insertions, 8 deletions

diff --git a/net-analyzer/dhcp_probe/ChangeLog b/net-analyzer/dhcp_probe/ChangeLog
index 4ede93dbc3cd..c1fa911c4625 100644
--- a/net-analyzer/dhcp_probe/ChangeLog
+++ b/net-analyzer/dhcp_probe/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/dhcp_probe
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/dhcp_probe/ChangeLog,v 1.5 2010/02/20 16:31:57 jer Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/dhcp_probe/ChangeLog,v 1.6 2012/01/17 17:44:01 jer Exp $
+
+*dhcp_probe-1.3.0-r3 (17 Jan 2012)
+
+  17 Jan 2012; Jeroen Roovers <jer@gentoo.org> -dhcp_probe-1.3.0-r2.ebuild,
+  +dhcp_probe-1.3.0-r3.ebuild, files/dhcp_probe.initd:
+  Replace opts with extra_commands in init.d script. Use append-flags
+  -D__ARCH__=64 the way the Debian patch was intended (fixes bug #398243 by
+  Zsolti).
 
 *dhcp_probe-1.3.0-r2 (20 Feb 2010)
 
diff --git a/net-analyzer/dhcp_probe/dhcp_probe-1.3.0-r2.ebuild b/net-analyzer/dhcp_probe/dhcp_probe-1.3.0-r3.ebuild
index c59b6cb2b376..c9c74eb0a950 100644
--- a/net-analyzer/dhcp_probe/dhcp_probe-1.3.0-r2.ebuild
+++ b/net-analyzer/dhcp_probe/dhcp_probe-1.3.0-r3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/dhcp_probe/dhcp_probe-1.3.0-r2.ebuild,v 1.1 2010/02/20 16:31:57 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/dhcp_probe/dhcp_probe-1.3.0-r3.ebuild,v 1.1 2012/01/17 17:44:01 jer Exp $
 
 EAPI="2"
 
-inherit eutils
+inherit eutils flag-o-matic
 
 DESCRIPTION="dhcp_probe attempts to discover DHCP and BootP servers on a directly-attached Ethernet network"
 HOMEPAGE="http://www.net.princeton.edu/software/dhcp_probe/"
@@ -26,6 +26,7 @@ src_prepare() {
 }
 
 src_configure() {
+	use amd64 && append-flags -D__ARCH__=64
 	STRIP=true econf || die "econf failed"
 }
 
diff --git a/net-analyzer/dhcp_probe/files/dhcp_probe.initd b/net-analyzer/dhcp_probe/files/dhcp_probe.initd
index e150a48ba48d..0192b337b65e 100644
--- a/net-analyzer/dhcp_probe/files/dhcp_probe.initd
+++ b/net-analyzer/dhcp_probe/files/dhcp_probe.initd
@@ -1,9 +1,9 @@
 #!/sbin/runscript
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/dhcp_probe/files/dhcp_probe.initd,v 1.2 2010/02/20 16:31:58 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/dhcp_probe/files/dhcp_probe.initd,v 1.3 2012/01/17 17:44:02 jer Exp $
 
-opts="reload"
+extra_commands="reload"
 
 DHCP_PROBE_BINARY="/usr/sbin/dhcp_probe"
 DHCP_PROBE_CONFIG="/etc/dhcp_probe.cf"