Block iputils built w/USE=traceroute.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

4 files changed, 28 insertions, 12 deletions

diff --git a/net-analyzer/traceroute/ChangeLog b/net-analyzer/traceroute/ChangeLog
index 2172c96800e8..2974cd527db1 100644
--- a/net-analyzer/traceroute/ChangeLog
+++ b/net-analyzer/traceroute/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/traceroute
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/traceroute/ChangeLog,v 1.107 2015/04/18 15:56:46 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/traceroute/ChangeLog,v 1.108 2015/04/25 01:45:29 vapier Exp $
+
+  25 Apr 2015; Mike Frysinger <vapier@gentoo.org> traceroute-2.0.20.ebuild,
+  traceroute-2.0.21.ebuild:
+  Block iputils built w/USE=traceroute.
 
   18 Apr 2015; Pacho Ramos <pacho@gentoo.org> traceroute-2.0.20.ebuild:
   x86 stable wrt bug #517380
diff --git a/net-analyzer/traceroute/Manifest b/net-analyzer/traceroute/Manifest
index fac7509712b4..faf46057eae0 100644
--- a/net-analyzer/traceroute/Manifest
+++ b/net-analyzer/traceroute/Manifest
@@ -8,14 +8,24 @@ DIST traceroute-2.0.21.tar.gz 69159 SHA256 f7ac93ef30b13a587292b8d6a7e2538a65bc9
 EBUILD traceroute-2.0.18.ebuild 871 SHA256 4ef3367aef5f6ac3082e88b455e9d38bd90761df44c4e97c352bd1a8b8a57522 SHA512 e94adec1bb70053ccb34f9c0feab2ab10f778626758c492a1578d83df8c08a612bfb0699ee3f5d892d59bb8e7c31a057c2213c00e0c47578c90b8f631859e36a WHIRLPOOL 1d6152d9c51d08b3d07386226b34f82c89b5643b22368d2c03d2d6e6a3a83ef118ddc5afd9cfc3e37700864cab94f9c78849461635bab8456fe745c483518158
 EBUILD traceroute-2.0.19-r1.ebuild 1015 SHA256 a6f9305bb751f8d14e8553b6cce95ddf5bf6c59fafa65edf2bf730fb48de91f0 SHA512 ba6bd57b9d302a7b89057e73bb2f0d2f43fa9bdd1e87fcb83d45f7eb2971bd528f455984cd8c1ff2e24777ad2a4bd91d530f46a46e451786d788ebe52f68b777 WHIRLPOOL 0386677940d494a2d2fd050c712939b402cab4f2b4d6670777c3b3103595e56f28ee064c97db539215a5626924f87bf7fde2524980e7531c2d84240a055d6e0c
 EBUILD traceroute-2.0.19.ebuild 864 SHA256 be2031d60cf6f3caefe84473300d2c08b17c25af4844c7eb7bf8edba619beb36 SHA512 c6850d08c4d2cad8461cbddf35fccce246b1efe9c384e394a801e450c9f393dc466e6843075c86910adf20c0147a7b9faafaaf401ae0c8a8567940c47e20ab89 WHIRLPOOL 638831f3995c4496bf35c776a08f76ff4c1e06bc217d65d1cb1ecba1a7637ada5cdafd5135108d84e581b46565fa0bed64b69d9f9dd3381b9b4b2ff17dc8a259
-EBUILD traceroute-2.0.20.ebuild 1010 SHA256 e2566758dcb4f460076910afd0a76ae60c4b3fc22a6953ae4d34948dc7364992 SHA512 562e8125b54feddd11c3d33b32f7b4ec0d0f8052c8ace57e02616f33c6143a472225c261f830b5cbd9f5f1881f23352cc87a29a30dce31bf4164ae295cb63bd1 WHIRLPOOL 5970e528915bf3f3f906aaa5665d0b1fb7cc496c1dd157dd05d69923d8c5e827ec7d8937b016129ab204a5a42823b4680fe57eb9447dc672998ab48cd8fb3712
-EBUILD traceroute-2.0.21.ebuild 952 SHA256 3aa8ce438c91591a71ba451215e9aba6555736ed90ab6da0001c7876640fe34a SHA512 2b094525541765e2fcf10106ba69965995bdb34ba452a3a273200c64cc270d42f72cd9bee71c2b3249ba2b54c0a70c4e53aaee205447666ccb19df6d655ac0a5 WHIRLPOOL cb3746f3289ba5d2c38f8181a09c2b279f5d4c6713fb35b08c9db133cf93c6f819d791d9a6161b0460fbd664a9ee6104da636d58940fb775ce2233b8fe9ec872
-MISC ChangeLog 15574 SHA256 95197571240308b94ac26eba9bc28a8ee0fd5e5c802b20cba13ccc6a613d0ff3 SHA512 712839e90a6c92970511b255a5eaad31f8f0839bc3183df7a1df9b283ec9927c293df80f71b5f91e59f8882ae83730c06e40952336d76739d0cb027038abbf1b WHIRLPOOL 5d2ada50348babd4143f34527c0c0069cf126c6e8eb7791f381b1c115f3301b683e287990608c368a02f7709bf3d1b69078f6608b2d42f41931b3d7f148fd8ca
+EBUILD traceroute-2.0.20.ebuild 1042 SHA256 a88d567f73a52bd5627966c18ae719782efbfa9ffbf47b807dbcc9c92ec1257a SHA512 1f5eca51886be86196bf8a8e1b3a20b390da4b9f92b5fc4592d3ef4f50e94b1661c607b18c462d63f8ac4da75d7e5e1a39330f360e16268def9952f34a3a693e WHIRLPOOL 90420e5d2aac273556778726adb789d05e6f0bc1029985222b3406caa9b765897ee440685da4270747a97099ae671d67bd19084035a3bb024755372924506fdb
+EBUILD traceroute-2.0.21.ebuild 983 SHA256 2cba2a44ee487e9e7e647459889251581601759f1e92ced25cde392f01b43ff5 SHA512 40a8deef78ad4bfe149fb18e107af832ffa88f7267bb04a04cfb3139bcf4af77280c7c26b3ce4ee6825ac6b6030a34b97aeb778f112334997591942e67b482f0 WHIRLPOOL 70dcdfe95d3043a00365515889678fa7404d8c27cc183d18d29c209ba7b9aa005244925d252fb7649079e6c16fd17935e7211e45fb1c62a4f9619fe2bd58d6c6
+MISC ChangeLog 15720 SHA256 db447cb8b9ee1deb43e010f6eddd22d95d30b88985b4dcd3c6053873c1339fd0 SHA512 7bdf7d8d21b6de2126dd8f039c1e3697b6bea309e77597ea17c3a08055339802409ff0e7e15d3f585f6efe9ce799abdaa900108279b6b12f4cb35cb940d2f2a4 WHIRLPOOL dcd1fa23eec8c93097da328365fef6dce4721255d3c19ae491d28a447d68ab86369977af6493774a62dc136cfde79faa622d99a185d14bc819177e11ae31d985
 MISC metadata.xml 235 SHA256 0dd7765ffffa47a13dd4ffcd8f83d0b1f7cb64a0b80abe132ecaf0373bf6d11e SHA512 7023752069ed86fe68d6005954df10705ae9257fc4b1ce97bd4b312a267b4c377bf840b836887d27651e5a913864e8337ed26a66ff47a196a12cc10753e18b37 WHIRLPOOL ef5a842558588f893c467051b9abb8b355012a7cc87f7eb526739b89effcf7a4a121fb29431e58e7dd26092b83484e0916fba0b3d11a39bc703bb76715cf9669
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlUyfr8ACgkQCaWpQKGI+9SPzQCeKjt+n2IfKQN0vMkNoOfdwvNY
-uHEAn1TElBsAMckguoctRG7lzNM9z/AQ
-=Oy4H
+iQIcBAEBCAAGBQJVOvG6AAoJEPGu1DbS6WIAlXQP/jEt8TmdbtNOUNEJ7o0yFOa6
+E27iURJAotcPNk6F3lWueZzwETKWFiOREv6LPGr9FbdweP8+AwxfiuD8ExGnZx7f
+7YspX3QZdPcJJ8Fz68zEQyW5Gz35J0hD1yypwsa3dpssXJbZJ71e0YjYfOHMY+lb
+DAlG4mkic8IYVofM2uI+NV0Bns7cQl+0DK5xmAvPhPU7DpHcIJ3KDWrr0q+E4QYv
+clnBzkWANEpXzuo9VW5eSkqk3t2oPNcgj/HB1tlkpcFY593+5+JIlR0BV2+Jf+GM
+VdwdK2Rk/zqSo6Ue3xTZlt/foeJG4ISlR4B26oUCJQw6Kc9bN8jefnxRlsvoIhm6
+QycQpkLZL1YUrkISBBPGUznRf/UP8MZ3QmS8v8cvrd98Hp2sstRJh8N/bsWCnei7
+qpIWOdBm3LE8JTo+QqY5tSaXZX1dj1OngJAjgUGzbXmk6iZsSguAgbGajFTLOYIH
+g13COMCIJUL/v3ee8XxsnhExY69YWmRf0IDCyqBljy+Uf8opWB25S7U49kOFjri+
+W/Z+B2XyVSOawoGM7TL8jJaT8hXa3gQ/IOujiR+lzK2WDpTHiGmsBfz2aLyo8a4n
+qGW+ETQpWoMqJbaT5WN/G/t1wFXfkniESREQxJx7EPdZ1ptC+wM4EGLTMkbltgde
+rkRlYpIeX3JOsSl02eYX
+=SkYd
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/traceroute/traceroute-2.0.20.ebuild b/net-analyzer/traceroute/traceroute-2.0.20.ebuild
index 7587a5dfbadc..5a89429532eb 100644
--- a/net-analyzer/traceroute/traceroute-2.0.20.ebuild
+++ b/net-analyzer/traceroute/traceroute-2.0.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/traceroute/traceroute-2.0.20.ebuild,v 1.10 2015/04/18 15:56:46 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/traceroute/traceroute-2.0.20.ebuild,v 1.11 2015/04/25 01:45:29 vapier Exp $
 
 EAPI=5
 
@@ -15,7 +15,8 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="static"
 
-RDEPEND="!<net-misc/iputils-20121221-r1"
+RDEPEND="!<net-misc/iputils-20121221-r1
+	!net-misc/iputils[traceroute]"
 
 src_compile() {
 	use static && append-ldflags -static
diff --git a/net-analyzer/traceroute/traceroute-2.0.21.ebuild b/net-analyzer/traceroute/traceroute-2.0.21.ebuild
index 12c1ec3fd83c..81131726d846 100644
--- a/net-analyzer/traceroute/traceroute-2.0.21.ebuild
+++ b/net-analyzer/traceroute/traceroute-2.0.21.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/traceroute/traceroute-2.0.21.ebuild,v 1.1 2014/11/12 19:24:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/traceroute/traceroute-2.0.21.ebuild,v 1.2 2015/04/25 01:45:29 vapier Exp $
 
 EAPI=5
 
@@ -15,7 +15,8 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="static"
 
-RDEPEND="!<net-misc/iputils-20121221-r1"
+RDEPEND="!<net-misc/iputils-20121221-r1
+	!net-misc/iputils[traceroute]"
 
 src_compile() {
 	use static && append-ldflags -static