| 1 |
commit: 84501aba8f2775f67fde23af25e6c58167e13a46 |
| 2 |
Author: Chí-Thanh Christopher Nguyễn <chithanh <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Mar 29 09:22:28 2018 +0000 |
| 4 |
Commit: Chí-Thanh Christopher Nguyễn <chithanh <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Mar 29 09:22:28 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84501aba |
| 7 |
|
| 8 |
app-misc/dvtm: add blocker for sys-libs/ncurses-6.1 file collisions |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/show_bug.cgi?id=648472 |
| 11 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
| 12 |
|
| 13 |
app-misc/dvtm/{dvtm-0.14.ebuild => dvtm-0.14-r1.ebuild} | 5 +++-- |
| 14 |
app-misc/dvtm/{dvtm-0.15-r1.ebuild => dvtm-0.15-r2.ebuild} | 3 ++- |
| 15 |
2 files changed, 5 insertions(+), 3 deletions(-) |
| 16 |
|
| 17 |
diff --git a/app-misc/dvtm/dvtm-0.14.ebuild b/app-misc/dvtm/dvtm-0.14-r1.ebuild |
| 18 |
similarity index 94% |
| 19 |
rename from app-misc/dvtm/dvtm-0.14.ebuild |
| 20 |
rename to app-misc/dvtm/dvtm-0.14-r1.ebuild |
| 21 |
index 3c57017af12..bbd504088ee 100644 |
| 22 |
--- a/app-misc/dvtm/dvtm-0.14.ebuild |
| 23 |
+++ b/app-misc/dvtm/dvtm-0.14-r1.ebuild |
| 24 |
@@ -1,4 +1,4 @@ |
| 25 |
-# Copyright 1999-2017 Gentoo Foundation |
| 26 |
+# Copyright 1999-2018 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
|
| 29 |
EAPI=5 |
| 30 |
@@ -21,7 +21,8 @@ SLOT="0" |
| 31 |
IUSE="unicode" |
| 32 |
|
| 33 |
DEPEND="sys-libs/ncurses:0=[unicode?]" |
| 34 |
-RDEPEND=${DEPEND} |
| 35 |
+RDEPEND="${DEPEND} |
| 36 |
+ !>=sys-libs/ncurses-6.1" |
| 37 |
|
| 38 |
src_prepare() { |
| 39 |
sed -i \ |
| 40 |
|
| 41 |
diff --git a/app-misc/dvtm/dvtm-0.15-r1.ebuild b/app-misc/dvtm/dvtm-0.15-r2.ebuild |
| 42 |
similarity index 94% |
| 43 |
rename from app-misc/dvtm/dvtm-0.15-r1.ebuild |
| 44 |
rename to app-misc/dvtm/dvtm-0.15-r2.ebuild |
| 45 |
index 8a4b03dec2e..85881fa2195 100644 |
| 46 |
--- a/app-misc/dvtm/dvtm-0.15-r1.ebuild |
| 47 |
+++ b/app-misc/dvtm/dvtm-0.15-r2.ebuild |
| 48 |
@@ -1,4 +1,4 @@ |
| 49 |
-# Copyright 1999-2017 Gentoo Foundation |
| 50 |
+# Copyright 1999-2018 Gentoo Foundation |
| 51 |
# Distributed under the terms of the GNU General Public License v2 |
| 52 |
|
| 53 |
EAPI=6 |
| 54 |
@@ -23,6 +23,7 @@ RDEPEND="sys-libs/ncurses:0=[unicode]" |
| 55 |
DEPEND=" |
| 56 |
${RDEPEND} |
| 57 |
virtual/pkgconfig |
| 58 |
+ !>=sys-libs/ncurses-6.1 |
| 59 |
" |
| 60 |
PATCHES=( |
| 61 |
"${FILESDIR}"/${PN}-0.15-gentoo.patch |
Archives