[gentoo-commits] repo/gentoo:master commit in: net-analyzer/mtr/, net-analyzer/mtr/files/

["Sam James" <sam@gentoo.org>]

commit:     3aaadef8745a7250dc238ec8cd5daad45d73179d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 20 06:25:27 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 20 06:25:27 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3aaadef8

net-analyzer/mtr: cleanup old

Package-Manager: Portage-3.0.12-prefix, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/mtr/Manifest                      |  2 -
 net-analyzer/mtr/files/mtr-0.80-impl-dec.patch | 12 -----
 net-analyzer/mtr/files/mtr-0.87-ipv6.patch     | 59 ------------------------
 net-analyzer/mtr/files/mtr-0.87-tinfo.patch    | 11 -----
 net-analyzer/mtr/mtr-0.87.ebuild               | 51 ---------------------
 net-analyzer/mtr/mtr-0.93-r2.ebuild            | 62 --------------------------
 6 files changed, 197 deletions(-)

diff --git a/net-analyzer/mtr/Manifest b/net-analyzer/mtr/Manifest
index a1baea181ad..69472acc09a 100644
--- a/net-analyzer/mtr/Manifest
+++ b/net-analyzer/mtr/Manifest
@@ -1,3 +1 @@
-DIST mtr-0.87.tar.gz 184645 BLAKE2B e96535b0bd46ee63c5e6110ee465195a9ead6ff7c7ea3629b2668631f25e9181cf4236ba0e2cfc0517e7c70683bbb6347d9c26a2b09701d89e225c27aa2faae4 SHA512 172ba2f78a6ee4deb427ac2fb00dff16843215dbd23663fbe41fcc957ffe278b408a73a0c7e1c05788b235e2d03fb53f9971b8b82d4de2f95edcaa9f2cff3cf9
-DIST mtr-0.93.tar.gz 291015 BLAKE2B 6ac0e21f9e06fbfee9e9ada4cddb6cd9685ae669a05d1ed257a2c238ab78ac16e1a1e152ef1359ca530b0eced14c9333df2b691c27cbc29173c843ebc64eaaa9 SHA512 046e98a661bd6248ce819411ceb6e2b875b92877de38523594898df507836c113573cf40d7d4cc548370f515abe99e0aa4d8b3ba44ad54dd00f8e93c8a96c021
 DIST mtr-0.94.tar.gz 143616 BLAKE2B e9b4619a85a515d729f0987d5882fb91e4bfa3be82476efbfdb832d0b13ed334be1c1a1bcf8ab4ca820002e79ca4a24d0b50f2739d9284b7dec0b8852a1a91e0 SHA512 0e58bd79562ff80f9308135562ab22aa1f1eea686aefd3aef07bac05e661e34b60fde7c66c96bf4f0919f546376fbd6106ecd8fa92328c24f6f903097496bf11

diff --git a/net-analyzer/mtr/files/mtr-0.80-impl-dec.patch b/net-analyzer/mtr/files/mtr-0.80-impl-dec.patch
deleted file mode 100644
index 5b41a54c744..00000000000
--- a/net-analyzer/mtr/files/mtr-0.80-impl-dec.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/gtk.c b/gtk.c
-index e42f4f6..333d7c8 100644
---- a/gtk.c
-+++ b/gtk.c
-@@ -24,6 +24,7 @@
- #include <unistd.h>
- #include <sys/time.h>
- #include <sys/types.h>
-+#include <string.h>
- 
- #ifndef NO_GTK
- #include <stdio.h>

diff --git a/net-analyzer/mtr/files/mtr-0.87-ipv6.patch b/net-analyzer/mtr/files/mtr-0.87-ipv6.patch
deleted file mode 100644
index 32a62853387..00000000000
--- a/net-analyzer/mtr/files/mtr-0.87-ipv6.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- a/net.c
-+++ b/net.c
-@@ -320,9 +320,13 @@
-   struct sockaddr_storage local;
-   struct sockaddr_storage remote;
-   struct sockaddr_in *local4 = (struct sockaddr_in *) &local;
-+#ifdef ENABLE_IPV6
-   struct sockaddr_in6 *local6 = (struct sockaddr_in6 *) &local;
-+#endif
-   struct sockaddr_in *remote4 = (struct sockaddr_in *) &remote;
-+#ifdef ENABLE_IPV6
-   struct sockaddr_in6 *remote6 = (struct sockaddr_in6 *) &remote;
-+#endif
-   socklen_t len;
- 
-   ttl = index + 1;
-@@ -437,9 +441,13 @@
-   struct sockaddr_storage local;
-   struct sockaddr_storage remote;
-   struct sockaddr_in *local4 = (struct sockaddr_in *) &local;
-+#ifdef ENABLE_IPV6
-   struct sockaddr_in6 *local6 = (struct sockaddr_in6 *) &local;
-+#endif
-   struct sockaddr_in *remote4 = (struct sockaddr_in *) &remote;
-+#ifdef ENABLE_IPV6
-   struct sockaddr_in6 *remote6 = (struct sockaddr_in6 *) &remote;
-+#endif
-   socklen_t len;
- 
-   ttl = index + 1;
-@@ -726,8 +734,12 @@
- 
-   /* sendto() assumes packet length includes the IPv4 header but not the 
-      IPv6 header. */
-+#ifdef ENABLE_IPV6
-   spacketsize = abs(packetsize)	-
- 		( ( af == AF_INET ) ? 0 : sizeof (struct ip6_hdr) );
-+#else
-+  spacketsize = abs(packetsize);
-+#endif
-   rv = sendto(sendsock, packet, spacketsize, 0, remotesockaddr, salen);
-   if (first && (rv < 0) && ((errno == EINVAL) || (errno == EMSGSIZE))) {
-     /* Try the first packet again using host byte order. */
-@@ -1535,11 +1547,15 @@
-   struct sockaddr_in name_struct;
- #endif
-   struct sockaddr_in *  sa4;
-+#ifdef ENABLE_IPV6
-   struct sockaddr_in6 * sa6;
-+#endif
-   struct sockaddr * name = (struct sockaddr *) &name_struct;
-   struct sockaddr_storage remote;
-   struct sockaddr_in *remote4 = (struct sockaddr_in *) &remote;
-+#ifdef ENABLE_IPV6
-   struct sockaddr_in6 *remote6 = (struct sockaddr_in6 *) &remote;
-+#endif
-   socklen_t len;
-   int s;
- 

diff --git a/net-analyzer/mtr/files/mtr-0.87-tinfo.patch b/net-analyzer/mtr/files/mtr-0.87-tinfo.patch
deleted file mode 100644
index 4dbdef1cc2f..00000000000
--- a/net-analyzer/mtr/files/mtr-0.87-tinfo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -25,6 +25,8 @@
-   AC_DEFINE(NO_CURSES, 1, [Define if you don't have the curses libraries available.])
-   CURSES_OBJ=)
- 
-+AC_SEARCH_LIBS(raw, [ncurses curses cursesX tinfo])
-+
- AC_CHECK_LIB(ncurses, use_default_colors, 
-   AC_DEFINE(HAVE_USE_DEFAULT_COLORS, 1, [Define this if your curses library has the use_default_colors() command.]))
- 

diff --git a/net-analyzer/mtr/mtr-0.87.ebuild b/net-analyzer/mtr/mtr-0.87.ebuild
deleted file mode 100644
index c3577104b26..00000000000
--- a/net-analyzer/mtr/mtr-0.87.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils fcaps flag-o-matic
-
-DESCRIPTION="My TraceRoute, an Excellent network diagnostic tool"
-HOMEPAGE="https://www.bitwizard.nl/mtr/"
-SRC_URI="https://www.bitwizard.nl/mtr/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="gtk ipv6"
-
-RDEPEND="
-	sys-libs/ncurses:0=
-	gtk? (
-		dev-libs/glib:2
-		x11-libs/gtk+:2
-	)
-"
-DEPEND="
-	${RDEPEND}
-	sys-devel/autoconf
-	virtual/pkgconfig
-"
-
-DOCS=( AUTHORS FORMATS NEWS README SECURITY TODO )
-FILECAPS=( cap_net_raw /usr/sbin/mtr )
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.80-impl-dec.patch
-	"${FILESDIR}"/${PN}-0.87-ipv6.patch
-	"${FILESDIR}"/${PN}-0.87-tinfo.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# In the source's configure script -lresolv is commented out. Apparently it
-	# is needed for 64bit macos still.
-	[[ ${CHOST} == *-darwin* ]] && append-libs -lresolv
-
-	econf \
-		$(use_enable ipv6) \
-		$(use_with gtk) \
-		--disable-gtktest
-}

diff --git a/net-analyzer/mtr/mtr-0.93-r2.ebuild b/net-analyzer/mtr/mtr-0.93-r2.ebuild
deleted file mode 100644
index 880c2729a41..00000000000
--- a/net-analyzer/mtr/mtr-0.93-r2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools eutils fcaps
-
-DESCRIPTION="My TraceRoute, an Excellent network diagnostic tool"
-HOMEPAGE="https://www.bitwizard.nl/mtr/"
-SRC_URI="https://www.bitwizard.nl/mtr/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="gtk ipv6 ncurses"
-
-RDEPEND="
-	gtk? (
-		dev-libs/glib:2
-		x11-libs/gtk+:2
-	)
-	ncurses? ( sys-libs/ncurses:0= )
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-DOCS=( AUTHORS NEWS SECURITY TODO )
-FILECAPS=( cap_net_raw usr/sbin/mtr-packet )
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.88-tinfo.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i -e 's|m4_esyscmd(\[build-aux/git-version-gen .tarball-version\])|'"${PV}"'|g' configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable ipv6) \
-		$(use_with gtk) \
-		$(use_with ncurses)
-}
-
-src_test() {
-	[[ "$UID" = 0 ]] && default
-}
-
-pkg_postinst() {
-	fcaps_pkg_postinst
-
-	if use prefix && [[ ${CHOST} == *-darwin* ]] ; then
-		ewarn "mtr needs root privileges to run.  To grant them:"
-		ewarn " % sudo chown root ${EPREFIX}/usr/sbin/mtr"
-		ewarn " % sudo chmod u+s ${EPREFIX}/usr/sbin/mtr"
-	fi
-}