Shebang care with many bumps

66 files changed, 230 insertions, 39 deletions

diff --git a/app-admin/sudox/ChangeLog b/app-admin/sudox/ChangeLog
index 68455468..5c6289a5 100644
--- a/app-admin/sudox/ChangeLog
+++ b/app-admin/sudox/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*sudox-3.13 (02 Nov 2013)
+
+  02 Nov 2013; Martin Väth <martin@mvath.de>:
+  Version bump, remove old ebuild.
+
 *sudox-3.12 (14 Sep 2012)
 
   10 Sep 2013; Martin Väth <martin@mvath.de>:
diff --git a/app-admin/sudox/Manifest b/app-admin/sudox/Manifest
index d7f6c524..205d1c67 100644
--- a/app-admin/sudox/Manifest
+++ b/app-admin/sudox/Manifest
@@ -1 +1 @@
-DIST sudox-3.12.tar.gz 5242 SHA256 9ba05be68800f17720c86d8ce029092a8f1d08e76046bc3b6efc6396b8b388c3 SHA512 15291a578d7eef40f2ade27e54bc159a666caa50a14636330ebb6e5a5a497117b6e27d16a09750b3ec1a6c830da7951905fbb8a195395a1a33ce6b3b87c99ae9 WHIRLPOOL 58d8af5af0c27890d31e374c81e0861a98edf8643a7a8216947870da7c0a579d94acd7fdd965629250cbd9defa834fb6e1b3ce365c94997ea361e231a384d749
+DIST sudox-3.13.tar.gz 5238 SHA256 6b52075951a9c011c92cc7b623d7c6d173c03015b5ee92ef8adfe7f7b7855ff6 SHA512 44b36f1c13d43322f33d31d25e9798bb52258be3ccb46b1a09152d3f629c512eabbe450a4cf1c6e28ec33ed6cbf5a39c7b83d4436ec89a997b87b0132a963219 WHIRLPOOL c8a296d33c3045427e16f13a955cce969e2389a59cf3f4be9a183fa9f830a061ed4fff38a163f2f88076a609934bd99877ec35f7faa90db7d8611789da2bb127
diff --git a/app-admin/sudox/sudox-3.12.ebuild b/app-admin/sudox/sudox-3.13.ebuild
index ca65c6ef..ca65c6ef 100644
--- a/app-admin/sudox/sudox-3.12.ebuild
+++ b/app-admin/sudox/sudox-3.13.ebuild
diff --git a/app-arch/archwrap/ChangeLog b/app-arch/archwrap/ChangeLog
index 503607c0..7115c112 100644
--- a/app-arch/archwrap/ChangeLog
+++ b/app-arch/archwrap/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*archwrap-1.11 (02 Nov 2013)
+
+  02 Nov 2013; Martin Väth <martin@mvath.de>:
+  Version bump, remove old ebuild. Shebang care
+
 *archwrap-1.10 (31 May 2013)
 
   10 Sep 2013; Martin Väth <martin@mvath.de>:
diff --git a/app-arch/archwrap/Manifest b/app-arch/archwrap/Manifest
index 3792f956..d02e71cb 100644
--- a/app-arch/archwrap/Manifest
+++ b/app-arch/archwrap/Manifest
@@ -1 +1 @@
-DIST archwrap-1.10.tar.gz 13673 SHA256 0f7ad2e20678bae47a8517d4c3016346e19d042ceb421ddd5798381331d7d241 SHA512 bf1314943e621a3b73bd4b1c5c385b1fe2cdb669e33a22dc53fc97101307b1e611a70d312951e54d451eeb91fe630f11f7086a0a8baa31d3b447f48eabf55266 WHIRLPOOL bc3f6b6177be11e75915d830842c185e99bc5dbe12461da93e93754ab6d33e7a7de16ed24f27f2c0fc845d7014303635a5bc2107e587a9cd47ab12727a9069e2
+DIST archwrap-1.11.tar.gz 13677 SHA256 4c9c21c6b1947be30ebad90dcd2992d10ad6f46bc8c6cc7ab83e9339e40fd285 SHA512 068e31c4897709bc61250c95e6f6d2f0080647eba2ae7b16818e96a1063dbee21f81888f609a098a81fa682c6cf575b09d7d89e1037e79a77b6624ce77194c79 WHIRLPOOL 9770ab3415ca2065fa08ca6d7f31dfd6fa4ea08afd37f8d23508f15f78df53a39af5df60af9be685bac5ecbe4c07ecd5c6a50ff064e3cfc32dcd6581b9838bdd
diff --git a/app-arch/archwrap/archwrap-1.10.ebuild b/app-arch/archwrap/archwrap-1.11.ebuild
index a1ac1cf1..edf9c00e 100644
--- a/app-arch/archwrap/archwrap-1.10.ebuild
+++ b/app-arch/archwrap/archwrap-1.11.ebuild
@@ -18,6 +18,9 @@ RDEPEND="app-shells/push"
 DEPEND=""
 
 src_prepare() {
+	use prefix || sed -i \
+		-e '1s"^#!/usr/bin/env sh$"#!'"$(command -v sh)"'"' \
+		-- bin/* || die
 	epatch_user
 }
 
diff --git a/app-arch/bzwc/ChangeLog b/app-arch/bzwc/ChangeLog
index 3ba68364..68e2bacc 100644
--- a/app-arch/bzwc/ChangeLog
+++ b/app-arch/bzwc/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*bzwc-2.13 (02 Nov 2013)
+
+  02 Nov 2013; Martin Väth <martin@mvath.de>:
+  Version bump, remove old ebuild. Shebang care
+
 *bzwc-2.12 (07 May 2012)
 
   10 Sep 2013; Martin Väth <martin@mvath.de>:
diff --git a/app-arch/bzwc/Manifest b/app-arch/bzwc/Manifest
index 7f53ba85..3455cb89 100644
--- a/app-arch/bzwc/Manifest
+++ b/app-arch/bzwc/Manifest
@@ -1 +1 @@
-DIST bzwc-2.12.tar.gz 1868 SHA256 6b65c58db603cd8e749da146f10eafb173b373011fb2871c697354d91c43b71c SHA512 a2b9c2c4182c06fd17bde8a0253b61da175dfc68c2dddf805501073a0a275998d476b5edc6fd6e108431991773dddf389e19a352d1afbe3f07eb8c25de03b9d7 WHIRLPOOL ae494cd17d88b66838992b72f7a9ea10a47981c234efb48092a41aaf8a141951b8fc12ae3cd24556f89c761afb4aecd9cd5648fc7e9552b63bc22ad104912627
+DIST bzwc-2.13.tar.gz 1870 SHA256 00398fc93464eb423ae9e3df91190db495dadbfbec9afaa136e0d8c923e47a2c SHA512 c5bed70607db97700cd3467b9a6bb70d7aea53965b64055f9059af671776e6f2efe7fe27f40a4f5ba8ea87164e0f6baeb82487b822e51a1509a95569d72a8b90 WHIRLPOOL 69e6182a57673dcbf68287de4ceb73de4c803a8a04e386b0c85a4137b1c439553b4038f81cd0dcedd8ef8e6cd1cfd8795717a004b7ac78769ec73aab9aef4227
diff --git a/app-arch/bzwc/bzwc-2.12.ebuild b/app-arch/bzwc/bzwc-2.13.ebuild
index 30494238..a445c348 100644
--- a/app-arch/bzwc/bzwc-2.12.ebuild
+++ b/app-arch/bzwc/bzwc-2.13.ebuild
@@ -18,6 +18,9 @@ RDEPEND="app-shells/push"
 DEPEND=""
 
 src_prepare() {
+	use prefix || sed -i \
+		-e '1s"^#!/usr/bin/env sh$"#!'"$(command -v sh)"'"' \
+		-- bin/* || die
 	epatch_user
 }
 
diff --git a/app-portage/find_cruft/ChangeLog b/app-portage/find_cruft/ChangeLog
index b64d03fa..54574371 100644
--- a/app-portage/find_cruft/ChangeLog
+++ b/app-portage/find_cruft/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*find_cruft-2.2 (02 Nov 2013)
+
+  02 Nov 2013; Martin Väth <martin@mvath.de>:
+  Version bump, remove old ebuild. Shebang care
+
 *find_cruft-2.1 (21 Aug 2013)
 
   10 Sep 2013; Martin Väth <martin@mvath.de>:
diff --git a/app-portage/find_cruft/Manifest b/app-portage/find_cruft/Manifest
index 4ad04ead..f2e0cf6e 100644
--- a/app-portage/find_cruft/Manifest
+++ b/app-portage/find_cruft/Manifest
@@ -1 +1 @@
-DIST find_cruft-2.1.tar.gz 9207 SHA256 3b757732ff7a44a5a532376098310f92e8936aea67dc90f0d868a41c3779e59a SHA512 29d34b2b350fedd22163be418309901cb4b34d337b15a40056d0e7fa37ccf9e9fa03ac182994f3aa77b0a571fd865b6ee33f9ccd09cb83279f25b34e2da3cad2 WHIRLPOOL 80d0c17aa7180d514bb649953285dcd77bcabe79106f535da65a2c060a7a7dcea54aab20a7ccc065ec6f73f9164e463c6e284e6de32d054a7472e959ea930c38
+DIST find_cruft-2.2.tar.gz 9209 SHA256 ceca85d1bc55799c8186f609aa45f6c19c57e1d366f1ee2503160b2fed87613c SHA512 e55035c9ad216bea0f52d0b1dd3cbc9bfa64bae6018bcf97d0ab7777ec5457315d5bc419f1a98f5a8490da474107d889c1985be42ee8d239939fdf9d59cbd33b WHIRLPOOL bf64c79d35ef8bf6f7859018846701bbdc1251c21e1051ce80cce3bc9b805d61b14d408383e7694b3e0801278a9ca40c0bf5c8ac4a4ea0b0fe2fbb0f333b248d
diff --git a/app-portage/find_cruft/find_cruft-2.1.ebuild b/app-portage/find_cruft/find_cruft-2.2.ebuild
index 07b74dc4..e5bce8f3 100644
--- a/app-portage/find_cruft/find_cruft-2.1.ebuild
+++ b/app-portage/find_cruft/find_cruft-2.2.ebuild
@@ -19,6 +19,9 @@ RDEPEND="dev-lang/perl
 	virtual/perl-Getopt-Long"
 
 src_prepare() {
+	use prefix || sed -i \
+		-e '1s"^#!/usr/bin/env perl$"#!'"$(command -v perl)"'"' \
+		-- bin/* || die
 	epatch_user
 }
 
diff --git a/app-portage/logclean/ChangeLog b/app-portage/logclean/ChangeLog
index 46ad3900..69cfa71d 100644
--- a/app-portage/logclean/ChangeLog
+++ b/app-portage/logclean/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*logclean-9.7 (02 Nov 2013)
+
+  21 Nov 2013; Martin Väth <martin@mvath.de>::
+  Version bump, remove old ebuild. Shebang care
+
 *logclean-9.6 (10 Sep 2013)
 
   10 Sep 2013; Martin Väth <martin@mvath.de>:
diff --git a/app-portage/logclean/Manifest b/app-portage/logclean/Manifest
index eb8b94c8..869fce8f 100644
--- a/app-portage/logclean/Manifest
+++ b/app-portage/logclean/Manifest
@@ -1 +1 @@
-DIST logclean-9.6.tar.gz 11350 SHA256 03ef55dc95e85b37bfadcc03d767d53e74e39791589b7fc825bc442d8451de2d SHA512 d632257262c42c6f6589db3d8565a45e0374026a9bf9f5828c896d817510482de53c3236d099c15bc0885fbe42e26912750319ce5f3609b84edfe02c3b85876a WHIRLPOOL 1dfa2aa5837b6b8000248f8b1eb0a8a385f24c3b977d5bef40d9ccd01cea155a8d72c63464aa40f00eee5189a91d43735c21ebd698d0ec7b61ac6aa83c066ddc
+DIST logclean-9.7.tar.gz 11354 SHA256 c311c0700f62294af6d545bd9bc243ce9b18022718f1db37bb6fa9ad2557ccef SHA512 95ac30e94fb4ab01ada27614b3a88889b3a987b11029a26abcae4819d12a509a52cd62ffa46abce7d53d20046e7f39ced9c4d56b9b50e95acb5ed0be12428521 WHIRLPOOL 6eed4001de01792c7accc694068bbb4bef5636ce3048922d4950722e726de48ea93e4f035405a685d7b58b0b6ef522ad8a257e7a15527348cec9faa9ec34a52f
diff --git a/app-portage/logclean/logclean-9.6.ebuild b/app-portage/logclean/logclean-9.7.ebuild
index cfe1ad16..7cd76226 100644
--- a/app-portage/logclean/logclean-9.6.ebuild
+++ b/app-portage/logclean/logclean-9.7.ebuild
@@ -20,6 +20,9 @@ RDEPEND="dev-lang/perl
 	virtual/perl-Getopt-Long"
 
 src_prepare() {
+	use prefix || sed -i \
+		-e '1s"^#!/usr/bin/env perl$"#!'"$(command -v perl)"'"' \
+		-- "${PN}" || die
 	epatch_user
 }
 
diff --git a/app-portage/trickyfetch/ChangeLog b/app-portage/trickyfetch/ChangeLog
index 52280ee0..494f0b4c 100644
--- a/app-portage/trickyfetch/ChangeLog
+++ b/app-portage/trickyfetch/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*trickyfetch-8.2 (02 Nov 2013)
+
+  02 Nov 2013; Martin Väth <martin@mvath.de>:
+  Version bump, remove old ebuild. Shebang care
+
 *trickyfetch-8.1 (28 Jan 2013)
 
   10 Sep 2013; Martin Väth <martin@mvath.de>:
diff --git a/app-portage/trickyfetch/Manifest b/app-portage/trickyfetch/Manifest
index 3a5eb515..a891e9a5 100644
--- a/app-portage/trickyfetch/Manifest
+++ b/app-portage/trickyfetch/Manifest
@@ -1 +1 @@
-DIST trickyfetch-8.1.tar.gz 10630 SHA256 ebffc4316c416e53226c640a5b63ba9f37132ced884a70aaf0be47e59b201010 SHA512 1def106779cd60569fced38f67e2d3e21a39b3b935baec0f654ff3b9c35c21ede4b11c28cc42d54d876a21faa9a3cac4b836944265915237a48f50ceeecbe0f4 WHIRLPOOL 3a90d698536fd78aa4d30b1a94905d340d795a4a42255ca5d1db75cfc87630065e911892e8516c3c6b5daf32b4a634f22dc449ca465f5700123f8b66dbf9ca03
+DIST trickyfetch-8.2.tar.gz 10627 SHA256 f9d0f594aa2a253149de7c265d99e623053507521f362552642cc1bf80923f80 SHA512 a4024cfca40d5ef4ad470e1b5c3cd26586b1c63833af642409da3bf6db9124c46fd8dc700a19f4520a9349b7840868edb616ae3afd3f102f5962f717ce8823ef WHIRLPOOL 4b14b6a79e0b7a3b6d49b10d26149daf50357cdcc39ff16c0957cc631bb0ae0b25aa0a254511f3d2acc07e8cc06c303bc1ee3818cc3375cc5ef8bf6859e15dfd
diff --git a/app-portage/trickyfetch/trickyfetch-8.1.ebuild b/app-portage/trickyfetch/trickyfetch-8.2.ebuild
index 7da72530..52c9c138 100644
--- a/app-portage/trickyfetch/trickyfetch-8.1.ebuild
+++ b/app-portage/trickyfetch/trickyfetch-8.2.ebuild
@@ -16,8 +16,14 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 src_prepare() {
-	sed -i -e "s'\\(PATH=.\\)/etc'\\1${EPREFIX}/etc'" \
-		-- "${S}/bin/trickyfetch"
+	if use prefix
+	then	sed -i \
+			-e "s'\\(PATH=.\\)/etc'\\1${EPREFIX}/etc'" \
+			-- "${S}/bin/trickyfetch" || die
+	else	sed -i \
+			-e '1s"^#!/usr/bin/env sh$"#!'"$(command -v sh)"'"' \
+			 -- "${S}"/bin/* || die
+	fi
 	epatch_user
 }
 
diff --git a/app-portage/useflags/ChangeLog b/app-portage/useflags/ChangeLog
index b753b2bb..7251500c 100644
--- a/app-portage/useflags/ChangeLog
+++ b/app-portage/useflags/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*useflags-3.2 (02 Nov 2013)
+
+  02 Jan 2013; Martin Väth <martin@mvath.de>:
+  Version bump, remove old ebuild. Shebang care
+
 *useflags-3.1 (28 Jan 2013)
 
   10 Sep 2013; Martin Väth <martin@mvath.de>:
diff --git a/app-portage/useflags/Manifest b/app-portage/useflags/Manifest
index 50775c15..803f01a6 100644
--- a/app-portage/useflags/Manifest
+++ b/app-portage/useflags/Manifest
@@ -1 +1 @@
-DIST useflags-3.1.tar.gz 5345 SHA256 e6f0425d41f2a4c02705deed737b3c46d1e66db188190846a10d43f68a39feff SHA512 6577994924a788a63ff279cba61dfcc07c0171ad34f3bda5f4a38d27a346054c61be48ef925b7888a1ea1e056385e7531f200257e0c2ae5b9eb7e0a58f856a01 WHIRLPOOL 15c6a279c1283690bdac013f221c459f7ec2d54a28f05f7e0a087a69dea4a25edbd4a053b336f7af2813248b70e79a1820d800354df7e3b904bf74b9e9f90f2e
+DIST useflags-3.2.tar.gz 5346 SHA256 9da42a0c955f800b232a68b017a6c65acbf1a6c54c8431e1711713eaabb954ad SHA512 c68fb0f9ba1cda917bfdf8b5b8e8ec90ad02c19e9ada1b256db437cf5dd98fa33787032e878e984fc2759e35213cc3cba3e869c25f5c9db74508e3792911b8da WHIRLPOOL 0559502bb868c9541ae9637ed3be5d0215edef5e8fb972428ae5ec139b9f1b3b906c346a86752dc7deecc3df1ea736b331646115138d8a0f14632276dea0e7dc
diff --git a/app-portage/useflags/useflags-3.1.ebuild b/app-portage/useflags/useflags-3.2.ebuild
index 9ded0965..500d46d4 100644
--- a/app-portage/useflags/useflags-3.1.ebuild
+++ b/app-portage/useflags/useflags-3.2.ebuild
@@ -19,6 +19,9 @@ RDEPEND="dev-lang/perl
 	virtual/perl-Getopt-Long"
 
 src_prepare() {
+	use prefix || sed -i \
+		-e '1s"^#!/usr/bin/env perl$"#!'"$(command -v perl)"'"' \
+		-- "${PN}" || die
 	epatch_user
 }
 
diff --git a/app-portage/world-mv/ChangeLog b/app-portage/world-mv/ChangeLog
index 627cb34b..d2abcaf7 100644
--- a/app-portage/world-mv/ChangeLog
+++ b/app-portage/world-mv/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*world-mv-3.11 (02 Nov 2013)
+
+  02 Nov 2013; Martin Väth <martin@mvath.de>:
+  Version bump, remove old ebuild. Shebang care
+
 *world-mv-3.10 (11 Nov 2012)
 
   10 Sep 2013; Martin Väth <martin@mvath.de>:
diff --git a/app-portage/world-mv/Manifest b/app-portage/world-mv/Manifest
index 04abca8f..d854e82e 100644
--- a/app-portage/world-mv/Manifest
+++ b/app-portage/world-mv/Manifest
@@ -1 +1 @@
-DIST world-3.10.tar.gz 3534 SHA256 c97a6bfef14447e2bee0332c4a3a2974ba127917d7c95f6449418cf7bc922ae4 SHA512 e21f85f4849eb29db013e00cf1df67286187bc9fef06d46a4f5a9c6429b8f8a3c08b0f0d9651682b20d4c536f6f757362d4b8da6e7d5319c373f49f46756451f WHIRLPOOL 8437a4de4ef5c58d20d746eadd1cf5256accccd3b26a60454e76d70d0cbbe108be52cb7861d47c27fa1d7906844e7760106b80ba37aef7a903d4de11729e4f16
+DIST world-3.11.tar.gz 3531 SHA256 7b801a0edab661f895ece2805b731a26dfeaea6a762eac41683d8df831da5627 SHA512 fef8d0e385533f28829e2d0a3265d21e0faa3c0bc657842bf3a9511488f9869557b13be497217ecb84bd8dcb3d1ac488006d652e8868e75b1795bee65e839cac WHIRLPOOL 0d10bff22424db0b680976aa9859872c2210136e4ed9f60e2a7567f80a1225059c0cae17186863ebddd9f8428a031b481bbbcefba2edfa9bdd0e958c2cba63a3
diff --git a/app-portage/world-mv/world-mv-3.10.ebuild b/app-portage/world-mv/world-mv-3.11.ebuild
index ca1eb9c1..a77e5230 100644
--- a/app-portage/world-mv/world-mv-3.10.ebuild
+++ b/app-portage/world-mv/world-mv-3.11.ebuild
@@ -18,7 +18,14 @@ IUSE=""
 S="${WORKDIR}/${mPN}-${PV}"
 
 src_prepare() {
-	sed -i -e "s'\${EPREFIX}'\\'${EPREFIX}\\''" "${mPN}" || die
+	if use prefix
+	then	sed -i \
+			-e "s'\${EPREFIX}'\\'${EPREFIX}\\''" \
+			-- "${mPN}" || die
+	else	sed -i \
+			-e '1s"^#!/usr/bin/env sh$"#!'"$(command -v sh)"'"' \
+			-- "${mPN}" || die
+	fi
 	epatch_user
 }
 
diff --git a/app-shells/runtitle/ChangeLog b/app-shells/runtitle/ChangeLog
index bc4253b0..dddb345a 100644
--- a/app-shells/runtitle/ChangeLog
+++ b/app-shells/runtitle/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*runtitle-2.4 (02 Nov 2013)
+
+  02 Nov 2013; Martin Väth <martin@mvath.de>:
+  Version bump, remove old ebuild. Shebang care
+
 *runtitle-2.3 (17 Nov 2012)
 
   10 Sep 2013; Martin Väth <martin@mvath.de>:
diff --git a/app-shells/runtitle/Manifest b/app-shells/runtitle/Manifest
index 605bd4c3..d60cf175 100644
--- a/app-shells/runtitle/Manifest
+++ b/app-shells/runtitle/Manifest
@@ -1 +1 @@
-DIST runtitle-2.3.tar.gz 3414 SHA256 c3d6d9720cb51752d082decb9b446c1122f2354a22b702c31d3f3b345709652c SHA512 69f8afd7195f572d0491eaa2e8ae7c911865b6b385941bd15d3567e496de4071404e7f2ea975adc8133d2d3302db466bdaf69d800ca2f2b005474b241b87c775 WHIRLPOOL 884b96b82a1636b30a7d80845933212da328bbf39da4018f20045ea2061184660517f18917f55d7c3a397dab6879594724a59fd2c30502d569e974c43b974c88
+DIST runtitle-2.4.tar.gz 3421 SHA256 c60c883c3f5b1a92bc8615da452001db7cc4ddca27623d8f1752b5167d65fe7d SHA512 7e9803efcc415c61735ef5c4159df400505a4c4113c91cf56d0aa33d65c48c4e418eeb5ddd6538d2c2315dcd4334947854c3aa4a9d1da6c6f42dc9ccf5049425 WHIRLPOOL 85a612e900376570d08df16438eec777f096a5de68e7fecda35d4ba24f3ab99d2d10b4bc21e99a2c04b89b7b878f08382fd799d9f12a5b2fb85db205e3d17eb8
diff --git a/app-shells/runtitle/runtitle-2.3.ebuild b/app-shells/runtitle/runtitle-2.4.ebuild
index 91381b6f..3dffc552 100644
--- a/app-shells/runtitle/runtitle-2.3.ebuild
+++ b/app-shells/runtitle/runtitle-2.4.ebuild
@@ -16,6 +16,9 @@ KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 src_prepare() {
+	use prefix || sed -i \
+		-e '1s"^#!/usr/bin/env sh$"#!'"$(command -v sh)"'"' \
+		-- bin/* || die
 	epatch_user
 }
 
diff --git a/app-shells/set_prompt/ChangeLog b/app-shells/set_prompt/ChangeLog
index 8bdcf21b..dc115ed0 100644
--- a/app-shells/set_prompt/ChangeLog
+++ b/app-shells/set_prompt/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*set_prompt-1.15 (02 Nov 2013)
+
+  02 Nov 2013; Martin Väth <martin@mvath.de>:
+  Version bump, remove old ebuild. Shebang care
+
 *set_prompt-1.14 (07 Jun 2013)
 
   07 Jun 2013; Martin Väth <martin@mvath.de>:
diff --git a/app-shells/set_prompt/Manifest b/app-shells/set_prompt/Manifest
index ad89e0bb..50516558 100644
--- a/app-shells/set_prompt/Manifest
+++ b/app-shells/set_prompt/Manifest
@@ -1 +1 @@
-DIST set_prompt-1.14.tar.gz 7755 SHA256 a47b75e15c97fa54a824b938b01a8e10343d059b620bc6163b5ea4b401cdeb9e SHA512 706dd6fc3fb125cd082bc6e7ed52a5ac434f86aeeb1d8081aff584a660ed1912bf2cb34dd3a536a8246acb5a4bd1393dc3dc2d2e6e268687c5efd1df33d3e1f3 WHIRLPOOL 4012c9a09d482aaed96289941e85f53b5785423a55056db3e9daf43723d24afdd37c757470fb40bec601cc34ff97210f8373bed3868619d9de3515a56b1352a3
+DIST set_prompt-1.15.tar.gz 7748 SHA256 3166988d70a71f99c42a7286d3051c56b6553d92cc6a662905b729c4de3c7572 SHA512 280ab4652cadee1607032f4a1135c072dc9f493c8dbf66631b930813eb88efecfe9d75765e6bca1bbfe89622fa092291cb3b7ab2ebeebef2b9058aacfc1d3cf6 WHIRLPOOL 952c22bb0fcae27a491009caeb219f884c7e30326dcf3f02330866f624cdf85e6f526b0aa8698dfd54d7aa7e3be3fb1e4ca05bbea1677560a46e23718123c8aa
diff --git a/app-shells/set_prompt/set_prompt-1.14.ebuild b/app-shells/set_prompt/set_prompt-1.15.ebuild
index 0736dad2..af839c1a 100644
--- a/app-shells/set_prompt/set_prompt-1.14.ebuild
+++ b/app-shells/set_prompt/set_prompt-1.15.ebuild
@@ -16,6 +16,9 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 src_prepare() {
+	use prefix || sed -i \
+		-e '1s"^#!/usr/bin/env sh$"#!'"$(command -v sh)"'"' \
+		-- * || die
 	epatch_user
 }
 
diff --git a/app-shells/termcolors-mv/ChangeLog b/app-shells/termcolors-mv/ChangeLog
index 4e7eb6cd..6d42335f 100644
--- a/app-shells/termcolors-mv/ChangeLog
+++ b/app-shells/termcolors-mv/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*termcolors-3.1 (02 Nov 2013)
+
+  02 Nov 2013; Martin Väth <martin@mvath.de>:
+  Version bump, remove old ebuild. Shebang care
+
 *termcolors-3.0 (07 Aug 2013)
 
   12 Oct 2013; Martin Väth <martin@mvath.de>:
diff --git a/app-shells/termcolors-mv/Manifest b/app-shells/termcolors-mv/Manifest
index 359eb98d..d20a003c 100644
--- a/app-shells/termcolors-mv/Manifest
+++ b/app-shells/termcolors-mv/Manifest
@@ -1 +1 @@
-DIST termcolors-mv-3.0.tar.gz 7720 SHA256 e796c7d33b7c52aed72b780f8344989cb25cc17e505a0f3d1a70c4104d79c842 SHA512 be32c3713346a494ebfddc1855d21c28333597593f7c6d4b6035ec708e1ec5944f21db1bc81703a075152877f940da9eac94ed07471f6ba8111231c0098a4b1a WHIRLPOOL d8c2d332ab3e49fda40c82789e17267ed309a3e2924beaa1c297a1e83c8616325e112afe28dc754b30dbf08e395b57835af2cddb89124aa65aad484ed6e4c68a
+DIST termcolors-mv-3.1.tar.gz 7718 SHA256 e33f415b74c9323aa412bd50e089a58e7245da595495090b584846e9de3e0d14 SHA512 081c442dcfa3303695c004d20594c7fe5d60df5bed8bb6b5d9dfad62d734c41280591bba222167e520ae8d7536c20604d675a26f565ce02857de596d19b74317 WHIRLPOOL 00f84134616bbb91f1a6f654a2c5b33afdff373417e61e81dae0f7ced99eba760651941b265ad6b3cf7661c983549215195ab34a7492bd176471b7d014774f95
diff --git a/app-shells/termcolors-mv/termcolors-mv-3.0.ebuild b/app-shells/termcolors-mv/termcolors-mv-3.1.ebuild
index b2b91128..bf82991a 100644
--- a/app-shells/termcolors-mv/termcolors-mv-3.0.ebuild
+++ b/app-shells/termcolors-mv/termcolors-mv-3.1.ebuild
@@ -26,6 +26,10 @@ and DEFAULTS is set appropriately, see the documentation.
 For zsh, this happens if you use zshrc-mv"
 
 src_prepare() {
+	use prefix || sed -i \
+		-e '1s"^#!/usr/bin/env sh$"#!'"$(command -v sh)"'"' \
+		-e '1s"^#!/usr/bin/env perl$"#!'"$(command -v perl)"'"' \
+		-- bin/* || die
 	epatch_user
 }
 
diff --git a/dev-util/diffhelp/ChangeLog b/dev-util/diffhelp/ChangeLog
index ee6f0b74..bd058b68 100644
--- a/dev-util/diffhelp/ChangeLog
+++ b/dev-util/diffhelp/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*diffhelp-1.6-r1 (02 Nov 2013)
+
+  02 Nov 2013; Martin Väth <martin@mvath.de>:
+  Shebang care
+
 *diffhelp-1.6 (09 Oct 2013)
 
   09 Oct 2013; Martin Väth <martin@mvath.de>:
diff --git a/dev-util/diffhelp/diffhelp-1.6.ebuild b/dev-util/diffhelp/diffhelp-1.6-r1.ebuild
index a22d30a4..cb73acad 100644
--- a/dev-util/diffhelp/diffhelp-1.6.ebuild
+++ b/dev-util/diffhelp/diffhelp-1.6-r1.ebuild
@@ -16,6 +16,9 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 src_prepare() {
+	use prefix || sed -i \
+		-e '1s"^#!/usr/bin/env sh$"#!'"$(command -v sh)"'"' \
+		-- "${PN}" || die
 	epatch_user
 }
 
diff --git a/dev-util/pyrep/ChangeLog b/dev-util/pyrep/ChangeLog
index d5024d03..a0b44771 100644
--- a/dev-util/pyrep/ChangeLog
+++ b/dev-util/pyrep/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*pyrep-1.2 (02 Nov 2013)
+
+  02 Nov 2013; Martin Väth <martin@mvath.de>:
+  Version bump, remove old ebuild. Shebang care
+
 *pyrep-1.1 (02 Mar 2012)
 
   28 Sep 2012; Martin Väth <martin@mvath.de>:
diff --git a/dev-util/pyrep/Manifest b/dev-util/pyrep/Manifest
index e533c026..7ed70829 100644
--- a/dev-util/pyrep/Manifest
+++ b/dev-util/pyrep/Manifest
@@ -1 +1 @@
-DIST pyrep-1.1.tar.gz 8539 SHA256 d6c927396e11fbdfed6fde7048a54b77d74776fe5cfa8a25ab9af5d8b4146280 SHA512 6558af9ae29195c7bd72e103ae4f4efda457400831190d17ee789464458c54c5f20ef564b73552832afdd074e61a686dc37b87b373ad60798eb35fd38f7c540f WHIRLPOOL 16badab1497371001136170efc71ee0661d4060bf7dc581e59b7335fc14f967251a610f9e3d7663831d9e3edd44a32753d0be70cb30c26d9af9f3d73669946e2
+DIST pyrep-1.2.tar.gz 8538 SHA256 12bf6d8fd8ce426b4042f8f1e2d05b47fc801de234ce324b547957c1e8e74f19 SHA512 4eb09d1352c9dc2f4d8eb5294ceb211d90276d9c30dd296900cf5ab891f680524a96585497b5a5bc549b943cfc71d0c1e7ec639d49de1c34e511ab85efc0f4f9 WHIRLPOOL a686a902f9fe11e4a56b4b26fbe6f56339d53e45e7afb8014240595839e79d739e6846cba81cfe9a1eb1c2b17428653b3df9f1e6f503b626e93069f73d165966
diff --git a/dev-util/pyrep/pyrep-1.1.ebuild b/dev-util/pyrep/pyrep-1.2.ebuild
index c40af2eb..fefd9aca 100644
--- a/dev-util/pyrep/pyrep-1.1.ebuild
+++ b/dev-util/pyrep/pyrep-1.2.ebuild
@@ -18,6 +18,9 @@ IUSE=""
 RDEPEND="dev-lang/python"
 
 src_prepare() {
+	use prefix || sed -i \
+		-e '1s"^#!/usr/bin/env python$"#!'"$(command -v python)"'"' \
+		-- "${PN}" || die
 	epatch_user
 }
 
diff --git a/media-video/video-mv/ChangeLog b/media-video/video-mv/ChangeLog
index 690b9e8a..44bd3acb 100644
--- a/media-video/video-mv/ChangeLog
+++ b/media-video/video-mv/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*video-mv-7.10-r1 (02 Nov 2013)
+
+  02 Nov 2013; Martin Väth <martin@mvath.de>:
+  Shebang care
+
 *video-mv-7.10 (20 Oct 2013)
 
   20 Oct 2013; Martin Väth <martin@mvath.de>:
diff --git a/media-video/video-mv/video-mv-7.10.ebuild b/media-video/video-mv/video-mv-7.10-r1.ebuild
index 560d2ff4..daf7e84f 100644
--- a/media-video/video-mv/video-mv-7.10.ebuild
+++ b/media-video/video-mv/video-mv-7.10-r1.ebuild
@@ -27,6 +27,9 @@ zstyle ':completion:*' matcher-list '' 'm:{a-zA-Z}={A-Za-z}'
 into your ~/.zshrc or /etc/zshrc for case-insensitive matching."
 
 src_prepare() {
+	use prefix || sed -i \
+		-e '1s"^#!/usr/bin/env sh$"#!'"$(command -v sh)"'"' \
+		-- bin/* || die
 	epatch_user
 }
 
diff --git a/net-firewall/firewall-mv/ChangeLog b/net-firewall/firewall-mv/ChangeLog
index d0cb8fe9..d0ff7dae 100644
--- a/net-firewall/firewall-mv/ChangeLog
+++ b/net-firewall/firewall-mv/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*firewall-mv-7.2-r1 (02 Nov 2013)
+
+  02 Nov 2013; Martin Väth <martin@mvath.de>:
+  Shebang care
+
 *firewall-mv-7.2 (13 Oct 2013)
 
   13 Oct 2013; Martin Väth <martin@mvath.de>:
diff --git a/net-firewall/firewall-mv/firewall-mv-7.2.ebuild b/net-firewall/firewall-mv/firewall-mv-7.2-r1.ebuild
index 586cc729..05cc7ce0 100644
--- a/net-firewall/firewall-mv/firewall-mv-7.2.ebuild
+++ b/net-firewall/firewall-mv/firewall-mv-7.2-r1.ebuild
@@ -18,12 +18,15 @@ RDEPEND="app-shells/push"
 DEPEND=""
 
 src_prepare() {
-	sed -i \
-		-e "s!/etc/!${EPREFIX}/etc/!g" \
-		-e "s!/usr/!${EPREFIX}/usr/!g" \
-		sbin/* \
-		etc/* \
-		systemd/*
+	if use prefix
+	then	sed -i \
+			-e "s!/etc/!${EPREFIX}/etc/!g" \
+			-e "s!/usr/!${EPREFIX}/usr/!g" \
+			-- sbin/* etc/* systemd/* || die
+	else	sed -i \
+			-e '1s"^#!/usr/bin/env sh$"#!'"$(command -v sh)"'"' \
+			-- sbin/* || die
+	fi
 	epatch_user
 }
 
diff --git a/net-misc/sshstart/ChangeLog b/net-misc/sshstart/ChangeLog
index 7cb4201e..5dc7174d 100644
--- a/net-misc/sshstart/ChangeLog
+++ b/net-misc/sshstart/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*sshstart-2.7 (02 Nov 2013)
+
+  02 Nov 2012; Martin Väth <martin@mvath.de>:
+  Version bump, remove old ebuild. Shebang care
+
 *sshstart-2.8 (07 May 2012)
 
   28 Sep 2012; Martin Väth <martin@mvath.de>:
diff --git a/net-misc/sshstart/Manifest b/net-misc/sshstart/Manifest
index 7f868a6c..d2344641 100644
--- a/net-misc/sshstart/Manifest
+++ b/net-misc/sshstart/Manifest
@@ -1 +1 @@
-DIST sshstart-2.8.tar.gz 2495 SHA256 b8895f8e463123c8cd5b112c0081c8884bf35d028651b2a7a54e0ff368b5f525 SHA512 2456a5c81b859ac4e221993e36f38d85f53154d0b7b041bdc2d37d5e18b0b14c644f64d6c9db90556316b94d2ca7493ae5d3dc4e50fb74f4dabef4e9760fee77 WHIRLPOOL cda2009e50e8f2f5c941fa580583b23c6e3275ae40b9d89b8740ddeb2ba164f0116e164aae992a2bad5314cde0f467a35a4b7fad53daff2447e23b6d777b01b0
+DIST sshstart-2.9.tar.gz 2494 SHA256 8b6e2300bc3af6e1a523998dc266c4f21ef495cf552a868e36124905762cf6f2 SHA512 92f37acab35b252d44bfc3ca20863aee342f014d42e3c8d95311011dbe5e69d80217ae35b7bcc95e5384069a76e50854283559bdcf83ac2db72b24a748480303 WHIRLPOOL 77717cd9affbb2e7c5a6181f831335aa6219286b387627e3a51a1b7bb137bf3940413f2f132add241f103668614171fb555f21bc8e363938336bc33db87edef2
diff --git a/net-misc/sshstart/sshstart-2.8.ebuild b/net-misc/sshstart/sshstart-2.9.ebuild
index b7397365..278894e6 100644
--- a/net-misc/sshstart/sshstart-2.8.ebuild
+++ b/net-misc/sshstart/sshstart-2.9.ebuild
@@ -19,10 +19,13 @@ RDEPEND="app-shells/push
 DEPEND=""
 
 src_prepare() {
+	use prefix || sed -i \
+		-e '1s"^#!/usr/bin/env sh$"#!'"$(command -v sh)"'"' \
+		-- "${PN}" || die
 	epatch_user
 }
 
 src_install() {
-	dobin sshstart
+	dobin "${PN}"
 	dodoc README
 }
diff --git a/sys-apps/cpi/ChangeLog b/sys-apps/cpi/ChangeLog
index f5606f91..b4d6a64f 100644
--- a/sys-apps/cpi/ChangeLog
+++ b/sys-apps/cpi/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*cpi-2.5 (02 Nov 2013)
+
+  02 Nov 2013; Martin Väth <martin@mvath.de>:
+  Version bump, remove old ebuild. Shebang care
+
 *cpi-2.4 (23 Aug 2013)
 
   10 Sep 2013; Martin Väth <martin@mvath.de>:
diff --git a/sys-apps/cpi/Manifest b/sys-apps/cpi/Manifest
index f5b91ea8..337decee 100644
--- a/sys-apps/cpi/Manifest
+++ b/sys-apps/cpi/Manifest
@@ -1 +1 @@
-DIST cpi-2.4.tar.gz 3473 SHA256 8d36b68574dc068f87d649be90d1d379cdf1fbdc913acd73458137c7a245b1b1 SHA512 ae1f5f40b5f8a6cc78f7932cbfc0617e821151f08d70c67df94165691eb963b6d4ac75c4c71b376d9ca5d973282ff0a5c6f3d8ec692390eb182a354190209d20 WHIRLPOOL aa9a02cc4c716eae2fb00eecae8bd33bd33081843f1e818a8b9225ee3157b2cec03409a32d52197e1d772591542e35ce518729393bde3166d6cb0fcd7e949924
+DIST cpi-2.5.tar.gz 3474 SHA256 6e2ce700e767a3922d73f6526985e2d0aeb18867eb84707a87fe2298ab976a99 SHA512 d75a32e1d7165325bcfe9df47206588b0d4e5b58be1fdfc5871425777983ede579176119cd3573f2f500559a61198c01a22585e6d9f652b8a4c1f990f71479a0 WHIRLPOOL 8550f43a0d136f64c18121522c47940704dd4733d6e63ef7efeb525caaed074d5b02af7fa0b04d79fc7d7fbea0332cadea95898dbd77031ec7020b9ca9bb55c6
diff --git a/sys-apps/cpi/cpi-2.4.ebuild b/sys-apps/cpi/cpi-2.5.ebuild
index 10349755..7238cc26 100644
--- a/sys-apps/cpi/cpi-2.4.ebuild
+++ b/sys-apps/cpi/cpi-2.5.ebuild
@@ -16,6 +16,9 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 src_prepare() {
+	use prefix || sed -i \
+		-e '1s"^#!/usr/bin/env sh$"#!'"$(command -v sh)"'"' \
+		-- bin/* || die
 	epatch_user
 }
 
diff --git a/sys-apps/openrc-wrapper/ChangeLog b/sys-apps/openrc-wrapper/ChangeLog
index 0442cdef..acc0a655 100644
--- a/sys-apps/openrc-wrapper/ChangeLog
+++ b/sys-apps/openrc-wrapper/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*openrc-wrapper-1.3 (02 Nov 2013)
+
+  02 Nov 2013; Martin Väth <martin@mvath.de>:
+  Version bump, remove old ebuild. Shebang care
+
 *openrc-wrapper-1.2 (14 Sep 2013)
 
   14 Sep 2013; Martin Väth <martin@mvath.de>:
diff --git a/sys-apps/openrc-wrapper/Manifest b/sys-apps/openrc-wrapper/Manifest
index 513a3bee..3955d708 100644
--- a/sys-apps/openrc-wrapper/Manifest
+++ b/sys-apps/openrc-wrapper/Manifest
@@ -1 +1 @@
-DIST openrc-wrapper-1.2.tar.gz 2436 SHA256 963caf208c9523c8c7901ce88259e8f26c5ecc1d65b76c337152a6c34468c6b4 SHA512 cc07e3c462f1867373971ca259656296da60281e94251b6817a0d15c64ceb023940d8eb92ae3da9ad125e7a301f38710c995aa05f3c45c6bad85fe75c48e6b26 WHIRLPOOL 5db4ecd12b8d23c1e2328c29d677cab9656a2d9019989861075df6f68350f3ba1335e0e69dec40974e04aea83217eb2b8351f8be91b871b00cde6960c89d0d6a
+DIST openrc-wrapper-1.3.tar.gz 2432 SHA256 f41da0f975e63e53688014e975b2efb0c32be17e754b847fa0df04fbcf652d6a SHA512 88c725fd294af10e0e0f252f8982be39fab7b5a784ba044c373a70910704ab6ba7871902e7e0a8b32b38ccc77bd3e64bb71d517936775ae5bab55c577ce8d794 WHIRLPOOL ad6505b1a1c1badf26490b425661aeaf0f482eb7ef3fb4f6ef4ff34cca3e04cad104b53adcd84b3afff0c6b23ac57a2785866484615838366c0854e2b82dc9f9
diff --git a/sys-apps/openrc-wrapper/openrc-wrapper-1.2.ebuild b/sys-apps/openrc-wrapper/openrc-wrapper-1.3.ebuild
index b478d0fa..b478d0fa 100644
--- a/sys-apps/openrc-wrapper/openrc-wrapper-1.2.ebuild
+++ b/sys-apps/openrc-wrapper/openrc-wrapper-1.3.ebuild
diff --git a/sys-apps/starter/ChangeLog b/sys-apps/starter/ChangeLog
index 5c19646b..e8ecae01 100644
--- a/sys-apps/starter/ChangeLog
+++ b/sys-apps/starter/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*starter-2.10 (02 Nov 2013)
+
+  02 Nov 2013; Martin Väth <martin@mvath.de>:
+  Version bump, remove old ebuild. Shebang care
+
 *starter-2.9 (17 Nov 2012)
 
   10 Sep 2013; Martin Väth <martin@mvath.de>:
diff --git a/sys-apps/starter/Manifest b/sys-apps/starter/Manifest
index 5cc3144f..3a2db1a4 100644
--- a/sys-apps/starter/Manifest
+++ b/sys-apps/starter/Manifest
@@ -1 +1 @@
-DIST starter-2.9.tar.gz 6518 SHA256 425e166d8c3d9ee6b1b617b855dae1e8fd4e8ed51b37e9ea475bebc5a3a6c49a SHA512 40759291feeb4348f36ecd00a77b4e91e2cc7de39b3fee1574ca19971d63061e656764ac1802f83a64bd742938ab1756fbb89fe73c45c6725a5440f1a6e98511 WHIRLPOOL 77f1590d9ff3d0abfcccb6059b233639bad7f8a1919c4bf737b180098d1759eddfd133d40bc350eacd6bfd8c2bdd8605676e5b92d9629052d796a0d9d32d05a2
+DIST starter-2.10.tar.gz 6520 SHA256 bac4348bb83d9de0742d294df2d5915212d307ad74bb553db2e3520b26a4e8ec SHA512 c605dbe68a8ea092bea488736300569a7216fd55562a09bcaa5b9b18d949d4faee25d6cdb95d653ae528388d23d76330f548405c6ff8a5ae78e503ed38221432 WHIRLPOOL 1ea3f917796d62b051c7a981baebb1ce3b61484c1dd0af1082ae1f8fdf7dc26302de5fd69678ff1530741e25349faf3eb834a27e3954a6f86a64fda4424e1608
diff --git a/sys-apps/starter/starter-2.9.ebuild b/sys-apps/starter/starter-2.10.ebuild
index cfcc13d2..454d5557 100644
--- a/sys-apps/starter/starter-2.9.ebuild
+++ b/sys-apps/starter/starter-2.10.ebuild
@@ -19,6 +19,9 @@ RDEPEND="app-shells/push
 DEPEND=""
 
 src_prepare() {
+	use prefix || sed -i \
+		-e '1s"^#!/usr/bin/env sh$"#!'"$(command -v sh)"'"' \
+		-- bin/* || die
 	epatch_user
 }
 
diff --git a/sys-block/zram-init/ChangeLog b/sys-block/zram-init/ChangeLog
index f4a82de0..a8530bd9 100644
--- a/sys-block/zram-init/ChangeLog
+++ b/sys-block/zram-init/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*zram-init-2.6-r1.ebuild (02 Nov 2013)
+
+  02 Nov 2013; Martin Väth <martin@mvath.de>:
+  Shebang care
+
 *zram-init-2.6.ebuild (11 Oct 2013)
 
   12 Oct 2013; Martin Väth <martin@mvath.de>:
diff --git a/sys-block/zram-init/zram-init-2.6.ebuild b/sys-block/zram-init/zram-init-2.6-r1.ebuild
index e44497da..57a209e7 100644
--- a/sys-block/zram-init/zram-init-2.6.ebuild
+++ b/sys-block/zram-init/zram-init-2.6-r1.ebuild
@@ -22,6 +22,9 @@ If you use systemd enable zram_swap, tmp, and/or var_tmp with systemctl.
 You might need to modify /etc/modprobe.d/zram.conf"
 
 src_prepare() {
+	use prefix || sed -i \
+		-e '1s"^#!/usr/bin/env sh$"#!'"$(command -v sh)"'"' \
+		-- sbin/* || die
 	epatch_user
 }
 
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
 }
 
diff --git a/sys-kernel/kernel/ChangeLog b/sys-kernel/kernel/ChangeLog
index dcb19503..843d0eb1 100644
--- a/sys-kernel/kernel/ChangeLog
+++ b/sys-kernel/kernel/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*kernel-1.28 (02 Nov 2013)
+
+  02 Nov 2013; Martin Väth <martin@mvath.de>:
+  Version bump, remove old ebuild. Shebang care
+
 *kernel-1.27 (03 Oct 2013)
 
   03 Oct 2013; Martin Väth <martin@mvath.de>:
diff --git a/sys-kernel/kernel/Manifest b/sys-kernel/kernel/Manifest
index bf1f08e1..7409fafe 100644
--- a/sys-kernel/kernel/Manifest
+++ b/sys-kernel/kernel/Manifest
@@ -1 +1 @@
-DIST kernel-1.27.tar.gz 6749 SHA256 a86f5472b0c0fb851b07cd2f01ef9e56577f5e62f6fa01a17a3ddc73a300ff92 SHA512 4a1031ff2c39adf851b16eb1ee3a1ad17f9639b5f5fa785dd7dc50ad15843ab0c40d63746773ff1cf7b781353ac87a77ba1d6d296aeca0de6bae634c0eb2de8b WHIRLPOOL 02030287e0366998d04dc8754df799e7b819a511a57a1a89089d96a169af54983c21e9fb9aa608d3e538fdff123e9b12d73bb70211881fc7d1bbeb81b341034d
+DIST kernel-1.28.tar.gz 6746 SHA256 b64a759d30ea4121c98873ea37a8b9b29bc38ecac6f491abbafa890ff054aa33 SHA512 9bcdc2052bf54a62c750db33398229c4c373b5458ea33d3c8c303f544154838e7ab926a56335266860c9117c3cb43ad9ca017ed9613ee433745a7dd9616813bc WHIRLPOOL 8fcf0acfa33fbee8f15f7a63e6486865571a36fdd07b43638b197633010c98d0c0a949f28ad0667e801322b1eff6ab37faa2187883bcfb11be4a4a2192b09b22
diff --git a/sys-kernel/kernel/kernel-1.27.ebuild b/sys-kernel/kernel/kernel-1.28.ebuild
index fc30a2b7..75606b09 100644
--- a/sys-kernel/kernel/kernel-1.27.ebuild
+++ b/sys-kernel/kernel/kernel-1.28.ebuild
@@ -21,6 +21,9 @@ RDEPEND="app-admin/sudo
 DEPEND=""
 
 src_prepare() {
+	use prefix || sed -i \
+		-e '1s"^#!/usr/bin/env sh$"#!'"$(command -v sh)"'"' \
+		-- "${PN}" || die
 	epatch_user
 }