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

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

diff --git a/sys-apps/net-tools/ChangeLog b/sys-apps/net-tools/ChangeLog
index 3677154c3f9f15bbf8d2e174375e1ca340c395f8..e95a1190a4825f91a1174d36d9244ea844bcb9c1 100644 (file)
--- 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/Manifest b/sys-apps/net-tools/Manifest
index cfa85d538c7c187cdd41917f5ddcb3fa5b92573d..002b0b319ec817bcb1f0e78dfffc77fa7dceda3b 100644 (file)
--- a/sys-apps/net-tools/Manifest
+++ b/sys-apps/net-tools/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 DIST net-tools-1.60_p20090728014017-patches-3.tar.lzma 12545 RMD160 9640e3ae1a5e147c74708989684a121ef4ad4632 SHA1 c9c979d0316931e339176c9aa207fb389e022618 SHA256 f592ec69354b6910319bfea4179829b9be0662a5418417780cdc7dc2cdece60e
 DIST net-tools-1.60_p20090728014017.tar.lzma 187111 RMD160 5f6f21c725cbd69f1a9609f95f98f98425fbe5c3 SHA1 c7159f7ed892cf326c0665a5720edac0b3c912f8 SHA256 bcac2d566264f52c4c35c9e1cc130d22d93e95aa49ff3a77d0cf26e4dafc6fe6
@@ -9,16 +9,20 @@ DIST net-tools-1.60_p20110409135728-patches-1.tar.xz 3976 RMD160 96b104edca816ae
 DIST net-tools-1.60_p20110409135728.tar.xz 223168 RMD160 61ef911a9bf6bc28d92de96a9ccdbe852eb06f12 SHA1 47e6c6684999cccf48e014cb2248bc03677e5627 SHA256 2379dab69c68c0b6755cd063c9cb170d4b3862be9f0154cf4c28d749d232b98f
 DIST net-tools-1.60_p20110820045617-patches-1.tar.xz 3976 RMD160 5f94985597c609779f904dd3c1eb4ad0aecba635 SHA1 4f482fd54aba3c5e3fe95c407004ba1857185573 SHA256 b907e8d0ae9dadc4a6724d3085904f1ced6c3470a3c6750722b7b488e1540f5b
 DIST net-tools-1.60_p20110820045617.tar.xz 223160 RMD160 b4077de3e00ee897bd2c5c11dde41028ff60028c SHA1 d278c570eecccfeabf741b572f6c67f6046ee62e SHA256 2cedf95214e9c101785ad9050b08bd96bc1ed8e1567812136eff355d114b8f4b
+DIST net-tools-1.60_p201111202031570500-patches-1.tar.xz 3348 RMD160 e3a5ee4a4ccb943bbf97d0eb0c57bea2ed102052 SHA1 0aa724cf0ab29db6e36d6a3bb96c0fb4a4c52b5b SHA256 98a5e20f4cc6aca911e3b24cc04a071bff0f694023013755dc195da26089f837
+DIST net-tools-1.60_p201111202031570500.tar.xz 223532 RMD160 cf72be8dcd92676bd904e673799b61b5275b0d64 SHA1 63d31f76459a8e58e3f1c527d28f4ca309a95799 SHA256 58bd85bd7d4776635754dc4ca2b2b164346967bad67cf661d4c9933e7d6b5474
 EBUILD net-tools-1.60_p20090728014017-r1.ebuild 2129 RMD160 a8193a24c57e8c64c6378f5176776f28e2bca5c3 SHA1 0890430a1f093a88c9b0ae6bc0af8d20ff2a29b9 SHA256 1a1f10184cbf103461ebf4b06142b8cfd226fd00eee520f5820f46016ff894ef
 EBUILD net-tools-1.60_p20100815160931.ebuild 2161 RMD160 bd0d29e9dd8b97cc161c7f5555b4e88b102b6f2e SHA1 a291441c8df2331702a3282560c41323ae58184f SHA256 8d767dd395d4ab1fd6b02bcdff78a768824f4cc4314caad47af17fae72c5e299
 EBUILD net-tools-1.60_p20110409135728.ebuild 2255 RMD160 db4b3c05982f59f732a51125143610142d875c76 SHA1 6d3475263a73bf2043fb2e29a0ec55ff9ce44c36 SHA256 80b1c01a4484b7f2f71ac2f9f2ce4d634f694a60ec349b2648c833bcd7797aa5
 EBUILD net-tools-1.60_p20110820045617.ebuild 2285 RMD160 6d9ec56bd5a0d621740f903da785585a0104258b SHA1 2a4f7649573f8fb1bea2ab5b250ded7ebb9550c6 SHA256 0e5fe3f5cd1f4d613e6abfb1bdd91ca4e0dd1266820f79016ca8abbb700c4ad3
-MISC ChangeLog 18580 RMD160 54965645944d3619142528216bd520752fe676a5 SHA1 ff462a15830d1cd7a67e026c32a95e796511199f SHA256 23b67035c2b3e2ac6e96421a64d1c5fbc1e986810efb98a70c2d48a4054f055e
-MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+EBUILD net-tools-1.60_p201111202031570500.ebuild 2615 RMD160 052a11bcf404009de9f464d5cc6278d4f6a60650 SHA1 6f97ce522bbdcc4f51ccd13c05f491bfadb5fcc4 SHA256 75d1a40870411066a5c0f978b160d1109749539f27e7c653141752ef459c20a0
+EBUILD net-tools-9999.ebuild 2595 RMD160 98afead841174e9732f245abd380945cb29395c8 SHA1 dd2ae7e0d8d70aa34386459809eaa882c3952ec0 SHA256 c752a2848f0d9548a54690d80da019df5f01c39aa815f52d42c5df02fd3c77ac
+MISC ChangeLog 18897 RMD160 c006d120e6e03ebba2b0eab52a9c0cec93c8982a SHA1 04ff3a1955f26ada58ad6f589953d026e27236d8 SHA256 676a3e2e89f6790f02d74c0ba7dc39c9fdc64fbaf6e6c75e9a527fc870c8f946
+MISC metadata.xml 283 RMD160 81fc4d8272396ca42e82bdb0c886829cee76d462 SHA1 aa3da7f4f3a7bd1f794ef04bcc42c80a84480ee2 SHA256 cec36850384943bdbf7c366908c2e7e0d68c0c906fa9eeac1796effedb58c8a0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (Darwin)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6kb6QACgkQX3X2B8XHTol6AwCfUkTvUZJ4OQf9I72nTtR63Xzg
-734An0r0YvQOz0XiwUn1m1h5tIesaftg
-=j+89
+iF4EAREIAAYFAk7KtfAACgkQaC/OocHi7JbffgD9FucYzbPYiasoC25AwRo2fO1T
+uyBGEBMmlIgPBak2FcUA/RMHnTpNoAlsqmTcU/ijkycIZ0+j1HdcXJg0K0oHnD40
+=jydE
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/net-tools/metadata.xml b/sys-apps/net-tools/metadata.xml
index 96a2d586367db7ac21a29fd459fdc264e9bba260..0c72e81d03158b425d7976cafbf6bb59780f7143 100644 (file)
--- 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 (file)
index 0000000..8eb7695
--- /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 (file)
index 0000000..61595a8
--- /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"
+}