From: "Tim Harder" <radhermit@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/zsh-completion:master commit in: /
Date: Thu, 7 Feb 2013 20:15:14 +0000 (UTC) [thread overview]
Message-ID: <1360194536.d9a4597e38afe9cafd90683e75cc87a837e3cbab.radhermit@gentoo> (raw)
commit: d9a4597e38afe9cafd90683e75cc87a837e3cbab
Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 6 23:48:56 2013 +0000
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Wed Feb 6 23:48:56 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/zsh-completion.git;a=commit;h=d9a4597e
check for /etc/portage/make.conf and the new make.globals location
---
_gcc-config | 2 +-
_gentoo_packages | 38 ++++++++++++++++++++++++++------------
_portage_utils | 7 +++++--
3 files changed, 32 insertions(+), 15 deletions(-)
diff --git a/_gcc-config b/_gcc-config
index d6e5bb8..3b0fcf3 100644
--- a/_gcc-config
+++ b/_gcc-config
@@ -5,7 +5,7 @@ local arguments
arguments=(
'(- :)'{--use-old,-O}'[use the old profile if one was selected]'
- '(- :)'{--use-portage-chost,-P}'[only set profile if its CHOST matches /etc/make.conf]:profiles:_gcc_profile'
+ '(- :)'{--use-portage-chost,-P}'[only set profile if its CHOST matches /etc/{portage/}make.conf]:profiles:_gcc_profile'
'(- :)'{--get-current-profile,-c}'[print current used gcc profile]'
'(- :)'{--list-profiles,-l}'[print a list of available profiles]'
'(- :)'{--print-environ,-E}'[print environment of the given/current profile]:profiles:_gcc_profile'
diff --git a/_gentoo_packages b/_gentoo_packages
index f1a0278..767d592 100644
--- a/_gentoo_packages
+++ b/_gentoo_packages
@@ -9,10 +9,12 @@
_gentoo_packages_update_useflag(){
local flags PORTDIR
var=PORTDIR
+ [[ -z ${(P)var} && -r /etc/portage/make.conf ]] &&
+ local $var="`. /etc/portage/make.conf 2>/dev/null; echo ${(P)var}`"
[[ -z ${(P)var} && -r /etc/make.conf ]] &&
local $var="`. /etc/make.conf 2>/dev/null; echo ${(P)var}`"
- [[ -z ${(P)var} && -r /etc/make.globals ]] &&
- local $var="`. /etc/make.globals 2>/dev/null; echo ${(P)var}`"
+ [[ -z ${(P)var} && -r /usr/share/portage/config/make.globals ]] &&
+ local $var="`. /usr/share/portage/config/make.globals 2>/dev/null; echo ${(P)var}`"
flags=( ${${(M)${(f)"$(<$PORTDIR/profiles/use.desc)"}:#* - *}%% - *}
${${${(M)${(f)"$(<$PORTDIR/profiles/use.local.desc)"}#* - *}%% - *}#*:} )
@@ -22,6 +24,8 @@ _gentoo_packages_update_useflag(){
_gentoo_packages_update_active_useflag(){
local flags USE
var=USE
+ [[ -z ${(P)var} && -r /etc/portage/make.conf ]] &&
+ local $var="`. /etc/portage/make.conf 2>/dev/null; echo ${(P)var}`"
[[ -z ${(P)var} && -r /etc/make.conf ]] &&
local $var="`. /etc/make.conf 2>/dev/null; echo ${(P)var}`"
flags=(${${${=USE}%-*}%\\*})
@@ -30,10 +34,12 @@ _gentoo_packages_update_active_useflag(){
_gentoo_packages_update_category(){
local var trees category
for var in PORTDIR PORTDIR_OVERLAY ; do
+ [[ -z ${(P)var} && -r /etc/portage/make.conf ]] &&
+ local $var="`. /etc/portage/make.conf 2>/dev/null; echo ${(P)var}`"
[[ -z ${(P)var} && -r /etc/make.conf ]] &&
local $var="`. /etc/make.conf 2>/dev/null; echo ${(P)var}`"
- [[ -z ${(P)var} && -r /etc/make.globals ]] &&
- local $var="`. /etc/make.globals 2>/dev/null; echo ${(P)var}`"
+ [[ -z ${(P)var} && -r /usr/share/portage/config/make.globals ]] &&
+ local $var="`. /usr/share/portage/config/make.globals 2>/dev/null; echo ${(P)var}`"
done
trees=($PORTDIR $=PORTDIR_OVERLAY)
category=( $trees/*-*(/:t) )
@@ -67,10 +73,12 @@ _gentoo_packages_update_available_pkgnames_only(){
local var trees packages
for var in PORTDIR PORTDIR_OVERLAY ; do
+ [[ -z ${(P)var} && -r /etc/portage/make.conf ]] &&
+ local $var="`. /etc/portage/make.conf 2>/dev/null; echo ${(P)var}`"
[[ -z ${(P)var} && -r /etc/make.conf ]] &&
local $var="`. /etc/make.conf 2>/dev/null; echo ${(P)var}`"
- [[ -z ${(P)var} && -r /etc/make.globals ]] &&
- local $var="`. /etc/make.globals 2>/dev/null; echo ${(P)var}`"
+ [[ -z ${(P)var} && -r /usr/share/portage/config/make.globals ]] &&
+ local $var="`. /usr/share/portage/config/make.globals 2>/dev/null; echo ${(P)var}`"
done
trees=( $PORTDIR $=PORTDIR_OVERLAY)
@@ -82,10 +90,12 @@ _gentoo_packages_update_available(){
local var trees category packages pkg expl
for var in PORTDIR PORTDIR_OVERLAY ; do
+ [[ -z ${(P)var} && -r /etc/portage/make.conf ]] &&
+ local $var="`. /etc/portage/make.conf 2>/dev/null; echo ${(P)var}`"
[[ -z ${(P)var} && -r /etc/make.conf ]] &&
local $var="`. /etc/make.conf 2>/dev/null; echo ${(P)var}`"
- [[ -z ${(P)var} && -r /etc/make.globals ]] &&
- local $var="`. /etc/make.globals 2>/dev/null; echo ${(P)var}`"
+ [[ -z ${(P)var} && -r /usr/share/portage/config/make.globals ]] &&
+ local $var="`. /usr/share/portage/config/make.globals 2>/dev/null; echo ${(P)var}`"
done
trees=( $PORTDIR $=PORTDIR_OVERLAY)
category=( $trees/*-*(/:t) )
@@ -110,10 +120,12 @@ _gentoo_packages_update_available_versions(){
local var overlay_ebuilds portage_ebuilds expl trees category
for var in PORTDIR PORTDIR_OVERLAY ; do
+ [[ -z ${(P)var} && -r /etc/portage/make.conf ]] &&
+ local $var="`. /etc/portage/make.conf 2>/dev/null; echo ${(P)var}`"
[[ -z ${(P)var} && -r /etc/make.conf ]] &&
local $var="`. /etc/make.conf 2>/dev/null; echo ${(P)var}`"
- [[ -z ${(P)var} && -r /etc/make.globals ]] &&
- local $var="`. /etc/make.globals 2>/dev/null; echo ${(P)var}`"
+ [[ -z ${(P)var} && -r /usr/share/portage/config/make.globals ]] &&
+ local $var="`. /usr/share/portage/config/make.globals 2>/dev/null; echo ${(P)var}`"
done
trees=($PORTDIR $=PORTDIR_OVERLAY)
category=( $trees/*-*(/:t) )
@@ -130,10 +142,12 @@ _gentoo_packages_update_available_versions(){
#Function to show tbz2 files available
_gentoo_packages_update_binary() {
+ [[ -z $PKGDIR && -r /etc/portage/make.conf ]] &&
+ local PKGDIR="`. /etc/portage/make.conf 2>/dev/null; echo $PKGDIR`"
[[ -z $PKGDIR && -r /etc/make.conf ]] &&
local PKGDIR="`. /etc/make.conf 2>/dev/null; echo $PKGDIR`"
- [[ -z $PKGDIR && -r /etc/make.globals ]] &&
- local PKGDIR="`. /etc/make.globals 2>/dev/null; echo $PKGDIR`"
+ [[ -z $PKGDIR && -r /usr/share/portage/config/make.globals ]] &&
+ local PKGDIR="`. /usr/share/portage/config/make.globals 2>/dev/null; echo $PKGDIR`"
# this doesn't take care of ${PORTAGE_BINHOST}. If Gentoo official
# binary mirror will be available we should rewrite it accordingly.
diff --git a/_portage_utils b/_portage_utils
index d18bd12..fc3b776 100644
--- a/_portage_utils
+++ b/_portage_utils
@@ -4,10 +4,13 @@
#
local common_args PORTDIR
var=PORTDIR
+[[ -z ${(P)var} && -r /etc/portage/make.conf ]] &&
+local $var="`. /etc/portage/make.conf 2>/dev/null; echo ${(P)var}`"
[[ -z ${(P)var} && -r /etc/make.conf ]] &&
local $var="`. /etc/make.conf 2>/dev/null; echo ${(P)var}`"
-[[ -z ${(P)var} && -r /etc/make.globals ]] &&
-local $var="`. /etc/make.globals 2>/dev/null; echo ${(P)var}`"
+[[ -z ${(P)var} && -r /usr/share/portage/config/make.globals ]] &&
+local $var="`. /usr/share/portage/config/make.globals 2>/dev/null; echo ${(P)var}`"
+
common_args=(
{'(--verbose)-v','(-v)--verbose'}'[Make a lot of noise]' \
{'(--quiet)-q','(-q)--quiet'}'[Tighter output; suppress warnings]' \
next reply other threads:[~2013-02-07 20:15 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-07 20:15 Tim Harder [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-02-07 20:15 [gentoo-commits] proj/zsh-completion:master commit in: / Tim Harder
2014-01-24 1:05 Tim Harder
2014-01-24 1:05 Tim Harder
2014-01-24 1:05 Tim Harder
2014-01-24 1:29 Tim Harder
2014-03-28 18:18 Tim Harder
2014-03-28 18:18 Tim Harder
2014-03-28 18:36 Tim Harder
2014-03-28 18:42 Tim Harder
2014-03-28 18:59 Tim Harder
2014-03-28 18:59 Tim Harder
2014-03-28 18:59 Tim Harder
2014-03-28 19:46 Tim Harder
2014-03-29 1:41 Tim Harder
2014-03-29 1:41 Tim Harder
2014-03-29 1:41 Tim Harder
2014-03-29 2:35 Tim Harder
2014-03-29 8:38 Tim Harder
2014-03-30 11:00 Tim Harder
2014-03-30 11:00 Tim Harder
2014-03-30 11:00 Tim Harder
2014-03-30 11:00 Tim Harder
2014-03-30 11:00 Tim Harder
2014-03-30 11:00 Tim Harder
2014-03-30 11:00 Tim Harder
2014-08-25 11:26 Vadim A. Misbakh-Soloviov
2014-08-25 12:41 Vadim A. Misbakh-Soloviov
2014-08-25 12:41 Vadim A. Misbakh-Soloviov
2014-08-25 16:13 Vadim A. Misbakh-Soloviov
2014-08-26 4:46 Vadim A. Misbakh-Soloviov
2014-08-26 18:51 Vadim A. Misbakh-Soloviov
2014-08-30 10:19 Vadim A. Misbakh-Soloviov
2014-08-30 10:19 Vadim A. Misbakh-Soloviov
2014-11-15 8:40 Tim Harder
2014-11-15 9:03 Tim Harder
2014-11-23 21:35 Vadim A. Misbakh-Soloviov
2014-12-18 16:59 Tim Harder
2014-12-20 23:39 Tim Harder
2015-04-28 12:07 Vadim A. Misbakh-Soloviov
2023-01-17 14:48 Vadim Misbakh-Soloviov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1360194536.d9a4597e38afe9cafd90683e75cc87a837e3cbab.radhermit@gentoo \
--to=radhermit@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox