[gentoo-commits] repo/gentoo:master commit in: app-editors/ng/

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

commit:     1cddea63e92eb4d6acf7a633a84cfd17ad45dc26
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  8 12:31:31 2021 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Fri Oct  8 12:31:31 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cddea63

app-editors/ng: update to EAPI 7

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

 app-editors/ng/metadata.xml           |  8 ++++----
 app-editors/ng/ng-1.5_beta1-r3.ebuild | 33 ++++++++++++++++-----------------
 2 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/app-editors/ng/metadata.xml b/app-editors/ng/metadata.xml
index 1d892a124fa..a94766977fa 100644
--- a/app-editors/ng/metadata.xml
+++ b/app-editors/ng/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>cjk@gentoo.org</email>
-	<name>Cjk</name>
-</maintainer>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 </pkgmetadata>

diff --git a/app-editors/ng/ng-1.5_beta1-r3.ebuild b/app-editors/ng/ng-1.5_beta1-r3.ebuild
index 428dbda5a7d..9c71c540e8b 100644
--- a/app-editors/ng/ng-1.5_beta1-r3.ebuild
+++ b/app-editors/ng/ng-1.5_beta1-r3.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 toolchain-funcs
 
@@ -9,30 +9,29 @@ MY_P="${P/_beta/beta}"
 
 DESCRIPTION="Emacs like micro editor Ng -- based on mg2a"
 HOMEPAGE="http://tt.sakura.ne.jp/~amura/ng/"
-SRC_URI="http://tt.sakura.ne.jp/~amura/archives/ng/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
+SRC_URI="http://tt.sakura.ne.jp/~amura/archives/${PN}/${MY_P}.tar.gz"
 
 LICENSE="Emacs"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
 
-RDEPEND="
-	sys-libs/ncurses:0=
-	!dev-java/nailgun"
+RDEPEND="sys-libs/ncurses:0="
 DEPEND="${RDEPEND}"
+S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
-	"${FILESDIR}/${MY_P}-ncurses.patch"
-	"${FILESDIR}/${MY_P}-configure.patch"
+	"${FILESDIR}"/${MY_P}-ncurses.patch
+	"${FILESDIR}"/${MY_P}-configure.patch
 )
 
 src_prepare() {
 	default
 
-	sed -i -e "/NO_BACKUP/s/undef/define/" config.h || die "sed failed"
-	pushd sys/unix > /dev/null || die
+	sed -i "/NO_BACKUP/s/undef/define/" config.h
+	cd sys/unix || die
+	mv configure.{in,ac} || die
 	eautoconf
-	popd > /dev/null || die
+	cd - >/dev/null || die
 	cp sys/unix/configure . || die
 }
 
@@ -45,20 +44,20 @@ src_compile() {
 }
 
 src_install() {
-	dobin ng
-	dodoc docs/* MANIFEST dot.ng
+	dobin ${PN}
+	dodoc docs/* MANIFEST dot.${PN}
 
-	insinto /usr/share/ng
+	insinto /usr/share/${PN}
 	doins bin/*
 
 	insinto /etc/skel
-	newins dot.ng .ng
+	newins {dot,}.${PN}
 }
 
 pkg_postinst() {
 	elog
 	elog "If you want to use user Config"
-	elog "cp /etc/skel/.ng ~/.ng"
-	elog "and edit your .ng configuration file."
+	elog "cp /etc/skel/.${PN} ~/.${PN}"
+	elog "and edit your .${PN} configuration file."
 	elog
 }