summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2018-03-29 11:22:28 +0200
committerChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2018-03-29 11:22:28 +0200
commit84501aba8f2775f67fde23af25e6c58167e13a46 (patch)
tree3ce56f5d65e7cc1c528e52f23bb4496db24f48da
parentx11-misc/xflux: New package (diff)
downloadgentoo-84501aba8f2775f67fde23af25e6c58167e13a46.tar.gz
gentoo-84501aba8f2775f67fde23af25e6c58167e13a46.tar.bz2
gentoo-84501aba8f2775f67fde23af25e6c58167e13a46.zip
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
-rw-r--r--app-misc/dvtm/dvtm-0.14-r1.ebuild (renamed from app-misc/dvtm/dvtm-0.14.ebuild)5
-rw-r--r--app-misc/dvtm/dvtm-0.15-r2.ebuild (renamed from app-misc/dvtm/dvtm-0.15-r1.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
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
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