Create the files on the fly to avoid file collision #228157 by Robin Johnson.

Package-Manager: portage-2.2_pre8/cvs/Linux 2.6.25 x86_64

7 files changed, 49 insertions, 38 deletions

diff --git a/sys-devel/kgcc64/ChangeLog b/sys-devel/kgcc64/ChangeLog
index 4d810412e7e5..4502d9a7b344 100644
--- a/sys-devel/kgcc64/ChangeLog
+++ b/sys-devel/kgcc64/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/kgcc64
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/kgcc64/ChangeLog,v 1.15 2008/06/18 09:58:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/kgcc64/ChangeLog,v 1.16 2008/06/19 02:38:58 vapier Exp $
+
+  19 Jun 2008; Mike Frysinger <vapier@gentoo.org> -files/wrapper,
+  kgcc64-3.4.6.ebuild, kgcc64-4.1.2.ebuild, kgcc64-4.2.4.ebuild,
+  kgcc64-4.3.1.ebuild:
+  Create the files on the fly to avoid file collision #228157 by Robin
+  Johnson.
 
 *kgcc64-4.3.1 (18 Jun 2008)
 *kgcc64-4.2.4 (18 Jun 2008)
diff --git a/sys-devel/kgcc64/Manifest b/sys-devel/kgcc64/Manifest
index 753828c3d9a6..48f1dd074cfe 100644
--- a/sys-devel/kgcc64/Manifest
+++ b/sys-devel/kgcc64/Manifest
@@ -1,7 +1,6 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX wrapper 27 RMD160 935a1418c97013e23b6328614e56639da16401d6 SHA1 6bf572312337e5c97e8c6a715ec8066f12703067 SHA256 96dd4f2e0375941d2015a3138b4bf8d88bdfa92dfbfb7311dd3cc1422b6e51b7
 DIST gcc-3.4.6-patches-1.2.tar.bz2 54757 RMD160 d4e1240b9e45b7661b7f8bf4f57bb2c9cac17686 SHA1 be5868d0ba17d0d8952cda5a82064aaca9168cb3 SHA256 43253a8defa6111bd6f107178cc46f425ec81efe0eb26b730c11c422a4d4de26
 DIST gcc-3.4.6.tar.bz2 28193401 RMD160 b15003368cedc7964f6ceaee0c39ddc43a46c442 SHA1 97b290fdc572c8e490b3b39f243e69bacad23c2b SHA256 7791a601878b765669022b8b3409fba33cc72f9e39340fec8af6d0e6f72dec39
 DIST gcc-4.1.2-patches-1.0.1.tar.bz2 43294 RMD160 70184d44cd3f051d154d8cbd957257d1eeefb460 SHA1 0affefdc4673f1781c829dafa24e62433fa868bc SHA256 311cef339fd021c72086cdef361e0aa6409a4a62d21fddaa7a5171bc1545085a
@@ -10,16 +9,16 @@ DIST gcc-4.2.4-patches-1.0.tar.bz2 21809 RMD160 7fc9889d88d5c3903e300a676fd9e553
 DIST gcc-4.2.4.tar.bz2 44025458 RMD160 15793d72b43c81a80afca08d031c38d110b6c9b6 SHA1 bb20efc7750fe0d6172c5945572bf036fe59d3dd SHA256 afba845e2d38547a63bd3976e90245c81ea176786f9e6966339c6d3761f1133a
 DIST gcc-4.3.1-patches-1.0.tar.bz2 10095 RMD160 a5a1105341c6e9408f42d5c709df0fff5ef2e4d8 SHA1 527aa4c3e23910974e1828d0d2dd39b63c07e4c6 SHA256 71cb0fe8e90b299424edd126e09a9689cdce4b8eb08f54fade9cb84d2aabea82
 DIST gcc-4.3.1.tar.bz2 58964610 RMD160 224205432af1592aa46f7a5b14293767e02f94aa SHA1 6f1565280ed0a25256f5768f6dff2c96b6a25287 SHA256 66596b80995f88cb66aaaf937598df7a9af10cc06799c3a7a64879e20b552fd5
-EBUILD kgcc64-3.4.6.ebuild 2332 RMD160 b821d041f42ad41d28e997241a3cc4efd846af6f SHA1 08e3ff450ba8526341de705386ad0f913618a9c0 SHA256 73972b36be2233c2cb3875643e1e8aa86d859d6a8256e722abfffd59c725bdfc
-EBUILD kgcc64-4.1.2.ebuild 1315 RMD160 50478c434dd2215105ba1242ab2979d47e9bd289 SHA1 8c2f0ecd31d125c75d19c3d958227cbb2a952bb8 SHA256 4e23451cfd27e969aee693b2db079a322c56b39dc3ca59e95239b8e567580fb1
-EBUILD kgcc64-4.2.4.ebuild 1192 RMD160 dc336da48776d0faa4b3d27d385ccabf87f6b585 SHA1 4712c68c4215a98e8b72b573a6067b013692380e SHA256 df85ab7a77a5a7d668d2d89dc79a7f3c19a49ebd6170bcb7e54078da3094d8fa
-EBUILD kgcc64-4.3.1.ebuild 1192 RMD160 613130bd5e6079bdd20ab232f4694baffdf5b7b2 SHA1 60bafcb3faa0ccc8e35233f0a958369bf8dddec8 SHA256 993014f2aac547e8f96c1b5d8c9fc5c31f482c234cdf7092e272f07f85d308fd
-MISC ChangeLog 2162 RMD160 fc01be2f34692fc078902895315adced501a4004 SHA1 ea0e91f988d8b43ee5a2de4215067224e4059e8f SHA256 119f345a6422353e7aa1597aaceaf2019090904a79e95b4e87db91c422d6c34c
+EBUILD kgcc64-3.4.6.ebuild 2327 RMD160 945455071de8c54fbffe6ab06de282a1caf39c00 SHA1 291abc98c07c197f1c39fb634c026d247ca33aa4 SHA256 973284c42459c95552714034edc84d91a226d21867174e7e4d78ecb5456ba8f0
+EBUILD kgcc64-4.1.2.ebuild 1313 RMD160 dfbf0387e79631222fc5bb8b93b08fefee05ce6e SHA1 e18428971e39e4b7ec7e9b404a24e97070ccfb5d SHA256 24032e7abf6a114b188c7eff16c7738b7af6627f7b013523302e13f3fd47324a
+EBUILD kgcc64-4.2.4.ebuild 1189 RMD160 4bb5b0c74b7dd98ba8c4bfe3f6391492a5f33c69 SHA1 42db014841d485bc47cb8fa843bb2afbc26b4b61 SHA256 e129832f266dd8d58ee3b9a7bcec16b6c863a0df251285983f99317eb36f4a8c
+EBUILD kgcc64-4.3.1.ebuild 1189 RMD160 50e80da1156313f3bf8a3da49eeaf4319b4abef2 SHA1 10d66761e2aadf1d46c485f8985786681bf64909 SHA256 71270055164ae675ceeaec6452e7dfcd955d7fd88752432aed60242a64598e50
+MISC ChangeLog 2399 RMD160 8efa5ec189abd74507ef8ec107286f4343f33a46 SHA1 0a34d76e5c188e7f5dfbb131cd06095eaf05632a SHA256 b7ce02f48149d662cdf4062ec137a57bd8d47b4844ae548da85f62a9d547158d
 MISC metadata.xml 163 RMD160 e0edc29d71818f22f7cdc41cdc873dd14bf0ede1 SHA1 b3e5d73eda963347ee046142b676bb8d4286965b SHA256 1f5f93a33ac7466a33ec5eae137d0eb13e9c9101b0053d96173e31ef14898d99
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkhY3EEACgkQ67wieSYcaxc1HACg3qITb0kr3aOX7FnBNWl2pJud
-cOcAoKbjwpE7fZ2agDUmA5WzBMVAXtoE
-=7DEn
+iEYEARECAAYFAkhZxsoACgkQ67wieSYcaxe+3QCbBTBGm0Eco6Ms7H+x/O0QLJJG
+/sYAoM7wgveE03o7/NUz5zJ+YXEroqgQ
+=PAvW
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/kgcc64/files/wrapper b/sys-devel/kgcc64/files/wrapper
deleted file mode 100644
index 775f64b9d004..000000000000
--- a/sys-devel/kgcc64/files/wrapper
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec TARGET "$@"
diff --git a/sys-devel/kgcc64/kgcc64-3.4.6.ebuild b/sys-devel/kgcc64/kgcc64-3.4.6.ebuild
index 8d281dd700bb..a014734a5177 100644
--- a/sys-devel/kgcc64/kgcc64-3.4.6.ebuild
+++ b/sys-devel/kgcc64/kgcc64-3.4.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/kgcc64/kgcc64-3.4.6.ebuild,v 1.7 2007/01/18 12:45:02 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/kgcc64/kgcc64-3.4.6.ebuild,v 1.8 2008/06/19 02:38:58 vapier Exp $
 
 case ${CHOST} in
 	hppa*)    CTARGET=hppa64-${CHOST#*-};;
@@ -60,12 +60,14 @@ src_unpack() {
 	esac
 }
 
-src_install() {
-	toolchain_src_install
-
+pkg_postinst() {
+	cd "${ROOT}"/usr/bin
 	local x
 	for x in gcc cpp ; do
-		newbin "${FILESDIR}"/wrapper ${CTARGET%%-*}-linux-${x}
-		dosed "s:TARGET:${CTARGET}-${x}:" /usr/bin/${CTARGET%%-*}-linux-${x}
+		cat <<-EOF >${CTARGET%%-*}-linux-${x}
+		#!/bin/sh
+		exec ${CTARGET}-${x} "\$@"
+		EOF
+		chmod a+rx ${CTARGET%%-*}-linux-${x}
 	done
 }
diff --git a/sys-devel/kgcc64/kgcc64-4.1.2.ebuild b/sys-devel/kgcc64/kgcc64-4.1.2.ebuild
index 811d4d37d974..dd1153264510 100644
--- a/sys-devel/kgcc64/kgcc64-4.1.2.ebuild
+++ b/sys-devel/kgcc64/kgcc64-4.1.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/kgcc64/kgcc64-4.1.2.ebuild,v 1.5 2007/11/20 04:06:21 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/kgcc64/kgcc64-4.1.2.ebuild,v 1.6 2008/06/19 02:38:58 vapier Exp $
 
 case ${CHOST} in
 	hppa*)    CTARGET=hppa64-${CHOST#*-};;
@@ -39,12 +39,14 @@ src_unpack() {
 	epatch "${GCC_FILESDIR}"/4.1.0/gcc-4.1.0-cross-compile.patch
 }
 
-src_install() {
-	toolchain_src_install
-
+pkg_postinst() {
+	cd "${ROOT}"/usr/bin
 	local x
 	for x in gcc cpp ; do
-		newbin "${FILESDIR}"/wrapper ${CTARGET%%-*}-linux-${x}
-		dosed "s:TARGET:${CTARGET}-${x}:" /usr/bin/${CTARGET%%-*}-linux-${x}
+		cat <<-EOF >${CTARGET%%-*}-linux-${x}
+		#!/bin/sh
+		exec ${CTARGET}-${x} "\$@"
+		EOF
+		chmod a+rx ${CTARGET%%-*}-linux-${x}
 	done
 }
diff --git a/sys-devel/kgcc64/kgcc64-4.2.4.ebuild b/sys-devel/kgcc64/kgcc64-4.2.4.ebuild
index 34fe03db92ef..304b319d3c9e 100644
--- a/sys-devel/kgcc64/kgcc64-4.2.4.ebuild
+++ b/sys-devel/kgcc64/kgcc64-4.2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/kgcc64/kgcc64-4.2.4.ebuild,v 1.1 2008/06/18 09:58:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/kgcc64/kgcc64-4.2.4.ebuild,v 1.2 2008/06/19 02:38:58 vapier Exp $
 
 case ${CHOST} in
 	hppa*)    CTARGET=hppa64-${CHOST#*-};;
@@ -32,12 +32,14 @@ DEPEND="hppa? ( sys-devel/binutils-hppa64 )
 	!sys-devel/gcc-powerpc64
 	!sys-devel/gcc-sparc64"
 
-src_install() {
-	toolchain_src_install
-
+pkg_postinst() {
+	cd "${ROOT}"/usr/bin
 	local x
 	for x in gcc cpp ; do
-		newbin "${FILESDIR}"/wrapper ${CTARGET%%-*}-linux-${x}
-		dosed "s:TARGET:${CTARGET}-${x}:" /usr/bin/${CTARGET%%-*}-linux-${x}
+		cat <<-EOF >${CTARGET%%-*}-linux-${x}
+		#!/bin/sh
+		exec ${CTARGET}-${x} "\$@"
+		EOF
+		chmod a+rx ${CTARGET%%-*}-linux-${x}
 	done
 }
diff --git a/sys-devel/kgcc64/kgcc64-4.3.1.ebuild b/sys-devel/kgcc64/kgcc64-4.3.1.ebuild
index 4e70c3d72216..f501ac675f9d 100644
--- a/sys-devel/kgcc64/kgcc64-4.3.1.ebuild
+++ b/sys-devel/kgcc64/kgcc64-4.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/kgcc64/kgcc64-4.3.1.ebuild,v 1.1 2008/06/18 09:58:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/kgcc64/kgcc64-4.3.1.ebuild,v 1.2 2008/06/19 02:38:58 vapier Exp $
 
 case ${CHOST} in
 	hppa*)    CTARGET=hppa64-${CHOST#*-};;
@@ -32,12 +32,14 @@ DEPEND="hppa? ( sys-devel/binutils-hppa64 )
 	!sys-devel/gcc-powerpc64
 	!sys-devel/gcc-sparc64"
 
-src_install() {
-	toolchain_src_install
-
+pkg_postinst() {
+	cd "${ROOT}"/usr/bin
 	local x
 	for x in gcc cpp ; do
-		newbin "${FILESDIR}"/wrapper ${CTARGET%%-*}-linux-${x}
-		dosed "s:TARGET:${CTARGET}-${x}:" /usr/bin/${CTARGET%%-*}-linux-${x}
+		cat <<-EOF >${CTARGET%%-*}-linux-${x}
+		#!/bin/sh
+		exec ${CTARGET}-${x} "\$@"
+		EOF
+		chmod a+rx ${CTARGET%%-*}-linux-${x}
 	done
 }