commit: 301a958e477b016e486fbbd22a3ee5ace07941fa Author: Matija Skala <mskala <AT> gmx <DOT> com> AuthorDate: Fri Jul 12 16:25:08 2019 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Thu Jul 18 07:52:01 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=301a958e
app-editors/nano: add support for /usr merge Signed-off-by: Matija Skala <mskala <AT> gmx.com> Closes: https://github.com/gentoo/gentoo/pull/12432 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> app-editors/nano/metadata.xml | 3 +++ app-editors/nano/nano-3.2.ebuild | 4 ++-- app-editors/nano/nano-4.2.ebuild | 4 ++-- app-editors/nano/nano-4.3.ebuild | 4 ++-- app-editors/nano/nano-9999.ebuild | 4 ++-- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/app-editors/nano/metadata.xml b/app-editors/nano/metadata.xml index ba70fb9893e..add7f71937d 100644 --- a/app-editors/nano/metadata.xml +++ b/app-editors/nano/metadata.xml @@ -35,5 +35,8 @@ perhaps providing other extra functionality. Disable all fancy features, including ones that otherwise have a dedicated USE flag (such as spelling). </flag> + <flag name="split-usr"> + Enable this if /bin and /usr/bin are separate directories + </flag> </use> </pkgmetadata> diff --git a/app-editors/nano/nano-3.2.ebuild b/app-editors/nano/nano-3.2.ebuild index ef6555432c2..9c28db49f39 100644 --- a/app-editors/nano/nano-3.2.ebuild +++ b/app-editors/nano/nano-3.2.ebuild @@ -18,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(+)] @@ -79,5 +79,5 @@ src_install() { "${ED%/}"/etc/nanorc || die fi - dosym ../../bin/nano /usr/bin/nano + use split-usr && dosym ../../bin/nano /usr/bin/nano } diff --git a/app-editors/nano/nano-4.2.ebuild b/app-editors/nano/nano-4.2.ebuild index cbab8247c5c..9bef974a5c3 100644 --- a/app-editors/nano/nano-4.2.ebuild +++ b/app-editors/nano/nano-4.2.ebuild @@ -18,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(+)] @@ -76,5 +76,5 @@ src_install() { "${ED}"/etc/nanorc || die fi - dosym ../../bin/nano /usr/bin/nano + use split-usr && dosym ../../bin/nano /usr/bin/nano } diff --git a/app-editors/nano/nano-4.3.ebuild b/app-editors/nano/nano-4.3.ebuild index 232301c0144..9934461b7d4 100644 --- a/app-editors/nano/nano-4.3.ebuild +++ b/app-editors/nano/nano-4.3.ebuild @@ -18,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(+)] @@ -76,5 +76,5 @@ src_install() { "${ED}"/etc/nanorc || die fi - dosym ../../bin/nano /usr/bin/nano + use split-usr && dosym ../../bin/nano /usr/bin/nano } diff --git a/app-editors/nano/nano-9999.ebuild b/app-editors/nano/nano-9999.ebuild index 232301c0144..9934461b7d4 100644 --- a/app-editors/nano/nano-9999.ebuild +++ b/app-editors/nano/nano-9999.ebuild @@ -18,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(+)] @@ -76,5 +76,5 @@ src_install() { "${ED}"/etc/nanorc || die fi - dosym ../../bin/nano /usr/bin/nano + use split-usr && dosym ../../bin/nano /usr/bin/nano }
