Gentoo Archives: gentoo-commits

From: Akinori Hattori <hattya@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-i18n/fbterm/
Date: Sat, 05 Aug 2017 13:15:59
Message-Id: 1501938763.95a831d738dae3bfb016f4ac2f1e2cb0eeee70b1.hattya@gentoo
1 commit: 95a831d738dae3bfb016f4ac2f1e2cb0eeee70b1
2 Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
3 AuthorDate: Sat Aug 5 13:12:43 2017 +0000
4 Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
5 CommitDate: Sat Aug 5 13:12:43 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95a831d7
7
8 app-i18n/fbterm: inherit fcaps
9
10 Gentoo-Bug: 566458
11
12 Package-Manager: Portage-2.3.6, Repoman-2.3.1
13
14 app-i18n/fbterm/fbterm-1.7-r2.ebuild | 17 +++++++++--------
15 1 file changed, 9 insertions(+), 8 deletions(-)
16
17 diff --git a/app-i18n/fbterm/fbterm-1.7-r2.ebuild b/app-i18n/fbterm/fbterm-1.7-r2.ebuild
18 index a371d7db068..f23bea99932 100644
19 --- a/app-i18n/fbterm/fbterm-1.7-r2.ebuild
20 +++ b/app-i18n/fbterm/fbterm-1.7-r2.ebuild
21 @@ -3,7 +3,7 @@
22
23 EAPI="6"
24
25 -inherit autotools
26 +inherit autotools fcaps
27
28 DESCRIPTION="Fast terminal emulator for the Linux framebuffer"
29 HOMEPAGE="https://code.google.com/p/fbterm"
30 @@ -12,11 +12,10 @@ SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.go
31 LICENSE="GPL-2"
32 SLOT="0"
33 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
34 -IUSE="caps gpm video_cards_vesa"
35 +IUSE="gpm video_cards_vesa"
36
37 RDEPEND="media-libs/fontconfig
38 media-libs/freetype:2
39 - caps? ( sys-libs/libcap )
40 gpm? ( sys-libs/gpm )
41 video_cards_vesa? ( dev-libs/libx86 )"
42 DEPEND="${RDEPEND}
43 @@ -25,6 +24,10 @@ DEPEND="${RDEPEND}
44
45 PATCHES=( "${FILESDIR}"/${PN}-gcc6.patch )
46
47 +FILECAPS=(
48 + cap_sys_tty_config+ep usr/bin/${PN}
49 +)
50 +
51 src_prepare() {
52 sed -i "s|tic|tic -o '\$(DESTDIR)\$(datadir)/terminfo'|" terminfo/Makefile.am
53
54 @@ -41,14 +44,12 @@ src_configure() {
55 src_install() {
56 default
57
58 - if use caps; then
59 - setcap "cap_sys_tty_config+ep" "${ED}"/usr/bin/${PN}
60 - else
61 - fperms u+s /usr/bin/${PN}
62 - fi
63 + use filecaps || fperms u+s /usr/bin/${PN}
64 }
65
66 pkg_postinst() {
67 + fcaps_pkg_postinst
68 +
69 elog "${PN} won't work with vga16fb. You have to use other native"
70 elog "framebuffer drivers or vesa driver."
71 elog "See ${EPREFIX}/usr/share/doc/${P}/README for details."