[gentoo-commits] repo/gentoo:master commit in: sys-apps/prefix-chain-utils/, sys-apps/prefix-chain-utils/files/

[gentoo-commits] repo/gentoo:master commit in: sys-apps/prefix-chain-utils/, sys-apps/prefix-chain-utils/files/

[Michael Haubenwallner]

commit:     ac4875f9cf40eb14e9c8f0d8f6815a1db1607db0
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 23 11:59:30 2017 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Thu Mar 23 11:59:43 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac4875f9

sys-apps/prefix-chain-utils: prefer /lib/gentoo/functions.sh

Package-Manager: portage-2.3.3

 sys-apps/prefix-chain-utils/files/startprefix.in                 | 9 ++++++++-
 ...hain-utils-0.2-r5.ebuild => prefix-chain-utils-0.2-r6.ebuild} | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/sys-apps/prefix-chain-utils/files/startprefix.in b/sys-apps/prefix-chain-utils/files/startprefix.in
index 1b84ed3c28e..3882ffe14a9 100644
--- a/sys-apps/prefix-chain-utils/files/startprefix.in
+++ b/sys-apps/prefix-chain-utils/files/startprefix.in
@@ -1,6 +1,13 @@
 #!/usr/bin/env bash
 
-. "@GENTOO_PORTAGE_EPREFIX@"/sbin/functions.sh
+if [[ -r "@GENTOO_PORTAGE_EPREFIX@"/lib/gentoo/functions.sh ]]; then
+	. "@GENTOO_PORTAGE_EPREFIX@"/lib/gentoo/functions.sh
+elif [[ -r "@GENTOO_PORTAGE_EPREFIX@"/etc/init.d/functions.sh ]]; then
+	. "@GENTOO_PORTAGE_EPREFIX@"/etc/init.d/functions.sh
+elif [[ -r "@GENTOO_PORTAGE_EPREFIX@"/sbin/functions.sh ]]; then
+	. "@GENTOO_PORTAGE_EPREFIX@"/sbin/functions.sh
+fi
+
 einfo "entering chained prefix @GENTOO_PORTAGE_EPREFIX@ ..."
 
 # inform profiles very early of us beeing interactive (or at least,

diff --git a/sys-apps/prefix-chain-utils/prefix-chain-utils-0.2-r5.ebuild b/sys-apps/prefix-chain-utils/prefix-chain-utils-0.2-r6.ebuild
similarity index 97%
rename from sys-apps/prefix-chain-utils/prefix-chain-utils-0.2-r5.ebuild
rename to sys-apps/prefix-chain-utils/prefix-chain-utils-0.2-r6.ebuild
index 1a31f8ddc67..fe753b07b81 100644
--- a/sys-apps/prefix-chain-utils/prefix-chain-utils-0.2-r5.ebuild
+++ b/sys-apps/prefix-chain-utils/prefix-chain-utils-0.2-r6.ebuild
@@ -4,7 +4,7 @@
 inherit prefix
 
 DESCRIPTION="Chained EPREFIX utilities and wrappers"
-HOMEPAGE="https://dev.gentoo.org/~mduft"
+HOMEPAGE="https://dev.gentoo.org/~haubi"
 SRC_URI=""
 
 LICENSE="GPL-3"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/prefix-chain-utils/, sys-apps/prefix-chain-utils/files/

[Michael Haubenwallner]

commit:     05b38cc9cb3f2ad09538016e85ed285a1b1154d0
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 25 10:50:48 2017 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Mon Sep 25 12:12:55 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05b38cc9

sys-apps/prefix-chain-utils: support windres

Package-Manager: Portage-2.3.8, Repoman-2.3.1

 sys-apps/prefix-chain-utils/files/prefix-chain-wrapper.in               | 2 +-
 ...refix-chain-utils-0.2-r6.ebuild => prefix-chain-utils-0.2-r7.ebuild} | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/sys-apps/prefix-chain-utils/files/prefix-chain-wrapper.in b/sys-apps/prefix-chain-utils/files/prefix-chain-wrapper.in
index 16a79b83680..d612cc46bb2 100644
--- a/sys-apps/prefix-chain-utils/files/prefix-chain-wrapper.in
+++ b/sys-apps/prefix-chain-utils/files/prefix-chain-wrapper.in
@@ -15,7 +15,7 @@ if [[ ${CHOST} == *"-winnt"* ]]; then
     # in this case, PATH elements get the "/dev/fs/C/WINDOWS/SUA" prefix
     absprefix=$(winpath2unix "$(unixpath2win "${absprefix}")")
 fi
-mode=link
+[[ $0 == *windres* ]] && mode=compile || mode=link
 orig_args=("$@")
 
 for opt in "$@"; do

diff --git a/sys-apps/prefix-chain-utils/prefix-chain-utils-0.2-r6.ebuild b/sys-apps/prefix-chain-utils/prefix-chain-utils-0.2-r7.ebuild
similarity index 92%
rename from sys-apps/prefix-chain-utils/prefix-chain-utils-0.2-r6.ebuild
rename to sys-apps/prefix-chain-utils/prefix-chain-utils-0.2-r7.ebuild
index 24eabc39928..b447752a153 100644
--- a/sys-apps/prefix-chain-utils/prefix-chain-utils-0.2-r6.ebuild
+++ b/sys-apps/prefix-chain-utils/prefix-chain-utils-0.2-r7.ebuild
@@ -41,11 +41,13 @@ src_install() {
 	dosym $wrapperdir/prefix-chain-wrapper $wrapperdir/${CHOST}-g++
 	dosym $wrapperdir/prefix-chain-wrapper $wrapperdir/${CHOST}-cpp
 	dosym $wrapperdir/prefix-chain-wrapper $wrapperdir/${CHOST}-c++
+	dosym $wrapperdir/prefix-chain-wrapper $wrapperdir/${CHOST}-windres
 
 	dosym $wrapperdir/${CHOST}-gcc $wrapperdir/gcc
 	dosym $wrapperdir/${CHOST}-g++ $wrapperdir/g++
 	dosym $wrapperdir/${CHOST}-cpp $wrapperdir/cpp
 	dosym $wrapperdir/${CHOST}-c++ $wrapperdir/c++
+	dosym $wrapperdir/${CHOST}-windres $wrapperdir/windres
 
 	# LDPATH is required to keep gcc-config happy :(
 	cat > "${T}"/$wrappercfg <<EOF