Gentoo Archives: gentoo-commits

From: "Paul Varner (fuzzyray)" <fuzzyray@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoolkit r568 - in trunk: . src/echangelog src/euse
Date: Fri, 01 May 2009 17:33:53
Message-Id: E1LzwcR-0000e5-GY@stork.gentoo.org
1 Author: fuzzyray
2 Date: 2009-05-01 17:33:51 +0000 (Fri, 01 May 2009)
3 New Revision: 568
4
5 Modified:
6 trunk/Makefile
7 trunk/src/echangelog/Makefile
8 trunk/src/euse/euse
9 Log:
10 Fix typo in Makefile
11
12 Modified: trunk/Makefile
13 ===================================================================
14 --- trunk/Makefile 2009-05-01 14:48:36 UTC (rev 567)
15 +++ trunk/Makefile 2009-05-01 17:33:51 UTC (rev 568)
16 @@ -51,7 +51,7 @@
17 ( cd release ; tar zcf gentoolkit-$(VERSION)$(RELEASE_TAG).tar.gz gentoolkit-$(VERSION)$(RELEASE_TAG)/ )
18
19 install:
20 - echo "Err0r: Must use either install-gentoolkit or install-gentoolkit-dev"
21 + echo "Error: Must use either install-gentoolkit or install-gentoolkit-dev"
22 exit 1
23
24 install-gentoolkit:
25
26 Modified: trunk/src/echangelog/Makefile
27 ===================================================================
28 --- trunk/src/echangelog/Makefile 2009-05-01 14:48:36 UTC (rev 567)
29 +++ trunk/src/echangelog/Makefile 2009-05-01 17:33:51 UTC (rev 568)
30 @@ -6,13 +6,16 @@
31
32 include ../../makedefs.mak
33
34 -%.1 : %.pod
35 - pod2man $< > $@
36 +#%.1 : %.pod
37 +# pod2man $< > $@
38
39 .PHONY: all
40 -all: echangelog.1
41
42 -dist: echangelog.1
43 +#all: echangelog.1
44 +all:
45 +
46 +#dist: echangelog.1
47 +dist:
48 mkdir -p ../../$(distdir)/src/echangelog/
49 cp Makefile AUTHORS README TODO ChangeLog echangelog echangelog.pod echangelog.1 ../../$(distdir)/src/echangelog/
50
51
52 Modified: trunk/src/euse/euse
53 ===================================================================
54 --- trunk/src/euse/euse 2009-05-01 14:48:36 UTC (rev 567)
55 +++ trunk/src/euse/euse 2009-05-01 17:33:51 UTC (rev 568)
56 @@ -347,7 +347,7 @@
57 local current_desc
58 local args
59 local -i foundone=0
60 - local IFS
61 + local OIFS="$IFS"
62
63 args=("${@:-*}")
64
65 @@ -377,7 +377,7 @@
66 echo "$desc"
67 # get list of installed packages matching this USE flag.
68 IFS=$'\n'
69 - packages=($(equery -q -C hasuse -i "${1}" | awk '{ print $(NF-1) }'))
70 + packages=($(equery -q -C hasuse -i "${1}" | awk '{ print $(NF-1) }' | sort))
71 foundone+=${#packages[@]}
72 printf "\nInstalled packages matching this USE flag: "
73 if [ ${foundone} -gt 0 ]; then
74 @@ -397,7 +397,9 @@
75 # exit status of equery instead of a subshell and pipe to wc -l
76 if [ $(equery -q -C list -i -e "${pkg}" | wc -l) -gt 0 ]; then
77 foundone=1
78 + IFS="$OIFS"
79 get_flagstatus "${flag}"
80 + IFS=': '
81 printf "%s (%s):\n%s\n\n" "${flag}" "${pkg}" "${desc#- }"
82 fi
83 done < <(grep ":${1} *-" "${descdir}/use.local.desc")
84 @@ -409,6 +411,7 @@
85 if [ ${foundone} -lt 1 ]; then
86 echo "no matching entries found"
87 fi
88 + IFS="$OIFS"
89 }
90
91 # show a list of all currently active flags and where they are activated