commit: 7e17670a886d15ab6a0ba40c906cbbe0dce5d066 Author: Alexey Sokolov <sokolov <AT> google <DOT> com> AuthorDate: Sun Apr 1 10:54:14 2018 +0000 Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org> CommitDate: Mon May 7 12:51:56 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e17670a
app-i18n/fbterm: fix file collision with sys-libs/ncurses-6.1 Bug: https://bugs.gentoo.org/648472 Closes: https://github.com/gentoo/gentoo/pull/7764 Package-Manager: Portage-2.3.24, Repoman-2.3.6 .../fbterm/{fbterm-1.7-r3.ebuild => fbterm-1.7-r4.ebuild} | 8 +++++--- .../fbterm/{fbterm-1.7-r3.ebuild => fbterm-1.7-r5.ebuild} | 14 +++++++------- app-i18n/fbterm/files/fbterm-noterminfo.patch | 15 +++++++++++++++ 3 files changed, 27 insertions(+), 10 deletions(-) diff --git a/app-i18n/fbterm/fbterm-1.7-r3.ebuild b/app-i18n/fbterm/fbterm-1.7-r4.ebuild similarity index 88% copy from app-i18n/fbterm/fbterm-1.7-r3.ebuild copy to app-i18n/fbterm/fbterm-1.7-r4.ebuild index 2138ece5ef1..8b906331dde 100644 --- a/app-i18n/fbterm/fbterm-1.7-r3.ebuild +++ b/app-i18n/fbterm/fbterm-1.7-r4.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" @@ -14,11 +14,13 @@ SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~x86" IUSE="gpm video_cards_vesa" -RDEPEND="media-libs/fontconfig +COMMON_DEPEND="media-libs/fontconfig media-libs/freetype:2 gpm? ( sys-libs/gpm ) video_cards_vesa? ( dev-libs/libx86 )" -DEPEND="${RDEPEND} +RDEPEND="${COMMON_DEPEND} + !>=sys-libs/ncurses-6.1" +DEPEND="${COMMON_DEPEND} sys-libs/ncurses virtual/pkgconfig" diff --git a/app-i18n/fbterm/fbterm-1.7-r3.ebuild b/app-i18n/fbterm/fbterm-1.7-r5.ebuild similarity index 80% rename from app-i18n/fbterm/fbterm-1.7-r3.ebuild rename to app-i18n/fbterm/fbterm-1.7-r5.ebuild index 2138ece5ef1..a4b174a1f85 100644 --- a/app-i18n/fbterm/fbterm-1.7-r3.ebuild +++ b/app-i18n/fbterm/fbterm-1.7-r5.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" @@ -17,20 +17,21 @@ IUSE="gpm video_cards_vesa" RDEPEND="media-libs/fontconfig media-libs/freetype:2 gpm? ( sys-libs/gpm ) - video_cards_vesa? ( dev-libs/libx86 )" + video_cards_vesa? ( dev-libs/libx86 ) + >=sys-libs/ncurses-6.1" DEPEND="${RDEPEND} - sys-libs/ncurses virtual/pkgconfig" -PATCHES=( "${FILESDIR}"/${PN}-gcc6.patch ) +PATCHES=( + "${FILESDIR}"/${PN}-gcc6.patch + "${FILESDIR}"/${PN}-noterminfo.patch +) FILECAPS=( cap_sys_tty_config+ep usr/bin/${PN} ) src_prepare() { - sed -i "s|tic|tic -o '\$(DESTDIR)\$(datadir)/terminfo'|" terminfo/Makefile.am - default eautoreconf } @@ -42,7 +43,6 @@ src_configure() { } src_install() { - dodir /usr/share/terminfo default use filecaps || fperms u+s /usr/bin/${PN} diff --git a/app-i18n/fbterm/files/fbterm-noterminfo.patch b/app-i18n/fbterm/files/fbterm-noterminfo.patch new file mode 100644 index 00000000000..76cf9fc7792 --- /dev/null +++ b/app-i18n/fbterm/files/fbterm-noterminfo.patch @@ -0,0 +1,15 @@ +commit 77c90022233634a3c891dc778585c526d9d846a1 +Author: Alexey Sokolov <[email protected]> +Date: Sun Apr 1 11:33:20 2018 +0100 + + Don't install terminfo: ncurses-6.1 supports fbterm itself + + https://bugs.gentoo.org/648472 + +diff --git a/Makefile.am b/Makefile.am +index 10814b6..8adcd57 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1 +1 @@ +-SUBDIRS = src im terminfo doc ++SUBDIRS = src im doc
