Shebang care with many bumps

7 files changed, 33 insertions, 12 deletions

diff --git a/sys-fs/emount/ChangeLog b/sys-fs/emount/ChangeLog
index 3f25ce9a..be25c474 100644
--- a/sys-fs/emount/ChangeLog
+++ b/sys-fs/emount/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*emount-2.7 (02 Nov 2013)
+
+  02 Nov 2013; Martin Väth <martin@mvath.de>:
+  Version bump, remove old ebuild.
+
 *emount-2.6 (18 Aug 2013)
 
   10 Sep 2013; Martin Väth <martin@mvath.de>:
diff --git a/sys-fs/emount/Manifest b/sys-fs/emount/Manifest
index ec787ee5..22451caf 100644
--- a/sys-fs/emount/Manifest
+++ b/sys-fs/emount/Manifest
@@ -1 +1 @@
-DIST emount-2.6.tar.gz 3606 SHA256 4cae70c076e5d078135fccbd4a6d027edf8004ab038374f290deca821eec9d77 SHA512 fd28126907eb1b437a75483a5b26b5881db4d4f1a13ce9919c8e2028f4d61558d2bb543082dafc35a2f83d38f4323aa8e6af796a85f25b636f4ebfe06f197de2 WHIRLPOOL 9a0e847a311036c66e425f71698f3224f15e2a07ad884d39e1c3f5be3a338454cbfac2d87344458275ea500b34852a2e739b06fa3b7bf5c0c6d8b7f5bf234e71
+DIST emount-2.7.tar.gz 3599 SHA256 f89d1b210d65780762de3410a29e9b810154e8a1d5eabaec7dfafb8ae70ccbed SHA512 5fa35ca3493bb317aa1f9ff51f17318ac5cdc7e69d644f84c418dc7f9eab23b91e689e7615a6f52bf29dabc1473a7aa0e9952a553a063b8cfc1b656b5e666679 WHIRLPOOL babd66ed50ef32e4087d574b0cbb18b06d14a599d62ba7e5d201a21c490610cedf81a2479b6dc708a9e5defc7b83ea027f36ae969b20ca2fcebcb5ceab0c934f
diff --git a/sys-fs/emount/emount-2.6.ebuild b/sys-fs/emount/emount-2.7.ebuild
index 24b2d663..24b2d663 100644
--- a/sys-fs/emount/emount-2.6.ebuild
+++ b/sys-fs/emount/emount-2.7.ebuild
diff --git a/sys-fs/squash_dir/ChangeLog b/sys-fs/squash_dir/ChangeLog
index 62c6e539..66629710 100644
--- a/sys-fs/squash_dir/ChangeLog
+++ b/sys-fs/squash_dir/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*squash_dir-13.4-r1 (02 Nov 2013)
+
+  02 Nov 2013; Martin Väth <martin@mvath.de>:
+  Shebang care. Avoid deprecated systemd_to_myeconfargs
+
 *squash_dir-13.4 (26 Oct 2013)
 
   26 Oct 2013; Martin Väth <martin@mvath.de>:
diff --git a/sys-fs/squash_dir/squash_dir-13.4.ebuild b/sys-fs/squash_dir/squash_dir-13.4-r1.ebuild
index 0c8df83a..c9ac53c0 100644
--- a/sys-fs/squash_dir/squash_dir-13.4.ebuild
+++ b/sys-fs/squash_dir/squash_dir-13.4-r1.ebuild
@@ -33,20 +33,23 @@ It is recommended to put into your zshrc the line:
 alias squash_dir='noglob squash_dir'"
 
 src_prepare() {
-	if [ -n "${EPREFIX}" ]
+	if use prefix
 	then	sed -i \
-		-e "s\"'[^']*/etc/conf[.]d/${PN}'\"'${EPREFIX}/etc/conf.d/${PN}'\"g" \
-			"init.d/${PN}" || die
+			-e "s\"'[^']*/etc/conf[.]d/${PN}'\"'${EPREFIX}/etc/conf.d/${PN}'\"g" \
+			-- "init.d/${PN}" || die
 		sed -i \
-		-e "s\"=/etc/\"=${EPREFIX}/etc/\"" \
-		-e "s\"=/usr/\"=${EPREFIX}/usr/\"" \
-			"systemd/${PN}@.service" || die
+			-e "s\"=/etc/\"=${EPREFIX}/etc/\"" \
+			-e "s\"=/usr/\"=${EPREFIX}/usr/\"" \
+			-- "systemd/${PN}@.service" || die
 		sed -i \
-		-e "s\":/usr/sbin:/sbin'\":${EPREFIX}/usr/sbin:${EPREFIX}/sbin:/usr/sbin:/sbin'\"" \
-			"sbin/${PN}" || die
+			-e "s\":/usr/sbin:/sbin'\":${EPREFIX}/usr/sbin:${EPREFIX}/sbin:/usr/sbin:/sbin'\"" \
+			-- "sbin/${PN}" || die
 		sed -i \
-		-e "s\"'/lib/rc/bin:\":'${EPREFIX}/lib/rc/bin:/lib/rc/bin:\"" \
-			"sbin/openrc-wrapper" || die
+			-e "s\"'/lib/rc/bin:\":'${EPREFIX}/lib/rc/bin:/lib/rc/bin:\"" \
+			-- "sbin/openrc-wrapper" || die
+	else	sed -i \
+			-e '1s"^#!/usr/bin/env sh$"#!'"$(command -v sh)"'"' \
+			-- bin/* sbin/* || die
 	fi
 	epatch_user
 	eautoreconf
@@ -60,9 +63,9 @@ src_configure() {
 	local myeconfargs=(
 		--with-zsh-completion
 		"$(use_enable bundled-openrc-wrapper openrc-wrapper)"
+		"$(systemd_with_unitdir)"
 		${order:+"--with-first-order=${order}"}
 	)
-	systemd_to_myeconfargs
 	autotools-utils_src_configure
 }
 
diff --git a/sys-fs/squashmount/ChangeLog b/sys-fs/squashmount/ChangeLog
index efd1398a..2f80422a 100644
--- a/sys-fs/squashmount/ChangeLog
+++ b/sys-fs/squashmount/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*squashmount-3.7-r1 (02 Nov 2013)
+
+  02 Nov 2013; Martin Väth <martin@mvath.de>:
+  Shebang care
+
 *squashmount-3.7 (22 Oct 2013)
 
   22 Oct 2013; Martin Väth <martin@mvath.de>:
diff --git a/sys-fs/squashmount/squashmount-3.7.ebuild b/sys-fs/squashmount/squashmount-3.7-r1.ebuild
index 332b2f27..2b2686a6 100644
--- a/sys-fs/squashmount/squashmount-3.7.ebuild
+++ b/sys-fs/squashmount/squashmount-3.7-r1.ebuild
@@ -32,6 +32,9 @@ It is recommended to put into your zshrc the line:
 alias squashmount='noglob squashmount'"
 
 src_prepare() {
+	use prefix || sed -i \
+		-e '1s"^#!/usr/bin/env perl$"#!'"$(command -v perl)"'"' \
+		-- bin/* || die
 	epatch_user
 }