commit: 8e4529c62db0b19c7f30b0ca4fdd656159d16e89
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Thu Jan 18 01:04:11 2018 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Thu Jan 18 01:04:11 2018 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=8e4529c6
sys-apps/net-tools: bump to 1.60_p20170221182432
sys-apps/net-tools/Manifest | 3 ++-
.../net-tools/net-tools-1.60_p20161110235919.ebuild | 2 +-
...19.ebuild => net-tools-1.60_p20170221182432.ebuild} | 18 +++++++-----------
3 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/sys-apps/net-tools/Manifest b/sys-apps/net-tools/Manifest
index 3555752..0af9d33 100644
--- a/sys-apps/net-tools/Manifest
+++ b/sys-apps/net-tools/Manifest
@@ -1 +1,2 @@
-DIST net-tools-1.60_p20161110235919.tar.xz 227552 SHA256
d9b52abb6bbf3305fde1fe414059602371a7819b214206312f6b16a2fde46fcd SHA512
06c2900305a5b11035bdb9d94e9d0a50c2ca832e14598d00d6907d99a4a3c981169475bbe916805888f9746a7d787829f20e6a4dec283731a2c85a72875b8e01
WHIRLPOOL
413553072466cee79c1f231742d6256f97d9a9e84647ee27aed97cf01eee16fd621c67fa67523174bcc0dd0c5f6181d2f6fcc698e3268fc9996eb2cbc7db1070
+DIST net-tools-1.60_p20161110235919.tar.xz 227552 BLAKE2B
0dba75b7b7345be047bd8618811c6ea43f96f0d7c8a2c67cd03138b8f31dc47a641c7ff1e93fb1ad295423f9b82e3d222178c7c97233d4e3698355fed729f723
SHA512
06c2900305a5b11035bdb9d94e9d0a50c2ca832e14598d00d6907d99a4a3c981169475bbe916805888f9746a7d787829f20e6a4dec283731a2c85a72875b8e01
+DIST net-tools-1.60_p20170221182432.tar.xz 227924 BLAKE2B
2617d99da0fa188163bcade5584038fcf8c9c73c23c5577585c3452f4e7b93b2d0cae06ae6d8e5543e04bdd93c247cf4c555751905406b88dcd16dec26bebeca
SHA512
38cf9a0e5a1b2494d1e8f491638f8e35cf04d630e9eae275cb1d0b997f2b73c62bdd40b0420e0f5f2aa212aefa7516ff773b6e3a19c0cbf442e785d2c7dad28e
diff --git a/sys-apps/net-tools/net-tools-1.60_p20161110235919.ebuild
b/sys-apps/net-tools/net-tools-1.60_p20161110235919.ebuild
index b068435..c1ed94e 100644
--- a/sys-apps/net-tools/net-tools-1.60_p20161110235919.ebuild
+++ b/sys-apps/net-tools/net-tools-1.60_p20161110235919.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
diff --git a/sys-apps/net-tools/net-tools-1.60_p20161110235919.ebuild
b/sys-apps/net-tools/net-tools-1.60_p20170221182432.ebuild
similarity index 88%
copy from sys-apps/net-tools/net-tools-1.60_p20161110235919.ebuild
copy to sys-apps/net-tools/net-tools-1.60_p20170221182432.ebuild
index b068435..ae3c0ed 100644
--- a/sys-apps/net-tools/net-tools-1.60_p20161110235919.ebuild
+++ b/sys-apps/net-tools/net-tools-1.60_p20170221182432.ebuild
@@ -1,17 +1,16 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
+EAPI=6
inherit flag-o-matic toolchain-funcs
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="git://git.code.sf.net/p/net-tools/code"
- EGIT_PROJECT="${PN}"
- inherit git-2
+ inherit git-r3
else
- SRC_URI="mirror://gentoo/${P}.tar.xz"
- KEYWORDS="amd64 arm ~mips ppc x86"
+ SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${P}.tar.xz";
+ KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
fi
DESCRIPTION="Standard Linux networking tools"
@@ -33,6 +32,8 @@ RDEPEND+="
hostname? ( !sys-apps/coreutils[hostname] )
!<sys-apps/openrc-0.9.9.3"
+PATCHES=( "${FILESDIR}"/${PN}-fix-headers.patch )
+
maint_pkg_create() {
cd /usr/local/src/net-tools
#git-update
@@ -43,7 +44,7 @@ maint_pkg_create() {
pushd "${T}" >/dev/null
emake -C "${p}/po" dist
sed -i "/^RELEASE/s:=.*:=${pv}:" */Makefile || die
- tar cf - ${p}/ | xz > ${p}.tar.xz
+ tar --exclude-vcs cf - ${p}/ | xz > ${p}.tar.xz
popd >/dev/null
du -b "${T}"/*.tar.xz
@@ -61,11 +62,6 @@ set_opt() {
config.in || die
}
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-fix-headers.patch
- epatch "${FILESDIR}/${P}-fix-building-w-older-linux-headers.patch"
-}
-
src_configure() {
# Clear out env vars from the user. #599602
unset BASEDIR BINDIR SBINDIR
