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

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

[David Seifert]

commit:     409741fd7cc9be0e260716068c70cff0e8756ac8
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 12 12:04:55 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Feb 12 12:05:40 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=409741fd

app-i18n/jfbterm: Modernise to EAPI 6

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 app-i18n/jfbterm/jfbterm-0.4.7-r4.ebuild | 42 ++++++++++++++++++--------------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/app-i18n/jfbterm/jfbterm-0.4.7-r4.ebuild b/app-i18n/jfbterm/jfbterm-0.4.7-r4.ebuild
index b79f0ff20b..43d7361f0f 100644
--- a/app-i18n/jfbterm/jfbterm-0.4.7-r4.ebuild
+++ b/app-i18n/jfbterm/jfbterm-0.4.7-r4.ebuild
@@ -2,7 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-inherit flag-o-matic eutils autotools
+EAPI=6
+
+inherit autotools flag-o-matic
 
 DESCRIPTION="The J Framebuffer Terminal/Multilingual Enhancement with UTF-8 support"
 HOMEPAGE="http://jfbterm.sourceforge.jp/"
@@ -13,35 +15,39 @@ SLOT="0"
 KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE="debug"
 
-DEPEND=">=sys-libs/ncurses-5.6"
-RDEPEND="media-fonts/unifont
+DEPEND="sys-libs/ncurses:0"
+RDEPEND="
+	media-fonts/unifont
 	media-fonts/font-misc-misc
 	media-fonts/intlfonts"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-sigchld-debian.patch"
-	epatch "${FILESDIR}/${P}-no-kernel-headers.patch"
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-	epatch "${FILESDIR}/${P}-wrong-inline-gcc5.patch"
+PATCHES=(
+	"${FILESDIR}"/${P}-sigchld-debian.patch
+	"${FILESDIR}"/${P}-no-kernel-headers.patch
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-wrong-inline-gcc5.patch
+)
 
+src_prepare() {
+	default
+	mv configure.{in,ac} || die
 	eautoreconf
 }
 
-src_compile() {
-	econf $(use_enable debug) || die "econf failed"
-	emake || die "emake failed"
+src_configure() {
+	econf $(use_enable debug)
 }
 
 src_install() {
 	dodir /etc /usr/share/fonts/jfbterm
-	emake -j1 DESTDIR="${D}" install || die "emake install failed"
+	default
 
-	mv "${D}"/etc/jfbterm.conf{.sample,}
+	mv "${ED%/}"/etc/jfbterm.conf{.sample,} || die
 
-	doman jfbterm.1 jfbterm.conf.5 || die "doman failed"
+	doman jfbterm.1 jfbterm.conf.5
 
-	dodoc AUTHORS ChangeLog NEWS README* jfbterm.conf.sample* \
-		|| die "dodoc failed"
+	# install example config files
+	docinto examples
+	dodoc jfbterm.conf.sample*
+	docompress -x /usr/share/doc/${PF}/examples
 }

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

[Akinori Hattori]

commit:     afeefcb79935faa54919e8be4bda6b8f8895bf95
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  7 14:09:55 2021 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Thu Oct  7 14:13:26 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afeefcb7

app-i18n/jfbterm: update to EAPI 7

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>

 app-i18n/jfbterm/jfbterm-0.4.7-r4.ebuild | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/app-i18n/jfbterm/jfbterm-0.4.7-r4.ebuild b/app-i18n/jfbterm/jfbterm-0.4.7-r4.ebuild
index 70443ef74fd..bcfc43de173 100644
--- a/app-i18n/jfbterm/jfbterm-0.4.7-r4.ebuild
+++ b/app-i18n/jfbterm/jfbterm-0.4.7-r4.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI="7"
 
 inherit autotools flag-o-matic
 
@@ -15,10 +15,9 @@ KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE="debug"
 
 DEPEND="sys-libs/ncurses:0"
-RDEPEND="
-	media-fonts/unifont
-	media-fonts/font-misc-misc
-	media-fonts/intlfonts"
+RDEPEND="media-fonts/font-misc-misc
+	media-fonts/intlfonts
+	media-fonts/unifont"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-sigchld-debian.patch
@@ -38,15 +37,15 @@ src_configure() {
 }
 
 src_install() {
-	dodir /etc /usr/share/fonts/jfbterm
+	dodir /etc /usr/share/fonts/${PN}
 	default
 
-	mv "${ED%/}"/etc/jfbterm.conf{.sample,} || die
+	mv "${ED}"/etc/${PN}.conf{.sample,} || die
 
-	doman jfbterm.1 jfbterm.conf.5
+	doman ${PN}.{1,conf.5}
 
 	# install example config files
 	docinto examples
-	dodoc jfbterm.conf.sample*
+	dodoc ${PN}.conf.sample*
 	docompress -x /usr/share/doc/${PF}/examples
 }