Change shebang of am-wrapper script from /bin/sh to bin/sh from the offset for Prefix...

Package-Manager: portage-2.2.00.15842-prefix/cvs/Darwin powerpc

diff --git a/sys-devel/automake-wrapper/ChangeLog b/sys-devel/automake-wrapper/ChangeLog
index 60b8841e845a8b7de56636dc8f14762bd75a80ad..9057f45f48835dab8ba41b6494f7d0a8c0e720c7 100644 (file)
--- a/sys-devel/automake-wrapper/ChangeLog
+++ b/sys-devel/automake-wrapper/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-devel/automake-wrapper
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake-wrapper/ChangeLog,v 1.44 2010/04/18 12:36:13 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake-wrapper/ChangeLog,v 1.45 2010/04/30 17:16:47 grobian Exp $
+
+  30 Apr 2010; Fabian Groffen <grobian@gentoo.org>
+  automake-wrapper-5.ebuild:
+  Change shebang of am-wrapper script from /bin/sh to bin/sh from the offset
+  for Prefix installs, since /bin/sh rarely is a POSIX shell out there.
 
   18 Apr 2010; <nixnut@gentoo.org> automake-wrapper-4.ebuild:
   ppc stable #295947

diff --git a/sys-devel/automake-wrapper/Manifest b/sys-devel/automake-wrapper/Manifest
index d7cc668ed04aba6d59f8c403e043b4298e886d12..3a23933f191907cfa69f954ac02b97c9aecb673f 100644 (file)
--- a/sys-devel/automake-wrapper/Manifest
+++ b/sys-devel/automake-wrapper/Manifest
@@ -3,6 +3,6 @@ AUX am-wrapper-4.sh 4354 RMD160 0dc2880dc64e639500a38ac04c0f0345eb9175ac SHA1 2d
 AUX am-wrapper-5.sh 4130 RMD160 eab77be481f142c3d7918bd8c53162c1a1d95d23 SHA1 a66b2d390546da297b68ae8a4385e43a8554dba7 SHA256 0546150d48e71d25ed3c909982fe30bdaccc6c79382ad1989538c2b0ce7a0d77
 EBUILD automake-wrapper-3-r1.ebuild 786 RMD160 1d2e30563262ded5b30f703b868e425b1ae02c05 SHA1 d6af8b8f1348247efa569bae5134195758b2f556 SHA256 5f97f5291690397f90b3149d683eb04240bd6ca3da2833f63993e4a76ece366d
 EBUILD automake-wrapper-4.ebuild 992 RMD160 e7dfae4cfa081788cffe4c07b4004db0fff3254b SHA1 4c1c030a6f810259b324457cbb81728ae3a56771 SHA256 69f77c5a7c3012d21480ecdc0bbf5796f377b21da3795e6c0a182b9f0705cb4d
-EBUILD automake-wrapper-5.ebuild 1003 RMD160 23a1e2eb800067ee67ee2dd9a5d324c1d718767e SHA1 8a608fea05226dfd7697d4b39ad43516cf7d477f SHA256 52d561399cb37b8980fa12f7c4d0e51185e3e34947600cb666b1b2a2885896c2
-MISC ChangeLog 5141 RMD160 33fa59a7b0afac5e0add4585640a761bd51da0f2 SHA1 e3c2afa98af787055c73844931814e38a8ab7bff SHA256 420d4e9d3bfe3a96c20279ea0f44df7d4f8597d8a39bef127549dba944f85f10
+EBUILD automake-wrapper-5.ebuild 1225 RMD160 1c6d79bfc392f6ba5b703ac1d50d0628defeae5b SHA1 326a4684c54b6eca9a1f86908b16537686ccab40 SHA256 fc7911c3f041708aa4633fd38cb4a29750d5e7d3a9d53af84215400d66db88d8
+MISC ChangeLog 5372 RMD160 90ea42e2f8f3c821e0e43108585429baeb7a2f20 SHA1 60af584c58fb6de2a4a63b6eccfbda1147120b85 SHA256 c597b491ccd781c9f750770f21c1e7f82d0f1b6eca4e559e25e6d02e0d34b9da
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92

diff --git a/sys-devel/automake-wrapper/automake-wrapper-5.ebuild b/sys-devel/automake-wrapper/automake-wrapper-5.ebuild
index ac1221fd2c986644098f8e28d76d9909e5a0599b..6818ff46752f1025824f8d2bed9df7aac83d39f6 100644 (file)
--- a/sys-devel/automake-wrapper/automake-wrapper-5.ebuild
+++ b/sys-devel/automake-wrapper/automake-wrapper-5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake-wrapper/automake-wrapper-5.ebuild,v 1.1 2010/03/07 15:45:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake-wrapper/automake-wrapper-5.ebuild,v 1.2 2010/04/30 17:16:47 grobian Exp $
 
 inherit multilib
 
@@ -15,9 +15,17 @@ IUSE=""
 
 S=${WORKDIR}
 
+src_unpack() {
+       cp "${FILESDIR}"/am-wrapper-${PV}.sh "${T}"/
+       # usr/bin/aclocal: bad substitution -> /bin/sh != POSIX shell
+       if use prefix ; then
+               sed -i -e '1c\#!'"${EPREFIX}"'/bin/sh' "${T}"/am-wrapper-${PV}.sh || die
+       fi
+}
+
 src_install() {
        exeinto /usr/$(get_libdir)/misc
-       newexe "${FILESDIR}"/am-wrapper-${PV}.sh am-wrapper.sh || die
+       newexe "${T}"/am-wrapper-${PV}.sh am-wrapper.sh || die
 
        keepdir /usr/share/aclocal