Add wrappers for gcjh, gfortran, and the D language #157694 by Philipp Kirchner.

Package-Manager: portage-2.1.2.2

diff --git a/sys-devel/gcc-config/ChangeLog b/sys-devel/gcc-config/ChangeLog
index 8756aec12b64825bf4ee6b5599d26fbf8bc65b13..530fd6d2a3406d4e2a8c873423fb45ac036b9b30 100644 (file)
--- 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.142 2007/01/27 19:26:41 eroyf Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/ChangeLog,v 1.143 2007/03/12 07:00:10 vapier Exp $
+
+*gcc-config-1.3.15-r1 (12 Mar 2007)
+
+  12 Mar 2007; Mike Frysinger <vapier@gentoo.org> files/gcc-config-1.3.15,
+  +gcc-config-1.3.15-r1.ebuild:
+  Add wrappers for gcjh, gfortran, and the D language #157694 by Philipp
+  Kirchner.
 
   27 Jan 2007; Alexander H. Færøy <eroyf@gentoo.org>
   gcc-config-1.3.14.ebuild:

diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest
index 59c40cb3e4c225c44932417a4cf9c32b53f8cc45..5c534583b9892fc3a548651a1e765d825280a465 100644 (file)
--- a/sys-devel/gcc-config/Manifest
+++ b/sys-devel/gcc-config/Manifest
@@ -9,10 +9,10 @@ AUX gcc-config-1.3.14 18828 RMD160 4f8b5962947dde209ffca5135a252e77c6e746d1 SHA1
 MD5 907258acebe67aa2ec71577dfa67da9b files/gcc-config-1.3.14 18828
 RMD160 4f8b5962947dde209ffca5135a252e77c6e746d1 files/gcc-config-1.3.14 18828
 SHA256 92ceadfe1e2799cd98b8b05503340337502e8d8a45a86d7efc96f63bd8b57678 files/gcc-config-1.3.14 18828
-AUX gcc-config-1.3.15 19669 RMD160 aa280a4651f1e761241b50d7b7bb572f66035a71 SHA1 292f4d68ac8c93016d1e2b45c7ed3f61fa094134 SHA256 1b9400bf1c91af8f2d2ab496be9f5f72ec5e6566e769a48abc2fb8b58ba50c7e
-MD5 5ce5569ce843c4b62054af020ac8ef32 files/gcc-config-1.3.15 19669
-RMD160 aa280a4651f1e761241b50d7b7bb572f66035a71 files/gcc-config-1.3.15 19669
-SHA256 1b9400bf1c91af8f2d2ab496be9f5f72ec5e6566e769a48abc2fb8b58ba50c7e files/gcc-config-1.3.15 19669
+AUX gcc-config-1.3.15 19739 RMD160 58de24fbae73c7bc8df3c3d0c55b751c81018bf3 SHA1 c07566df2024cc0d5491b2b1bfa4d28d927e74b3 SHA256 5167befd34d7089f6ac650281dffe6ddf6f2bcb2d1a36a0c165dcf440db1d412
+MD5 5c312e23c933bbd436d95ff238085bba files/gcc-config-1.3.15 19739
+RMD160 58de24fbae73c7bc8df3c3d0c55b751c81018bf3 files/gcc-config-1.3.15 19739
+SHA256 5167befd34d7089f6ac650281dffe6ddf6f2bcb2d1a36a0c165dcf440db1d412 files/gcc-config-1.3.15 19739
 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
@@ -26,18 +26,18 @@ EBUILD gcc-config-1.3.14.ebuild 1505 RMD160 d2cf06010de226f0272e44692327d0a2a337
 MD5 74895bad7d863231042d8c82649be091 gcc-config-1.3.14.ebuild 1505
 RMD160 d2cf06010de226f0272e44692327d0a2a33718d0 gcc-config-1.3.14.ebuild 1505
 SHA256 0c515b3c2ceeb89b827c8c4b6ffef9ab172a02df2bf3a50b1157b9064fc5b336 gcc-config-1.3.14.ebuild 1505
-EBUILD gcc-config-1.3.15.ebuild 1518 RMD160 799e0a55b3350b63c34ed75fb98935a101d12452 SHA1 8d87d7454129b9e79453d923072d997c60e8d191 SHA256 53dc9cf9df7a7f1a1bdb62d62b9ff24152ca2fdd0684ff86f439332ad03a4e37
-MD5 2d8335fd0bd66cd380f4359dbeee5461 gcc-config-1.3.15.ebuild 1518
-RMD160 799e0a55b3350b63c34ed75fb98935a101d12452 gcc-config-1.3.15.ebuild 1518
-SHA256 53dc9cf9df7a7f1a1bdb62d62b9ff24152ca2fdd0684ff86f439332ad03a4e37 gcc-config-1.3.15.ebuild 1518
+EBUILD gcc-config-1.3.15-r1.ebuild 1521 RMD160 d64e122c6b604ebd83d498549da88eb4a6172f2e SHA1 029aec174489c94513d0e6be0bd11ec8b34963ca SHA256 38e46ac0659a79bc8c78b915e125b975eb090062eb51e1d1b5b677a1743d069b
+MD5 b2e9033bd457f781a227e87113fb2106 gcc-config-1.3.15-r1.ebuild 1521
+RMD160 d64e122c6b604ebd83d498549da88eb4a6172f2e gcc-config-1.3.15-r1.ebuild 1521
+SHA256 38e46ac0659a79bc8c78b915e125b975eb090062eb51e1d1b5b677a1743d069b gcc-config-1.3.15-r1.ebuild 1521
 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 27153 RMD160 acca54b9c5538219205b7689cf4db8969f59623e SHA1 2a80a9498ac083a1c78c29469d16bb56915b72b3 SHA256 cdeab13a66c99d1af6f25775a7abef6acc7b1d97b1bcfdf16f37074febb619a7
-MD5 fc1db77ecda85ea3cc80fbe85aa12221 ChangeLog 27153
-RMD160 acca54b9c5538219205b7689cf4db8969f59623e ChangeLog 27153
-SHA256 cdeab13a66c99d1af6f25775a7abef6acc7b1d97b1bcfdf16f37074febb619a7 ChangeLog 27153
+MISC ChangeLog 27384 RMD160 d8acb62c127e15c9aa213ff7d18c1e5f4673f975 SHA1 f3e9492a26ab6b871950a5585cf8752e740ecd71 SHA256 1b496641402d41a81abfa49c419646ed61cd662f4a7920920b12f5ca08569a62
+MD5 41b427222ea59d8ee4710b968302ddef ChangeLog 27384
+RMD160 d8acb62c127e15c9aa213ff7d18c1e5f4673f975 ChangeLog 27384
+SHA256 1b496641402d41a81abfa49c419646ed61cd662f4a7920920b12f5ca08569a62 ChangeLog 27384
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 metadata.xml 162
@@ -48,16 +48,16 @@ SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/di
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.14 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-gcc-config-1.3.14 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-gcc-config-1.3.14 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.15 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-gcc-config-1.3.15 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-gcc-config-1.3.15 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.15-r1 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-gcc-config-1.3.15-r1 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-gcc-config-1.3.15-r1 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.2 (GNU/Linux)
+Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFF7JaZ8bi6rjpTunYRAjVbAKDLXr6FsR2mWwwVrlDe52cuw+hkPACglQ/k
-kDJDqPsa7oR6NYkbx6vxmtE=
-=ity+
+iD8DBQFF9PqH8bi6rjpTunYRAu2LAJ95WUbgQmMKiV55+uwrnwwmgIk3bgCgw3ik
+XpL7P0tSRhVcTCfCoB1qIPw=
+=fdWf
 -----END PGP SIGNATURE-----

diff --git a/sys-devel/gcc-config/files/digest-gcc-config-1.3.15-r1 b/sys-devel/gcc-config/files/digest-gcc-config-1.3.15-r1
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/sys-devel/gcc-config/files/gcc-config-1.3.15 b/sys-devel/gcc-config/files/gcc-config-1.3.15
index f470948c99d027153cc72de43fcadff0b398ca5d..51dd400747ac991de3dd2e33115b40fe9c6a011f 100755 (executable)
--- a/sys-devel/gcc-config/files/gcc-config-1.3.15
+++ b/sys-devel/gcc-config/files/gcc-config-1.3.15
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2006 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.15,v 1.2 2006/12/16 19:36:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.3.15,v 1.3 2007/03/12 07:00:10 vapier Exp $
 
 trap ":" INT QUIT TSTP
 
@@ -295,9 +295,10 @@ switch_profile() {
        done
 
        # Update the wrappers for this profile
-       local native="gcc cpp cc c++ g++ f77 g77 gcj"
-       is_cross_compiler && native=""
-       for x in ${native} ${CTARGET}-{cpp,gcc,c++,g++,f77,g77,gcj} ; do
+       for x in {,${CTARGET}}-{cpp,cc,gcc,c++,g++,f77,g77,gcj,gcjh,gfortran,gdc,gdmd} ; do
+               # Obviously don't want to touch native stuff for cross-compilers
+               [[ ${x} != ${CTARGET}-* ]] && is_cross_compiler && continue
+
                # Make sure we have no stale wrappers
                ${RM} -f "${ROOT}/usr/bin/${x}"
                [[ ${x:${#x}-3} == "gcc" || ${x:${#x}-3} == "g++" ]] \

diff --git a/sys-devel/gcc-config/gcc-config-1.3.15-r1.ebuild b/sys-devel/gcc-config/gcc-config-1.3.15-r1.ebuild
new file mode 100644 (file)
index 0000000..85ae645
--- /dev/null
+++ b/sys-devel/gcc-config/gcc-config-1.3.15-r1.ebuild
@@ -0,0 +1,51 @@
+# 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.3.15-r1.ebuild,v 1.1 2007/03/12 07:00:10 vapier Exp $
+
+inherit toolchain-funcs multilib
+
+# 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 ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="!app-admin/eselect-compiler"
+
+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"
+       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
+               [[ ${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
+}