From: Jeroen Roovers <jer@gentoo.org>
Date: Fri, 14 Aug 2015 11:46:59 +0000 (+0200)
Subject: Set RDEPEND on <=sys-libs/ncurses-6.0 and do not install terminfo (bug #557454).
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5354041561e08610e41141f06a3c1f0b7030be07;p=gentoo.git

Set RDEPEND on <=sys-libs/ncurses-6.0 and do not install terminfo (bug #557454).

Package-Manager: portage-2.2.20.1
---

diff --git a/x11-terms/st/st-9999.ebuild b/x11-terms/st/st-9999.ebuild
index 7cde185fdd85..7d6761273bf3 100644
--- a/x11-terms/st/st-9999.ebuild
+++ b/x11-terms/st/st-9999.ebuild
@@ -11,18 +11,21 @@ EGIT_REPO_URI="git://git.suckless.org/st"
 
 LICENSE="MIT-with-advertising"
 SLOT="0"
-KEYWORDS=""
 IUSE="savedconfig"
 
-RDEPEND="media-libs/fontconfig
+RDEPEND="
+	!<sys-libs/ncurses-6.0
+	media-libs/fontconfig
 	x11-libs/libX11
 	x11-libs/libXext
-	x11-libs/libXft"
-DEPEND="${RDEPEND}
-	sys-libs/ncurses
+	x11-libs/libXft
+"
+DEPEND="
+	${RDEPEND}
 	virtual/pkgconfig
 	x11-proto/xextproto
-	x11-proto/xproto"
+	x11-proto/xproto
+"
 
 src_prepare() {
 	epatch_user
@@ -42,7 +45,6 @@ src_prepare() {
 
 src_install() {
 	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
-	tic -s -o "${ED}"/usr/share/terminfo st.info || die
 	dodoc TODO
 
 	make_desktop_entry ${PN} simpleterm utilities-terminal 'System;TerminalEmulator;' ''