Fix file collision with app-emulation/docker.

Package-Manager: portage-2.2.20/cvs/Linux x86_64

4 files changed, 17 insertions, 30 deletions

diff --git a/app-shells/zsh-completions/ChangeLog b/app-shells/zsh-completions/ChangeLog
index 5ad12b564ec5..5b173f0ebed7 100644
--- a/app-shells/zsh-completions/ChangeLog
+++ b/app-shells/zsh-completions/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-shells/zsh-completions
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh-completions/ChangeLog,v 1.4 2015/06/06 07:53:13 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh-completions/ChangeLog,v 1.5 2015/06/30 18:12:51 mrueg Exp $
+
+*zsh-completions-0.12.0-r2 (30 Jun 2015)
+
+  30 Jun 2015; Manuel Rüger <mrueg@gentoo.org>
+  +zsh-completions-0.12.0-r2.ebuild, -zsh-completions-0.12.0-r1.ebuild,
+  zsh-completions-9999.ebuild:
+  Fix file collision with app-emulation/docker.
 
   06 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add github to remote-id in metadata.xml
diff --git a/app-shells/zsh-completions/Manifest b/app-shells/zsh-completions/Manifest
index 3c0b65421bf7..2b0f6fe12c6f 100644
--- a/app-shells/zsh-completions/Manifest
+++ b/app-shells/zsh-completions/Manifest
@@ -1,27 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 DIST zsh-completions-0.12.0.tar.gz 193410 SHA256 770d92749b11b22192595b207208508f8bfa319d5d03210a71bc44c8b9cfa0d5 SHA512 3c6b19f10d9598f40cf37ca5c5828e5652b0cad144d48ca681f5a16c1921c308f8cd3d9b8a2dd1c50ddbf167d4bb2e2e5299d1e30591971f4c7d9b28c2250feb WHIRLPOOL 7c5a1cb45d2e045fb0f8eb64deb8d87cab506f11b94996b9ff6cb169fd20672040bdc624de78a58ab5908d2222130de93a179a8e00d5aa75365af0ab0566852a
-EBUILD zsh-completions-0.12.0-r1.ebuild 995 SHA256 35030babbdfafddf225757b619a2044e095e32d8bde587a8e7ab68634683ee57 SHA512 1d6c419747a8ebeda3e1ac0dcb6fff0d3fa95bdbb071c5cf23f7f5c3c576f213e73d1991a652ed1e04a3001414283957723fc93cd3f06904464ab0aa0850a287 WHIRLPOOL 4dc4a70c02c0c9033d9a58c2dc903bb025df2cbe23e02abe6c87808749e15dcc2c937641ae2c42c4ec5583dae0c168e3e08c93e5134a92f59c07137adbdae6be
-EBUILD zsh-completions-9999.ebuild 917 SHA256 95f775e48cc4efac8a84924a5d89b404b22325130b17d09c5ad5fa267b879bc6 SHA512 7d51618b089d1582e28dc21ea7b7ea65e764ae63c0e59a3b38d87c62de54c3469ff208eb2886fcb3a1064f99a28c896c6ff898b51b958a6b7402f37057931b6f WHIRLPOOL 8ae72c4267db37394bcb1931fa69a209f40c31ed8680e76cd505525cac2607a1058c099b061d223229457ff99c5eabe89837a24f8a09df5d6233c40a83deccd6
-MISC ChangeLog 885 SHA256 3c402c659133ef801c920f92a27d57b2b60a431f4aeb1dca8b62a3a0e3709fdf SHA512 60624207f7c60a988bbf9bc6ba402e4c0000b6d00702759c94f34ce71001a137411c8c356e4cbbfa00955d509861e9bef7af4c593f00863b01ed9c488772b6fb WHIRLPOOL f54c5ce0c566bebb16411915f6fc8ad08f2a614c1ebd3e0d84f69479dbaade5bf48cdbd08872a34e6780a0d55d42bebce6d08e0702cc81ca6370011e75536c09
+EBUILD zsh-completions-0.12.0-r2.ebuild 1062 SHA256 f2f5c1b159123589b8a5530376c00308f9f0a160f10b76cb17220046898508d2 SHA512 8ec68f8ae3b73ac54b4bee1ba502bd5e3164a2759369c3ad85cfa8726f0ac05b3acb7efe75222996fa93e6223b88f9dfa4a3c6d00a979e8f1efbf4d7bb544295 WHIRLPOOL 3dd8b681c87e55220bf8d8a27389081d58ad55e994659d6839a76e22c55d60fba66aea6d41c780358aeaf5049812576f83308f6e5cf6e580102e34e0a85b058d
+EBUILD zsh-completions-9999.ebuild 913 SHA256 4b8a218212a77e94b07b1eee92e2a5574e153859d95e3f6c7f151423519f6678 SHA512 8e569fced2cf7c04f3b64e6d270f770825e22f84452cd4d5b70884770d8a72ea1788de9d2f0dac5006479ac4927b42afda3c5160da86c76c8e3c64cfe5ca9c2e WHIRLPOOL 40719537131f77d841ef93ac1d9bc7c7e568b4437852372d993fe16a2fe7e90e1a697d31ee53f6f6119777b0e7efb7dd40b8095e9f8be3f898b5cdad94d1fed6
+MISC ChangeLog 1128 SHA256 caed04468cca9cd99e0c96847a8c835649af86ac5b5f38c25072af940405ce71 SHA512 9908a0fd89eda8a33dc7c91f4b054fdfc3b7de126d96cac125ea30fb25ceb15a5ee215d4169375bd8a32390ec7869229842069c85954a220fbc7b8d8f44c77bb WHIRLPOOL 2610ffda5366d5f3d8059e6c838c570aaf3ddfecc87863d6433e324e00ecdc77a8672f05c96bd4e7d3a442c751a00a390513b065c9ee8ae71d2dbf1a0fe01506
 MISC metadata.xml 472 SHA256 83e6c8ae3f7b69025c3282813d277e1cce0074ad1fa81feff0e53e27eed9d2c8 SHA512 607d7280276568d0266e2303342159179fa2c55fcfec806a42139037ed3534f1cf22ca42e494f2a139385e4513d5e36e3314c4d4911010b1c0d92d951f62f34c WHIRLPOOL 584c854b876f02d869b1c233abd592ff825e0282094a82e1dcdc064a19480338efb14486fb561aad36c95329688f1d6f4bf95953709f260ae3a297ce1f927d64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
-
-iQJ8BAEBCgBmBQJVcqbqXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiMhUP/0q2BhskorxlG47aoPt5J39M
-TbYg6gYsgDd/fWnbHtRVPfOGlKduUqzI9aVG0NB8CbclCXnZlC+j5EhXMmrrEDv4
-hO4QsG+Hzv8Us6gCHAbefyX40r+WjBW4rikcFqxyJWbL8asgdglJe9P1eA46QmUL
-hR+jAs+BQI7H/XGxnpuYYmxsOFghxGBUyqol5Ld+6/aU8zRVNJyw54q7R5eXy1ut
-EaPqNrz9W7AEQUJlbZbuxhtsnBWwUW/VoThnzQjYzHfWOS8V1xZqvhrcN6OpVDkS
-LSBLONfTVOPqSSgmtu3e0Bclvk5ioiZSeA77Yhr0G4o0I6hkkKO/DDJV3KVvwKHp
-WlWEg5H0LwktMAes5FtwN2ZsrqzF8lQZFISCyiMxpBeUOJRutQwLF7NcdzLGKkPd
-NgtEl8mzI+5v7zN5+I/bY5yHtz1RuSUqPFKUJF38FGWwlyWKexHohDi1ThjzbFsv
-hgl+3tMMXyaGK9eONOOe8S57+l7g9HOJhNO8ako8fZjwPdplnP3l3m5rGAaBploD
-yQODO+EPI/91dqpRBwnVRyBoK9bYWod+wiFp+AfPqQqkElLApBk8yATYQAE2EkAM
-J9cdpoveLTGOfY8dgPVORF/qwt/D54WsGZleHiczjvU/p9uNoKGphl5+KUNfUK1H
-BoGaBPbFUSY3Cs9fOmYW
-=ivXH
------END PGP SIGNATURE-----
diff --git a/app-shells/zsh-completions/zsh-completions-0.12.0-r1.ebuild b/app-shells/zsh-completions/zsh-completions-0.12.0-r2.ebuild
index 446409edd2ce..97111cc39b79 100644
--- a/app-shells/zsh-completions/zsh-completions-0.12.0-r1.ebuild
+++ b/app-shells/zsh-completions/zsh-completions-0.12.0-r2.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/app-shells/zsh-completions/zsh-completions-0.12.0-r1.ebuild,v 1.1 2014/11/23 19:15:14 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh-completions/zsh-completions-0.12.0-r2.ebuild,v 1.1 2015/06/30 18:12:51 mrueg Exp $
 
 EAPI=5
 
@@ -23,6 +23,8 @@ RDEPEND="app-shells/zsh"
 src_prepare() {
 	# File collision with dev-python/pip
 	rm src/_pip || die
+	# File collision with app-emulation/docker
+	rm src/_docker || die
 }
 
 src_install() {
diff --git a/app-shells/zsh-completions/zsh-completions-9999.ebuild b/app-shells/zsh-completions/zsh-completions-9999.ebuild
index 6fa6fafe82af..f6b2b178d838 100644
--- a/app-shells/zsh-completions/zsh-completions-9999.ebuild
+++ b/app-shells/zsh-completions/zsh-completions-9999.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/app-shells/zsh-completions/zsh-completions-9999.ebuild,v 1.1 2014/11/21 10:28:13 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh-completions/zsh-completions-9999.ebuild,v 1.2 2015/06/30 18:12:51 mrueg Exp $
 
 EAPI=5