From edcb4c459f0c993a7233074da66fde9ff22e729f Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 8 Jan 2006 09:52:45 +0000 Subject: Ignore directores in /etc/env.d/gcc #118246 by Mark Purtill. Package-Manager: portage-2.1_pre3-r1 --- sys-devel/gcc-config/ChangeLog | 11 ++++- sys-devel/gcc-config/Manifest | 20 ++++----- .../gcc-config/files/digest-gcc-config-1.3.12-r5 | 0 .../gcc-config/files/digest-gcc-config-1.3.12-r6 | 0 .../gcc-config/files/digest-gcc-config-1.3.13 | 0 .../gcc-config/files/digest-gcc-config-1.3.13-r1 | 0 sys-devel/gcc-config/files/gcc-config-1.3.12 | 3 +- sys-devel/gcc-config/files/gcc-config-1.3.13 | 3 +- sys-devel/gcc-config/gcc-config-1.3.12-r5.ebuild | 51 ---------------------- sys-devel/gcc-config/gcc-config-1.3.12-r6.ebuild | 51 ++++++++++++++++++++++ sys-devel/gcc-config/gcc-config-1.3.13-r1.ebuild | 51 ++++++++++++++++++++++ sys-devel/gcc-config/gcc-config-1.3.13.ebuild | 51 ---------------------- 12 files changed, 126 insertions(+), 115 deletions(-) delete mode 100644 sys-devel/gcc-config/files/digest-gcc-config-1.3.12-r5 create mode 100644 sys-devel/gcc-config/files/digest-gcc-config-1.3.12-r6 delete mode 100644 sys-devel/gcc-config/files/digest-gcc-config-1.3.13 create mode 100644 sys-devel/gcc-config/files/digest-gcc-config-1.3.13-r1 delete mode 100644 sys-devel/gcc-config/gcc-config-1.3.12-r5.ebuild create mode 100644 sys-devel/gcc-config/gcc-config-1.3.12-r6.ebuild create mode 100644 sys-devel/gcc-config/gcc-config-1.3.13-r1.ebuild delete mode 100644 sys-devel/gcc-config/gcc-config-1.3.13.ebuild (limited to 'sys-devel') diff --git a/sys-devel/gcc-config/ChangeLog b/sys-devel/gcc-config/ChangeLog index 0a398c99f587..c69fda77a917 100644 --- a/sys-devel/gcc-config/ChangeLog +++ b/sys-devel/gcc-config/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for sys-devel/gcc-config # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/ChangeLog,v 1.114 2006/01/05 03:05:42 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/ChangeLog,v 1.115 2006/01/08 09:52:45 vapier Exp $ + +*gcc-config-1.3.13-r1 (08 Jan 2006) +*gcc-config-1.3.12-r6 (08 Jan 2006) + + 08 Jan 2006; Mike Frysinger files/gcc-config-1.3.12, + files/gcc-config-1.3.13, -gcc-config-1.3.12-r5.ebuild, + +gcc-config-1.3.12-r6.ebuild, -gcc-config-1.3.13.ebuild, + +gcc-config-1.3.13-r1.ebuild: + Ignore directores in /etc/env.d/gcc #118246 by Mark Purtill. *gcc-config-1.3.12-r5 (05 Jan 2006) diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest index 4cead40bb0a6..d4338d2d0e0a 100644 --- a/sys-devel/gcc-config/Manifest +++ b/sys-devel/gcc-config/Manifest @@ -1,21 +1,21 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 3ffe4a67450e1c382b4cdd6ec5152c3e ChangeLog 22978 -MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.12-r5 0 -MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.13 0 +MD5 0d27bbe99f8a034ab004ecf8fcafe7f0 ChangeLog 23338 +MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.12-r6 0 +MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.13-r1 0 MD5 c7cf3a3617d90adfaacc7c2c012ddfb0 files/digest-gcc-config-2.0.0_beta2 79 -MD5 2b8205d9fde699e089891d8a4d345ded files/gcc-config-1.3.12 17606 -MD5 fcb6888f1f57de7560e4bd6fb16a6c6d files/gcc-config-1.3.13 17909 +MD5 6ca78d8db840ae4aa3acdd0d91b649ba files/gcc-config-1.3.12 17638 +MD5 235bdfabb33bcbaf51cf1adc6fe21df2 files/gcc-config-1.3.13 17941 MD5 1b19cf481e2777dff9722f36698c3b24 files/wrapper-1.4.7.c 9837 -MD5 63e27aa76e788bb004681de123fe56d8 gcc-config-1.3.12-r5.ebuild 1458 -MD5 7f9885dad4dc0c03271e92bc65ad8ec6 gcc-config-1.3.13.ebuild 1468 +MD5 15eb934411212481076e228d609466d9 gcc-config-1.3.12-r6.ebuild 1458 +MD5 5de34d048ceeeb2ddbbd3f2f0549063a gcc-config-1.3.13-r1.ebuild 1471 MD5 35fee17d74ce037258c00f8d9e9dd820 gcc-config-2.0.0_beta2.ebuild 781 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (GNU/Linux) -iD8DBQFDvI1F2+ySkm8kpY0RAhlrAJ0enC54sNGCo1PVHEgkYegklJIvVwCgptpV -ixZmRhM07ziD3g241JtL5mg= -=4yCh +iD8DBQFDwOFA2+ySkm8kpY0RAq7GAKCbTYQSNJSioq2DRRlI97JFM7lhCgCgj7ph +vG5xTQsMNyg9AmWb+MtkMq0= +=Q8OU -----END PGP SIGNATURE----- diff --git a/sys-devel/gcc-config/files/digest-gcc-config-1.3.12-r5 b/sys-devel/gcc-config/files/digest-gcc-config-1.3.12-r5 deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/sys-devel/gcc-config/files/digest-gcc-config-1.3.12-r6 b/sys-devel/gcc-config/files/digest-gcc-config-1.3.12-r6 new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/sys-devel/gcc-config/files/digest-gcc-config-1.3.13 b/sys-devel/gcc-config/files/digest-gcc-config-1.3.13 deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/sys-devel/gcc-config/files/digest-gcc-config-1.3.13-r1 b/sys-devel/gcc-config/files/digest-gcc-config-1.3.13-r1 new file mode 100644 index 000000000000..e69de29bb2d1 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 8366a2678f7c..ebce2f0a711b 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.13 2006/01/05 03:05:42 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.3.12,v 1.14 2006/01/08 09:52:45 vapier Exp $ trap ":" INT QUIT TSTP @@ -595,6 +595,7 @@ for x in "$@" ; do # User gave us a # representing the profile i=1 for y in "${GCC_ENV_D}"/* ; do + [[ -f ${y} ]] || continue [[ ${y/\/config} != ${y} ]] && continue if [[ -f ${y} ]] && [[ ${x} == ${i} ]] ; then diff --git a/sys-devel/gcc-config/files/gcc-config-1.3.13 b/sys-devel/gcc-config/files/gcc-config-1.3.13 index 2a82308a947b..e2c8debd3bf2 100755 --- a/sys-devel/gcc-config/files/gcc-config-1.3.13 +++ b/sys-devel/gcc-config/files/gcc-config-1.3.13 @@ -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.13,v 1.2 2006/01/05 03:05:42 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.3.13,v 1.3 2006/01/08 09:52:45 vapier Exp $ trap ":" INT QUIT TSTP @@ -601,6 +601,7 @@ for x in "$@" ; do # User gave us a # representing the profile i=1 for y in "${GCC_ENV_D}"/* ; do + [[ -f ${y} ]] || continue [[ ${y/\/config} != ${y} ]] && continue if [[ -f ${y} ]] && [[ ${x} == ${i} ]] ; then diff --git a/sys-devel/gcc-config/gcc-config-1.3.12-r5.ebuild b/sys-devel/gcc-config/gcc-config-1.3.12-r5.ebuild deleted file mode 100644 index a04e9726b036..000000000000 --- a/sys-devel/gcc-config/gcc-config-1.3.12-r5.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# 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/gcc-config-1.3.12-r5.ebuild,v 1.1 2006/01/05 03:05:42 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 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" - 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 -} diff --git a/sys-devel/gcc-config/gcc-config-1.3.12-r6.ebuild b/sys-devel/gcc-config/gcc-config-1.3.12-r6.ebuild new file mode 100644 index 000000000000..eb3a252ddb8c --- /dev/null +++ b/sys-devel/gcc-config/gcc-config-1.3.12-r6.ebuild @@ -0,0 +1,51 @@ +# 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/gcc-config-1.3.12-r6.ebuild,v 1.1 2006/01/08 09:52:45 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 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" + 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 +} diff --git a/sys-devel/gcc-config/gcc-config-1.3.13-r1.ebuild b/sys-devel/gcc-config/gcc-config-1.3.13-r1.ebuild new file mode 100644 index 000000000000..f6dfdfa8d70b --- /dev/null +++ b/sys-devel/gcc-config/gcc-config-1.3.13-r1.ebuild @@ -0,0 +1,51 @@ +# 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/gcc-config-1.3.13-r1.ebuild,v 1.1 2006/01/08 09:52:45 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 ~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" + 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 +} diff --git a/sys-devel/gcc-config/gcc-config-1.3.13.ebuild b/sys-devel/gcc-config/gcc-config-1.3.13.ebuild deleted file mode 100644 index e1dc88e8ed7d..000000000000 --- a/sys-devel/gcc-config/gcc-config-1.3.13.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# 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.13.ebuild,v 1.1 2005/12/30 11:04:41 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 ~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" - 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 -} -- cgit v1.2.3-65-gdbad