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 DA70C138336 for ; Sun, 24 Mar 2019 21:41:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CFF53E0A01; Sun, 24 Mar 2019 21:40:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 9091EE0A01 for ; Sun, 24 Mar 2019 21:40:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 3D834335D4C for ; Sun, 24 Mar 2019 21:40:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 17E8356E for ; Sun, 24 Mar 2019 21:40:56 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1553463649.8081ea9be17ec027df0fcf16b428b5050284f6a7.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/nano/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-editors/nano/nano-9999.ebuild X-VCS-Directories: app-editors/nano/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 8081ea9be17ec027df0fcf16b428b5050284f6a7 X-VCS-Branch: master Date: Sun, 24 Mar 2019 21:40:56 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: baf63783-133e-4f70-bf1d-4b6e78895c62 X-Archives-Hash: ea95339633bbbb3276801305f6d55087 commit: 8081ea9be17ec027df0fcf16b428b5050284f6a7 Author: Lars Wendler gentoo org> AuthorDate: Sun Mar 24 21:39:23 2019 +0000 Commit: Lars Wendler gentoo org> CommitDate: Sun Mar 24 21:40:49 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8081ea9b app-editors/nano: Synced live ebuild. Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Lars Wendler gentoo.org> app-editors/nano/nano-9999.ebuild | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/app-editors/nano/nano-9999.ebuild b/app-editors/nano/nano-9999.ebuild index f4eec8c7c12..aa130516a9a 100644 --- a/app-editors/nano/nano-9999.ebuild +++ b/app-editors/nano/nano-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then 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" + 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 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi @@ -27,10 +27,11 @@ 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 @@ -46,7 +47,6 @@ src_configure() { $(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) @@ -56,16 +56,13 @@ src_configure() { $(use_enable minimal tiny) $(usex ncurses --without-slang $(use_with slang)) ) - case ${CHOST} in - *-gnu*|*-uclibc*) myconf+=( "--with-wordbounds" ) ;; #467848 - esac econf "${myconf[@]}" } src_install() { default # don't use "${ED}" here or things break (#654534) - rm -r "${D%/}"/trash || die + rm -r "${D}"/trash || die dodoc doc/sample.nanorc docinto html @@ -76,7 +73,7 @@ src_install() { # Enable colorization by default. sed -i \ -e '/^# include /s:# *::' \ - "${ED%/}"/etc/nanorc || die + "${ED}"/etc/nanorc || die fi dosym ../../bin/nano /usr/bin/nano