Fix long option for -S (--split-profile).

(Portage version: 2.0.51.22-r2)

5 files changed, 73 insertions, 27 deletions

diff --git a/sys-devel/gcc-config/ChangeLog b/sys-devel/gcc-config/ChangeLog
index 0edbef24bfb2..e79d8b4817dc 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.97 2005/08/04 03:40:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/ChangeLog,v 1.98 2005/08/05 15:21:18 azarah Exp $
+
+*gcc-config-1.3.12-r2 (05 Aug 2005)
+
+  05 Aug 2005; Martin Schlemmer <azarah@gentoo.org> files/gcc-config-1.3.12,
+  +gcc-config-1.3.12-r2.ebuild:
+  Fix long option for -S (--split-profile).
 
 *gcc-config-1.3.12-r1 (04 Aug 2005)
 
diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest
index e38c8b76cb85..a213f7bf50dc 100644
--- a/sys-devel/gcc-config/Manifest
+++ b/sys-devel/gcc-config/Manifest
@@ -1,31 +1,23 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 4f38cac9c208dfd3f4e8b798a8108366 gcc-config-1.3.12.ebuild 1389
+MD5 e7cff05773a87f50205a8777e899b626 gcc-config-1.3.12-r2.ebuild 1392
+MD5 8ddb51e4d22a768b490aea079b28c334 gcc-config-1.3.11-r3.ebuild 1387
 MD5 afc6f633e9ba456750668a4b552c9593 gcc-config-1.3.11-r4.ebuild 1379
 MD5 e7cff05773a87f50205a8777e899b626 gcc-config-1.3.12-r1.ebuild 1392
-MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
-MD5 68273ce4a2e66af6cf44808d4e477026 gcc-config-1.4.0.ebuild 1840
-MD5 8ddb51e4d22a768b490aea079b28c334 gcc-config-1.3.11-r3.ebuild 1387
-MD5 e1e82310909ead9c8b474d56cb94ee8c gcc-config-1.3.10-r1.ebuild 1393
 MD5 301381f7041a23d80f62004bc29eb4d9 ChangeLog 19982
-MD5 4f38cac9c208dfd3f4e8b798a8108366 gcc-config-1.3.12.ebuild 1389
-MD5 d153788edf3039aa4f68ae41bf46bf0d files/gcc-config-1.3.11 15776
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.11-r4 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.12 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.11-r3 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.4.0 0
-MD5 35bfdc34bf7a621fc41de516b13cb4ea files/gcc-config-1.4.0 14923
+MD5 e1e82310909ead9c8b474d56cb94ee8c gcc-config-1.3.10-r1.ebuild 1393
+MD5 68273ce4a2e66af6cf44808d4e477026 gcc-config-1.4.0.ebuild 1840
+MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 MD5 4c31f7f5f8723588a4401dd102061301 files/gcc-config-1.3.10 13549
-MD5 e3203a5aa6df669ffa479aeeb7605029 files/wrapper-1.4.5.c 10671
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.10-r1 0
-MD5 1b19cf481e2777dff9722f36698c3b24 files/wrapper-1.4.7.c 9837
 MD5 72557949fda7b1226549291b8f171e15 files/wrapper-1.4.6.c 10568
-MD5 c4dd33ad0dcb7135344c428f1155b1ad files/gcc-config-1.3.12 15985
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.4.0 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.12-r2 0
+MD5 d153788edf3039aa4f68ae41bf46bf0d files/gcc-config-1.3.11 15776
+MD5 35bfdc34bf7a621fc41de516b13cb4ea files/gcc-config-1.4.0 14923
+MD5 874bc776cf29fbefaed5a160ad292c91 files/gcc-config-1.3.12 16016
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.12 0
+MD5 1b19cf481e2777dff9722f36698c3b24 files/wrapper-1.4.7.c 9837
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.11-r4 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.11-r3 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.12-r1 0
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFC8Y4ogIKl8Uu19MoRAgRMAJ45T6VE1bPB2F5nwIlErN/C/S09oQCfR4lp
-SAcZ+jZhLaeQQr0NKCDMyi0=
-=WR1U
------END PGP SIGNATURE-----
+MD5 e3203a5aa6df669ffa479aeeb7605029 files/wrapper-1.4.5.c 10671
diff --git a/sys-devel/gcc-config/files/digest-gcc-config-1.3.12-r2 b/sys-devel/gcc-config/files/digest-gcc-config-1.3.12-r2
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/sys-devel/gcc-config/files/digest-gcc-config-1.3.12-r2
diff --git a/sys-devel/gcc-config/files/gcc-config-1.3.12 b/sys-devel/gcc-config/files/gcc-config-1.3.12
index 8dfe697d856f..0d3519b2c4f9 100755
--- a/sys-devel/gcc-config/files/gcc-config-1.3.12
+++ b/sys-devel/gcc-config/files/gcc-config-1.3.12
@@ -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.12,v 1.2 2005/07/10 06:18:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.3.12,v 1.3 2005/08/05 15:21:19 azarah Exp $
 
 trap ":" INT QUIT TSTP
 
@@ -484,7 +484,7 @@ for x in "$@" ; do
 			fi
 			;;
 		-S|--split-profile)
-			if [[ $1 != "-S" || $# -eq 1 ]] ; then
+			if [[ ( $1 != "-S" && $1 != "--split-profile" ) || $# -eq 1 ]] ; then
 				usage 1
 			fi
 			shift # push -S out
diff --git a/sys-devel/gcc-config/gcc-config-1.3.12-r2.ebuild b/sys-devel/gcc-config/gcc-config-1.3.12-r2.ebuild
new file mode 100644
index 000000000000..f72e04c8b4e6
--- /dev/null
+++ b/sys-devel/gcc-config/gcc-config-1.3.12-r2.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.12-r2.ebuild,v 1.1 2005/08/05 15:21:19 azarah Exp $
+
+inherit toolchain-funcs
+
+# Version of .c wrapper to use
+W_VER="1.4.7"
+
+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=""
+
+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
+}