| 1 |
commit: 40bbbb5a40ced77b0f1884bc9fef7ad344516449 |
| 2 |
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Sep 26 07:25:39 2015 +0000 |
| 4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Sep 26 08:07:42 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40bbbb5a |
| 7 |
|
| 8 |
app-editors/nano: update to EAPI=5 and use subslot w/ncurses #561310 |
| 9 |
|
| 10 |
Also sync the magic changes from the non-live to the 9999 ebuild. |
| 11 |
|
| 12 |
app-editors/nano/nano-2.4.2.ebuild | 6 +++--- |
| 13 |
app-editors/nano/nano-9999.ebuild | 8 ++++---- |
| 14 |
2 files changed, 7 insertions(+), 7 deletions(-) |
| 15 |
|
| 16 |
diff --git a/app-editors/nano/nano-2.4.2.ebuild b/app-editors/nano/nano-2.4.2.ebuild |
| 17 |
index f324c2e..48d87ed 100644 |
| 18 |
--- a/app-editors/nano/nano-2.4.2.ebuild |
| 19 |
+++ b/app-editors/nano/nano-2.4.2.ebuild |
| 20 |
@@ -2,7 +2,7 @@ |
| 21 |
# Distributed under the terms of the GNU General Public License v2 |
| 22 |
# $Id$ |
| 23 |
|
| 24 |
-EAPI="4" |
| 25 |
+EAPI="5" |
| 26 |
|
| 27 |
inherit eutils flag-o-matic |
| 28 |
if [[ ${PV} == "9999" ]] ; then |
| 29 |
@@ -21,8 +21,8 @@ LICENSE="GPL-3" |
| 30 |
SLOT="0" |
| 31 |
IUSE="debug justify +magic minimal ncurses nls slang +spell static unicode" |
| 32 |
|
| 33 |
-LIB_DEPEND=">=sys-libs/ncurses-5.9-r1:0[unicode?] |
| 34 |
- sys-libs/ncurses:0[static-libs(+)] |
| 35 |
+LIB_DEPEND=">=sys-libs/ncurses-5.9-r1:0=[unicode?] |
| 36 |
+ sys-libs/ncurses:0=[static-libs(+)] |
| 37 |
magic? ( sys-apps/file[static-libs(+)] ) |
| 38 |
nls? ( virtual/libintl ) |
| 39 |
!ncurses? ( slang? ( sys-libs/slang[static-libs(+)] ) )" |
| 40 |
|
| 41 |
diff --git a/app-editors/nano/nano-9999.ebuild b/app-editors/nano/nano-9999.ebuild |
| 42 |
index 8548dec..48d87ed 100644 |
| 43 |
--- a/app-editors/nano/nano-9999.ebuild |
| 44 |
+++ b/app-editors/nano/nano-9999.ebuild |
| 45 |
@@ -2,7 +2,7 @@ |
| 46 |
# Distributed under the terms of the GNU General Public License v2 |
| 47 |
# $Id$ |
| 48 |
|
| 49 |
-EAPI="4" |
| 50 |
+EAPI="5" |
| 51 |
|
| 52 |
inherit eutils flag-o-matic |
| 53 |
if [[ ${PV} == "9999" ]] ; then |
| 54 |
@@ -21,8 +21,8 @@ LICENSE="GPL-3" |
| 55 |
SLOT="0" |
| 56 |
IUSE="debug justify +magic minimal ncurses nls slang +spell static unicode" |
| 57 |
|
| 58 |
-LIB_DEPEND=">=sys-libs/ncurses-5.9-r1:0[unicode?] |
| 59 |
- sys-libs/ncurses:0[static-libs(+)] |
| 60 |
+LIB_DEPEND=">=sys-libs/ncurses-5.9-r1:0=[unicode?] |
| 61 |
+ sys-libs/ncurses:0=[static-libs(+)] |
| 62 |
magic? ( sys-apps/file[static-libs(+)] ) |
| 63 |
nls? ( virtual/libintl ) |
| 64 |
!ncurses? ( slang? ( sys-libs/slang[static-libs(+)] ) )" |
| 65 |
@@ -41,7 +41,6 @@ src_prepare() { |
| 66 |
|
| 67 |
src_configure() { |
| 68 |
use static && append-ldflags -static |
| 69 |
- eval export ac_cv_{header_magic_h,lib_magic_magic_open}=$(usex magic) |
| 70 |
local myconf=() |
| 71 |
case ${CHOST} in |
| 72 |
*-gnu*|*-uclibc*) myconf+=( "--with-wordbounds" ) ;; #467848 |
| 73 |
@@ -53,6 +52,7 @@ src_configure() { |
| 74 |
$(use_enable !minimal multibuffer) \ |
| 75 |
$(use_enable !minimal nanorc) \ |
| 76 |
--disable-wrapping-as-root \ |
| 77 |
+ $(use_enable magic libmagic) \ |
| 78 |
$(use_enable spell speller) \ |
| 79 |
$(use_enable justify) \ |
| 80 |
$(use_enable debug) \ |
Archives