[gentoo-commits] proj/emacs-tools:ebuild-mode commit in: /

[Ulrich Müller]

commit:     1d055c6902f338aacd3a312a0d2275d4ca3e5e74
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 22 22:28:28 2014 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed Jan 22 22:28:28 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=1d055c69

Avoid deprecated "portageq portdir" call in keyword-generation.sh.

* keyword-generation.sh (ECLASSES, ECLASSFILES): Avoid deprecated
"portageq portdir" call.

---
 ChangeLog             |  5 +++++
 keyword-generation.sh | 13 +++++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 22c0f1a..98c74d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
[phone]  Ulrich Müller  <ulm@g.o>
+
+	* keyword-generation.sh (ECLASSES, ECLASSFILES): Avoid deprecated
+	"portageq portdir" call.
+
 2013-10-10  Ulrich Müller  <ulm@g.o>
 
 	* ebuild-mode-keywords.el

diff --git a/keyword-generation.sh b/keyword-generation.sh
index bc4648b..09f028d 100755
--- a/keyword-generation.sh
+++ b/keyword-generation.sh
@@ -8,12 +8,16 @@
 #
 # Generate a raw list for app-emacs/ebuild-mode
 
+REPO=gentoo
 TMPFILE="$(mktemp ${TMPDIR:-/tmp}/keyword-generation.XXXXXX)"
-ECLASSDIR="$(portageq portdir)/eclass"
-ECLASSES=$(cd ${ECLASSDIR}; ls *.eclass | sed 's/\.eclass$//' | LC_ALL=C sort)
+ECLASSES=( $(portageq available_eclasses / ${REPO} | LC_ALL=C sort) )
+ECLASSFILES=( $(portageq eclass_path / ${REPO} "${ECLASSES[@]}") )
 # Obsolete eclasses
 OBSOLETE="bash-completion gems leechcraft ruby x-modular"
 
+# Arrays should have equal size
+[[ ${#ECLASSES[@]} -eq ${#ECLASSFILES[@]} ]] || exit 1
+
 has() {
     local needle=$1 item
     shift
@@ -25,9 +29,10 @@ has() {
 
 echo "Output in ${TMPFILE}"
 
-for eclass in ${ECLASSES}; do
+for (( i = 0; i < ${#ECLASSES[@]}; i++ )); do
+    eclass=${ECLASSES[i]}
     has ${eclass} ${OBSOLETE} && continue
-    file="${ECLASSDIR}/${eclass}.eclass"
+    file=${ECLASSFILES[i]}
     grep -q "^# @DEAD$" "${file}" && continue
 
     functions=$(env -i bash -c ". ${file}; declare -F" 2>/dev/null \