gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-08-06 00:48:18 -07:00
Code Issues Projects Releases Wiki Activity

app-editors/nano: update to EAPI=5 and use subslot w/ncurses #561310

Browse Source 
Also sync the magic changes from the non-live to the 9999 ebuild.
This commit is contained in:
Mike Frysinger
2015-09-26 03:25:39 -04:00
parent d5854659e4
commit 40bbbb5a40
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app-editors/nano/nano-2.4.2.ebuild
View File

@@ -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(+)] ) )"

8
app-editors/nano/nano-9999.ebuild
View File

@@ -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) \