[gentoo-commits] repo/proj/prefix:master commit in: app-editors/nano/

[Sam James]

commit:     75413e6004749a5c0abf7bc45860a006d415111e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 30 05:03:54 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Nov 30 05:03:54 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=75413e60

app-editors/nano: sync live

Package-Manager: Portage-3.0.10.2-prefix, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-editors/nano/nano-4.9.3.ebuild |  2 +-
 app-editors/nano/nano-9999.ebuild  | 71 ++++++++++++++++++--------------------
 2 files changed, 35 insertions(+), 38 deletions(-)

diff --git a/app-editors/nano/nano-4.9.3.ebuild b/app-editors/nano/nano-4.9.3.ebuild
index 3fedc6281e..f2672b23e4 100644
--- a/app-editors/nano/nano-4.9.3.ebuild
+++ b/app-editors/nano/nano-4.9.3.ebuild
@@ -76,7 +76,7 @@ src_install() {
 			"${ED}"/etc/nanorc || die
 	fi
 
-	if use split-usr || ! use prefix-guest ; then
+	if use split-usr || ( use prefix && ! use prefix-guest ) ; then
 		 dosym ../../bin/nano /usr/bin/nano
 	fi
 }

diff --git a/app-editors/nano/nano-9999.ebuild b/app-editors/nano/nano-9999.ebuild
index dd61bfc2c2..83537e7423 100644
--- a/app-editors/nano/nano-9999.ebuild
+++ b/app-editors/nano/nano-9999.ebuild
@@ -1,17 +1,16 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
-EAPI=6
+EAPI=7
 
-inherit eutils flag-o-matic
+inherit flag-o-matic
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://git.sv.gnu.org/nano.git"
 	inherit git-r3 autotools
 else
-	MY_P=${PN}-${PV/_}
-	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:3}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	MY_P="${PN}-${PV/_}"
+	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="GNU GPL'd Pico clone with more functionality"
@@ -19,7 +18,7 @@ HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="debug justify +magic minimal ncurses nls slang +spell static unicode"
+IUSE="debug justify +magic minimal ncurses nls slang +spell +split-usr static unicode"
 
 LIB_DEPEND=">=sys-libs/ncurses-5.9-r1:0=[unicode?]
 	sys-libs/ncurses:0=[static-libs(+)]
@@ -28,58 +27,56 @@ LIB_DEPEND=">=sys-libs/ncurses-5.9-r1:0=[unicode?]
 	!ncurses? ( slang? ( sys-libs/slang[static-libs(+)] ) )"
 RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
 DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )"
+BDEPEND="
 	nls? ( sys-devel/gettext )
 	virtual/pkgconfig
-	static? ( ${LIB_DEPEND} )"
-
+"
 src_prepare() {
+	default
 	if [[ ${PV} == "9999" ]] ; then
 		eautoreconf
 	fi
-	default
 }
 
 src_configure() {
 	use static && append-ldflags -static
-	local myconf=()
-	case ${CHOST} in
-	*-gnu*|*-uclibc*) myconf+=( "--with-wordbounds" ) ;; #467848
-	esac
-	econf \
-		--bindir="${EPREFIX}"/bin \
-		--htmldir=/trash \
-		$(use_enable !minimal color) \
-		$(use_enable !minimal multibuffer) \
-		$(use_enable !minimal nanorc) \
-		--disable-wrapping-as-root \
-		$(use_enable magic libmagic) \
-		$(use_enable spell speller) \
-		$(use_enable justify) \
-		$(use_enable debug) \
-		$(use_enable nls) \
-		$(use_enable unicode utf8) \
-		$(use_enable minimal tiny) \
-		$(usex ncurses --without-slang $(use_with slang)) \
-		"${myconf[@]}"
+	local myconf=(
+		--bindir="${EPREFIX}"/bin
+		--htmldir=/trash
+		$(use_enable !minimal color)
+		$(use_enable !minimal multibuffer)
+		$(use_enable !minimal nanorc)
+		$(use_enable magic libmagic)
+		$(use_enable spell speller)
+		$(use_enable justify)
+		$(use_enable debug)
+		$(use_enable nls)
+		$(use_enable unicode utf8)
+		$(use_enable minimal tiny)
+		$(usex ncurses --without-slang $(use_with slang))
+	)
+	econf "${myconf[@]}"
 }
 
 src_install() {
 	default
-	rm -rf "${D}"/trash
+	# don't use "${ED}" here or things break (#654534)
+	rm -r "${D}"/trash || die
 
-	dodoc doc/nanorc.sample
+	dodoc doc/sample.nanorc
 	docinto html
 	dodoc doc/faq.html
 	insinto /etc
-	newins doc/nanorc.sample nanorc
+	newins doc/sample.nanorc nanorc
 	if ! use minimal ; then
 		# Enable colorization by default.
 		sed -i \
 			-e '/^# include /s:# *::' \
 			"${ED}"/etc/nanorc || die
 	fi
-	if ! use prefix-guest ; then
-		dodir /usr/bin
-		dosym /bin/nano /usr/bin/nano
+
+	if use split-usr || ( use prefix && ! use prefix-guest ) ; then
+		dosym ../../bin/nano /usr/bin/nano
 	fi
 }