Update eselect modules to forms that were committed in r275

6 files changed, 39 insertions, 31 deletions

diff --git a/app-admin/eselect-blas/Manifest b/app-admin/eselect-blas/Manifest
index 45e514c..4ef81f0 100644
--- a/app-admin/eselect-blas/Manifest
+++ b/app-admin/eselect-blas/Manifest
@@ -1,8 +1,8 @@
-AUX blas.eselect-0.1 384 RMD160 6644f12689faf5fa8b3e2ae4de793147dca0edcf SHA1 a66822e95b329c59575b8d4aad5b18d92217afcf SHA256 983316fcec9069c2ae1e0ef0b28f418bbad2eb8e30ac740dbf29e28ef6371d9d size 384
-MD5 5b199f6ab4ede0a6040cd78d6a5bbd9d files/blas.eselect-0.1 384
-RMD160 6644f12689faf5fa8b3e2ae4de793147dca0edcf files/blas.eselect-0.1 384
-SHA256 983316fcec9069c2ae1e0ef0b28f418bbad2eb8e30ac740dbf29e28ef6371d9d files/blas.eselect-0.1 384
-EBUILD eselect-blas-0.1.ebuild 654 RMD160 efe31bec213c56d6b381c1c71f1e81d477830668 SHA1 cce3d77b585e7c23e860e7ed81997479c9536263 SHA256 810789e55a2dcce1327900442286a2ecaad76c4f3e35af8126aa5e0fdf4208ac size 654
+AUX blas.eselect-0.1 432 RMD160 cad6df43c570be81e6587cce134d08c394104e7e SHA1 c2a41a4ef9c9d2709ed98a05ad68ab60e02bfdcc SHA256 f86e66a9174876d3983c7c18f8ba1df2b3d5fb01339edc28a4d6bd2f962c8b01
+MD5 f0c2f28f1e84edf0496ce0bc84780efc files/blas.eselect-0.1 432
+RMD160 cad6df43c570be81e6587cce134d08c394104e7e files/blas.eselect-0.1 432
+SHA256 f86e66a9174876d3983c7c18f8ba1df2b3d5fb01339edc28a4d6bd2f962c8b01 files/blas.eselect-0.1 432
+EBUILD eselect-blas-0.1.ebuild 654 RMD160 efe31bec213c56d6b381c1c71f1e81d477830668 SHA1 cce3d77b585e7c23e860e7ed81997479c9536263 SHA256 810789e55a2dcce1327900442286a2ecaad76c4f3e35af8126aa5e0fdf4208ac
 MD5 23e302fb3993fce73f6afae0c69a0026 eselect-blas-0.1.ebuild 654
 RMD160 efe31bec213c56d6b381c1c71f1e81d477830668 eselect-blas-0.1.ebuild 654
 SHA256 810789e55a2dcce1327900442286a2ecaad76c4f3e35af8126aa5e0fdf4208ac eselect-blas-0.1.ebuild 654
diff --git a/app-admin/eselect-blas/files/blas.eselect-0.1 b/app-admin/eselect-blas/files/blas.eselect-0.1
index 196d8ce..c3dd940 100644
--- a/app-admin/eselect-blas/files/blas.eselect-0.1
+++ b/app-admin/eselect-blas/files/blas.eselect-0.1
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: $
+# $Id: blas.eselect 275 2006-06-18 19:48:18Z spyderous $
 
 inherit skel
 
@@ -9,7 +9,7 @@ IFACE="blas"
 
 DESCRIPTION="Manage installed $MODULE implementations"
 MAINTAINER="spyderous@gentoo.org"
-SVN_DATE='$Date: 2006-05-15 20:36:55 +0200 (Mon, 15 May 2006) $'
+SVN_DATE='$Date: 2006-06-18 12:48:18 -0700 (Sun, 18 Jun 2006) $'
 VERSION=$(svn_date_to_version "${SVN_DATE}" )
 
 # vim: set ft=eselect :
diff --git a/app-admin/eselect-lapack/Manifest b/app-admin/eselect-lapack/Manifest
index 1f31a2b..75e2ce2 100644
--- a/app-admin/eselect-lapack/Manifest
+++ b/app-admin/eselect-lapack/Manifest
@@ -1,8 +1,8 @@
-AUX lapack.eselect-0.1 388 RMD160 fc369053f9456f37660df4e48b79e31c4fbe7674 SHA1 60f976585ff3d1331d35274b37a7f19ac928fe5f SHA256 557abd684b1e3cb24384e1ed88a550b43c407469b73bf86cf3316835d1066911 size 388
-MD5 f07d0a700addd9e82c30691f851806ff files/lapack.eselect-0.1 388
-RMD160 fc369053f9456f37660df4e48b79e31c4fbe7674 files/lapack.eselect-0.1 388
-SHA256 557abd684b1e3cb24384e1ed88a550b43c407469b73bf86cf3316835d1066911 files/lapack.eselect-0.1 388
-EBUILD eselect-lapack-0.1.ebuild 658 RMD160 346f2183a3edaa91d122d401ff7aa6bc483cac61 SHA1 295d9d7c037750715351cf2a1bdc28227cac65e5 SHA256 cebb1d5401f8360f978949854dac1a5be780d728e398758b41148cb86ac8d0bf size 658
+AUX lapack.eselect-0.1 438 RMD160 1ef040c38bc0bbc3215b9d0f5ffce2bc4c3965fc SHA1 1a509d933f2db50df895806d9747321318ef2deb SHA256 a59e24a68662b79196e6833bf81ffc2caa8e10944a7bb108b17947cde50e32dd
+MD5 4bf70047d50d7011bda5ef0a382b40e7 files/lapack.eselect-0.1 438
+RMD160 1ef040c38bc0bbc3215b9d0f5ffce2bc4c3965fc files/lapack.eselect-0.1 438
+SHA256 a59e24a68662b79196e6833bf81ffc2caa8e10944a7bb108b17947cde50e32dd files/lapack.eselect-0.1 438
+EBUILD eselect-lapack-0.1.ebuild 658 RMD160 346f2183a3edaa91d122d401ff7aa6bc483cac61 SHA1 295d9d7c037750715351cf2a1bdc28227cac65e5 SHA256 cebb1d5401f8360f978949854dac1a5be780d728e398758b41148cb86ac8d0bf
 MD5 e9d88d17d15782c43418eb232e1809d5 eselect-lapack-0.1.ebuild 658
 RMD160 346f2183a3edaa91d122d401ff7aa6bc483cac61 eselect-lapack-0.1.ebuild 658
 SHA256 cebb1d5401f8360f978949854dac1a5be780d728e398758b41148cb86ac8d0bf eselect-lapack-0.1.ebuild 658
diff --git a/app-admin/eselect-lapack/files/lapack.eselect-0.1 b/app-admin/eselect-lapack/files/lapack.eselect-0.1
index 86b0eff..bc7d4a5 100644
--- a/app-admin/eselect-lapack/files/lapack.eselect-0.1
+++ b/app-admin/eselect-lapack/files/lapack.eselect-0.1
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: $
+# $Id: lapack.eselect 275 2006-06-18 19:48:18Z spyderous $
 
 inherit skel
 
@@ -9,7 +9,7 @@ IFACE="lapack"
 
 DESCRIPTION="Manage installed $MODULE implementations"
 MAINTAINER="spyderous@gentoo.org"
-SVN_DATE='$Date: 2006-05-15 20:36:55 +0200 (Mon, 15 May 2006) $'
+SVN_DATE='$Date: 2006-06-18 12:48:18 -0700 (Sun, 18 Jun 2006) $'
 VERSION=$(svn_date_to_version "${SVN_DATE}" )
 
 # vim: set ft=eselect :
diff --git a/app-admin/eselect/Manifest b/app-admin/eselect/Manifest
index 2a55e37..b168505 100644
--- a/app-admin/eselect/Manifest
+++ b/app-admin/eselect/Manifest
@@ -1,7 +1,7 @@
-AUX skel.bash 9587 RMD160 a4da6046a3ed1377ad81428879b199ae01a4afbc SHA1 24b51af4d9e59ebafb886231d92aee3fcfe7bc66 SHA256 2a8f62555e350390f04c4f0b8893a80c4ce9c42c21972bf0a7c90ea4b0309b64
-MD5 51d3d4424c497f2bb602dc5c36733b19 files/skel.bash 9587
-RMD160 a4da6046a3ed1377ad81428879b199ae01a4afbc files/skel.bash 9587
-SHA256 2a8f62555e350390f04c4f0b8893a80c4ce9c42c21972bf0a7c90ea4b0309b64 files/skel.bash 9587
+AUX skel.bash 9787 RMD160 68ef0d71619d1ff8b31b4c1f995dd5bb3344f1d2 SHA1 30f3db22282da0aa172de950d5c08a88b5191036 SHA256 b30e16a1a3551250eed8a3a59abf76b7eb7dc84bae26ccd88a8d48b150b53119
+MD5 9615ad7dd80cf320a23007eb6e704dd1 files/skel.bash 9787
+RMD160 68ef0d71619d1ff8b31b4c1f995dd5bb3344f1d2 files/skel.bash 9787
+SHA256 b30e16a1a3551250eed8a3a59abf76b7eb7dc84bae26ccd88a8d48b150b53119 files/skel.bash 9787
 DIST eselect-1.0.2.tar.bz2 147189 RMD160 73cdb5235d068965cb3df9e82e34031e4782af00 SHA1 139153caa6758738a0e4e75cce013c090600308f SHA256 0be9cb816f9194d28dc50a2f7110aa9d0622dd41c981265af10420cb972cf7f5
 EBUILD eselect-1.0.2-r1.ebuild 1616 RMD160 329b9fc5ff05ed2f2d83e4def79adc9bdf947cea SHA1 440d8c6902a362895064ed15cc849f05bca5251e SHA256 f9ab349030a12a2efa9a94c5c135e05d17075c8bb16b60eefc750a8c83bf331e
 MD5 6d654ca9bdf1cdf31702be47277dd53c eselect-1.0.2-r1.ebuild 1616
diff --git a/app-admin/eselect/files/skel.bash b/app-admin/eselect/files/skel.bash
index 0d0cc7e..9e90c55 100644
--- a/app-admin/eselect/files/skel.bash
+++ b/app-admin/eselect/files/skel.bash
@@ -63,7 +63,7 @@ switch_implem() {
         while read line; do
             # Skip comments
             [[ "${line}" = *#* ]] && continue
-    
+
             line=${line//@LIBDIR@/${libdir}}
 
             set ${line}
@@ -100,7 +100,7 @@ iface_do_list() {
     # None installed for $libdir
     [[ -z ${implems[@]} ]] \
         && return
-    
+
     write_list_start "Installed $MODULE for libdir $(highlight ${libdir})"
     for implem in ${implems[@]} ; do
         (( i++ ))
@@ -126,7 +126,7 @@ iface_do_show() {
     [[ -e ${ROOT}/etc/env.d/${iface}/${libdir}/${implem} ]] \
         || die "File \"${ROOT}/etc/env.d/${iface}/${libdir}/${implem}\" is missing!"
 
-    echo "${implem}"
+    echo "${libdir}: ${implem}"
 }
 
 # get_libdirs
@@ -216,9 +216,9 @@ do_set() {
                 libdir_max=$(( ${libdir_min} + ${libdir_ct[$i]} - 1 ))
                 if [[ ${item} -ge ${libdir_min} ]] && [[ ${item} -le ${libdir_max} ]] ; then
                     if ! switch_implem ${iface} ${libdir} ${implems[$(( ${item} -1 ))]}; then
-                        fail=1
-                        echo "Failed to switch to implementation \"${item}\" for libdir \"${libdir}\"!"
-                        continue
+	                    fail=1
+	                    echo "Failed to switch to implementation \"${item}\" for libdir \"${libdir}\"!"
+	                    continue
                     fi
                 else
                     fail=1
@@ -230,14 +230,14 @@ do_set() {
                 # for that libdir
                 if has ${file##*/} $(find_implems ${iface} ${libdir}); then
                     if ! [[ -f ${file} ]] ; then
-                        fail=1
-                        echo "Pattern doesn't match anything in ${libdir}: ${item}" 
-                        continue
+	                    fail=1
+	                    echo "Pattern doesn't match anything in ${libdir}: ${item}" 
+	                    continue
                     fi
                     if ! switch_implem ${iface} ${libdir} ${file##*/}; then
-                        fail=1
-                        echo "Failed to switch to implementation \"${item}\" for libdir \"${libdir}\"!"
-                        continue
+	                    fail=1
+	                    echo "Failed to switch to implementation \"${item}\" for libdir \"${libdir}\"!"
+	                    continue
                     fi
                 fi
             fi
@@ -256,7 +256,15 @@ describe_show() {
 
 do_show() {
     local libdir
-    for libdir in $(get_libdirs); do
+    local libdirs=$(get_libdirs)
+    for param in ${@} ; do
+        if has ${param} ${libdirs} ; then
+            mylibdirs=(${mylibdirs[@]} ${param})
+        fi
+    done
+    [[ -n ${mylibdirs[@]} ]] && libdirs=${mylibdirs[@]}
+
+    for libdir in ${libdirs}; do
         [[ -d ${ROOT}/usr/${libdir} ]] \
             && [[ ! -h ${ROOT}/usr/${libdir} ]] \
             || continue