From 03dc437db8f21898a1eb3118129fc3ce1dada1c1 Mon Sep 17 00:00:00 2001
From: Jeroen Roovers <jer@gentoo.org>
Date: Mon, 12 Jun 2017 07:03:47 +0200
Subject: net-analyzer/mtr: Set filecaps on mtr-packet by gentoo-user (c-14.de)
 (bug #621538).

Package-Manager: Portage-2.3.6, Repoman-2.3.2
---
 net-analyzer/mtr/mtr-0.88.ebuild    |  2 +-
 net-analyzer/mtr/mtr-0.92-r1.ebuild | 63 +++++++++++++++++++++++++++++++++++++
 net-analyzer/mtr/mtr-0.92.ebuild    | 63 -------------------------------------
 net-analyzer/mtr/mtr-9999.ebuild    |  2 +-
 4 files changed, 65 insertions(+), 65 deletions(-)
 create mode 100644 net-analyzer/mtr/mtr-0.92-r1.ebuild
 delete mode 100644 net-analyzer/mtr/mtr-0.92.ebuild

diff --git a/net-analyzer/mtr/mtr-0.88.ebuild b/net-analyzer/mtr/mtr-0.88.ebuild
index 997a4da8bc0f..ea48af37e69d 100644
--- a/net-analyzer/mtr/mtr-0.88.ebuild
+++ b/net-analyzer/mtr/mtr-0.88.ebuild
@@ -27,7 +27,7 @@ DEPEND="
 "
 
 DOCS=( AUTHORS FORMATS NEWS README SECURITY TODO )
-FILECAPS=( cap_net_raw usr/sbin/mtr )
+FILECAPS=( cap_net_raw usr/sbin/mtr-packet )
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.88-tinfo.patch
 )
diff --git a/net-analyzer/mtr/mtr-0.92-r1.ebuild b/net-analyzer/mtr/mtr-0.92-r1.ebuild
new file mode 100644
index 000000000000..ea48af37e69d
--- /dev/null
+++ b/net-analyzer/mtr/mtr-0.92-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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="http://www.bitwizard.nl/mtr/"
+SRC_URI="ftp://ftp.bitwizard.nl/mtr/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~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}
+	sys-devel/autoconf
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS FORMATS NEWS README SECURITY TODO )
+FILECAPS=( cap_net_raw usr/sbin/mtr-packet )
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.88-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) \
+		$(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
+}
diff --git a/net-analyzer/mtr/mtr-0.92.ebuild b/net-analyzer/mtr/mtr-0.92.ebuild
deleted file mode 100644
index 997a4da8bc0f..000000000000
--- a/net-analyzer/mtr/mtr-0.92.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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="http://www.bitwizard.nl/mtr/"
-SRC_URI="ftp://ftp.bitwizard.nl/mtr/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~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}
-	sys-devel/autoconf
-	virtual/pkgconfig
-"
-
-DOCS=( AUTHORS FORMATS NEWS README SECURITY TODO )
-FILECAPS=( cap_net_raw usr/sbin/mtr )
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.88-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) \
-		$(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
-}
diff --git a/net-analyzer/mtr/mtr-9999.ebuild b/net-analyzer/mtr/mtr-9999.ebuild
index 7bb86b67b47b..3a1ec3b3a684 100644
--- a/net-analyzer/mtr/mtr-9999.ebuild
+++ b/net-analyzer/mtr/mtr-9999.ebuild
@@ -28,7 +28,7 @@ DEPEND="
 "
 
 DOCS=( AUTHORS FORMATS NEWS README SECURITY TODO )
-FILECAPS=( cap_net_raw usr/sbin/mtr )
+FILECAPS=( cap_net_raw usr/sbin/mtr-packet )
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.88-tinfo.patch
 )
-- 
cgit v1.2.3-18-g5258