Add USE=old-output to revert ifconfig output to old style #217775. Start a new live git ebuild.

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

4 files changed, 203 insertions, 1 deletions

diff --git a/sys-apps/net-tools/ChangeLog b/sys-apps/net-tools/ChangeLog
index 3677154c3f9f..e95a1190a482 100644
--- a/sys-apps/net-tools/ChangeLog
+++ b/sys-apps/net-tools/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-apps/net-tools
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/ChangeLog,v 1.118 2011/10/23 19:48:47 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/ChangeLog,v 1.119 2011/11/21 20:34:49 vapier Exp $
+
+*net-tools-9999 (21 Nov 2011)
+*net-tools-1.60_p201111202031570500 (21 Nov 2011)
+
+  21 Nov 2011; Mike Frysinger <vapier@gentoo.org>
+  +net-tools-1.60_p201111202031570500.ebuild, +net-tools-9999.ebuild,
+  metadata.xml:
+  Add USE=old-output to revert ifconfig output to old style #217775.
+  Start a new live git ebuild.
 
   23 Oct 2011; Fabian Groffen <grobian@gentoo.org>
   net-tools-1.60_p20110820045617.ebuild:
diff --git a/sys-apps/net-tools/metadata.xml b/sys-apps/net-tools/metadata.xml
index 96a2d586367d..0c72e81d0315 100644
--- a/sys-apps/net-tools/metadata.xml
+++ b/sys-apps/net-tools/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
+<use>
+ <flag name='old-output'>use old ifconfig output style (useful for when new output breaks scripts)</flag>
+</use>
 </pkgmetadata>
diff --git a/sys-apps/net-tools/net-tools-1.60_p201111202031570500.ebuild b/sys-apps/net-tools/net-tools-1.60_p201111202031570500.ebuild
new file mode 100644
index 000000000000..8eb769560d00
--- /dev/null
+++ b/sys-apps/net-tools/net-tools-1.60_p201111202031570500.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2011 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_p201111202031570500.ebuild,v 1.1 2011/11/21 20:34:49 vapier Exp $
+
+EAPI="3"
+
+inherit flag-o-matic toolchain-funcs eutils
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URL="git://net-tools.git.sourceforge.net/gitroot/net-tools/net-tools"
+	inherit git-2
+	KEYWORDS=""
+else
+	PATCH_VER="1"
+	SRC_URI="mirror://gentoo/${P}.tar.xz
+		mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="Standard Linux networking tools"
+HOMEPAGE="http://net-tools.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="nls old-output static"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	app-arch/xz-utils"
+
+maint_pkg_create() {
+	cd /usr/local/src/net-tools/git
+	#git-update
+	local stamp=$(git log -n1 --pretty=format:%ai master | sed -e 's:[- :]::g' -e 's:+.*::')
+	local pv="${PV/_p*}_p${stamp}"; pv=${pv/9999/1.60}
+	local p="${PN}-${pv}"
+	git archive --prefix="nt/" master | tar xf - -C "${T}"
+	pushd "${T}" >/dev/null
+	pushd nt >/dev/null
+	sed -i "/^RELEASE/s:=.*:=${pv}:" Makefile || die
+	emake dist >/dev/null
+	popd >/dev/null
+	zcat ${p}.tar.gz | xz > ${p}.tar.xz
+	rm -f ${p}.tar.gz
+	popd >/dev/null
+
+	local patches="${p}-patches-${PATCH_VER:-1}"
+	local d="${T}/${patches}"
+	mkdir "${d}"
+	git format-patch -o "${d}" master..gentoo > /dev/null
+	echo "From http://git.overlays.gentoo.org/gitweb/?p=proj/net-tools.git" > "${d}"/README
+	tar cf - -C "${T}" ${d##*/} | xz > "${T}"/${patches}.tar.xz
+	rm -rf "${d}"
+
+	du -b "${T}"/*.tar.xz
+}
+
+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_prepare() {
+	if [[ -n ${PATCH_VER} ]] ; then
+		use old-output || EPATCH_EXCLUDE="0001-revert-621a2f376334f8097604b9fee5783e0f1141e66d-for-.patch"
+		EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" epatch "${WORKDIR}"/${P}-patches-${PATCH_VER}
+	fi
+}
+
+src_configure() {
+	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
+	tc-export AR CC
+	yes "" | ./configure.sh config.in || die
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install || die
+	dodoc README README.ipv6 TODO
+}
+
+pkg_postinst() {
+	einfo "etherwake and such have been split into net-misc/ethercard-diag"
+}
diff --git a/sys-apps/net-tools/net-tools-9999.ebuild b/sys-apps/net-tools/net-tools-9999.ebuild
new file mode 100644
index 000000000000..61595a858ff7
--- /dev/null
+++ b/sys-apps/net-tools/net-tools-9999.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/net-tools-9999.ebuild,v 1.1 2011/11/21 20:34:49 vapier Exp $
+
+EAPI="3"
+
+inherit flag-o-matic toolchain-funcs eutils
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://net-tools.git.sourceforge.net/gitroot/net-tools/net-tools"
+	inherit git-2
+	KEYWORDS=""
+else
+	PATCH_VER="1"
+	SRC_URI="mirror://gentoo/${P}.tar.xz
+		mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="Standard Linux networking tools"
+HOMEPAGE="http://net-tools.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="nls old-output static"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	app-arch/xz-utils"
+
+maint_pkg_create() {
+	cd /usr/local/src/net-tools/git
+	#git-update
+	local stamp=$(git log -n1 --pretty=format:%ai master | sed -e 's:[- :]::g' -e 's:+.*::')
+	local pv="${PV/_p*}_p${stamp}"; pv=${pv/9999/1.60}
+	local p="${PN}-${pv}"
+	git archive --prefix="nt/" master | tar xf - -C "${T}"
+	pushd "${T}" >/dev/null
+	pushd nt >/dev/null
+	sed -i "/^RELEASE/s:=.*:=${pv}:" Makefile || die
+	emake dist >/dev/null
+	popd >/dev/null
+	zcat ${p}.tar.gz | xz > ${p}.tar.xz
+	rm -f ${p}.tar.gz
+	popd >/dev/null
+
+	local patches="${p}-patches-${PATCH_VER:-1}"
+	local d="${T}/${patches}"
+	mkdir "${d}"
+	git format-patch -o "${d}" master..gentoo > /dev/null
+	echo "From http://git.overlays.gentoo.org/gitweb/?p=proj/net-tools.git" > "${d}"/README
+	tar cf - -C "${T}" ${d##*/} | xz > "${T}"/${patches}.tar.xz
+	rm -rf "${d}"
+
+	du -b "${T}"/*.tar.xz
+}
+
+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_prepare() {
+	if [[ -n ${PATCH_VER} ]] ; then
+		use old-output || EPATCH_EXCLUDE="0001-revert-621a2f376334f8097604b9fee5783e0f1141e66d-for-.patch"
+		EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" epatch "${WORKDIR}"/${P}-patches-${PATCH_VER}
+	fi
+}
+
+src_configure() {
+	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
+	tc-export AR CC
+	yes "" | ./configure.sh config.in || die
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install || die
+	dodoc README README.ipv6 TODO
+}
+
+pkg_postinst() {
+	einfo "etherwake and such have been split into net-misc/ethercard-diag"
+}