Reorganize zsh-completion USE. Force correct LC_CTYPE in zsh by default

6 files changed, 111 insertions, 82 deletions

diff --git a/app-shells/zsh-completion/metadata.xml b/app-shells/zsh-completion/metadata.xml
index aa631f8a..dd70215e 100644
--- a/app-shells/zsh-completion/metadata.xml
+++ b/app-shells/zsh-completion/metadata.xml
@@ -13,28 +13,30 @@
 		<remote-id type="github">zsh-users/zsh-completions</remote-id>
 	</upstream>
 	<use>
-		<flag name="completion_ack">zsh completion for sys-apps/ack</flag>
-		<flag name="completion_android">Android-related zsh completions</flag>
-		<flag name="completion_bumblebee">zsh completion for x11-misc/bumblebee</flag>
-		<flag name="completion_database">database-related zsh completions</flag>
-		<flag name="completion_dev">zsh completions for development (build systems, editors, web)</flag>
-		<flag name="completion_disk">zsh completions for disk tools</flag>
-		<flag name="completion_distribute">zsh completions for tools for distributing tasks to various machines</flag>
-		<flag name="completion_gentoo">Gentoo-related zsh completions</flag>
-		<flag name="completion_git">zsh completions for special git tools</flag>
-		<flag name="completion_google">zsh completions for googlecl</flag>
-		<flag name="completion_haskell">zsh completions for Haskell tools</flag>
-		<flag name="completion_managers">zsh completions for various filemanagers (not portage)</flag>
-		<flag name="completion_net">zsh completions for various net-related tools</flag>
-		<flag name="completion_perf">zsh completion for linux kernel's perf tool</flag>
-		<flag name="completion_perl">zsh completion for perl-related tools</flag>
-		<flag name="completion_pip">zsh completion for app-misc/pip</flag>
-		<flag name="completion_python">zsh completion for python development tools</flag>
-		<flag name="completion_ruby">zsh completion for ruby tools and tools in ruby</flag>
-		<flag name="completion_session">zsh completion for session-handling frontends</flag>
-		<flag name="completion_showoff">zsh completion for showoff</flag>
-		<flag name="completion_subtitles">zsh completion for subtitle tools</flag>
-		<flag name="completion_virtualbox">zsh completion for virtualbox</flag>
-		<flag name="completion_web">zsh completion for web-related tools incl. java/javascript/scala</flag>
+		<flag name="completion_Android">Install zsh completions for Android-related programs</flag>
+		<flag name="completion_Gentoo">Install zsh completions for Gentoo and portage</flag>
+		<flag name="completion_Google">Install zsh completions for googlecl</flag>
+		<flag name="completion_Unix">Install zsh completion for unix system tools</flag>
+		<flag name="completion_bumblebee">Install zsh completion for x11-misc/bumblebee</flag>
+		<flag name="completion_database">Install zsh completions for database programs</flag>
+		<flag name="completion_dev">Install zsh completions for development (build systems, editors, web)</flag>
+		<flag name="completion_disk">Install zsh completions for disk tools</flag>
+		<flag name="completion_distribute">Install zsh completions for tools for distributing tasks to various machines</flag>
+		<flag name="completion_dzen">Install zsh completions for x11-misc/dzen</flag>
+		<flag name="completion_git">Install zsh completions for special git tools</flag>
+		<flag name="completion_haskell">Install zsh completions for Haskell tools</flag>
+		<flag name="completion_id3">Install zsh completions for media-sound/id3 and media-sound/id3v2</flag>
+		<flag name="completion_managers">Install zsh completions for various package managers (not portage)</flag>
+		<flag name="completion_net">Install zsh completions for various net-related tools</flag>
+		<flag name="completion_perf">Install zsh completion for dev-util/perf</flag>
+		<flag name="completion_perl">Install zsh completion for perl-related tools</flag>
+		<flag name="completion_python">Install zsh completion for python development tools</flag>
+		<flag name="completion_ruby">Install zsh completion for ruby tools and tools in ruby</flag>
+		<flag name="completion_search">Install zsh completion for search tools like sys-apps/ack and sys-apps/the_silver_searcher</flag>
+		<flag name="completion_session">Install zsh completion for session-handling frontends</flag>
+		<flag name="completion_showoff">Install zsh completion for showoff</flag>
+		<flag name="completion_subtitles">Install zsh completion for subtitle tools</flag>
+		<flag name="completion_virtualbox">Install zsh completion for virtualbox</flag>
+		<flag name="completion_web">Install zsh completion for web-related tools incl. java/javascript/scala</flag>
 	</use>
 </pkgmetadata>
diff --git a/app-shells/zsh-completion/zsh-completion-99999999.ebuild b/app-shells/zsh-completion/zsh-completion-99999999.ebuild
index d7df428c..4b27947b 100644
--- a/app-shells/zsh-completion/zsh-completion-99999999.ebuild
+++ b/app-shells/zsh-completion/zsh-completion-99999999.ebuild
@@ -33,29 +33,31 @@ declare -a COMPLETIONS FILES
 COMPLETIONS=()
 FILES=()
 for completion in \
-	'ack _ack' \
-	'android _adb _android _emulator' \
+	'Android _adb _android _emulator' \
+	'+Gentoo _baselayout _eselect _gcc-config _genlop _gentoo_packages _gentoolkit _layman _portage _portage_utils' \
+	'Google _google' \
+	'+Unix _logger' \
 	'bumblebee _optirun' \
 	'database _redis-cli _pgsql_utils' \
 	'dev _choc _gradle _geany _manage.py _mvn _pear _play _symfony _thor _vagrant' \
 	'disk _sdd _smartmontools _srm' \
-	'distribute _cap _fab _knife _mussh' \
-	'+gentoo _baselayout _eselect _gcc-config _genlop _gentoo_packages _gentoolkit _layman _portage _portage_utils' \
+	'distribute _fab _knife _mussh' \
+	'dzen _dzen2' \
 	'git _git-flow _git-pulls' \
-	'google _google' \
 	'haskell _cabal' \
+	'id3 _id3 _id3v2' \
 	'managers _brew _debuild _lein _packagekit _pactree _pkcon _port _yaourt' \
-	'net _dhcpcd _mosh _ssh-copy-id _vpnc _vnstat' \
+	'net _dhcpcd _mosh _socat _ssh-copy-id _vpnc _vnstat' \
 	'perf _perf' \
 	'perl _cpanm' \
-	'pip _pip' \
-	'python _bpython _pygmentize _setup.py' \
-	'ruby _bundle _ditz _gas _gem _github _git-wtf _lunchy _rvm' \
+	'python _bpython _pip _pygmentize _setup.py' \
+	'ruby _bundle _cap _ditz _gas _gem _github _git-wtf _lunchy _rvm' \
+	'search _ack _ag' \
 	'session _attach _teamocil _tmuxinator' \
 	'showoff _showoff' \
 	'subtitles _language_codes _periscope _subliminal' \
 	'virtualbox _virtualbox' \
-	'web _coffee _docpad _gradle _heroku _jonas _jmeter _jmeter-plugins _lunar _node _nvm _sbt _scala'
+	'web _coffee _docpad _gradle _heroku _jonas _jmeter _jmeter-plugins _lunar _node _nvm _sbt _scala _svm'
 do	curr=${completion%% *}
 	case ${curr} in
 	'+'*)
diff --git a/app-shells/zsh/ChangeLog b/app-shells/zsh/ChangeLog
index 542e32dc..ff21225f 100644
--- a/app-shells/zsh/ChangeLog
+++ b/app-shells/zsh/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*zsh-5.0.2-r2 (15 Apr 2013)
+
+  15 Apr 2013; Martin Väth <martin@mvath.de>
+  Override LC_CTYPE, using some heuristics, unless USE=custom-ctype is chosen.
+
 *zsh-5.0.2-r2 (03 Apr 2013)
 
   03 Apr 2013; Martin Väth <martin@mvath.de>
diff --git a/app-shells/zsh/metadata.xml b/app-shells/zsh/metadata.xml
index 2f25f5ba..74576112 100644
--- a/app-shells/zsh/metadata.xml
+++ b/app-shells/zsh/metadata.xml
@@ -23,18 +23,19 @@
   added.
 </longdescription>
 <use>
-  <flag name='completion_AIX'>install completions for AIX</flag>
-  <flag name='completion_BSD'>install completions for BSD</flag>
-  <flag name='completion_Cygwin'>install completions for Cygwin</flag>
-  <flag name='completion_Darwin'>install completions for Darwin</flag>
-  <flag name='completion_Debian'>install completions for Debian</flag>
-  <flag name='completion_Linux'>install completions for Linux</flag>
-  <flag name='completion_Mandriva'>install completions for Mandriva</flag>
-  <flag name='completion_openSUSE'>install completions for openSUSE</flag>
-  <flag name='completion_Redhat'>install completions for Redhat</flag>
-  <flag name='completion_Solaris'>install completions for Solaris</flag>
-  <flag name='completion_Unix'>install completions for Unix</flag>
-  <flag name='completion_X'>install completions for X</flag>
+  <flag name='completion_AIX'>Install zsh completions for AIX</flag>
+  <flag name='completion_BSD'>Install zsh completions for BSD</flag>
+  <flag name='completion_Cygwin'>Install zsh completions for Cygwin</flag>
+  <flag name='completion_Darwin'>Install zsh completions for Darwin</flag>
+  <flag name='completion_Debian'>Install zsh completions for Debian</flag>
+  <flag name='completion_Linux'>Install zsh completions for Linux</flag>
+  <flag name='completion_Mandriva'>Install zsh completions for Mandriva</flag>
+  <flag name='completion_openSUSE'>Install zsh completions for openSUSE</flag>
+  <flag name='completion_Redhat'>Install zsh completions for Redhat</flag>
+  <flag name='completion_Solaris'>Install zsh completions for Solaris</flag>
+  <flag name='completion_Unix'>Install zsh completions for Unix</flag>
+  <flag name='completion_X'>Install zsh completions for X</flag>
+  <flag name='custom-ctype'>Set this and an utf8-capable LC_CTYPE (e.g. in make.conf) if run-help does not work for you. If unset, the value of LC_CTYPE for the generation of run-help is calculated by a heuristic based on locale -a.</flag>
   <flag name='run-help'>Create and install data for run-help command</flag>
 </use>
 </pkgmetadata>
diff --git a/app-shells/zsh/zsh-5.0.2-r2.ebuild b/app-shells/zsh/zsh-5.0.2-r2.ebuild
index 549452c7..5111c272 100644
--- a/app-shells/zsh/zsh-5.0.2-r2.ebuild
+++ b/app-shells/zsh/zsh-5.0.2-r2.ebuild
@@ -35,7 +35,7 @@ SRC_URI="${ZSH_URI}
 LICENSE="ZSH gdbm? ( GPL-2 )"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="caps"
+IUSE="caps custom-ctype"
 COMPLETIONS="AIX BSD Cygwin Darwin Debian +Linux Mandriva openSUSE Redhat Solaris +Unix +X"
 for curr in ${COMPLETIONS}
 do	case ${curr} in
@@ -169,7 +169,23 @@ generate_run_help() (
 	export MANWIDTH=80
 	export LANG=C
 	unset MANPL MANROFFSEQ LC_ALL
-	[ -z "${LC_CTYPE}" ] && export LC_CTYPE=en_US.utf8
+	if [ -z "${LC_CTYPE++}" ] || ! use custom-ctype
+	then	local i j=
+		unset LC_CTYPE
+		for i in `locale -a 2>/dev/null`
+		do	case ${i} in
+			en*[uU][tT][fF]8*)
+				LC_CTYPE=${i}
+				break;;
+			*[uU][tT][fF]8*)
+				[ -n "${LC_CTYPE}" ] || LC_CTYPE=${i};;
+			en*|*.*)
+				j=${i};;
+			esac
+		done
+		[ -n "${LC_CTYPE}" ] || LC_CTYPE=${j}
+		[ -z "${LC_CTYPE}" ] || export LC_CTYPE
+	fi
 	ebegin "Generating files for run-help"
 	# It is necessary to be paranoid about the success of the following pipe,
 	# since any change in locale or environment (like unset GROFF_NO_SGR,
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 55b9a8fe..8416a542 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -15,42 +15,45 @@ app-portage/eix:swap-remote - Swap role of remote addresses in eix-remote, makin
 app-portage/eix:tools - Create separate binary for script helper tools; useful if they are called extremely often
 app-shells/auto-fu-zsh:compile - Byte-compile to speed up
 app-shells/termcolors-mv:perl - Install 256colors perl script
-app-shells/zsh:completion_AIX - install completions for AIX
-app-shells/zsh:completion_BSD - install completions for BSD
-app-shells/zsh:completion_Cygwin - install completions for Cygwin
-app-shells/zsh:completion_Darwin - install completions for Darwin
-app-shells/zsh:completion_Debian - install completions for Debian
-app-shells/zsh:completion_Linux - install completions for Linux
-app-shells/zsh:completion_Mandriva - install completions for Mandriva
-app-shells/zsh:completion_Redhat - install completions for Redhat
-app-shells/zsh:completion_Solaris - install completions for Solaris
-app-shells/zsh:completion_Unix - install completions for Unix
-app-shells/zsh:completion_X - install completions for X
-app-shells/zsh:completion_openSUSE - install completions for openSUSE
+app-shells/zsh:completion_AIX - Install zsh completions for AIX
+app-shells/zsh:completion_BSD - Install zsh completions for BSD
+app-shells/zsh:completion_Cygwin - Install zsh completions for Cygwin
+app-shells/zsh:completion_Darwin - Install zsh completions for Darwin
+app-shells/zsh:completion_Debian - Install zsh completions for Debian
+app-shells/zsh:completion_Linux - Install zsh completions for Linux
+app-shells/zsh:completion_Mandriva - Install zsh completions for Mandriva
+app-shells/zsh:completion_Redhat - Install zsh completions for Redhat
+app-shells/zsh:completion_Solaris - Install zsh completions for Solaris
+app-shells/zsh:completion_Unix - Install zsh completions for Unix
+app-shells/zsh:completion_X - Install zsh completions for X
+app-shells/zsh:completion_openSUSE - Install zsh completions for openSUSE
+app-shells/zsh:custom-ctype - Set this and an utf8-capable LC_CTYPE (e.g. in make.conf) if run-help does not work for you. If unset, the value of LC_CTYPE for the generation of run-help is calculated by a heuristic based on locale -a.
 app-shells/zsh:run-help - Create and install data for run-help command
-app-shells/zsh-completion:completion_ack - zsh completion for sys-apps/ack
-app-shells/zsh-completion:completion_android - Android-related zsh completions
-app-shells/zsh-completion:completion_bumblebee - zsh completion for x11-misc/bumblebee
-app-shells/zsh-completion:completion_database - database-related zsh completions
-app-shells/zsh-completion:completion_dev - zsh completions for development (build systems, editors, web)
-app-shells/zsh-completion:completion_disk - zsh completions for disk tools
-app-shells/zsh-completion:completion_distribute - zsh completions for tools for distributing tasks to various machines
-app-shells/zsh-completion:completion_gentoo - Gentoo-related zsh completions
-app-shells/zsh-completion:completion_git - zsh completions for special git tools
-app-shells/zsh-completion:completion_google - zsh completions for googlecl
-app-shells/zsh-completion:completion_haskell - zsh completions for Haskell tools
-app-shells/zsh-completion:completion_managers - zsh completions for various filemanagers (not portage)
-app-shells/zsh-completion:completion_net - zsh completions for various net-related tools
-app-shells/zsh-completion:completion_perf - zsh completion for linux kernel's perf tool
-app-shells/zsh-completion:completion_perl - zsh completion for perl-related tools
-app-shells/zsh-completion:completion_pip - zsh completion for app-misc/pip
-app-shells/zsh-completion:completion_python - zsh completion for python development tools
-app-shells/zsh-completion:completion_ruby - zsh completion for ruby tools and tools in ruby
-app-shells/zsh-completion:completion_session - zsh completion for session-handling frontends
-app-shells/zsh-completion:completion_showoff - zsh completion for showoff
-app-shells/zsh-completion:completion_subtitles - zsh completion for subtitle tools
-app-shells/zsh-completion:completion_virtualbox - zsh completion for virtualbox
-app-shells/zsh-completion:completion_web - zsh completion for web-related tools incl. java/javascript/scala
+app-shells/zsh-completion:completion_Android - Install zsh completions for Android-related programs
+app-shells/zsh-completion:completion_Gentoo - Install zsh completions for Gentoo and portage
+app-shells/zsh-completion:completion_Google - Install zsh completions for googlecl
+app-shells/zsh-completion:completion_Unix - Install zsh completion for unix system tools
+app-shells/zsh-completion:completion_bumblebee - Install zsh completion for x11-misc/bumblebee
+app-shells/zsh-completion:completion_database - Install zsh completions for database programs
+app-shells/zsh-completion:completion_dev - Install zsh completions for development (build systems, editors, web)
+app-shells/zsh-completion:completion_disk - Install zsh completions for disk tools
+app-shells/zsh-completion:completion_distribute - Install zsh completions for tools for distributing tasks to various machines
+app-shells/zsh-completion:completion_dzen - Install zsh completions for x11-misc/dzen
+app-shells/zsh-completion:completion_git - Install zsh completions for special git tools
+app-shells/zsh-completion:completion_haskell - Install zsh completions for Haskell tools
+app-shells/zsh-completion:completion_id3 - Install zsh completions for media-sound/id3 and media-sound/id3v2
+app-shells/zsh-completion:completion_managers - Install zsh completions for various package managers (not portage)
+app-shells/zsh-completion:completion_net - Install zsh completions for various net-related tools
+app-shells/zsh-completion:completion_perf - Install zsh completion for dev-util/perf
+app-shells/zsh-completion:completion_perl - Install zsh completion for perl-related tools
+app-shells/zsh-completion:completion_python - Install zsh completion for python development tools
+app-shells/zsh-completion:completion_ruby - Install zsh completion for ruby tools and tools in ruby
+app-shells/zsh-completion:completion_search - Install zsh completion for search tools like sys-apps/ack and sys-apps/the_silver_searcher
+app-shells/zsh-completion:completion_session - Install zsh completion for session-handling frontends
+app-shells/zsh-completion:completion_showoff - Install zsh completion for showoff
+app-shells/zsh-completion:completion_subtitles - Install zsh completion for subtitle tools
+app-shells/zsh-completion:completion_virtualbox - Install zsh completion for virtualbox
+app-shells/zsh-completion:completion_web - Install zsh completion for web-related tools incl. java/javascript/scala
 app-text/stardict:espeak - Enable text to speech synthesizer using espeak engine
 app-text/stardict:gucharmap - Enable gucharmap dictionary plugin
 app-text/stardict:pronounce - Install WyabdcRealPeopleTTS package (it is just many .wav files) to make StarDict pronounce English words