diff options
| author |   Akinori Hattori <hattya@gentoo.org> | 2018-05-07 21:57:41 +0900 |
|---|---|---|
| committer | Akinori Hattori <hattya@gentoo.org> | 2018-05-07 21:57:41 +0900 |
| commit | 65a109b101e0250a5dfbf21751998dcb36e1cf77 (patch) | |
| tree | 5ee43858c89da7f271c62648eb7f218fa9ba84d3 /app-i18n | |
| parent | app-i18n/fbterm: fix file collision with sys-libs/ncurses-6.1 (diff) | |
| download | gentoo-65a109b101e0250a5dfbf21751998dcb36e1cf77.tar.gz gentoo-65a109b101e0250a5dfbf21751998dcb36e1cf77.tar.bz2 gentoo-65a109b101e0250a5dfbf21751998dcb36e1cf77.zip | |
app-i18n/fbterm: tidy
Package-Manager: Portage-2.3.24, Repoman-2.3.6
Diffstat (limited to 'app-i18n')
| -rw-r--r-- | app-i18n/fbterm/fbterm-1.7-r4.ebuild | 6 | ||||
| -rw-r--r-- | app-i18n/fbterm/fbterm-1.7-r5.ebuild | 8 | ||||
| -rw-r--r-- | app-i18n/fbterm/files/fbterm-noterminfo.patch | 15 |
3 files changed, 7 insertions, 22 deletions
diff --git a/app-i18n/fbterm/fbterm-1.7-r4.ebuild b/app-i18n/fbterm/fbterm-1.7-r4.ebuild index 8b906331dde7..b8952a615af8 100644 --- a/app-i18n/fbterm/fbterm-1.7-r4.ebuild +++ b/app-i18n/fbterm/fbterm-1.7-r4.ebuild @@ -14,13 +14,13 @@ SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~x86" IUSE="gpm video_cards_vesa" -COMMON_DEPEND="media-libs/fontconfig +CDEPEND="media-libs/fontconfig media-libs/freetype:2 gpm? ( sys-libs/gpm ) video_cards_vesa? ( dev-libs/libx86 )" -RDEPEND="${COMMON_DEPEND} +RDEPEND="${CDEPEND} !>=sys-libs/ncurses-6.1" -DEPEND="${COMMON_DEPEND} +DEPEND="${CDEPEND} sys-libs/ncurses virtual/pkgconfig" diff --git a/app-i18n/fbterm/fbterm-1.7-r5.ebuild b/app-i18n/fbterm/fbterm-1.7-r5.ebuild index a4b174a1f859..45117addebe2 100644 --- a/app-i18n/fbterm/fbterm-1.7-r5.ebuild +++ b/app-i18n/fbterm/fbterm-1.7-r5.ebuild @@ -22,16 +22,16 @@ RDEPEND="media-libs/fontconfig DEPEND="${RDEPEND} virtual/pkgconfig" -PATCHES=( - "${FILESDIR}"/${PN}-gcc6.patch - "${FILESDIR}"/${PN}-noterminfo.patch -) +PATCHES=( "${FILESDIR}"/${PN}-gcc6.patch ) FILECAPS=( cap_sys_tty_config+ep usr/bin/${PN} ) src_prepare() { + # bug #648472 + sed -i "s/terminfo//" Makefile.am + default eautoreconf } diff --git a/app-i18n/fbterm/files/fbterm-noterminfo.patch b/app-i18n/fbterm/files/fbterm-noterminfo.patch deleted file mode 100644 index 76cf9fc77925..000000000000 --- a/app-i18n/fbterm/files/fbterm-noterminfo.patch +++ /dev/null @@ -1,15 +0,0 @@ -commit 77c90022233634a3c891dc778585c526d9d846a1 -Author: Alexey Sokolov <sokolov@google.com> -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 |