[gentoo-commits] repo/gentoo:master commit in: app-misc/dvtm/, app-misc/dvtm/files/

[gentoo-commits] repo/gentoo:master commit in: app-misc/dvtm/, app-misc/dvtm/files/

[Chí-Thanh Christopher Nguyễn]

commit:     3a8b441ca3250b4b7bc2534720c79ff8a64d4e10
Author:     Chí-Thanh Christopher Nguyễn <chithanh <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 29 09:53:11 2018 +0000
Commit:     Chí-Thanh Christopher Nguyễn <chithanh <AT> gentoo <DOT> org>
CommitDate: Thu Mar 29 09:53:11 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a8b441c

app-misc/dvtm: add patch to avoid file collisions with sys-libs/ncurses

Bug: https://bugs.gentoo.org/show_bug.cgi?id=648472
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 app-misc/dvtm/{dvtm-9999.ebuild => dvtm-0.15-r3.ebuild}      | 11 ++++++-----
 app-misc/dvtm/dvtm-9999.ebuild                               |  5 +++--
 app-misc/dvtm/files/dvtm-0.15-stop-installing-terminfo.patch | 12 ++++++++++++
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/app-misc/dvtm/dvtm-9999.ebuild b/app-misc/dvtm/dvtm-0.15-r3.ebuild
similarity index 84%
copy from app-misc/dvtm/dvtm-9999.ebuild
copy to app-misc/dvtm/dvtm-0.15-r3.ebuild
index 557a8538c0a..1de9eac3cde 100644
--- a/app-misc/dvtm/dvtm-9999.ebuild
+++ b/app-misc/dvtm/dvtm-0.15-r3.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
@@ -19,13 +19,14 @@ fi
 LICENSE="MIT"
 SLOT="0"
 
-RDEPEND="sys-libs/ncurses:0=[unicode]"
-DEPEND="
-	${RDEPEND}
+RDEPEND=">=sys-libs/ncurses-6.1:0=[unicode]"
+DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
+
 PATCHES=(
-	"${FILESDIR}"/${PN}-9999-gentoo.patch
+	"${FILESDIR}"/${PN}-0.15-gentoo.patch
+	"${FILESDIR}"/${PN}-0.15-stop-installing-terminfo.patch
 )
 
 src_prepare() {

diff --git a/app-misc/dvtm/dvtm-9999.ebuild b/app-misc/dvtm/dvtm-9999.ebuild
index 557a8538c0a..64b9d7335b2 100644
--- a/app-misc/dvtm/dvtm-9999.ebuild
+++ b/app-misc/dvtm/dvtm-9999.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
@@ -19,13 +19,14 @@ fi
 LICENSE="MIT"
 SLOT="0"
 
-RDEPEND="sys-libs/ncurses:0=[unicode]"
+RDEPEND=">=sys-libs/ncurses-6.1:0=[unicode]"
 DEPEND="
 	${RDEPEND}
 	virtual/pkgconfig
 "
 PATCHES=(
 	"${FILESDIR}"/${PN}-9999-gentoo.patch
+	"${FILESDIR}"/${PN}-0.15-stop-installing-terminfo.patch
 )
 
 src_prepare() {

diff --git a/app-misc/dvtm/files/dvtm-0.15-stop-installing-terminfo.patch b/app-misc/dvtm/files/dvtm-0.15-stop-installing-terminfo.patch
new file mode 100644
index 00000000000..fbf2598f242
--- /dev/null
+++ b/app-misc/dvtm/files/dvtm-0.15-stop-installing-terminfo.patch
@@ -0,0 +1,12 @@
+diff -ur a/Makefile b/Makefile
+--- a/Makefile	2016-01-09 12:40:56.000000000 +0100
++++ b/Makefile	2018-02-23 00:45:06.436287174 +0100
+@@ -55,8 +55,6 @@
+ 	@mkdir -p ${DESTDIR}${MANPREFIX}/man1
+ 	@sed "s/VERSION/${VERSION}/g" < dvtm.1 > ${DESTDIR}${MANPREFIX}/man1/dvtm.1
+ 	@chmod 644 ${DESTDIR}${MANPREFIX}/man1/dvtm.1
+-	@echo installing terminfo description
+-	@TERMINFO=${TERMINFO} tic -s dvtm.info
+ 
+ uninstall:
+ 	@echo removing executable file from ${DESTDIR}${PREFIX}/bin