From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 4B14F13881D for ; Sat, 26 Sep 2015 08:07:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7793921C006; Sat, 26 Sep 2015 08:07:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DAD1021C09A for ; Sat, 26 Sep 2015 08:07:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 18B51340A5D for ; Sat, 26 Sep 2015 08:07:54 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 10F2023C for ; Sat, 26 Sep 2015 08:07:52 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1443254862.40bbbb5a40ced77b0f1884bc9fef7ad344516449.vapier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/nano/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-editors/nano/nano-2.4.2.ebuild app-editors/nano/nano-9999.ebuild X-VCS-Directories: app-editors/nano/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: 40bbbb5a40ced77b0f1884bc9fef7ad344516449 X-VCS-Branch: master Date: Sat, 26 Sep 2015 08:07:52 +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-Archives-Salt: aa7b28aa-26cb-433a-81ec-70ebbd8225a6 X-Archives-Hash: 19fe0c3a01b2dacca0ec3d2966885a2e commit: 40bbbb5a40ced77b0f1884bc9fef7ad344516449 Author: Mike Frysinger gentoo org> AuthorDate: Sat Sep 26 07:25:39 2015 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Sat Sep 26 08:07:42 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40bbbb5a app-editors/nano: update to EAPI=5 and use subslot w/ncurses #561310 Also sync the magic changes from the non-live to the 9999 ebuild. app-editors/nano/nano-2.4.2.ebuild | 6 +++--- app-editors/nano/nano-9999.ebuild | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app-editors/nano/nano-2.4.2.ebuild b/app-editors/nano/nano-2.4.2.ebuild index f324c2e..48d87ed 100644 --- a/app-editors/nano/nano-2.4.2.ebuild +++ b/app-editors/nano/nano-2.4.2.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="4" +EAPI="5" inherit eutils flag-o-matic if [[ ${PV} == "9999" ]] ; then @@ -21,8 +21,8 @@ LICENSE="GPL-3" SLOT="0" IUSE="debug justify +magic minimal ncurses nls slang +spell static unicode" -LIB_DEPEND=">=sys-libs/ncurses-5.9-r1:0[unicode?] - sys-libs/ncurses:0[static-libs(+)] +LIB_DEPEND=">=sys-libs/ncurses-5.9-r1:0=[unicode?] + sys-libs/ncurses:0=[static-libs(+)] magic? ( sys-apps/file[static-libs(+)] ) nls? ( virtual/libintl ) !ncurses? ( slang? ( sys-libs/slang[static-libs(+)] ) )" diff --git a/app-editors/nano/nano-9999.ebuild b/app-editors/nano/nano-9999.ebuild index 8548dec..48d87ed 100644 --- a/app-editors/nano/nano-9999.ebuild +++ b/app-editors/nano/nano-9999.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="4" +EAPI="5" inherit eutils flag-o-matic if [[ ${PV} == "9999" ]] ; then @@ -21,8 +21,8 @@ LICENSE="GPL-3" SLOT="0" IUSE="debug justify +magic minimal ncurses nls slang +spell static unicode" -LIB_DEPEND=">=sys-libs/ncurses-5.9-r1:0[unicode?] - sys-libs/ncurses:0[static-libs(+)] +LIB_DEPEND=">=sys-libs/ncurses-5.9-r1:0=[unicode?] + sys-libs/ncurses:0=[static-libs(+)] magic? ( sys-apps/file[static-libs(+)] ) nls? ( virtual/libintl ) !ncurses? ( slang? ( sys-libs/slang[static-libs(+)] ) )" @@ -41,7 +41,6 @@ src_prepare() { src_configure() { use static && append-ldflags -static - eval export ac_cv_{header_magic_h,lib_magic_magic_open}=$(usex magic) local myconf=() case ${CHOST} in *-gnu*|*-uclibc*) myconf+=( "--with-wordbounds" ) ;; #467848 @@ -53,6 +52,7 @@ src_configure() { $(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) \