commit: 84501aba8f2775f67fde23af25e6c58167e13a46 Author: Chí-Thanh Christopher Nguyễn <chithanh <AT> gentoo <DOT> org> AuthorDate: Thu Mar 29 09:22:28 2018 +0000 Commit: Chí-Thanh Christopher Nguyễn <chithanh <AT> gentoo <DOT> org> CommitDate: Thu Mar 29 09:22:28 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84501aba
app-misc/dvtm: add blocker for sys-libs/ncurses-6.1 file collisions Bug: https://bugs.gentoo.org/show_bug.cgi?id=648472 Package-Manager: Portage-2.3.24, Repoman-2.3.6 app-misc/dvtm/{dvtm-0.14.ebuild => dvtm-0.14-r1.ebuild} | 5 +++-- app-misc/dvtm/{dvtm-0.15-r1.ebuild => dvtm-0.15-r2.ebuild} | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app-misc/dvtm/dvtm-0.14.ebuild b/app-misc/dvtm/dvtm-0.14-r1.ebuild similarity index 94% rename from app-misc/dvtm/dvtm-0.14.ebuild rename to app-misc/dvtm/dvtm-0.14-r1.ebuild index 3c57017af12..bbd504088ee 100644 --- a/app-misc/dvtm/dvtm-0.14.ebuild +++ b/app-misc/dvtm/dvtm-0.14-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=5 @@ -21,7 +21,8 @@ SLOT="0" IUSE="unicode" DEPEND="sys-libs/ncurses:0=[unicode?]" -RDEPEND=${DEPEND} +RDEPEND="${DEPEND} + !>=sys-libs/ncurses-6.1" src_prepare() { sed -i \ diff --git a/app-misc/dvtm/dvtm-0.15-r1.ebuild b/app-misc/dvtm/dvtm-0.15-r2.ebuild similarity index 94% rename from app-misc/dvtm/dvtm-0.15-r1.ebuild rename to app-misc/dvtm/dvtm-0.15-r2.ebuild index 8a4b03dec2e..85881fa2195 100644 --- a/app-misc/dvtm/dvtm-0.15-r1.ebuild +++ b/app-misc/dvtm/dvtm-0.15-r2.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 @@ -23,6 +23,7 @@ RDEPEND="sys-libs/ncurses:0=[unicode]" DEPEND=" ${RDEPEND} virtual/pkgconfig + !>=sys-libs/ncurses-6.1 " PATCHES=( "${FILESDIR}"/${PN}-0.15-gentoo.patch
