Make sure that -c errors out if given an invalid TARGET.

Package-Manager: portage-2.0.51.22-r1

5 files changed, 63 insertions, 9 deletions

diff --git a/sys-devel/gcc-config/ChangeLog b/sys-devel/gcc-config/ChangeLog
index cc32de012e17..79632826b88a 100644
--- a/sys-devel/gcc-config/ChangeLog
+++ b/sys-devel/gcc-config/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/gcc-config
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/ChangeLog,v 1.92 2005/06/07 22:42:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/ChangeLog,v 1.93 2005/06/13 04:57:03 vapier Exp $
+
+*gcc-config-1.3.11-r3 (13 Jun 2005)
+
+  13 Jun 2005; Mike Frysinger <vapier@gentoo.org> files/gcc-config-1.3.11,
+  +gcc-config-1.3.11-r3.ebuild:
+  Make sure that -c errors out if given an invalid TARGET.
 
 *gcc-config-1.3.11-r2 (07 Jun 2005)
 
diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest
index 6f1743989017..b1a73ef92d20 100644
--- a/sys-devel/gcc-config/Manifest
+++ b/sys-devel/gcc-config/Manifest
@@ -1,11 +1,10 @@
 MD5 a1e5f8b8fb9566f795d36754e8075eb8 gcc-config-1.3.10-r2.ebuild 1428
-MD5 7d84b4ae0b58a923355a1e7ed7fc131a ChangeLog 18875
-MD5 a34edb1246e5b3e8a62f296a79a7d694 gcc-config-1.3.11-r2.ebuild 1428
+MD5 e6178be34257cea2b5d447a4db2e7719 ChangeLog 19079
 MD5 856d159682acb2dca11e43b8bbe42b70 gcc-config-1.4.0.ebuild 1896
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 MD5 106edaabe4dcbc34c50e9f5e4c18e2bf gcc-config-1.3.10-r1.ebuild 1431
-MD5 cbcf269b7fb55f5b24b9c30cebbede3a files/gcc-config-1.3.11 15633
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.11-r2 0
+MD5 68c3015c0e13fd0a2e1bd96d091d8381 gcc-config-1.3.11-r3.ebuild 1428
+MD5 5ac3a868ad0f6e9dc8d48fdca9b01ab1 files/gcc-config-1.3.11 15716
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.4.0 0
 MD5 35bfdc34bf7a621fc41de516b13cb4ea files/gcc-config-1.4.0 14923
 MD5 4c31f7f5f8723588a4401dd102061301 files/gcc-config-1.3.10 13549
@@ -13,3 +12,4 @@ MD5 3b96d761f411a1befda4f334da8fea03 files/wrapper-1.4.6.c 10526
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.10-r2 0
 MD5 e3203a5aa6df669ffa479aeeb7605029 files/wrapper-1.4.5.c 10671
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.10-r1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.11-r3 0
diff --git a/sys-devel/gcc-config/files/digest-gcc-config-1.3.11-r3 b/sys-devel/gcc-config/files/digest-gcc-config-1.3.11-r3
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/sys-devel/gcc-config/files/digest-gcc-config-1.3.11-r3
diff --git a/sys-devel/gcc-config/files/gcc-config-1.3.11 b/sys-devel/gcc-config/files/gcc-config-1.3.11
index 2808256203bf..7715f6ab5d6c 100755
--- a/sys-devel/gcc-config/files/gcc-config-1.3.11
+++ b/sys-devel/gcc-config/files/gcc-config-1.3.11
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2005 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.3.11,v 1.4 2005/06/07 22:49:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.3.11,v 1.5 2005/06/13 04:57:03 vapier Exp $
 
 trap ":" INT QUIT TSTP
 
@@ -484,10 +484,10 @@ for x in "$@" ; do
 				else
 					# User gave us a full HOST-gccver
 					x=${x##*/}
-					if [[ ${DOIT} != "get_current_profile" ]] && \
-					   [[ ! -f ${GCC_ENV_D}/${x} ]]
+					if [[ ${DOIT} == "get_current_profile" && -z $(ls "${GCC_ENV_D}"/${x}-* 2>/dev/null) ]] || \
+					   [[ ${DOIT} != "get_current_profile" && ! -f ${GCC_ENV_D}/${x} ]]
 					then
-						eerror "$0: Could not locate '$x' in '${GCC_ENV_D}/'!"
+						eerror "$0: Could not locate '$x' in '${GCC_ENV_D}/' !"
 						exit 1
 					fi
 					CC_COMP="${x}"
diff --git a/sys-devel/gcc-config/gcc-config-1.3.11-r3.ebuild b/sys-devel/gcc-config/gcc-config-1.3.11-r3.ebuild
new file mode 100644
index 000000000000..6ff9cc1ed29c
--- /dev/null
+++ b/sys-devel/gcc-config/gcc-config-1.3.11-r3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2005 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.3.11-r3.ebuild,v 1.1 2005/06/13 04:57:03 vapier Exp $
+
+inherit toolchain-funcs
+
+# Version of .c wrapper to use
+W_VER="1.4.6"
+
+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 x86"
+IUSE=""
+
+DEPEND=">=sys-apps/portage-2.0.47-r10" # We need portageq ...
+
+S=${WORKDIR}
+
+src_compile() {
+	$(tc-getCC) -O2 -Wall -o wrapper \
+		${FILESDIR}/wrapper-${W_VER}.c || die "compile wrapper"
+}
+
+src_install() {
+	newbin ${FILESDIR}/${PN}-${PV} ${PN} || die "install gcc-config"
+	dosed "s:PORTAGE-VERSION:${PVR}:" /usr/bin/${PN}
+
+	exeinto /usr/lib/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
+		[[ ${ROOT} = "/" ]] && gcc-config $(/usr/bin/gcc-config --get-current-profile)
+	fi
+
+	# Make sure old versions dont exist #79062
+	rm -f "${ROOT}"/usr/sbin/gcc-config
+}