From 387ef2622bc629c3f37f8ff629d6d1de2c05cece Mon Sep 17 00:00:00 2001
From: Mike Gilbert <floppym@gentoo.org>
Date: Tue, 21 Apr 2015 13:55:55 +0000
Subject: [PATCH] Add blocker on <net-dns/bind-9.10.2 so that portage does not
 complain about file collisions.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4
---
 net-dns/bind-tools/ChangeLog                |  6 +++++-
 net-dns/bind-tools/Manifest                 | 24 ++++++---------------
 net-dns/bind-tools/bind-tools-9.10.2.ebuild |  5 +++--
 3 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/net-dns/bind-tools/ChangeLog b/net-dns/bind-tools/ChangeLog
index 40a47f7c7fec..28cb35e47c88 100644
--- a/net-dns/bind-tools/ChangeLog
+++ b/net-dns/bind-tools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dns/bind-tools
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind-tools/ChangeLog,v 1.281 2015/04/21 05:54:06 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind-tools/ChangeLog,v 1.282 2015/04/21 13:55:53 floppym Exp $
+
+  21 Apr 2015; Mike Gilbert <floppym@gentoo.org> bind-tools-9.10.2.ebuild:
+  Add blocker on <net-dns/bind-9.10.2 so that portage does not complain about
+  file collisions.
 
 *bind-tools-9.10.2 (21 Apr 2015)
 
diff --git a/net-dns/bind-tools/Manifest b/net-dns/bind-tools/Manifest
index 9519d121fb3e..83aacc83f3d4 100644
--- a/net-dns/bind-tools/Manifest
+++ b/net-dns/bind-tools/Manifest
@@ -6,26 +6,14 @@ DIST bind-9.10.1-P1.tar.gz 8356463 SHA256 974343108d32f253a130383d0ba51290fb7bf3
 DIST bind-9.10.2.tar.gz 8481111 SHA256 6f9bb7908aa45c1edfa391e356fc0afc1ded175386cdefb6cf9e1289f7457a98 SHA512 e4c72fe52641a515620930d0e1c149e6f0d9cec2e1a64cbfd510829d908ccab7293197dbbe603c863168f9ea9ded57b27b32cbad02f8b60abc91acb035c2e79f WHIRLPOOL 6b1df7b711fd6d7bba0aad533a11cc979d9e06ea43d4c160536306945e18ece8e622077f75be0bf6a077dd6b40789377e443d92d7dbabdb528b3bdd24aec0553
 DIST bind-9.9.5.tar.gz 7729695 SHA256 d4b64c1dde442145a316679acff2df4008aa117ae52dfa3a6bc69efecc7840d1 SHA512 2639e73c0b57a6a34727e65e44a6d4c90e8682145f92a0a543f80fe0d3cdf707287b67d7ff9f1da5cf91a3c23861033b542871bc909ce0f538b4d3d368932574 WHIRLPOOL ad25df5dfebe06db950755d46531ceb36ae5f8dde38d1a53a3ca593bbd62161535b8a611c6a89701ff5853c740a5a2ff5e7f83da3841ea5482718e569b9f9c71
 EBUILD bind-tools-9.10.1_p1.ebuild 2923 SHA256 0031051c7bc9f2c3132ec14d0883c872d53602efaa4b3c42d50bafad9096a73f SHA512 58de007dd75d03bb37e5f671a6529bff7fe44ecd0bf06f9de0d65becab2a385fa9498de29c2aa42ea1752d132fdadb386495da068a92c30ef54f50c190c82a5a WHIRLPOOL 79a6f87e07c002f011fd12b5ac899cc4a4f4f6adc5652e92f3b87b44bd039687e6e06f479411e9930f43181c39c7dd20dd1e0acc72029839a5cc5228adce66a9
-EBUILD bind-tools-9.10.2.ebuild 3039 SHA256 cdcf21b787f551c0116870c8a8df995b2ee59bd645d7e3e429c35db9a1b0fcdf SHA512 7e32f442f677c4d35297b026ab9f7edb1f792a68a2d383a447168f0d2d63d094a4162bdbff0dbb2020aafa141fad73d00e2805b57ab77a35dc6f7a3c471452cd WHIRLPOOL 9bf9a20f588dcdd789959b5f5c9c006de49928ac7d17f038424a17f1385fdc043d21234bdee9644c904b74b2d0c7fa0d3af042036d9a7b012a64a6e89dc3cfc9
+EBUILD bind-tools-9.10.2.ebuild 3065 SHA256 1a36b2b9ed95918f59b79abd52ca084219bb0729bf2f43d65665749f79a8d14f SHA512 33d1dc200bb561565d66b0d675df6c99465755c6014904d4460d39b1569508410c71744f297fae4e5908f4753e097bd5d7eeba1058f05dc47bde4346fcf555cd WHIRLPOOL 78836284968d1bf1a8beb4025530d35fddab68b1b21aca58b80c4a39f1b80174fd191885416cfe2aec3ccca904b45f3cdf6086d875e238b498a4fcf518a00c83
 EBUILD bind-tools-9.9.5.ebuild 2725 SHA256 ee0c2ad62f49fd08b907c3d4eac80867226603902b0280c323457b51f11b7739 SHA512 44eb686d6390f1320757dd31c1eab84fcd524acf3323e2ac909561937652438febfc515619584070ced40628182d7deb68c69621c39460b1d8f0f204ad54cc33 WHIRLPOOL 22e3a13da29727f6894fff6c33e8ccb5257d1690ae12948e6130ccbeee6921a38af90b7cfd729de38bf2bb030bea7501ee05283f334339c68647f9f5aafedbe8
-MISC ChangeLog 40620 SHA256 897283bdc14535e115b697329cadbbeed9d009e92fb63477cd5ad242663aa1c7 SHA512 da5d2a77fd0b33bee4d1268e5614262d893d147d2d8ffce53c46c58e38744757caccc452c45b3c0e7e9ab408740ed48d0f8dc1c07a01d67b064a378df8cbef25 WHIRLPOOL 9a30f733d35f094d402f37dbc1afb63a3a79e70360c70744d50af27f802dd5eb84d1e03a7fba636179ade8fa4602f4659daca3389e0a80ea493e51980d4e7ca3
+MISC ChangeLog 40796 SHA256 0b88d75ab0ce49534cf1632752e374ed5c564a251ccb43ee0b857cb5a2261e81 SHA512 b1363a0e4b1a3428846f58f10e75c08f475da0ee0082842b4babc1285e37b15596c9b0434d72d8e161fe81e5021b9e3429f2305fb5f1ced0af46546ab0fbc400 WHIRLPOOL ca5f5dd880f749c84c4d057205f72ba97ddc3fb2c4c7ab5c9f12d773477d37becf956325822dd8966763682db268a8dd5094ee582206456a6050417178517aac
 MISC metadata.xml 499 SHA256 8d5d4d0257735d89c3435d0c595aa743e08e79cc8345996a00f1cd0744d92c3e SHA512 d6c960b12a25d46a767131b94712d643c6fcd9508cf9dc02eaff1681749819a0a11615d8fb2b76ba6b78252fa14d21755f05b4f9a7157e16a97a52bdbb688301 WHIRLPOOL d7d8ddf46cfcc638c539d7eea0212086923fdd866b4f9b4c6d1808ead5ccd9bfce63736ede94163998fc50a99664ce36ee923cbdd133dcc033448edb4f7ec0bc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.1
+Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVNeZVXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRBQjk1NkM0NUMxNzFCRTY4Rjk4NENDMDk3
-N0YxRjE3NTU4NkEzQjFGAAoJEHfx8XVYajsfcB0P/3HODIX9x0Ppy6lTh6d/LvjE
-dUfQo3TH6aQNnqhznrh4NftfUm1pH54KMC4PKIxRtkWrDm/zUrzkyKVVGCR+tRf/
-w63jHA37atWCW2IpIbPdd4ZymKLHaKr7npv6rJ2KyDPuYbLMaZnILhfx7q0ajCfg
-db4ofOzcIXl8t3wGp6EjK+PkTryYVZLdVGyGEE51NxK3ZM1vT3Mi3/7gHEJ9oTnX
-xEcRdDuTFPLxanFKfUsAIuzNvqDjXSPiGPh0AZVeqv23A1gVaQMpccNwJ2Oa4Smi
-OzLvZsEpatkNwHR4Lkg7vLuICTWjL9CgkEcj90WG+CrRzdqoWuKopc3cKzdyt8iK
-Ken+PCMq5KFm5+V1HR6R0R+bE3izCy/FjO91nxfgEMXLgA2xo/5mDFTW4vODagCE
-xn8o8VRPLm2P4PFbli3fw34OVC73kRDDwGvrkt9cLBN/iEZC/NoVyTALrVwzKWuC
-GhzlNnMIl9xse4s6OId29Gr744pjuU2/u4zMNrICW3R8DPT2oU7jvehDe7n+SwnF
-R/MuGhQC/djZ8arVGEn5sWxGePDeJIuEoRt7LmJpWtTnuMR83AqNphSZLCmW36vF
-1QzM3qtLxhOihUUBcqimFg+iYbAb6NRBxZK6hmD94r6M9bhvvz+s0m6voM4wUqYf
-1egCXKqVogw7QdhAUoZV
-=6uWv
+iF4EAREIAAYFAlU2VuoACgkQC77qH+pIQ6R8dwD+Lo+iAiVs/DckwwJjP7GZ1xvE
+OJOjSRiPJ48XknI2XYUA+gOsbL5P3oKPdnyuWNc6FSvLc4WdU5naDkvdmwZhVeR6
+=4ZsP
 -----END PGP SIGNATURE-----
diff --git a/net-dns/bind-tools/bind-tools-9.10.2.ebuild b/net-dns/bind-tools/bind-tools-9.10.2.ebuild
index b9277569725b..12a0c56c4b2f 100644
--- a/net-dns/bind-tools/bind-tools-9.10.2.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.10.2.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-dns/bind-tools/bind-tools-9.10.2.ebuild,v 1.1 2015/04/21 05:54:06 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind-tools/bind-tools-9.10.2.ebuild,v 1.2 2015/04/21 13:55:53 floppym Exp $
 
 EAPI="5"
 
@@ -29,7 +29,8 @@ DEPEND="ssl? ( dev-libs/openssl:0 )
 	idn? ( net-dns/idnkit )
 	gssapi? ( virtual/krb5 )
 	readline? ( sys-libs/readline )"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	!<net-dns/bind-9.10.2"
 
 S="${WORKDIR}/${MY_P}"
 
-- 
2.26.2