Fix typo in Makefile
authorfuzzyray <fuzzyray@gentoo.org>
Fri, 1 May 2009 17:33:51 +0000 (17:33 -0000)
committerfuzzyray <fuzzyray@gentoo.org>
Fri, 1 May 2009 17:33:51 +0000 (17:33 -0000)
svn path=/; revision=568

trunk/Makefile
trunk/src/echangelog/Makefile
trunk/src/euse/euse

index 3906c525c1efe8208a6bdc24fd7d1f11f149092d..76dfe1debe9f6a6992dae81e5ab952295328f625 100644 (file)
@@ -51,7 +51,7 @@ dist-gentoolkit:
        ( cd release ; tar zcf gentoolkit-$(VERSION)$(RELEASE_TAG).tar.gz gentoolkit-$(VERSION)$(RELEASE_TAG)/ )
 
 install:
-       echo "Err0r: Must use either install-gentoolkit or install-gentoolkit-dev"
+       echo "Error: Must use either install-gentoolkit or install-gentoolkit-dev"
        exit 1
 
 install-gentoolkit:
index 61c5e5739a58f2eeb98a783e05161230af3e9bf6..b33e0ce707a03ad8062f1ddf131aed0e28cbf7a0 100644 (file)
@@ -6,13 +6,16 @@
 
 include ../../makedefs.mak
 
-%.1 : %.pod
-       pod2man $< > $@
+#%.1 : %.pod
+#      pod2man $< > $@
 
 .PHONY: all
-all: echangelog.1
 
-dist: echangelog.1
+#all: echangelog.1
+all:
+
+#dist: echangelog.1
+dist:
        mkdir -p ../../$(distdir)/src/echangelog/
        cp Makefile AUTHORS README TODO ChangeLog echangelog echangelog.pod echangelog.1 ../../$(distdir)/src/echangelog/
 
index 74007092b1ac7997eb23277244cd0e6390712ace..f9fd2fde64f3eca456a0488c4d20e02ebc4a6e73 100755 (executable)
@@ -347,7 +347,7 @@ showinstdesc() {
        local current_desc
        local args
        local -i foundone=0
-       local IFS
+       local OIFS="$IFS"
 
        args=("${@:-*}")
 
@@ -377,7 +377,7 @@ showinstdesc() {
                                        echo "$desc"
                                        # get list of installed packages matching this USE flag.
                                        IFS=$'\n'
-                                       packages=($(equery -q -C hasuse -i "${1}" | awk '{ print $(NF-1) }'))
+                                       packages=($(equery -q -C hasuse -i "${1}" | awk '{ print $(NF-1) }' | sort))
                                        foundone+=${#packages[@]}
                                        printf "\nInstalled packages matching this USE flag: "
                                        if [ ${foundone} -gt 0 ]; then
@@ -397,7 +397,9 @@ showinstdesc() {
                                        #       exit status of equery instead of a subshell and pipe to wc -l
                                        if [ $(equery -q -C list -i -e "${pkg}" | wc -l) -gt 0 ]; then
                                                foundone=1
+                                               IFS="$OIFS"
                                                get_flagstatus "${flag}"
+                                               IFS=': '
                                                printf "%s (%s):\n%s\n\n" "${flag}" "${pkg}" "${desc#- }"
                                        fi
                                done < <(grep ":${1}  *-" "${descdir}/use.local.desc")
@@ -409,6 +411,7 @@ showinstdesc() {
        if [ ${foundone} -lt 1 ]; then
                echo "no matching entries found"
        fi
+       IFS="$OIFS"
 }
 
 # show a list of all currently active flags and where they are activated