summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sys-apps/net-tools')
-rw-r--r--sys-apps/net-tools/ChangeLog10
-rw-r--r--sys-apps/net-tools/net-tools-1.60_p20071202044231-r1.ebuild24
2 files changed, 26 insertions, 8 deletions
diff --git a/sys-apps/net-tools/ChangeLog b/sys-apps/net-tools/ChangeLog
index 3ac67ad048ff..26cbca825fab 100644
--- a/sys-apps/net-tools/ChangeLog
+++ b/sys-apps/net-tools/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for sys-apps/net-tools
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/ChangeLog,v 1.84 2008/09/30 11:33:15 armin76 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/ChangeLog,v 1.85 2009/08/24 08:16:54 vapier Exp $
+
+ 24 Aug 2009; Mike Frysinger <vapier@gentoo.org>
+ net-tools-1.60_p20071202044231-r1.ebuild:
+ Update git invocation, disable infiniband with older kernels #238690 by
+ Mark Wagner, and disable strict aliasing because this source code base is
+ awful.
30 Sep 2008; Raúl Porcel <armin76@gentoo.org>
net-tools-1.60_p20071202044231-r1.ebuild:
diff --git a/sys-apps/net-tools/net-tools-1.60_p20071202044231-r1.ebuild b/sys-apps/net-tools/net-tools-1.60_p20071202044231-r1.ebuild
index ecf456ab71d6..7730717d21af 100644
--- a/sys-apps/net-tools/net-tools-1.60_p20071202044231-r1.ebuild
+++ b/sys-apps/net-tools/net-tools-1.60_p20071202044231-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/net-tools-1.60_p20071202044231-r1.ebuild,v 1.10 2008/09/30 11:33:15 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/net-tools-1.60_p20071202044231-r1.ebuild,v 1.11 2009/08/24 08:16:54 vapier Exp $
inherit flag-o-matic toolchain-funcs eutils
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.lzma"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
IUSE="nls static"
RDEPEND=""
@@ -20,25 +20,37 @@ DEPEND="nls? ( sys-devel/gettext )
maint_pkg_create() {
cd /usr/local/src/net-tools
#git-update
- local stamp=$(git log -n1 --pretty=format:%ai | sed -e 's:[- :]::g' -e 's:+.*::')
+ local stamp=$(git log -n1 --pretty=format:%ai master | sed -e 's:[- :]::g' -e 's:+.*::')
local pv="${PV/_p*}_p${stamp}"
local p="${PN}-${pv}"
- git-archive --prefix="${p}/" HEAD | lzma > "${T}"/${p}.tar.lzma
+ git archive --prefix="${p}/" master | lzma > "${T}"/${p}.tar.lzma
du -b "${T}"/${p}.tar.lzma
}
pkg_setup() { [[ -n ${VAPIER_LOVES_YOU} ]] && maint_pkg_create ; }
+set_opt() {
+ local opt=$1 ans
+ shift
+ ans=$("$@" && echo y || echo n)
+ einfo "Setting option ${opt} to ${ans}"
+ sed -i \
+ -e "/^bool.* ${opt} /s:[yn]$:${ans}:" \
+ config.in || die
+}
+
src_unpack() {
unpack ${A}
cd "${S}"
EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" epatch "${FILESDIR}"/${PV}/
- sed -i "/^bool.*I18N/s:[yn]$:$(use nls && echo y || echo n):" config.in
+ set_opt I18N use nls
+ set_opt HAVE_HWIB has_version '>=sys-kernel/linux-headers-2.6'
if use static ; then
append-flags -static
append-ldflags -static
fi
+ append-flags -fno-strict-aliasing #blah
}
src_compile() {