[gentoo-commits] repo/proj/prefix:master commit in: sys-devel/gcc-config/, sys-devel/gcc-config/files/

2018-01-19 Thread Michael Haubenwallner
commit: 7c116df5b34e6e8f1ae9c2121b1f01d02bb978ff
Author: Michael Haubenwallner  gentoo  org>
AuthorDate: Fri Jan 19 10:44:30 2018 +
Commit: Michael Haubenwallner  gentoo  org>
CommitDate: Fri Jan 19 10:44:30 2018 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=7c116df5

sys-devel/gcc-config: sync, use /usr/bin/env bash

For prefix-chaining there eventually is no EPREFIX/bin/bash, so we need
to /usr/bin/env bash instead.

Package-Manager: Portage-2.3.18-prefix, Repoman-2.3.6

 sys-devel/gcc-config/Manifest  |  1 +
 .../files/gcc-config-1.9-usrbinenv-bash.patch  | 18 +++
 sys-devel/gcc-config/gcc-config-1.9.1.ebuild   | 62 ++
 3 files changed, 81 insertions(+)

diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest
index ccd59688f9..3a3f29ce03 100644
--- a/sys-devel/gcc-config/Manifest
+++ b/sys-devel/gcc-config/Manifest
@@ -1 +1,2 @@
 DIST gcc-config-1.9.0.tar.xz 17468 BLAKE2B 
3e0b6faff3ac582fc0fed921958ff849ba8b1be5b0c25609790cd56400c05371e47ecd955b7bc79362179a559def94463a3667858a70d6edd283d2c064ff0734
 SHA512 
658c8ce26f6f3e519310001cdf0f8fb01226df2d575fec81b39c083613ef0675024b79b285fab89a930c4ada7a1aef04433eb21947b4e9c0a9cb12f8fabc
+DIST gcc-config-1.9.1.tar.xz 17628 BLAKE2B 
8fce87038d9aed625d833327a7e335c311aeb04d44a07a7738def235333a9428664314ddd4da3a1d59d030136734377a838f25ff411b249aba25ea22a88460ee
 SHA512 
6c518c266698277a1ad00a1624fc1ada15ed7096d05a520700c60a27180885169bd2051fb6869e6a958503c8eebc1cd6c211098501c5fe258ee11d96c6a0b069

diff --git a/sys-devel/gcc-config/files/gcc-config-1.9-usrbinenv-bash.patch 
b/sys-devel/gcc-config/files/gcc-config-1.9-usrbinenv-bash.patch
new file mode 100644
index 00..5df08b42f6
--- /dev/null
+++ b/sys-devel/gcc-config/files/gcc-config-1.9-usrbinenv-bash.patch
@@ -0,0 +1,18 @@
+--- gcc-config-1.9.0/gcc-config
 gcc-config-1.9.0/gcc-config
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/env bash
+ # Copyright 1999-2012 Gentoo Foundation
+ # Distributed under the terms of the GNU General Public License v2
+ 
+--- gcc-config-1.9.1/Makefile
 gcc-config-1.9.1/Makefile
+@@ -26,7 +26,6 @@
+ 
+ .gcc-config: gcc-config
+   sed \
+-  -e '1s:/:$(EPREFIX)/:' \
+   -e 's:@GENTOO_EPREFIX@:$(EPREFIX):g' \
+   -e 's:@GENTOO_LIBDIR@:$(SUBLIBDIR):g' \
+   -e 's:@PV@:$(PV):g' \

diff --git a/sys-devel/gcc-config/gcc-config-1.9.1.ebuild 
b/sys-devel/gcc-config/gcc-config-1.9.1.ebuild
new file mode 100644
index 00..3605471f2d
--- /dev/null
+++ b/sys-devel/gcc-config/gcc-config-1.9.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+if [[ ${PV} ==  ]]; then
+   EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gcc-config.git;
+   inherit git-r3
+else
+   SRC_URI="mirror://gentoo/${P}.tar.xz
+   https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.xz;
+   KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris ~x86-winnt"
+fi
+
+DESCRIPTION="Utility to manage compilers"
+HOMEPAGE="https://gitweb.gentoo.org/proj/gcc-config.git/;
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND=">=sys-apps/gentoo-functions-0.10"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.8-copy-gcc-libs-darwin.patch
+   "${FILESDIR}"/${PN}-1.9-cygwin.patch
+   "${FILESDIR}"/${PN}-1.9-usrbinenv-bash.patch
+)
+
+src_compile() {
+   emake CC="$(tc-getCC)" \
+   EPREFIX="${EPREFIX}" \
+   PV="${PV}" \
+   SUBLIBDIR="$(get_libdir)"
+}
+
+src_install() {
+   emake \
+   EPREFIX="${EPREFIX}" \
+   DESTDIR="${D}" \
+   PV="${PV}" \
+   SUBLIBDIR="$(get_libdir)" \
+   install
+}
+
+pkg_postinst() {
+   # Scrub eselect-compiler remains
+   rm -f "${EROOT}"/etc/env.d/05compiler &
+
+   # We not longer use the /usr/include/g++-v3 hacks, as
+   # it is not needed ...
+   rm -f "${EROOT}"/usr/include/g++{,-v3} &
+
+   # Do we have a valid multi ver setup ?
+   local x
+   for x in $(gcc-config -C -l 2>/dev/null | awk '$NF == "*" { print $2 
}') ; do
+   gcc-config ${x}
+   done
+
+   wait
+}



[gentoo-commits] repo/proj/prefix:master commit in: sys-devel/gcc-config/, sys-devel/gcc-config/files/

2017-11-25 Thread Fabian Groffen
commit: 03f39731a884d2b38f60e3ed44f93c0a3529240c
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sat Nov 25 19:45:56 2017 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sat Nov 25 19:45:56 2017 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=03f39731

sys-devel/gcc-config: sync

Package-Manager: Portage-2.3.13-prefix, Repoman-2.3.4

 sys-devel/gcc-config/Manifest  |2 +-
 sys-devel/gcc-config/files/gcc-config-1.5  | 1054 
 .../gcc-config-1.8-copy-gcc-libs-darwin.patch  |4 +-
 .../files/gcc-config-1.8-copy-gcc-libs.patch   |  212 
 ...8-dont_source_functions_sh_from_etc_initd.patch |   47 -
 8-cygwin.patch => gcc-config-1.9-cygwin.patch} |   14 +-
 .../files/gcc-config-prefix-1.8-r221-r1.patch  |  342 ---
 .../files/gcc-config-prefix-1.8-r221.patch |  344 ---
 sys-devel/gcc-config/gcc-config-1.5-r2.ebuild  |   65 --
 sys-devel/gcc-config/gcc-config-1.8-r00.1.ebuild   |   59 --
 sys-devel/gcc-config/gcc-config-1.8-r01.1.ebuild   |   62 --
 ...onfig-1.8-r1.ebuild => gcc-config-1.9.0.ebuild} |   34 +-
 12 files changed, 23 insertions(+), 2216 deletions(-)

diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest
index 6776ccd9a6..2a177c0f99 100644
--- a/sys-devel/gcc-config/Manifest
+++ b/sys-devel/gcc-config/Manifest
@@ -1 +1 @@
-DIST gcc-config-1.8.tar.xz 15020 SHA256 
2453e2a07521b12267ca62b9b860eb2d2bc606cad0f29bf42a1c9543673f5a1b SHA512 
3b84af2d961a0527834759e047330dbab7bac0ff3d6aae103f14fca2d44bd612bd4a1005649e8b4198036231ed8a8319fb13326b4d2c40474826cf53f7bc0826
 WHIRLPOOL 
4899bc1da43a158cc486022f68661e5318db7e4e83afdb5d892fc7ce5098a4bdb059dbab3c50e632901e577cd8760b2386da3ee24f5e944db12d3e246d9c26b6
+DIST gcc-config-1.9.0.tar.xz 17468 SHA256 
3e0acf3fe683dc6193b0135fe4b26ce7f959210296fff040a10bccc33a247d1a SHA512 
658c8ce26f6f3e519310001cdf0f8fb01226df2d575fec81b39c083613ef0675024b79b285fab89a930c4ada7a1aef04433eb21947b4e9c0a9cb12f8fabc
 WHIRLPOOL 
ed341f1fa72958008d4e1c1a814a2cf025be7404d21c963c6b82c36dc951ba15849f7809211fb21e5fb4a18ce5c12f4f4b36242822e568d4b4f39a8f9f26aa0a

diff --git a/sys-devel/gcc-config/files/gcc-config-1.5 
b/sys-devel/gcc-config/files/gcc-config-1.5
deleted file mode 100755
index 6b7d1a102f..00
--- a/sys-devel/gcc-config/files/gcc-config-1.5
+++ /dev/null
@@ -1,1054 +0,0 @@
-#!/bin/bash
-# Copyright 1999-2012 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.5,v 
1.7 2011/12/07 05:42:19 vapier Exp $
-
-# Format of /etc/env.d/gcc/:
-#  config-TARGET:  CURRENT=version for TARGET
-#  TARGET-VER: has a TARGET and VER variable
-
-: ${ROOT:=/}
-[[ ${ROOT} != */ ]] && ROOT="${ROOT}/"
-[[ ${ROOT} != /* ]] && ROOT="${PWD}${ROOT}"
-EPREFIX="@GENTOO_PORTAGE_EPREFIX@"
-EROOT="${ROOT%/}${EPREFIX}/"
-
-cd /
-
-trap ":" INT QUIT TSTP
-
-argv0=${0##*/}
-source "@GENTOO_PORTAGE_EPREFIX@"/etc/init.d/functions.sh || {
-   echo "${argv0}: Could not source 
@GENTOO_PORTAGE_EPREFIX@/etc/init.d/functions.sh!" 1>&2
-   exit 1
-}
-esyslog() { :; }
-umask 022
-
-die_eerror() {
-   eerror "${argv0}: $*"
-   exit 1
-}
-
-# *BSD are plain stupid ... copy a GNU extension but don't just copy it,
-# change it so it works differently.  Wish Darwin did selective evolution
-# on software developers.
-SED=$(type -P gsed)
-: ${SED:=$(type -P sed)}
-
-# Further pain: `tac` is not available everywhere #390179
-if ! type -P tac >/dev/null ; then
-   tac() { ${SED} -e '1!G;h;$!d' "$@" ; }
-fi
-
-GENTOO_LIBDIR="@GENTOO_LIBDIR@"
-[[ ${GENTOO_LIBDIR} == @*@ ]] && GENTOO_LIBDIR="lib"
-
-usage() {
-cat << "USAGE_END"
-Usage: gcc-config [options] [CC Profile]
-Change the current cc/gcc profile, or give info about profiles.
-
-Options:
-  -C, --nocolor  Disable color output
-  -O, --use-old  Use the old profile if one was selected.
-  -f, --forceMake sure all config files are regenerated.
-  -P, --use-portage-chostOnly set to given profile if its CHOST is the
- same as that set in /etc/portage/make.conf
- (or one of other portage config files...).
-  -c, --get-current-profile  Print current used gcc profile.
-  -l, --list-profilesPrint a list of available profiles.
-  -S, --split-profileSplit profiles into their components
-  -E, --print-environPrint environment that can be used to setup the
- current gcc profile, or a specified one.
-  -B, --get-bin-path Print path where binaries of the given/current
- profile are located.
-  -L, --get-lib-path Print path where libraries of the given/current
- profile are located.
-
-Profile names are of the form:  -
-For example: