[gentoo-commits] repo/gentoo:master commit in: sys-apps/net-tools/

[Andreas Hüttel]

commit:     e12102d5069290d325ea012392058f38aa54777a
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 26 20:25:04 2017 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Jun 26 20:25:04 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e12102d5

sys-apps/net-tools: Remove old, bug 605728

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 sys-apps/net-tools/Manifest                        |   3 -
 sys-apps/net-tools/metadata.xml                    |   1 -
 .../net-tools-1.60_p20141019041918-r1.ebuild       |  95 ------------------
 .../net-tools-1.60_p20151124144947.ebuild          | 106 ---------------------
 4 files changed, 205 deletions(-)

diff --git a/sys-apps/net-tools/Manifest b/sys-apps/net-tools/Manifest
index e0fd0181181..0810e010c72 100644
--- a/sys-apps/net-tools/Manifest
+++ b/sys-apps/net-tools/Manifest
@@ -1,5 +1,2 @@
-DIST net-tools-1.60_p20141019041918-patches-1.tar.xz 3352 SHA256 12e79c866c532ba75c0367397f664799f90ab8901bc906429b67939e8e6b354f SHA512 139f8c2990e5be44c17c2c5c4a900d2d2a8cdb5c067a8fe822b20b964045a24bc1138f7656291bc4db80ecddaa24e2e2655c018925d7b214651284443df550f9 WHIRLPOOL 3e33a3d5e0209360c7d90e4741a1b2be662e3c9d1c8a1f8a7283bff98642934fd26da296c5ed4a064915fa1a1006ee8f94fedc07d86bda48ed9624fc9946d190
-DIST net-tools-1.60_p20141019041918.tar.xz 197684 SHA256 22d1fb8acfa0b1e92d3c5dd3f544770b107df72f32f5b16232e65045c5efd2d0 SHA512 5fb02e181f3fec0a62a8ec8f1e6b0549d711d70d292491a2721d7f19f1a3b07d41fd0c8f503809435cd1a1b1999bcf5690402acc51f06ac6d626e11fef590e2e WHIRLPOOL c34f0c7363cc445e2457ccbf796947b60f74a063ed299840f755c6c023b8eb2cd46cdf42e1f9ca7530170e0b32dd14477e64ce50ec089e4a8b5d3e6bf65456ec
-DIST net-tools-1.60_p20151124144947.tar.xz 227044 SHA256 fd771419c735ac43b27584594595e9bf8ee708aaf9948a44696ce9aa955e887d SHA512 0118af976ebc45edfd301c666fbf934c1fca1fd09396b6e3d09a8f9810809f7b765d6b3329044da5fccf96574b15b04fdedbaeac8e76e9811c0e87f53eff6530 WHIRLPOOL 33e1de04bc53ba16edc964b4f4b9393fbc2f474c423d73b565eb5449dfdb866edd275a16c08c25bd7eacbf8dff761e20f5eb13abd15c6af0062b6439fe439c5f
 DIST net-tools-1.60_p20160215155418.tar.xz 227284 SHA256 9c9aee20e3b09213ab0b27c62329fafcb25e156143fc3999c16e8dcee72304b2 SHA512 3fac6e00f061daf5c9ed1c8038d14635333a6149b09ad1493db35e4f931095915ad47468c42cc10299a4df1b5c946d6609a92a00c326a50a4da166670f6608e4 WHIRLPOOL b04de5acd5cb17177d105168d8dd5d4e1cbb108d946bd656b162b11081098b9254993883088df851c3f2fc4eab2dbc18892cff96f20f1e2748663ab6f17ffac0
 DIST net-tools-1.60_p20161110235919.tar.xz 227552 SHA256 d9b52abb6bbf3305fde1fe414059602371a7819b214206312f6b16a2fde46fcd SHA512 06c2900305a5b11035bdb9d94e9d0a50c2ca832e14598d00d6907d99a4a3c981169475bbe916805888f9746a7d787829f20e6a4dec283731a2c85a72875b8e01 WHIRLPOOL 413553072466cee79c1f231742d6256f97d9a9e84647ee27aed97cf01eee16fd621c67fa67523174bcc0dd0c5f6181d2f6fcc698e3268fc9996eb2cbc7db1070

diff --git a/sys-apps/net-tools/metadata.xml b/sys-apps/net-tools/metadata.xml
index d539cc54728..533583070f4 100644
--- a/sys-apps/net-tools/metadata.xml
+++ b/sys-apps/net-tools/metadata.xml
@@ -8,7 +8,6 @@
 <use>
 	<flag name="arp">build the arp and rarp tools (for manipulating the ARP cache)</flag>
 	<flag name="hostname">build the hostname and dnsdomainname tools</flag>
-	<flag name="old-output">use old ifconfig output style (useful for when new output breaks scripts)</flag>
 	<flag name="plipconfig">build the plipconfig tool (for working with old PLIP hardware)</flag>
 	<flag name="slattach">build the slattach tool (for working with old serial ports)</flag>
 </use>

diff --git a/sys-apps/net-tools/net-tools-1.60_p20141019041918-r1.ebuild b/sys-apps/net-tools/net-tools-1.60_p20141019041918-r1.ebuild
deleted file mode 100644
index 1e6a2bd5bd0..00000000000
--- a/sys-apps/net-tools/net-tools-1.60_p20141019041918-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-
-inherit flag-o-matic toolchain-funcs eutils
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.code.sf.net/p/net-tools/code"
-	EGIT_PROJECT="${PN}"
-	inherit git-2
-else
-	PATCH_VER="1"
-	SRC_URI="mirror://gentoo/${P}.tar.xz
-		mirror://gentoo/${P}-patches-${PATCH_VER}.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="nls old-output selinux static"
-
-RDEPEND="!<sys-apps/openrc-0.9.9.3
-	selinux? ( sys-libs/libselinux )"
-DEPEND="${RDEPEND}
-	selinux? ( virtual/pkgconfig )
-	app-arch/xz-utils"
-
-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
-	sed -i "/^RELEASE/s:=.*:=${pv}:" */Makefile || die
-	tar cf - ${p}/ | xz > ${p}.tar.xz
-	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 https://cgit.gentoo.org/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'
-	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
-	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-1.60_p20151124144947.ebuild b/sys-apps/net-tools/net-tools-1.60_p20151124144947.ebuild
deleted file mode 100644
index 851939396a2..00000000000
--- a/sys-apps/net-tools/net-tools-1.60_p20151124144947.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-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
-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"
-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"
-
-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 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() {
-	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
-	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
-
-	# TODO: Make these into config knobs upstream.
-	if ! use arp ; then
-		rm "${ED}"/sbin/{,r}arp "${ED}"/usr/share/man/man8/{,r}arp.8* || die
-	fi
-	if ! use hostname ; then
-		if use nis ; then
-			# Since all the tools are symlinks, repoint them.
-			rm "${ED}"/bin/domainname || die
-			cp -p "${ED}"/bin/{host,domain}name || die
-			dosym domainname /bin/nisdomainname
-			dosym domainname /bin/ypdomainname
-		fi
-		rm "${ED}"/bin/{host,dnsdomain}name "${ED}"/usr/share/man/man1/{host,dnsdomain}name.1* || die
-	fi
-	if ! use nis ; then
-		rm "${ED}"/bin/{,nis,yp}domainname "${ED}"/usr/share/man/man1/{,nis,yp}domainname.1* || die
-	fi
-	if ! use plipconfig ; then
-		rm "${ED}"/sbin/plipconfig "${ED}"/usr/share/man/man8/plipconfig.8* || die
-	fi
-	if ! use slattach ; then
-		rm "${ED}"/sbin/slattach "${ED}"/usr/share/man/man8/slattach.8* || die
-	fi
-}