split-usr: If unset use /usr/bin/sh instead of /bin/sh

Signed-off-by: Martin Väth <martin@mvath.de>

16 files changed, 32 insertions, 32 deletions

diff --git a/app-admin/sudox/sudox-10.0-r1.ebuild b/app-admin/sudox/sudox-10.0-r1.ebuild
index 36fb6f4c..00ba2948 100644
--- a/app-admin/sudox/sudox-10.0-r1.ebuild
+++ b/app-admin/sudox/sudox-10.0-r1.ebuild
@@ -11,14 +11,14 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
-IUSE=""
+IUSE="split-usr"
 RDEPEND="app-admin/sudo
 	app-shells/push:0/1"
 DEPEND=""
 
 src_prepare() {
 	use prefix || sed -i \
-		-e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}"'/bin/sh"' \
+		-e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}$(usex split-usr '' /usr)"'/bin/sh"' \
 		-- bin/* || die
 	default
 }
diff --git a/app-arch/archwrap/archwrap-12.1.ebuild b/app-arch/archwrap/archwrap-12.1.ebuild
index 6faa2516..58ebc05f 100644
--- a/app-arch/archwrap/archwrap-12.1.ebuild
+++ b/app-arch/archwrap/archwrap-12.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
-IUSE=""
+IUSE="split-usr"
 RDEPEND="app-shells/push:0/1"
 DEPEND=""
 
@@ -19,7 +19,7 @@ src_prepare() {
 	local i
 	use prefix || for i in bin/*
 	do	test -h "${i}" || sed -i \
-			-e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \
+			-e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}$(usex split-usr '' /usr)/bin/sh"'"' \
 			-e 's"^\. archwrap\.sh$". '"${EPREFIX}/usr/lib/archwrap/archwrap.sh"'"' \
 			-- "${i}" || die
 	done
diff --git a/app-arch/bzwc/bzwc-5.1-r1.ebuild b/app-arch/bzwc/bzwc-5.1-r1.ebuild
index d0096f91..5dabbf32 100644
--- a/app-arch/bzwc/bzwc-5.1-r1.ebuild
+++ b/app-arch/bzwc/bzwc-5.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
-IUSE=""
+IUSE="split-usr"
 RDEPEND="app-shells/push:0/1"
 DEPEND=""
 
@@ -19,7 +19,7 @@ src_prepare() {
 	local i
 	use prefix || for i in bin/*
 	do	test -h "${i}" || \
-		sed -i -e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' -- "${i}" \
+		sed -i -e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}$(usex split-usr '' /usr)/bin/sh"'"' -- "${i}" \
 			|| die
 	done
 	default
diff --git a/app-portage/portage-postsyncd-mv/portage-postsyncd-mv-8.4.ebuild b/app-portage/portage-postsyncd-mv/portage-postsyncd-mv-8.4.ebuild
index fe75c527..57f003ff 100644
--- a/app-portage/portage-postsyncd-mv/portage-postsyncd-mv-8.4.ebuild
+++ b/app-portage/portage-postsyncd-mv/portage-postsyncd-mv-8.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 x86"
-IUSE=""
+IUSE="split-usr"
 
 # These should really depend on USE-flags but must not by policy.
 # Waiting for https://bugs.gentoo.org/show_bug.cgi?id=424283
@@ -27,7 +27,7 @@ ${OPTIONAL_RDEPEND}"
 src_prepare() {
 	use prefix || {
 		sed -i \
-				-e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \
+				-e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}$(usex split-usr '' /usr)/bin/sh"'"' \
 				-- repo.postsync.d/[0-9]* || die
 		sed -i \
 			-e '1s"^#!/usr/bin/env "#!'"${EPREFIX}/usr/bin/"'"' \
diff --git a/app-portage/trickyfetch/trickyfetch-10.1.ebuild b/app-portage/trickyfetch/trickyfetch-10.1.ebuild
index 49088cbe..9c8756b0 100644
--- a/app-portage/trickyfetch/trickyfetch-10.1.ebuild
+++ b/app-portage/trickyfetch/trickyfetch-10.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
-IUSE=""
+IUSE="split-usr"
 
 src_prepare() {
 	if use prefix
@@ -20,7 +20,7 @@ src_prepare() {
 			-e "s'\\(PATH=.\\)/etc'\\1${EPREFIX}/etc'" \
 			-- "${S}/bin/trickyfetch" || die
 	else	sed -i \
-			-e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \
+			-e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}$(usex split-usr '' /usr)/bin/sh"'"' \
 			 -- "${S}"/bin/* || die
 	fi
 	default
diff --git a/app-portage/world-mv/world-mv-3.20.ebuild b/app-portage/world-mv/world-mv-3.20.ebuild
index f0f40164..8bbb0959 100644
--- a/app-portage/world-mv/world-mv-3.20.ebuild
+++ b/app-portage/world-mv/world-mv-3.20.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${mPN}-${PV}"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
-IUSE=""
+IUSE="split-usr"
 S="${WORKDIR}/${mPN}-${PV}"
 
 src_prepare() {
@@ -22,7 +22,7 @@ src_prepare() {
 			-e "s'\${EPREFIX}'\\'${EPREFIX}\\''" \
 			-- bin/* || die
 	else	sed -i \
-			-e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \
+			-e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}$(usex split-usr '' /usr)/bin/sh"'"' \
 			-- bin/* || die
 	fi
 	default
diff --git a/app-shells/runtitle/runtitle-2.11.ebuild b/app-shells/runtitle/runtitle-2.11.ebuild
index e11b2b30..1966e96d 100644
--- a/app-shells/runtitle/runtitle-2.11.ebuild
+++ b/app-shells/runtitle/runtitle-2.11.ebuild
@@ -11,11 +11,11 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
-IUSE=""
+IUSE="split-usr"
 
 src_prepare() {
 	use prefix || sed -i \
-		-e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \
+		-e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}$(usex split-usr '' /usr)/bin/sh"'"' \
 		-- bin/* || die
 	default
 }
diff --git a/app-shells/termcolors-mv/termcolors-mv-4.9.ebuild b/app-shells/termcolors-mv/termcolors-mv-4.9.ebuild
index a3069ae4..67f79ae6 100644
--- a/app-shells/termcolors-mv/termcolors-mv-4.9.ebuild
+++ b/app-shells/termcolors-mv/termcolors-mv-4.9.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="create +perl poor"
+IUSE="create +perl poor split-usr"
 DEPEND="dev-lang/perl"
 RDEPEND="create? ( dev-lang/perl )
 perl? ( dev-lang/perl )"
@@ -26,7 +26,7 @@ For zsh, this happens if you use zshrc-mv"
 
 src_prepare() {
 	use prefix || sed -i \
-		-e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \
+		-e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}$(usex split-usr '' /usr)/bin/sh"'"' \
 		-e '1s"^#!/usr/bin/env perl$"#!'"${EPREFIX}/usr/bin/perl"'"' \
 		-- bin/* || die
 	default
diff --git a/dev-util/diffhelp/diffhelp-1.12.ebuild b/dev-util/diffhelp/diffhelp-1.12.ebuild
index af3beb9f..2f0fa967 100644
--- a/dev-util/diffhelp/diffhelp-1.12.ebuild
+++ b/dev-util/diffhelp/diffhelp-1.12.ebuild
@@ -11,11 +11,11 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE=""
+IUSE="split-usr"
 
 src_prepare() {
 	use prefix || sed -i \
-		-e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \
+		-e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}$(usex split-usr '' /usr)/bin/sh"'"' \
 		-- bin/* || die
 	default
 }
diff --git a/dev-vcs/git-wrappers-mv/git-wrappers-mv-2.3.ebuild b/dev-vcs/git-wrappers-mv/git-wrappers-mv-2.3.ebuild
index a1bdb620..f58bab82 100644
--- a/dev-vcs/git-wrappers-mv/git-wrappers-mv-2.3.ebuild
+++ b/dev-vcs/git-wrappers-mv/git-wrappers-mv-2.3.ebuild
@@ -11,11 +11,11 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="CC-BY-4.0"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE=""
+IUSE="split-usr"
 
 src_prepare() {
 	use prefix || sed -i \
-		-e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}"'/bin/sh"' \
+		-e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}$(usex split-usr '' /usr)"'/bin/sh"' \
 		-- bin/git-[b-z]* || die
 	default
 }
diff --git a/media-video/video-mv/video-mv-17.2.ebuild b/media-video/video-mv/video-mv-17.2.ebuild
index 66bc8c14..fce2f50b 100644
--- a/media-video/video-mv/video-mv-17.2.ebuild
+++ b/media-video/video-mv/video-mv-17.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
-IUSE=""
+IUSE="split-usr"
 
 # This should really depend on a USE-flag but must not by policy.
 # Waiting for https://bugs.gentoo.org/show_bug.cgi?id=424283
@@ -29,7 +29,7 @@ src_prepare() {
 	local i
 	use prefix || for i in bin/*
 	do	test -h "${i}" || sed -i \
-			-e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \
+			-e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}$(usex split-usr '' /usr)/bin/sh"'"' \
 			-e 's"^\. _videoscript\.sh$". '"${EPREFIX}/usr/share/video-mv/_videoscript.sh"'"' \
 			-- "${i}" || die
 	done
diff --git a/net-misc/sshstart/sshstart-4.10-r1.ebuild b/net-misc/sshstart/sshstart-4.10-r1.ebuild
index 2d4cf738..090297b8 100644
--- a/net-misc/sshstart/sshstart-4.10-r1.ebuild
+++ b/net-misc/sshstart/sshstart-4.10-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
-IUSE=""
+IUSE="split-usr"
 RDEPEND="app-shells/push:0/1"
 DEPEND=""
 
@@ -19,7 +19,7 @@ src_prepare() {
 	local i
 	use prefix || for i in bin/*
 	do	test -h "${i}" || sed -i \
-		-e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \
+		-e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}$(usex split-usr '' /usr)/bin/sh"'"' \
 		-- "${i}" || die
 	done
 	default
diff --git a/sys-apps/cpi/cpi-3.2.ebuild b/sys-apps/cpi/cpi-3.2.ebuild
index fc6985f9..9deb7f54 100644
--- a/sys-apps/cpi/cpi-3.2.ebuild
+++ b/sys-apps/cpi/cpi-3.2.ebuild
@@ -11,11 +11,11 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE=""
+IUSE="split-usr"
 
 src_prepare() {
 	use prefix || sed -i \
-		-e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \
+		-e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}$(usex split-usr '' /usr)/bin/sh"'"' \
 		-- bin/cpi || die
 	default
 }
diff --git a/sys-apps/schedule/schedule-8.0.1-r2.ebuild b/sys-apps/schedule/schedule-8.0.1-r2.ebuild
index 131ca0ab..a9c89d9a 100644
--- a/sys-apps/schedule/schedule-8.0.1-r2.ebuild
+++ b/sys-apps/schedule/schedule-8.0.1-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE=""
+IUSE="split-usr"
 
 # These should really depend on USE-flags but must not by policy.
 # Waiting for https://bugs.gentoo.org/show_bug.cgi?id=424283
@@ -43,7 +43,7 @@ If you use systemd, you might want to override schedule.service locally in
 
 src_prepare() {
 	use prefix || sed -i \
-		-e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \
+		-e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}$(usex split-usr '' /usr)/bin/sh"'"' \
 		-e '1s"^#!/usr/bin/env perl$"#!'"${EPREFIX}/usr/bin/perl"'"' \
 		-e 's"^/usr/share/schedule"${EPREFIX}/usr/share/${PN}"' \
 		-e '/^use FindBin;/,/^\}$/d' \
diff --git a/sys-apps/starter/starter-3.0-r1.ebuild b/sys-apps/starter/starter-3.0-r1.ebuild
index b1b115cd..c0cfa798 100644
--- a/sys-apps/starter/starter-3.0-r1.ebuild
+++ b/sys-apps/starter/starter-3.0-r1.ebuild
@@ -11,14 +11,14 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE=""
+IUSE="split-usr"
 RDEPEND="app-shells/push:0/1
 	>=app-shells/runtitle-2.3"
 DEPEND=""
 
 src_prepare() {
 	use prefix || sed -i \
-		-e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \
+		-e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}$(usex split-usr '' /usr)/bin/sh"'"' \
 		-- bin/* || die
 	default
 }
diff --git a/sys-fs/squash_dir/squash_dir-13.14-r1.ebuild b/sys-fs/squash_dir/squash_dir-13.14-r1.ebuild
index f63cadb3..f256d8f6 100644
--- a/sys-fs/squash_dir/squash_dir-13.14-r1.ebuild
+++ b/sys-fs/squash_dir/squash_dir-13.14-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="aufs overlayfs bundled-openrc-wrapper unionfs-fuse"
+IUSE="aufs bundled-openrc-wrapper overlayfs split-usr unionfs-fuse"
 
 DEPEND="bundled-openrc-wrapper? ( !!sys-apps/openrc-wrapper )"
 RDEPEND="sys-fs/squashfs-tools
@@ -46,7 +46,7 @@ src_prepare() {
 			-e "s\"'/lib\"'${EPREFIX}/lib64/rc/bin:${EPREFIX}/lib/rc/bin:/lib\"" \
 			-- "bin/openrc-wrapper" || die
 	else	sed -i \
-			-e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \
+			-e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}$(usex split-usr '' /usr)/bin/sh"'"' \
 			-- bin/* sbin/* || die
 	fi
 	default