app-editors/nano: add support for /usr merge

Signed-off-by: Matija Skala <mskala@gmx.com>
Closes: https://github.com/gentoo/gentoo/pull/12432
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>

diff --git a/app-editors/nano/metadata.xml b/app-editors/nano/metadata.xml
index ba70fb9893e9058e17d38060b98dd2e622f59188..add7f71937d3aeab952c2df7e397e9eaa95fd918 100644 (file)
--- 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 ef6555432c21d289574a2a596dbd8ce31aaa5c21..9c28db49f39f55e44bd5abf433cd385b38140ade 100644 (file)
--- 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 cbab8247c5c8b36bdc06d1747ed5481ee13e96a8..9bef974a5c32823748baf79fefcea6852f92a7b8 100644 (file)
--- 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 232301c01447e0a79bc7615872e31c7ad68e9126..9934461b7d4e4db58c8ece91b7869636c094ea24 100644 (file)
--- 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 232301c01447e0a79bc7615872e31c7ad68e9126..9934461b7d4e4db58c8ece91b7869636c094ea24 100644 (file)
--- 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
 }