Rename NATIVE symlink to .NATIVE so it doesnt show up in listings and confuse people.

Package-Manager: portage-2.1.3.7

6 files changed, 90 insertions, 27 deletions

diff --git a/sys-devel/gcc-config/ChangeLog b/sys-devel/gcc-config/ChangeLog
index cb48006bc786..3de3a14b7ab1 100644
--- a/sys-devel/gcc-config/ChangeLog
+++ b/sys-devel/gcc-config/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-devel/gcc-config
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/ChangeLog,v 1.165 2007/08/26 03:21:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/ChangeLog,v 1.166 2007/08/31 01:42:47 vapier Exp $
+
+*gcc-config-1.4.0-r2 (31 Aug 2007)
+
+  31 Aug 2007; Mike Frysinger <vapier@gentoo.org> files/gcc-config-1.4.0,
+  files/wrapper-1.5.0.c, +gcc-config-1.4.0-r2.ebuild:
+  Rename NATIVE symlink to .NATIVE so it doesnt show up in listings and
+  confuse people.
 
 *gcc-config-1.4.0-r1 (26 Aug 2007)
 
diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest
index 6231bd759a13..4a3f0abe02c3 100644
--- a/sys-devel/gcc-config/Manifest
+++ b/sys-devel/gcc-config/Manifest
@@ -17,10 +17,10 @@ AUX gcc-config-1.3.16 19744 RMD160 c48c1137113100e6fdc08a666638ac56eb60ebae SHA1
 MD5 5fc3469999611894758a1b9c2365b719 files/gcc-config-1.3.16 19744
 RMD160 c48c1137113100e6fdc08a666638ac56eb60ebae files/gcc-config-1.3.16 19744
 SHA256 c4c3ada7597b7a8610873ff2b45b0137264821df870a1700fd278727c72e3717 files/gcc-config-1.3.16 19744
-AUX gcc-config-1.4.0 20576 RMD160 2fb2fb891f0055698ef2ef8b96f0422915c84d5e SHA1 bbd59bdcbab84b042a9f6c493eb2a006b4e2650e SHA256 9ecd30d5d1c13d5f99a12b8b1ab3716d095efa3a63864ffd2184bcc7ed93b202
-MD5 80358340b9b2e22c3177b3c741053e81 files/gcc-config-1.4.0 20576
-RMD160 2fb2fb891f0055698ef2ef8b96f0422915c84d5e files/gcc-config-1.4.0 20576
-SHA256 9ecd30d5d1c13d5f99a12b8b1ab3716d095efa3a63864ffd2184bcc7ed93b202 files/gcc-config-1.4.0 20576
+AUX gcc-config-1.4.0 20630 RMD160 5aa6063c5bf628d96ecabde67ea89705616b7946 SHA1 690050804e58ca5b8355019c2bc4759dd1aa5d12 SHA256 b1b8c45d82d10d85d3a3e64f056df16293f58d8719dbb03063cefe340d9afef6
+MD5 4a95542f5015f9d0f610807df719769e files/gcc-config-1.4.0 20630
+RMD160 5aa6063c5bf628d96ecabde67ea89705616b7946 files/gcc-config-1.4.0 20630
+SHA256 b1b8c45d82d10d85d3a3e64f056df16293f58d8719dbb03063cefe340d9afef6 files/gcc-config-1.4.0 20630
 AUX wrapper-1.4.7.c 9837 RMD160 e4feac8cd8746ad7036ec32ff09f1b02d7eceaf8 SHA1 4aee9df408a84b22b4007bc9b74543dd8a6f4fc8 SHA256 f462c49721d291ce3b91c46e5fb8e567d6344f0e359e788301bac07065987744
 MD5 1b19cf481e2777dff9722f36698c3b24 files/wrapper-1.4.7.c 9837
 RMD160 e4feac8cd8746ad7036ec32ff09f1b02d7eceaf8 files/wrapper-1.4.7.c 9837
@@ -29,10 +29,10 @@ AUX wrapper-1.4.8.c 9712 RMD160 1210dc111da9955926dc98264991e39489525f20 SHA1 61
 MD5 a2a6606413d1fd68198bc65ee15d1d06 files/wrapper-1.4.8.c 9712
 RMD160 1210dc111da9955926dc98264991e39489525f20 files/wrapper-1.4.8.c 9712
 SHA256 a45dec68f7a2b4f1d96e83181693afb10cf73b6fbdcd3456055e2bc64bc114e7 files/wrapper-1.4.8.c 9712
-AUX wrapper-1.5.0.c 9655 RMD160 25cb8d6e4b35c470861d9bd5237a9e9c9cf951c8 SHA1 6d30d2c599adf04606addcff66bbec81c3dccfd1 SHA256 82394c6d55dce24db9a18f7c90ad13785a83f181b8bb146f3187de31fed5b283
-MD5 11929fd20731a1295c27443c99c76731 files/wrapper-1.5.0.c 9655
-RMD160 25cb8d6e4b35c470861d9bd5237a9e9c9cf951c8 files/wrapper-1.5.0.c 9655
-SHA256 82394c6d55dce24db9a18f7c90ad13785a83f181b8bb146f3187de31fed5b283 files/wrapper-1.5.0.c 9655
+AUX wrapper-1.5.0.c 9656 RMD160 9f2838e2bc1e43a752196930a94fdbb79a6efcda SHA1 f824622eeccfc60a8c07bb1878667ee5253c4e42 SHA256 df3fcb1d135d654b57fe685de5321fd1959296cabcbfcf1c3174e075286f5591
+MD5 fdcb27d8ee8bd630cc4505506fb19d07 files/wrapper-1.5.0.c 9656
+RMD160 9f2838e2bc1e43a752196930a94fdbb79a6efcda files/wrapper-1.5.0.c 9656
+SHA256 df3fcb1d135d654b57fe685de5321fd1959296cabcbfcf1c3174e075286f5591 files/wrapper-1.5.0.c 9656
 DIST compiler-config-2.0.0_rc1.tar.gz 117180 RMD160 dbcd8120139c75f40ae2405746ab2a5f26e810b4 SHA1 3a1a1605dd0e8b59ba5d796c4583244f46f97a03 SHA256 a911a7b0a1184c576500df8530e77823f976dce387001c581ba89ac8edfe30c2
 EBUILD gcc-config-1.3.13-r4.ebuild 1496 RMD160 bb50b68fb945979eea48dba086b1582c32573377 SHA1 f24baf13a4bbe346274f0863d5e7065a8c43ccf1 SHA256 b6bb88fda5494c5f6e22e3ae885cb7b92dec720cd4bbd86132255dcf2984d544
 MD5 1d90be7823ef441090aded734aef408c gcc-config-1.3.13-r4.ebuild 1496
@@ -50,18 +50,18 @@ EBUILD gcc-config-1.3.16.ebuild 1527 RMD160 69365cd208813bb12bd862588108334d0b3e
 MD5 34eb120d8476b4885b7a2305df9cb288 gcc-config-1.3.16.ebuild 1527
 RMD160 69365cd208813bb12bd862588108334d0b3ef084 gcc-config-1.3.16.ebuild 1527
 SHA256 5996ca2ce991811fd6a0989c6bcaeb41f154585a8176c3499f3ec5f727c8b4ed gcc-config-1.3.16.ebuild 1527
-EBUILD gcc-config-1.4.0-r1.ebuild 1563 RMD160 bfe4f0e77e3a9a637ad37ba6395ea8a214643823 SHA1 dace1e12d652947441576b72972a040e97742385 SHA256 12cc1255c1eb17d6bc0a85ca9f3a1bd749a7abb4f6def17440d365863313b4b3
-MD5 225c5feb50d788d94aa92a617f7e9cf6 gcc-config-1.4.0-r1.ebuild 1563
-RMD160 bfe4f0e77e3a9a637ad37ba6395ea8a214643823 gcc-config-1.4.0-r1.ebuild 1563
-SHA256 12cc1255c1eb17d6bc0a85ca9f3a1bd749a7abb4f6def17440d365863313b4b3 gcc-config-1.4.0-r1.ebuild 1563
+EBUILD gcc-config-1.4.0-r2.ebuild 1563 RMD160 29636097e7046985f029fdd1ada93d1b02f17cf5 SHA1 6f6e35a4305f8f2473fa462ab7ac0464893e70ac SHA256 4413f7f35df3aa9b1f571e352716a4875b957c5559b19a5bbb4aa05c9132e607
+MD5 c06fdfef2483d1eb5cf91f5f04934770 gcc-config-1.4.0-r2.ebuild 1563
+RMD160 29636097e7046985f029fdd1ada93d1b02f17cf5 gcc-config-1.4.0-r2.ebuild 1563
+SHA256 4413f7f35df3aa9b1f571e352716a4875b957c5559b19a5bbb4aa05c9132e607 gcc-config-1.4.0-r2.ebuild 1563
 EBUILD gcc-config-2.0.0_rc1.ebuild 775 RMD160 a41c99cba464ed16040552f329c067326094174d SHA1 4a7a816e8e3d596369a53e127ac8933bb5fe2aa2 SHA256 5be5dcd340934282c6147d8e90dd47a36b9af54416a301855e5f767f021f0a7a
 MD5 d7781cb8103fd03712bf341e79153ed0 gcc-config-2.0.0_rc1.ebuild 775
 RMD160 a41c99cba464ed16040552f329c067326094174d gcc-config-2.0.0_rc1.ebuild 775
 SHA256 5be5dcd340934282c6147d8e90dd47a36b9af54416a301855e5f767f021f0a7a gcc-config-2.0.0_rc1.ebuild 775
-MISC ChangeLog 30219 RMD160 b867256dd88c1d4d9bf8f112edf766c9fc538de6 SHA1 f4d361634e9354c17109550976670f8e2dbe164b SHA256 96e0615b85de70dd064651a87caef36e0be13965ff897abaea891b343ce5d09a
-MD5 d4903be63ed1553c506d42a853696f2d ChangeLog 30219
-RMD160 b867256dd88c1d4d9bf8f112edf766c9fc538de6 ChangeLog 30219
-SHA256 96e0615b85de70dd064651a87caef36e0be13965ff897abaea891b343ce5d09a ChangeLog 30219
+MISC ChangeLog 30474 RMD160 2d733c889779cd9bd0531d4e298a88f8a741b218 SHA1 8f5546738904503800e847569735db271aff9366 SHA256 5961adc672aa3883f9b7182d2a041c94cecd7e5665a4a175bbf9e9151c72daa4
+MD5 b166f105284a467fc60d85da0bb62040 ChangeLog 30474
+RMD160 2d733c889779cd9bd0531d4e298a88f8a741b218 ChangeLog 30474
+SHA256 5961adc672aa3883f9b7182d2a041c94cecd7e5665a4a175bbf9e9151c72daa4 ChangeLog 30474
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 metadata.xml 162
@@ -78,16 +78,16 @@ SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/di
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.16 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-gcc-config-1.3.16 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-gcc-config-1.3.16 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.4.0-r1 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-gcc-config-1.4.0-r1 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-gcc-config-1.4.0-r1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.4.0-r2 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-gcc-config-1.4.0-r2 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-gcc-config-1.4.0-r2 0
 MD5 63440bc21fdf46cc94352893f2fd6e3e files/digest-gcc-config-2.0.0_rc1 277
 RMD160 3b08c6248c4f7f8d14ac66ff0fb70bb8c8276c53 files/digest-gcc-config-2.0.0_rc1 277
 SHA256 ba21ae92f613fd0a6f34b3fda34d1d82c6b284c045481b9686b66fd9e373c21e files/digest-gcc-config-2.0.0_rc1 277
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.6 (GNU/Linux)
 
-iD8DBQFG0PH1p/wUKkr7RBoRAg1+AKDfS14t+zzBJYblWXQFXRCVPtD7LgCeP/gl
-nzpoqkKobYcxgDBCZVulS40=
-=a23b
+iD8DBQFG13Igp/wUKkr7RBoRAmRvAKDfgqLx9Vdl6V86gc/oqqD0y9F2/wCg2pb0
+aYlCuenWjBMHW7I+B+8eDVs=
+=DF/j
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/gcc-config/files/digest-gcc-config-1.4.0-r2 b/sys-devel/gcc-config/files/digest-gcc-config-1.4.0-r2
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/sys-devel/gcc-config/files/digest-gcc-config-1.4.0-r2
diff --git a/sys-devel/gcc-config/files/gcc-config-1.4.0 b/sys-devel/gcc-config/files/gcc-config-1.4.0
index e8ac054b0394..9cf1b1d486b6 100755
--- a/sys-devel/gcc-config/files/gcc-config-1.4.0
+++ b/sys-devel/gcc-config/files/gcc-config-1.4.0
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.4.0,v 1.20 2007/08/26 03:21:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.4.0,v 1.21 2007/08/31 01:42:47 vapier Exp $
 
 trap ":" INT QUIT TSTP
 
@@ -260,7 +260,8 @@ switch_profile() {
 		echo "CURRENT=${CC_COMP}" > "${GCC_ENV_D}/config-${CTARGET}"
 
 		# Help out the gcc wrapper
-		ln -sf ${CC_COMP} "${GCC_ENV_D}/NATIVE"
+		rm -f "${GCC_ENV_D}/NATIVE" "${GCC_ENV_D}/.NATIVE"
+		ln -sf ${CC_COMP} "${GCC_ENV_D}/.NATIVE"
 
 		# Punt old files
 		rm -f "${ENV_D}/05gcc"
diff --git a/sys-devel/gcc-config/files/wrapper-1.5.0.c b/sys-devel/gcc-config/files/wrapper-1.5.0.c
index a23149d0b363..a434a676b351 100644
--- a/sys-devel/gcc-config/files/wrapper-1.5.0.c
+++ b/sys-devel/gcc-config/files/wrapper-1.5.0.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 1999-2007 Gentoo Foundation
  * Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/wrapper-1.5.0.c,v 1.3 2007/08/26 03:21:02 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/wrapper-1.5.0.c,v 1.4 2007/08/31 01:42:47 vapier Exp $
  * Author: Martin Schlemmer <azarah@gentoo.org>
  * az's lackey: Mike Frysinger <vapier@gentoo.org>
  */
@@ -134,7 +134,7 @@ static int find_target_in_envd(struct wrapper_data *data, int cross_compile)
 		/* for the sake of speed, we'll keep a symlink around for
 		 * the native compiler.  #190260
 		 */
-		snprintf(envd_file, sizeof(envd_file)-1, "/etc/env.d/gcc/NATIVE");
+		snprintf(envd_file, sizeof(envd_file)-1, "/etc/env.d/gcc/.NATIVE");
 	} else {
 		char *ctarget, *end = strrchr(data->name, '-');
 		if (end == NULL)
diff --git a/sys-devel/gcc-config/gcc-config-1.4.0-r2.ebuild b/sys-devel/gcc-config/gcc-config-1.4.0-r2.ebuild
new file mode 100644
index 000000000000..674324138e29
--- /dev/null
+++ b/sys-devel/gcc-config/gcc-config-1.4.0-r2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2007 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.4.0-r2.ebuild,v 1.1 2007/08/31 01:42:47 vapier Exp $
+
+inherit flag-o-matic toolchain-funcs multilib
+
+# Version of .c wrapper to use
+W_VER="1.5.0"
+
+DESCRIPTION="Utility to change the gcc compiler being used"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="!app-admin/eselect-compiler"
+
+S=${WORKDIR}
+
+src_unpack() {
+	cp "${FILESDIR}"/wrapper-${W_VER}.c "${S}"/wrapper.c || die
+}
+
+src_compile() {
+	strip-flags
+	emake CC="$(tc-getCC)" wrapper || die "compile wrapper"
+}
+
+src_install() {
+	newbin "${FILESDIR}"/${PN}-${PV} ${PN} || die "install gcc-config"
+	sed -i \
+		-e "s:PORTAGE-VERSION:${PVR}:g" \
+		-e "s:GENTOO_LIBDIR:$(get_libdir):g" \
+		"${D}"/usr/bin/${PN}
+
+	exeinto /usr/$(get_libdir)/misc
+	newexe wrapper gcc-config || die "install wrapper"
+}
+
+pkg_postinst() {
+	# Do we have a valid multi ver setup ?
+	if gcc-config --get-current-profile &>/dev/null ; then
+		# We not longer use the /usr/include/g++-v3 hacks, as
+		# it is not needed ...
+		[[ -L ${ROOT}/usr/include/g++ ]] && rm -f "${ROOT}"/usr/include/g++
+		[[ -L ${ROOT}/usr/include/g++-v3 ]] && rm -f "${ROOT}"/usr/include/g++-v3
+		gcc-config $(/usr/bin/gcc-config --get-current-profile)
+	fi
+
+	# Make sure old versions dont exist #79062
+	rm -f "${ROOT}"/usr/sbin/gcc-config
+}