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, 13 insertions, 28 deletions

diff --git a/net-analyzer/mtr/ChangeLog b/net-analyzer/mtr/ChangeLog
index 7f5a51dce9ac..999053b6b1e9 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.163 2014/12/27 12:00:51 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/ChangeLog,v 1.164 2014/12/27 12:20:52 jer Exp $
+
+  27 Dec 2014; Jeroen Roovers <jer@gentoo.org> mtr-9999.ebuild:
+  Inherit fcaps.eclass, drop USE=suid by Kevin Korb (bug #483080).
 
   27 Dec 2014; Jeroen Roovers <jer@gentoo.org> mtr-0.86.ebuild:
   Inherit fcaps.eclass, drop USE=suid by Kevin Korb (bug #483080).
diff --git a/net-analyzer/mtr/Manifest b/net-analyzer/mtr/Manifest
index 590b2b2a4290..3f941fd06c2c 100644
--- a/net-analyzer/mtr/Manifest
+++ b/net-analyzer/mtr/Manifest
@@ -11,13 +11,13 @@ DIST mtr-0.86.tar.gz 185374 SHA256 c5d948920b641cc35f8b380fc356ddfe07cce6a9c6474
 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 1071 SHA256 5c7a3f8629babb93b3ac2b36a8638bcee0a12884fd001d9a54a1841d22c2295d SHA512 61aa811d1388cf81acfe7ad747899fc3d26397b5fca41f1eba0174348f16a97b3764d3a3ecc5ae77a2db601a6ba3337c744f9c8b46b6bcad8e609edf0d0f9f3f WHIRLPOOL dd9125430507fca877f05e38a2c0eedfa3084eef53a3bdb7c8e9e234ec358921814e84b4ac08e250791370016032b799bd283885f31942043ed4256392b6d203
-EBUILD mtr-9999.ebuild 1830 SHA256 7e77a2b71453c4d8639f2b924e19d71751c6c717f402c86e356f2357e27876f6 SHA512 afe975556ccdfabdf986b0c400a3122a4c431dd3b44ee3025cc4761ea771da907d913383b533ea29db362977204f69d71a6519e37a1bcbb039ebb66ff4dc16aa WHIRLPOOL 2cf40237d01c32d840a02bad6272527844e5914396b08f1d3cb4eb2a99a692bf22c53c7ff55ddb0bea0a9e908d757186fb7ec4b1a4858c79bc0470a97ae31155
-MISC ChangeLog 19156 SHA256 80b11bc5989a30a7d7c43fbff75cb4eed9260d14dbdf449a0579b85bc9c2d67a SHA512 719010a8b7838d18185e9dbc031b56f0136970ba34913b113861a0845b521176c32b614619eac2bd05aeef2b8857f77d71a8b2d2f3b14d536c4d7ef26150a444 WHIRLPOOL 56c67ee181bc56f55b4ae62b52a01d524ef6574e848c3e2c1eb670f4f6e72db1e1ef885d0de96751c16a83974a6c1456d2dfe3ee260f3decde74c75db7a9cb05
+EBUILD mtr-9999.ebuild 1442 SHA256 642469b51d8cacb562fbc202e0ba9c3dd469277325d00b2d174b606766e0577f SHA512 afed65fa7b81926d9bb8d3ce258ec92b0f3b375f10c9ced97e21037a9ae5ca11191b474b9f7ec96540c76da16996d92a3c3092ad95db9dd89ee8b80a9cfa1e7b WHIRLPOOL 55149a6a413e7a2ce1bde9d67ae53b62f7ad4067b76b1d41327068e3e72733b0e56312153ee5c910e6f50c3ef1deada393a8f5d2b56fa8eddbe4c81e56df50c0
+MISC ChangeLog 19288 SHA256 54665e83cfba6c54925d7cb3433bc93199eab3ac62f22b78e718481229f133c0 SHA512 186fe9d743a7107b24894bfa0d2dd9325922a4850466388b195509d5dda6f3fb9337dfd97c681af546307dc3a2e1bbe0deab3d3a44e8439cfe32f2d2caa7a188 WHIRLPOOL 2ad4f2bd2289672bd29d21b6d4b8ae21016a05a51d33dc25dd957aa69ab02c7b31bad0c4c9b18329b833bbdab756c1d631238d76aceb7dfd50b76fa969bf5b73
 MISC metadata.xml 244 SHA256 4b90774b23e03ba5cfff56d639ba013394dccf7597849fc010e54f69042b47d9 SHA512 1e6d38f1ed92a6771bc35aa6b0c9dd9d6b58308947c2e2ffe06a827cf1ae41c7c570b7e806112e21b14d4a549eeab9f63b8891de0a25f3f5f5c9d42199b025f9 WHIRLPOOL 758fb22a0c339694f8fee0784423405fc3b250ad2d76e37fb6bb0af1376ba6c1b4b55a2956c3b3beac378965c422a159278293f36042267c771785158a09c540
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlSen3UACgkQVWmRsqeSphO5iQCfTOSuS1Pk0G0Lb6VZ/6EqN3Ys
-nO0AnjjU8SozLvBeHc6WRtMUS5GgoQz/
-=NOVw
+iEYEAREIAAYFAlSepCgACgkQVWmRsqeSphMngQCePP1JGgOR7yPSWt+hBGCh2J3X
+9t0An0USg42m3i7kSY5Rzd6wmcr0vFF3
+=6Qd7
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/mtr/mtr-9999.ebuild b/net-analyzer/mtr/mtr-9999.ebuild
index 86ff3725b4e8..46f52c6841d3 100644
--- a/net-analyzer/mtr/mtr-9999.ebuild
+++ b/net-analyzer/mtr/mtr-9999.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-9999.ebuild,v 1.4 2014/01/26 10:38:45 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/mtr-9999.ebuild,v 1.5 2014/12/27 12:20:52 jer Exp $
 
 EAPI=5
-inherit eutils autotools flag-o-matic git-r3
+inherit eutils autotools fcaps flag-o-matic git-r3
 
 DESCRIPTION="My TraceRoute, an Excellent network diagnostic tool"
 HOMEPAGE="http://www.bitwizard.nl/mtr/"
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/gtk-2.0-for-mtr.m4.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="gtk ipv6 suid"
+IUSE="gtk ipv6"
 
 RDEPEND="
 	sys-libs/ncurses
@@ -28,6 +28,7 @@ DEPEND="
 "
 
 DOCS=( AUTHORS FORMATS NEWS README SECURITY TODO )
+FILECAPS=( cap_net_raw /usr/sbin/mtr )
 
 src_unpack() {
 	git-r3_src_unpack
@@ -54,23 +55,4 @@ src_configure() {
 	econf \
 		$(use_enable ipv6) \
 		$(use_with gtk)
-
-	# It's a bit absurd to have to do this, but the package isn't
-	# actually "configured" and ready to be compiled until this is
-	# done because upstream packaged .o files with the tarball.
-	# Remember to take this out on future versions.
-	emake clean
-}
-
-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
 }