[gentoo-commits] repo/gentoo:master commit in: app-i18n/fbterm/

["Akinori Hattori" <hattya@gentoo.org>]

commit:     95a831d738dae3bfb016f4ac2f1e2cb0eeee70b1
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sat Aug  5 13:12:43 2017 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sat Aug  5 13:12:43 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95a831d7

app-i18n/fbterm: inherit fcaps

Gentoo-Bug: 566458

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 app-i18n/fbterm/fbterm-1.7-r2.ebuild | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/app-i18n/fbterm/fbterm-1.7-r2.ebuild b/app-i18n/fbterm/fbterm-1.7-r2.ebuild
index a371d7db068..f23bea99932 100644
--- a/app-i18n/fbterm/fbterm-1.7-r2.ebuild
+++ b/app-i18n/fbterm/fbterm-1.7-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-inherit autotools
+inherit autotools fcaps
 
 DESCRIPTION="Fast terminal emulator for the Linux framebuffer"
 HOMEPAGE="https://code.google.com/p/fbterm"
@@ -12,11 +12,10 @@ SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.go
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="caps gpm video_cards_vesa"
+IUSE="gpm video_cards_vesa"
 
 RDEPEND="media-libs/fontconfig
 	media-libs/freetype:2
-	caps? ( sys-libs/libcap )
 	gpm? ( sys-libs/gpm )
 	video_cards_vesa? ( dev-libs/libx86 )"
 DEPEND="${RDEPEND}
@@ -25,6 +24,10 @@ DEPEND="${RDEPEND}
 
 PATCHES=( "${FILESDIR}"/${PN}-gcc6.patch )
 
+FILECAPS=(
+	cap_sys_tty_config+ep usr/bin/${PN}
+)
+
 src_prepare() {
 	sed -i "s|tic|tic -o '\$(DESTDIR)\$(datadir)/terminfo'|" terminfo/Makefile.am
 
@@ -41,14 +44,12 @@ src_configure() {
 src_install() {
 	default
 
-	if use caps; then
-		setcap "cap_sys_tty_config+ep" "${ED}"/usr/bin/${PN}
-	else
-		fperms u+s /usr/bin/${PN}
-	fi
+	use filecaps || fperms u+s /usr/bin/${PN}
 }
 
 pkg_postinst() {
+	fcaps_pkg_postinst
+
 	elog "${PN} won't work with vga16fb. You have to use other native"
 	elog "framebuffer drivers or vesa driver."
 	elog "See ${EPREFIX}/usr/share/doc/${P}/README for details."