Revert "merge iconv and getent completions, as they are both glibc utils"

This reverts commit 3f0d8f8e9f1991e7d7610fd210c68421eef4e09f, as this is
only true for Linux

contrib/Makefile.am

@@ -42,14 +42,15 @@ static_bashcomp = abook \
 		gcl \
 		gdb \
 		genisoimage \
+		getent \
 		gkrellm \
-		glibc \
 		gnatmake \
 		gpg \
 		gpg2 \
 		gzip \
 		heimdal \
 		hping2 \
+		iconv \
 		ifupdown \
 		imagemagick \
 		info \

contrib/getent

@@ -1,46 +1,5 @@
-# Completions for tools included in glibc
+# bash completion for getent
 
-# iconv(1)
-have iconv &&
-_iconv()
-{
-    local cur prev split=false
-
-    COMPREPLY=()
-    _get_comp_words_by_ref cur prev
-
-    _split_longopt && split=true
-
-    case $prev in
-        -'?'|--help|--usage|-V|--version|--unicode-subst|--byte-subst|\
-        --widechar-subst)
-            return 0
-            ;;
-        -f|--from-code|-t|--to-code)
-            COMPREPLY=( $( compgen -W '$( iconv -l | \
-                sed -e "s@/*\$@@" -e "s/[,()]//g" )' -- "$cur" ) )
-            return 0
-            ;;
-        -o|--output)
-            _filedir
-            return 0
-            ;;
-    esac
-
-    $split && return 0
-
-    if [[ "$cur" = -* ]]; then
-        COMPREPLY=( $( compgen -W '--from-code --to-code --list -c
-            --unicode-subst --byte-subst --widechar-subst --output --silent
-            --verbose --help --usage --version' -- "$cur" ) )
-        return 0
-    fi
-} &&
-complete -F _iconv -o default iconv
-# Intentionally not -o filenames here, -f/-t completions may contain slashes
-# and -o filenames would break them.
-
-# getent(1)
 have getent &&
 _getent()
 {

contrib/iconv

@@ -0,0 +1,48 @@
+# iconv(1) completion
+
+have iconv &&
+_iconv()
+{
+    local cur prev split=false
+
+    COMPREPLY=()
+    _get_comp_words_by_ref cur prev
+
+    _split_longopt && split=true
+
+    case $prev in
+        -'?'|--help|--usage|-V|--version|--unicode-subst|--byte-subst|\
+        --widechar-subst)
+            return 0
+            ;;
+        -f|--from-code|-t|--to-code)
+            COMPREPLY=( $( compgen -W '$( iconv -l | \
+                sed -e "s@/*\$@@" -e "s/[,()]//g" )' -- "$cur" ) )
+            return 0
+            ;;
+        -o|--output)
+            _filedir
+            return 0
+            ;;
+    esac
+
+    $split && return 0
+
+    if [[ "$cur" = -* ]]; then
+        COMPREPLY=( $( compgen -W '--from-code --to-code --list -c
+            --unicode-subst --byte-subst --widechar-subst --output --silent
+            --verbose --help --usage --version' -- "$cur" ) )
+        return 0
+    fi
+} &&
+complete -F _iconv -o default iconv
+# Intentionally not -o filenames here, -f/-t completions may contain slashes
+# and -o filenames would break them.
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 4
+# sh-indent-comment: t
+# indent-tabs-mode: nil
+# End:
+# ex: ts=4 sw=4 et filetype=sh