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

Signed-off-by: Matija Skala <[email protected]> Closes: gentoo#12432 Signed-off-by: Lars Wendler <[email protected]>
hanetzer · Jul 18, 2019 · 301a958 · 301a958
1 parent 2182bbe
commit 301a958
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
 }