Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-devel/binutils-config/files: binutils-config-4
Date: Mon, 09 Feb 2015 15:14:57
Message-Id: 20150209151452.D7F6611666@oystercatcher.gentoo.org
1 vapier 15/02/09 15:14:52
2
3 Modified: binutils-config-4
4 Log:
5 Fix by Ruud Koolen for ROOT handling with man/info paths #532610 by Ruud Koolen.
6
7 (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
8
9 Revision Changes Path
10 1.3 sys-devel/binutils-config/files/binutils-config-4
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/binutils-config/files/binutils-config-4?rev=1.3&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/binutils-config/files/binutils-config-4?rev=1.3&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/binutils-config/files/binutils-config-4?r1=1.2&r2=1.3
15
16 Index: binutils-config-4
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-4,v
19 retrieving revision 1.2
20 retrieving revision 1.3
21 diff -u -r1.2 -r1.3
22 --- binutils-config-4 30 Dec 2014 15:10:36 -0000 1.2
23 +++ binutils-config-4 9 Feb 2015 15:14:52 -0000 1.3
24 @@ -1,7 +1,7 @@
25 #!/bin/bash
26 -# Copyright 1999-2014 Gentoo Foundation
27 +# Copyright 1999-2015 Gentoo Foundation
28 # Distributed under the terms of the GNU General Public License v2
29 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-4,v 1.2 2014/12/30 15:10:36 blueness Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-4,v 1.3 2015/02/09 15:14:52 vapier Exp $
31
32 # Format of /etc/env.d/binutils/:
33 # config-TARGET: CURRENT=version for TARGET
34 @@ -170,8 +170,8 @@
35 local e="${ROOT}"/etc/env.d/05binutils
36 local ee="${e}.tmp"
37 rm -f "${ee}"
38 - [[ -d ${DATAPATH}/man ]] && echo "MANPATH=${DATAPATH}/man" >> "${ee}"
39 - [[ -d ${DATAPATH}/info ]] && echo "INFOPATH=${DATAPATH}/info" >> "${ee}"
40 + [[ -d ${ROOT}/${DATAPATH}/man ]] && echo "MANPATH=${DATAPATH}/man" >> "${ee}"
41 + [[ -d ${ROOT}/${DATAPATH}/info ]] && echo "INFOPATH=${DATAPATH}/info" >> "${ee}"
42 # hmm, `ld` has this in SEARCH_DIR(), but ld.so does not ...
43 if [[ -d ${ROOT}/etc/ld.so.conf.d ]] ; then
44 local l="${ROOT}"/etc/ld.so.conf.d/05binutils.conf
45 @@ -384,7 +384,7 @@
46 -h|--help) usage 0 ;;
47 -V|--version)
48 unset Header
49 - cvsver="$Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-4,v 1.2 2014/12/30 15:10:36 blueness Exp $"
50 + cvsver="$Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-4,v 1.3 2015/02/09 15:14:52 vapier Exp $"
51 cvsver=${cvsver##*binutils-config-}
52 bver=${cvsver%%,v *}
53 cvsver=${cvsver#* }