gentoo resync : 24.12.2018

3 files changed, 3 insertions, 95 deletions

diff --git a/sys-apps/net-tools/Manifest b/sys-apps/net-tools/Manifest
index 456f25774a7b..086412ccc586 100644
--- a/sys-apps/net-tools/Manifest
+++ b/sys-apps/net-tools/Manifest
@@ -1,9 +1,7 @@
 AUX net-tools-1.60_p20161110235919-fix-building-w-older-linux-headers.patch 968 BLAKE2B 4104f8238ac3758e756b37dd281f1ca66f3f6d6dff9966713ffb108c539fbd19b9bffff94c929b829254c755cd0e1fc4530c74c5b8d6ef85889d7b8f9f54b5f9 SHA512 e732e809a4a17e3535c9ef009519808d5d1a6a792c1249e5cbaedc2aebc0245a16f4cdbc351c6ceaca676e942d909de548b036b8c59a62a68c277093aaa09445
 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
 DIST net-tools-1.60_p20180626073013.tar.xz 228276 BLAKE2B 1545533abf75cb960896994710a02f0e4f5534232057fa9c80d2ec54af84d068d3337a93e869e8377539584eebf4c4d8175e16f19bc12360946ab908b41b2f2f SHA512 3ea9036c2597e6da3a1d9a61a77bbe0b80c448d42a3cc59469f37255064d9e046b5f331155adac256f9812200342f72624ba1ea27a4ee3696b3c9ad53b6b86eb
 EBUILD net-tools-1.60_p20161110235919.ebuild 2547 BLAKE2B 15987228f0674bc75b090c8cc4ad659af1e7cc391ed730ca646d56819e0947228335afeb1f9e8658f0af39c35392d64c4089053d80da9360bdee764c197c881c SHA512 2942abff1478a4ec2de75dc41811beb09435828ac36b441da0ef693976f73031f3016e0992251ec5b0c2ad7a94ba1db53ff6293d6ab36b537475343e0b5718e4
-EBUILD net-tools-1.60_p20170221182432.ebuild 2511 BLAKE2B 84acd3beb6a16ea4db1a3e865a69b8d6bdac149456b00ba127e36ca8373692337d9f9d4f43291a0b3eba4babf9ae86ad8a5ea0c64c6b1ee5b0dd5458a02a6d34 SHA512 3852ea3769b93f74dd32a0025922a2a9f662c3d53cace4db630a942632068ed4b8c1a043790ee81623acea8c73cfeb4842d934bb76c94aabe8a233f272452066
-EBUILD net-tools-1.60_p20180626073013.ebuild 2485 BLAKE2B 6f71c07ffe73b97c8bdca06e34d6fec1924f73e96f2e291f97372982eff2e7c031bb2b9051aa5efb1aeab5fe3ee0d84de786a137f86d067556031cb92a196864 SHA512 88d307884896a579fff1456365900411acff779ad5e034c79a8ad14e969128689d5e2b0bd4d9bbeea499d17a6aeab0c35272465b3e1230b27d9cdfa416b1020a
+EBUILD net-tools-1.60_p20180626073013.ebuild 2473 BLAKE2B c5ac348e6bef344bd51743fa29c1c5c1ec76214be4202c0d6b43a32a06cc58e60b45eb073b82c5bfc07c3c68ea3dcce0f939b137366c6535872a382e2d6c23fe SHA512 4c2070e30af382c57d4da26fb0cc0154969e2f3167abde1b39aa2186303215d57b8653f089f06f0108a1e5851f232432bc503159ec1315e42002a13316dfb74f
 EBUILD net-tools-9999.ebuild 2485 BLAKE2B 6f71c07ffe73b97c8bdca06e34d6fec1924f73e96f2e291f97372982eff2e7c031bb2b9051aa5efb1aeab5fe3ee0d84de786a137f86d067556031cb92a196864 SHA512 88d307884896a579fff1456365900411acff779ad5e034c79a8ad14e969128689d5e2b0bd4d9bbeea499d17a6aeab0c35272465b3e1230b27d9cdfa416b1020a
 MISC metadata.xml 687 BLAKE2B 0a0c86a9a234a973e5b16dfaa72fbfd1392f8a89f48e0ee2924e77d49c5160b904fd054c0616957882a4d2be78031989b01493454693607aff0d31dd3931b87a SHA512 ef16e4cde591fcc5815fb7fee106e007bea128f52b05a71d050956df586e8037e58d6eb3bdd00ef4a0b9d55ddaea4c29d6a0ce12409a515e638452fc932e2037
diff --git a/sys-apps/net-tools/net-tools-1.60_p20170221182432.ebuild b/sys-apps/net-tools/net-tools-1.60_p20170221182432.ebuild
deleted file mode 100644
index 418ef02d92ce..000000000000
--- a/sys-apps/net-tools/net-tools-1.60_p20170221182432.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://git.code.sf.net/p/net-tools/code"
-	inherit git-r3
-else
-	SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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="+arp +hostname ipv6 nis nls plipconfig selinux slattach static"
-REQUIRED_USE="nis? ( hostname )"
-
-RDEPEND="selinux? ( sys-libs/libselinux )"
-DEPEND="${RDEPEND}
-	selinux? ( virtual/pkgconfig )
-	app-arch/xz-utils"
-if [[ ${PV} == "9999" ]]; then
-	DEPEND+=" nls? ( sys-devel/gettext )"
-fi
-RDEPEND+="
-	hostname? ( !sys-apps/coreutils[hostname] )
-	!<sys-apps/openrc-0.9.9.3"
-
-maint_pkg_create() {
-	cd /usr/local/src/net-tools
-	#git-update
-	local stamp=$(date --date="$(git log -n1 --pretty=format:%ci master)" -u +%Y%m%d%H%M%S)
-	local pv="${PV/_p*}_p${stamp}"; pv=${pv/9999/1.60}
-	local p="${PN}-${pv}"
-	git archive --prefix="${p}/" master | tar xf - -C "${T}"
-	pushd "${T}" >/dev/null
-	emake -C "${p}/po" dist
-	sed -i "/^RELEASE/s:=.*:=${pv}:" */Makefile || die
-	tar --exclude-vcs cf - ${p}/ | xz > ${p}.tar.xz
-	popd >/dev/null
-
-	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_configure() {
-	# Clear out env vars from the user. #599602
-	unset BASEDIR BINDIR SBINDIR
-
-	set_opt I18N use nls
-	set_opt HAVE_AFINET6 use ipv6
-	set_opt HAVE_HWIB has_version '>=sys-kernel/linux-headers-2.6'
-	set_opt HAVE_HWTR has_version '<sys-kernel/linux-headers-3.5'
-	set_opt HAVE_HWSTRIP has_version '<sys-kernel/linux-headers-3.6'
-	set_opt HAVE_SELINUX use selinux
-	set_opt HAVE_ARP_TOOLS use arp
-	set_opt HAVE_HOSTNAME_TOOLS use hostname
-	set_opt HAVE_HOSTNAME_SYMLINKS use nis
-	set_opt HAVE_PLIP_TOOLS use plipconfig
-	set_opt HAVE_SERIAL_TOOLS use slattach
-	if use static ; then
-		append-flags -static
-		append-ldflags -static
-	fi
-	tc-export AR CC
-	yes "" | ./configure.sh config.in || die
-}
-
-src_install() {
-	# We need to use emake by hand to pass ED. #567300
-	emake DESTDIR="${ED}" install
-	dodoc README THANKS TODO
-}
diff --git a/sys-apps/net-tools/net-tools-1.60_p20180626073013.ebuild b/sys-apps/net-tools/net-tools-1.60_p20180626073013.ebuild
index 3aa31e441b45..025fcf9f9bce 100644
--- a/sys-apps/net-tools/net-tools-1.60_p20180626073013.ebuild
+++ b/sys-apps/net-tools/net-tools-1.60_p20180626073013.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://gentoo/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Standard Linux networking tools"