Fix installation of cc/f77 helpers #412319 by Yuta SATOH.

Package-Manager: portage-2.2.0_alpha102/cvs/Linux x86_64

3 files changed, 69 insertions, 5 deletions

diff --git a/sys-devel/gcc-config/ChangeLog b/sys-devel/gcc-config/ChangeLog
index baade7d9f262..786b981bbdd7 100644
--- a/sys-devel/gcc-config/ChangeLog
+++ b/sys-devel/gcc-config/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-devel/gcc-config
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/ChangeLog,v 1.210 2012/04/26 12:30:41 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/ChangeLog,v 1.211 2012/05/13 20:14:06 vapier Exp $
+
+*gcc-config-1.7.1 (13 May 2012)
+
+  13 May 2012; Mike Frysinger <vapier@gentoo.org> +gcc-config-1.7.1.ebuild:
+  Fix installation of cc/f77 helpers #412319 by Yuta SATOH.
 
   26 Apr 2012; Alexis Ballier <aballier@gentoo.org> gcc-config-1.7.ebuild:
   keyword ~amd64-fbsd
diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest
index 50781dc10b28..9cb8055e038a 100644
--- a/sys-devel/gcc-config/Manifest
+++ b/sys-devel/gcc-config/Manifest
@@ -7,6 +7,7 @@ AUX gcc-config-1.5.1 21018 RMD160 7dcacda1c00126c0b4f085b5c996d7aa6be12344 SHA1
 AUX wrapper-1.5.1.c 9788 RMD160 b628944ee01dd772eb917cd08d13dc41bf58409f SHA1 51ac1f9419bc2230a9ce2196e70b5ee4ba61be18 SHA256 991981059fdcd0a9c76d73ff2ce576e553f37ae7d3b378b92ead553963f7339a
 AUX wrapper-1.5.2.c 8021 RMD160 1b008c513fc38009665964b6dfeafa66e1899fb8 SHA1 1a83c24b859b0b61fe6dc420debe57054eb87a1b SHA256 5ed07f88103ecea30f66a4415421f90d1ddfdd4a902aa34a346a7883cd947e36
 DIST gcc-config-1.6.tar.xz 14232 RMD160 e29078ccf7c0586720ce38ae877ef5a5d7db8344 SHA1 638b30ecb7e44c16c21acadf7706db833a780980 SHA256 ca6a94d685a60e9ae5b8ff32c3173929848455a123233709ca791e72b640bf77
+DIST gcc-config-1.7.1.tar.xz 14708 RMD160 8d847fd4a63d883af515b093ad7cc73b1cd40756 SHA1 1d4b239056f288142c3b0d784ed5c0f8a2b11d1e SHA256 5d69148957bc48db2bf107558724d8c40701f8d27d1cfc7636f02353e9c2f79a
 DIST gcc-config-1.7.tar.xz 14584 RMD160 cf5c0ec81fb92a504f2bedcca2a19acb4c22c8c6 SHA1 21b5383db1e7c887d8736802b78cf60a8bb2844b SHA256 b704cb3b98c7a8f478dcc932ae7e4ac4f4f8a847bebe35f97dc45fa7a29268ee
 EBUILD gcc-config-1.4.1-r1.ebuild 1645 RMD160 4d94a4a9be9fe092e6b6ba3f0cb665641271e58a SHA1 d9aa6e233c13827c6a551b9b6b3a21efe5eb230c SHA256 f19f05b52db8eb0816ad4953ecba68a28943a6c8948439edc35c56ce18761b1d
 EBUILD gcc-config-1.5-r1.ebuild 1647 RMD160 ebd03e749a514a0cf446ae323e7bf8e6926621e2 SHA1 da17446b4b83cce6d3d488b77eab1b1d7a496db8 SHA256 96e9b0e83ac1ce0e194f839b0dbfa713beb3951c7c53619fe80afaacba8f0c7b
@@ -14,13 +15,24 @@ EBUILD gcc-config-1.5-r2.ebuild 1633 RMD160 79380182be389edabb2fb404d18446980647
 EBUILD gcc-config-1.5.1-r1.ebuild 1647 RMD160 335751e0ed2674a83df1aa7d1abddbfa0baf07ae SHA1 db7d584cdcf470c74df2ec23ad9a205d7be8f9f6 SHA256 a7794c24c16349756f5d13f25899d94477069e89ecfa76ca4952f7073a61f058
 EBUILD gcc-config-1.5.1.ebuild 1644 RMD160 d9666b07a23a678fe1c13185475101a9dcf3373b SHA1 b3b1e5992c0cf68aeb657c5066fb7e13d6e5ce29 SHA256 d608e32fe85c65266178acecd5be054230e78d0ecb85779974f524fe5d10d139
 EBUILD gcc-config-1.6.ebuild 1230 RMD160 49d041777b3c13d3bebfc14ae40ab6280edc9981 SHA1 8349876ba860f97b8a396aeab53368cd235618e7 SHA256 4be66e45a8c42a67d80810becd129bffb83991d156dcb5c092f5051d4370d07e
+EBUILD gcc-config-1.7.1.ebuild 1244 RMD160 30f9e9a90805abfacc3c50d2d094524b9285129f SHA1 f02c60305440b378274059d3645a06e3544ced7b SHA256 7af82844612a8f9fbc03824b5ebfa3f8a172a6ea70212f6dc556d591223cf7db
 EBUILD gcc-config-1.7.ebuild 1244 RMD160 7a0ef1201968c25d52d92739defbdd85a6f2cbd9 SHA1 119413f76cd71d2b35cc986c519655543b127d35 SHA256 9f0f7d0fd0ef62c5d3b16db643575b6854d9b50327cc8dad6b486b73fb38fb1e
-MISC ChangeLog 37216 RMD160 5bfea9221e71d7bd758b663b83da1c8a36af1af1 SHA1 bbe7b1c1846cc617c11871e4b562cd2f4f87c2b7 SHA256 80574eb25e2732b18518b1ba307ecc65dfb8569aa8c6fa7ad38194b321301736
+MISC ChangeLog 37384 RMD160 83e0166d43f1266e9b4de3a507713facd9334351 SHA1 8b274184e200d724bc9f531bb948981d64352013 SHA256 55701543872985b844111bfed4ef5736f34ead8407000f78a105c9dd0d88e807
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+ZP/YACgkQvFcC4BYPU0pNhwCgumNo9my8SdAgHtUP5FCyJWtI
-LJwAoK3LxIIVJBDmKvcXdS7vJL1hqsJm
-=iZYu
+iQIcBAEBAgAGBQJPsBYvAAoJELEHsLL7fEFWdGUQAMOe1qjPSm6de+NZ+mP6oE9u
+agc8exMHAAKL8joD0i0yg5DYOfrZLCLAa5JdmrEJVRiKxDItunVVJw/6BMrTlOe5
+/FqP3J+ijH+migZrKuNjzZhHhriXn/rmimE1t35LyDfjsaH8cMFcSzEThr3D467N
+XvzK+SVjuqxBYnYETdpdDH762F3AtE+SNlTiiMaXCPq1X65zUnCVAxUP4H3Q1DNx
+5z4ubrAB9jcqdIql3fJUCzpcKhZjeBDcSSi2ttYbeA5rNiAnMJfx6kAP8wWB6Gim
+CAzWps8OZvKeRS54AOb9Mqzr59EAe4+mDu6KMGdam6kCd03DMzeb1j5pouOloK2u
+sAXYUvkY5wT8UWJdehUdTTm8N3Hfcsd4zkZdA6dfgqLxxvXOgJBZ9plVNfWI+cdj
+p9r+HKKiQUsuWiNdxcCSH2gXQezunSRrP2C/XlTWJLcKbrwvVlOa+xBRLeY1WqrA
+qWmbfGOCJ6i+rpT0YPAZ3fqoxVhICDKR7f7nuvPlxsM5OTvPxUpM09BLK5LRbnVT
+W3Y6gsVhwhILTUgtg6mok8gFn8x+++OPjOsjRkeYvnJIn72FHOttlSDIh0sqGLR2
+0VXv8ioBXCMf5J+x7tOW5E8QW6MJ7O5+1U5YpkDW8n8Gt/5L+mlQUzJ7ohHIc0Gp
+SXwAXt6epRTUuu3khxtw
+=WmNl
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/gcc-config/gcc-config-1.7.1.ebuild b/sys-devel/gcc-config/gcc-config-1.7.1.ebuild
new file mode 100644
index 000000000000..7205d5e6f526
--- /dev/null
+++ b/sys-devel/gcc-config/gcc-config-1.7.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/gcc-config-1.7.1.ebuild,v 1.1 2012/05/13 20:14:06 vapier Exp $
+
+inherit unpacker toolchain-funcs multilib
+
+DESCRIPTION="utility to manage compilers"
+HOMEPAGE="http://git.overlays.gentoo.org/gitweb/?p=proj/gcc-config.git"
+SRC_URI="mirror://gentoo/${P}.tar.xz
+	http://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE=""
+
+src_compile() {
+	emake CC="$(tc-getCC)" || die
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		PV="${PV}" \
+		SUBLIBDIR="$(get_libdir)" \
+		install || die
+}
+
+pkg_postinst() {
+	# Scrub eselect-compiler remains
+	rm -f "${ROOT}"/etc/env.d/05compiler &
+
+	# Make sure old versions dont exist #79062
+	rm -f "${ROOT}"/usr/sbin/gcc-config &
+
+	# We not longer use the /usr/include/g++-v3 hacks, as
+	# it is not needed ...
+	rm -f "${ROOT}"/usr/include/g++{,-v3} &
+
+	# Do we have a valid multi ver setup ?
+	local x
+	for x in $(gcc-config -C -l 2>/dev/null | awk '$NF == "*" { print $2 }') ; do
+		gcc-config ${x}
+	done
+
+	wait
+}