commit: 157dc868a0b7a933626382701a0dba6e74000bde Author: Marco Genasci <fedeliallalinea <AT> gmail <DOT> com> AuthorDate: Wed Jun 27 00:08:40 2018 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Wed Jun 27 00:11:46 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=157dc868
www-apps/chromedriver-bin: block www-client/chromium (bug 649742) Both packages install /usr/bin/chromedriver. Closes: https://bugs.gentoo.org/649742 Package-Manager: Portage-2.3.40, Repoman-2.3.9 ...{chromedriver-bin-2.24.ebuild => chromedriver-bin-2.24-r1.ebuild} | 5 +++-- ...{chromedriver-bin-2.30.ebuild => chromedriver-bin-2.30-r1.ebuild} | 5 +++-- ...{chromedriver-bin-2.35.ebuild => chromedriver-bin-2.35-r1.ebuild} | 3 ++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/www-apps/chromedriver-bin/chromedriver-bin-2.24.ebuild b/www-apps/chromedriver-bin/chromedriver-bin-2.24-r1.ebuild similarity index 84% rename from www-apps/chromedriver-bin/chromedriver-bin-2.24.ebuild rename to www-apps/chromedriver-bin/chromedriver-bin-2.24-r1.ebuild index 3163f506be0..20c77c77d88 100644 --- a/www-apps/chromedriver-bin/chromedriver-bin-2.24.ebuild +++ b/www-apps/chromedriver-bin/chromedriver-bin-2.24-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -13,7 +13,8 @@ SLOT="0" KEYWORDS="~amd64" IUSE="" -RDEPEND="www-client/google-chrome" +RDEPEND="!www-client/chromium + www-client/google-chrome" S="${WORKDIR}" QA_PREBUILT="usr/bin/chromedriver" diff --git a/www-apps/chromedriver-bin/chromedriver-bin-2.30.ebuild b/www-apps/chromedriver-bin/chromedriver-bin-2.30-r1.ebuild similarity index 84% rename from www-apps/chromedriver-bin/chromedriver-bin-2.30.ebuild rename to www-apps/chromedriver-bin/chromedriver-bin-2.30-r1.ebuild index 3163f506be0..20c77c77d88 100644 --- a/www-apps/chromedriver-bin/chromedriver-bin-2.30.ebuild +++ b/www-apps/chromedriver-bin/chromedriver-bin-2.30-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -13,7 +13,8 @@ SLOT="0" KEYWORDS="~amd64" IUSE="" -RDEPEND="www-client/google-chrome" +RDEPEND="!www-client/chromium + www-client/google-chrome" S="${WORKDIR}" QA_PREBUILT="usr/bin/chromedriver" diff --git a/www-apps/chromedriver-bin/chromedriver-bin-2.35.ebuild b/www-apps/chromedriver-bin/chromedriver-bin-2.35-r1.ebuild similarity index 89% rename from www-apps/chromedriver-bin/chromedriver-bin-2.35.ebuild rename to www-apps/chromedriver-bin/chromedriver-bin-2.35-r1.ebuild index 07d1ad1d190..2ddd7f88b05 100644 --- a/www-apps/chromedriver-bin/chromedriver-bin-2.35.ebuild +++ b/www-apps/chromedriver-bin/chromedriver-bin-2.35-r1.ebuild @@ -12,7 +12,8 @@ SLOT="0" KEYWORDS="~amd64" IUSE="" -RDEPEND="www-client/google-chrome" +RDEPEND="!www-client/chromium + www-client/google-chrome" S="${WORKDIR}" QA_PREBUILT="usr/bin/chromedriver"
