Inherit fcaps.eclass, drop USE=suid by Kevin Korb (bug #483080).

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

3 files changed, 15 insertions, 24 deletions

diff --git a/net-analyzer/mtr/ChangeLog b/net-analyzer/mtr/ChangeLog
index c6d2522b42ba..7f5a51dce9ac 100644
--- a/net-analyzer/mtr/ChangeLog
+++ b/net-analyzer/mtr/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/mtr
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/ChangeLog,v 1.162 2014/12/27 11:48:45 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/ChangeLog,v 1.163 2014/12/27 12:00:51 jer Exp $
+
+  27 Dec 2014; Jeroen Roovers <jer@gentoo.org> mtr-0.86.ebuild:
+  Inherit fcaps.eclass, drop USE=suid by Kevin Korb (bug #483080).
 
 *mtr-0.86 (27 Dec 2014)
 
diff --git a/net-analyzer/mtr/Manifest b/net-analyzer/mtr/Manifest
index 79594c31e468..590b2b2a4290 100644
--- a/net-analyzer/mtr/Manifest
+++ b/net-analyzer/mtr/Manifest
@@ -10,14 +10,14 @@ DIST mtr-0.85_p20140126.tar.bz2 223945 SHA256 beb0d910a26fcfb1a4c1c09c55fc412254
 DIST mtr-0.86.tar.gz 185374 SHA256 c5d948920b641cc35f8b380fc356ddfe07cce6a9c6474afe242fc58113f28c06 SHA512 e649825ab77987e369e0cd353a502b31f4aafa54a934467db907cb171af45b11bd0a8725d567d923422f32b886ad272b42151514c71893f0ba947f8d18719583 WHIRLPOOL bcf736514a48d6db24d1abf5c8d8b6c792fa8726b646d88d2810bf5f1ed237439a49dd4365f88cee1a9ebe3956cd2f30020abcc7a0d0b368161e0f1053dab290
 EBUILD mtr-0.85.ebuild 2063 SHA256 749ce782bb30561bf33da7329a0c293db49896643dc37247a647e79309195746 SHA512 cb51331fcdbc209efb618cb6387ed1eb9c0bcef5bd36a9b692a84e28bb31ecf1bffaef70c7ef514a9d61d085a452a628e5988c69fe13ff1dd8d1de76d0347078 WHIRLPOOL 4456a1c57b3ece9da3bdc507e756305824feb1c748881b1bff266edb01e2f78faf4b13faf70e727ba4734275916ac4d168a8e944892e982eb5422259d16dc76d
 EBUILD mtr-0.85_p20140126.ebuild 1214 SHA256 9ef7965179f0ccf5c552b00ebf87074940fa120c11b185e3960b26e4ad0687b4 SHA512 cd45f35f3cd6dd281c667e702a19163fbf28480b242693ce9244a74f801f161b8f26005f5bd35cf3e1cca78153337002bdcc050fd8d636335a6ff932d95e1ecb WHIRLPOOL 34fcbdcd6f1d6d13871a8c93261178d97014eadd56945399702f9e2e971110489b4ef23d37fa45766f90938edb76871668a2e29ebdf891b6b9d99cc50bcab1c7
-EBUILD mtr-0.86.ebuild 1208 SHA256 f988b7e6da8e47812f13b4a5a05d857d331715b24dc1f8a5209641677e8d9df8 SHA512 9c003716a652d5bc81ac7398ed1671e19e41d7e96c2818c2f33384fad3134466aa00e4d6013d59e6f91afd69389db6c5af5d55f6c1d287cf909f4533a456f145 WHIRLPOOL 92b6175feabfb01973470cb5b4764f947a3e1b711696010f8dcb4c93294e8f6bbe4157a58af865056d0b32f0326d0055827cf72b12e42d44c32a53f03c2d92cc
+EBUILD mtr-0.86.ebuild 1071 SHA256 5c7a3f8629babb93b3ac2b36a8638bcee0a12884fd001d9a54a1841d22c2295d SHA512 61aa811d1388cf81acfe7ad747899fc3d26397b5fca41f1eba0174348f16a97b3764d3a3ecc5ae77a2db601a6ba3337c744f9c8b46b6bcad8e609edf0d0f9f3f WHIRLPOOL dd9125430507fca877f05e38a2c0eedfa3084eef53a3bdb7c8e9e234ec358921814e84b4ac08e250791370016032b799bd283885f31942043ed4256392b6d203
 EBUILD mtr-9999.ebuild 1830 SHA256 7e77a2b71453c4d8639f2b924e19d71751c6c717f402c86e356f2357e27876f6 SHA512 afe975556ccdfabdf986b0c400a3122a4c431dd3b44ee3025cc4761ea771da907d913383b533ea29db362977204f69d71a6519e37a1bcbb039ebb66ff4dc16aa WHIRLPOOL 2cf40237d01c32d840a02bad6272527844e5914396b08f1d3cb4eb2a99a692bf22c53c7ff55ddb0bea0a9e908d757186fb7ec4b1a4858c79bc0470a97ae31155
-MISC ChangeLog 19024 SHA256 b88ffa07bb3670370ecb76b4f3dc686f3e38f6918f278c6a10b5149ccf865e6f SHA512 88dee3a7342d6236b0355e5fcb7f9f373e67d74a8c8fcff9168fba244c6cf8eabf8d0dc8c8038bba758c6eddd1850428f13144f7016b908e368df231f148c69e WHIRLPOOL 9b68cd47b8788cb406e6f01ecd87f3a9eabbf12ee5dacae7c534c08aacbb2eb825f7163656c4a928d3bc918261c92e901b7aee9b79796eb97229b48d25695eab
+MISC ChangeLog 19156 SHA256 80b11bc5989a30a7d7c43fbff75cb4eed9260d14dbdf449a0579b85bc9c2d67a SHA512 719010a8b7838d18185e9dbc031b56f0136970ba34913b113861a0845b521176c32b614619eac2bd05aeef2b8857f77d71a8b2d2f3b14d536c4d7ef26150a444 WHIRLPOOL 56c67ee181bc56f55b4ae62b52a01d524ef6574e848c3e2c1eb670f4f6e72db1e1ef885d0de96751c16a83974a6c1456d2dfe3ee260f3decde74c75db7a9cb05
 MISC metadata.xml 244 SHA256 4b90774b23e03ba5cfff56d639ba013394dccf7597849fc010e54f69042b47d9 SHA512 1e6d38f1ed92a6771bc35aa6b0c9dd9d6b58308947c2e2ffe06a827cf1ae41c7c570b7e806112e21b14d4a549eeab9f63b8891de0a25f3f5f5c9d42199b025f9 WHIRLPOOL 758fb22a0c339694f8fee0784423405fc3b250ad2d76e37fb6bb0af1376ba6c1b4b55a2956c3b3beac378965c422a159278293f36042267c771785158a09c540
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlSenJ4ACgkQVWmRsqeSphNY6QCdEIzX3SnZUtVu4crQ2X4uE6pL
-k/sAmgKQvQmC+kdO6DKC8GWKvC9kXM5+
-=4DNJ
+iEYEAREIAAYFAlSen3UACgkQVWmRsqeSphO5iQCfTOSuS1Pk0G0Lb6VZ/6EqN3Ys
+nO0AnjjU8SozLvBeHc6WRtMUS5GgoQz/
+=NOVw
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/mtr/mtr-0.86.ebuild b/net-analyzer/mtr/mtr-0.86.ebuild
index 2a2d5927145d..face34eaf74a 100644
--- a/net-analyzer/mtr/mtr-0.86.ebuild
+++ b/net-analyzer/mtr/mtr-0.86.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/mtr-0.86.ebuild,v 1.1 2014/12/27 11:48:45 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/mtr-0.86.ebuild,v 1.2 2014/12/27 12:00:51 jer Exp $
 
 EAPI=5
-inherit eutils flag-o-matic
+inherit eutils fcaps flag-o-matic
 
 DESCRIPTION="My TraceRoute, an Excellent network diagnostic tool"
 HOMEPAGE="http://www.bitwizard.nl/mtr/"
@@ -12,7 +12,7 @@ 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 suid"
+IUSE="gtk ipv6"
 
 RDEPEND="
 	sys-libs/ncurses
@@ -27,6 +27,7 @@ DEPEND="
 "
 
 DOCS=( AUTHORS FORMATS NEWS README SECURITY TODO )
+FILECAPS=( cap_net_raw /usr/sbin/mtr )
 
 src_configure() {
 	# In the source's configure script -lresolv is commented out. Apparently it
@@ -34,20 +35,7 @@ src_configure() {
 	[[ ${CHOST} == *-darwin* ]] && append-libs -lresolv
 
 	econf \
-		--disable-gtktest \
 		$(use_enable ipv6) \
-		$(use_with gtk)
-}
-
-src_install() {
-	default
-
-	if use !prefix ; then
-		fowners root:0 /usr/sbin/mtr
-		if use suid; then
-			fperms 4711 /usr/sbin/mtr
-		else
-			fperms 0710 /usr/sbin/mtr
-		fi
-	fi
+		$(use_with gtk) \
+		--disable-gtktest
 }