[gentoo-commits] repo/gentoo:master commit in: x11-terms/eterm/

["Sam James" <sam@gentoo.org>]

commit:     e0254882d6ec2c5d70222e660fefbc5dfeba6dc0
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 12 23:44:30 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan 12 23:44:30 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0254882

x11-terms/eterm: EAPI 7, missing BDEPEND (man2html)

Closes: https://bugs.gentoo.org/764137
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>

 x11-terms/eterm/eterm-0.9.6-r2.ebuild | 13 +++++++------
 x11-terms/eterm/eterm-9999.ebuild     | 13 ++++++++-----
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/x11-terms/eterm/eterm-0.9.6-r2.ebuild b/x11-terms/eterm/eterm-0.9.6-r2.ebuild
index dac113376d1..138602b2825 100644
--- a/x11-terms/eterm/eterm-0.9.6-r2.ebuild
+++ b/x11-terms/eterm/eterm-0.9.6-r2.ebuild
@@ -1,27 +1,29 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="A vt102 terminal emulator for X"
 HOMEPAGE="http://www.eterm.org/"
 SRC_URI="
 	http://www.eterm.org/download/${P^}.tar.gz
 	!minimal? ( http://www.eterm.org/download/Eterm-bg-${PV}.tar.gz )"
+S="${WORKDIR}/${P^}"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~ppc-macos"
 IUSE="escreen minimal cpu_flags_x86_mmx cpu_flags_x86_sse2 unicode +utempter"
 
+BDEPEND="sys-apps/man2html"
 RDEPEND="
+	media-libs/imlib2[X]
+	media-fonts/font-misc-misc
 	x11-libs/libX11
 	x11-libs/libXt
 	x11-libs/libICE
 	x11-libs/libSM
 	x11-libs/libast
-	media-libs/imlib2[X]
-	media-fonts/font-misc-misc
 	escreen? ( app-misc/screen )
 "
 DEPEND="${RDEPEND}"
@@ -29,8 +31,6 @@ DEPEND="${RDEPEND}"
 DOCS=( ChangeLog README ReleaseNotes bg/README.backgrounds )
 PATCHES=( "${FILESDIR}"/${P}-asm-gnu-stack.patch )
 
-S=${WORKDIR}/${P^}
-
 src_unpack() {
 	unpack ${P^}.tar.gz
 	cd "${S}" || die
@@ -55,6 +55,7 @@ src_configure() {
 src_install() {
 	use escreen && DOCS+=( doc/README.Escreen )
 	default
+
 	# We don't install headers to link against this library
-	rm -f "${ED%/}"/usr/*/libEterm.{so,la} || die
+	rm "${ED}"/usr/*/libEterm.{so,la} || die
 }

diff --git a/x11-terms/eterm/eterm-9999.ebuild b/x11-terms/eterm/eterm-9999.ebuild
index e1045ccb87f..ae754baae08 100644
--- a/x11-terms/eterm/eterm-9999.ebuild
+++ b/x11-terms/eterm/eterm-9999.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit autotools git-r3
 
 DESCRIPTION="A vt102 terminal emulator for X"
@@ -12,14 +13,15 @@ LICENSE="BSD"
 SLOT="0"
 IUSE="escreen minimal cpu_flags_x86_mmx cpu_flags_x86_sse2 unicode +utempter"
 
+BDEPEND="sys-apps/man2html"
 RDEPEND="
+	media-libs/imlib2[X]
+	media-fonts/font-misc-misc
 	x11-libs/libX11
 	x11-libs/libXt
 	x11-libs/libICE
 	x11-libs/libSM
 	x11-libs/libast
-	media-libs/imlib2[X]
-	media-fonts/font-misc-misc
 	escreen? ( app-misc/screen )
 "
 DEPEND="${RDEPEND}"
@@ -49,6 +51,7 @@ src_configure() {
 src_install() {
 	use escreen && DOCS+=( doc/README.Escreen )
 	default
+
 	# We don't install headers to link against this library
-	rm -f "${ED%/}"/usr/*/libEterm.{so,la} || die
+	rm "${ED}"/usr/*/libEterm.{so,la} || die
 }