From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A6431139694 for ; Sat, 5 Aug 2017 13:16:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F14D6E0DA7; Sat, 5 Aug 2017 13:16:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C116BE0DA7 for ; Sat, 5 Aug 2017 13:16:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 928B0341810 for ; Sat, 5 Aug 2017 13:16:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4627B75F1 for ; Sat, 5 Aug 2017 13:15:55 +0000 (UTC) From: "Akinori Hattori" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Akinori Hattori" Message-ID: <1501938568.868f612bb48712e77205955d6a409d4e92944e53.hattya@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-i18n/fbterm/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-i18n/fbterm/fbterm-1.7-r2.ebuild app-i18n/fbterm/metadata.xml X-VCS-Directories: app-i18n/fbterm/ X-VCS-Committer: hattya X-VCS-Committer-Name: Akinori Hattori X-VCS-Revision: 868f612bb48712e77205955d6a409d4e92944e53 X-VCS-Branch: master Date: Sat, 5 Aug 2017 13:15:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: e4a0a640-16e6-4be6-96e8-5addeb5ab431 X-Archives-Hash: a3acf571f16b0f9f255d467c80938659 commit: 868f612bb48712e77205955d6a409d4e92944e53 Author: Akinori Hattori gentoo org> AuthorDate: Sat Aug 5 13:09:28 2017 +0000 Commit: Akinori Hattori gentoo org> CommitDate: Sat Aug 5 13:09:28 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=868f612b app-i18n/fbterm: update to EAPI 6 Package-Manager: Portage-2.3.6, Repoman-2.3.1 app-i18n/fbterm/fbterm-1.7-r2.ebuild | 53 +++++++++++++++++------------------- app-i18n/fbterm/metadata.xml | 11 +++++--- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/app-i18n/fbterm/fbterm-1.7-r2.ebuild b/app-i18n/fbterm/fbterm-1.7-r2.ebuild index 5685cd6a76e..536c70f0606 100644 --- a/app-i18n/fbterm/fbterm-1.7-r2.ebuild +++ b/app-i18n/fbterm/fbterm-1.7-r2.ebuild @@ -1,60 +1,57 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="5" -inherit autotools-utils +EAPI="6" + +inherit autotools DESCRIPTION="Fast terminal emulator for the Linux framebuffer" HOMEPAGE="https://fbterm.googlecode.com/" -SRC_URI="https://fbterm.googlecode.com/files/${P}.0.tar.gz" +SRC_URI="https://${PN}.googlecode.com/files/${P}.0.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~x86" IUSE="caps gpm video_cards_vesa" -RDEPEND="caps? ( sys-libs/libcap ) +RDEPEND="media-libs/fontconfig + media-libs/freetype:2 + caps? ( sys-libs/libcap ) gpm? ( sys-libs/gpm ) - video_cards_vesa? ( dev-libs/libx86 ) - media-libs/fontconfig - media-libs/freetype:2" + video_cards_vesa? ( dev-libs/libx86 )" DEPEND="${RDEPEND} sys-libs/ncurses virtual/pkgconfig" -AUTOTOOLS_IN_SOURCE_BUILD=1 +PATCHES=( "${FILESDIR}"/${PN}-gcc6.patch ) -DOCS=( AUTHORS NEWS README ) +src_prepare() { + sed -i "s|tic|tic -o '\$(DESTDIR)\$(datadir)/terminfo'|" terminfo/Makefile.am -PATCHES=( - "${FILESDIR}"/${PN}-gcc6.patch -) + default + eautoreconf +} src_configure() { - local myeconfargs=( - $(use_enable gpm) + econf \ + $(use_enable gpm) \ $(use_enable video_cards_vesa vesa) - ) - autotools-utils_src_configure } src_install() { - autotools-utils_src_install - $(type -P tic) -o "${ED}/usr/share/terminfo/" \ - "${S}"/terminfo/fbterm || die "Failed to generate terminfo database" + default + if use caps; then - setcap "cap_sys_tty_config+ep" "${ED}"/usr/bin/fbterm + setcap "cap_sys_tty_config+ep" "${ED}"/usr/bin/${PN} else - fperms u+s /usr/bin/fbterm + fperms u+s /usr/bin/${PN} fi } pkg_postinst() { - einfo - einfo " ${PN} won't work with vga16fb. You have to use other native" - einfo " framebuffer drivers or vesa driver." - einfo " See ${EPREFIX}/usr/share/doc/${P}/README for details." - einfo " To use ${PN}, ensure you are in video group." - einfo " To input CJK merge app-i18n/fbterm-ucimf" - einfo + 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." + elog + elog "To use ${PN}, ensure you are in video group." } diff --git a/app-i18n/fbterm/metadata.xml b/app-i18n/fbterm/metadata.xml index c921b96adf6..165c6df0ed2 100644 --- a/app-i18n/fbterm/metadata.xml +++ b/app-i18n/fbterm/metadata.xml @@ -1,8 +1,11 @@ - - cjk@gentoo.org - Cjk - + + cjk@gentoo.org + Cjk + + + fbterm +