QA commit: revision bump, fix bug #491430, add epatch_user

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x1F357D42

5 files changed, 187 insertions, 12 deletions

diff --git a/app-shells/zsh-completion/ChangeLog b/app-shells/zsh-completion/ChangeLog
index 01dfd1f561ad..3eb5523d9d88 100644
--- a/app-shells/zsh-completion/ChangeLog
+++ b/app-shells/zsh-completion/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-shells/zsh-completion
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh-completion/ChangeLog,v 1.55 2014/10/15 13:50:00 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh-completion/ChangeLog,v 1.56 2014/11/21 08:28:32 pinkbyte Exp $
+
+*zsh-completion-20130808-r1 (21 Nov 2014)
+
+  21 Nov 2014; Sergey Popov <pinkbyte@gentoo.org>
+  +zsh-completion-20130808-r1.ebuild, zsh-completion-99999999.ebuild,
+  +files/zsh-completion-20130808-eselect.patch:
+  QA commit: revision bump, fix bug #491430, add epatch_user
 
   15 Oct 2014; Tobias Klausmann <klausman@gentoo.org>
   zsh-completion-20130808.ebuild:
diff --git a/app-shells/zsh-completion/Manifest b/app-shells/zsh-completion/Manifest
index c0c268c9ef90..f56621cad6fe 100644
--- a/app-shells/zsh-completion/Manifest
+++ b/app-shells/zsh-completion/Manifest
@@ -1,20 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX zsh-completion-20130808-eselect.patch 5964 SHA256 22150fdd85c730d82d0572d3eed3af39d8e10656eebcbf1db293ee19010dbdc7 SHA512 06de15c78c55e485e38df0f619552c2a8d15837f3a6594ddf13dd067fe5e8cc26b8f68b329c64ad93e14d4684042b415053db5b5f5d80d477c7c448c66e5ffc6 WHIRLPOOL 03d14417aea638e71937ba37076e6b35c71ea48967b1c7867a1caf71bc3465c1b59d65f361da35b6660a529c26b34a5af9e2472b00cf4feeee9e1858b23a00c3
 AUX zsh-completion-eix-20091203.patch 3778 SHA256 4f2b4ac99a32bc6f282e9d933405adec1f1ac60c091feda60c17ab26a2007409 SHA512 e4bf16a1da3412805aa12c46dfa98f21d61cdabe37abcafc7b28ac683db6f4f76098ac6595708edb3706d2e238210b208b5233cb8813c4ce1b39a8f29a5c98e9 WHIRLPOOL 216d4d4d257b8355027dd5f3d55d2ad25ace64fffd66ebbe39fc08087bea835f76dcceb02a116298c79d82116b9f062d14308e59c4a713fbb0a40b433a1b0934
 DIST zsh-completion-20080310.tar.bz2 18625 SHA256 3de95b5af52f24c21b77f7baf3c6515d908beae02141b26ffd02d9afb2ea4b64 SHA512 021e963aa3569e9b5243967aa726e981e9f516df768afab15e548a27c934525977f55bea50c7d2a036770b9f00bf4b85ffaae5f9b8cba8bb936c32fd6efc719e WHIRLPOOL e68a8270b391fdb51c927eeb0890e1b1950462b9241d4020efdc6bc470d709e391382c1ce170de3b090227788f8a3e60eb7a0a18007f1a19dd15b788cc9065b2
 DIST zsh-completion-20130808.tar.bz2 15076 SHA256 9954f35bfbf5afa7aa312fb9f5850280e0ee57881157f5119a25de9536f23f40 SHA512 c36a488cb2c886b5835b8de149e0c3c4578b88d8637132a8bb12a6f72120a984b1bddb956cc92aaeb163cb793a0317d19b248d7541f23f7b34c1e4651fda072a WHIRLPOOL 7e05a42615bb68d0ddf77e1bb391fe64389b9c9a72639ad16816a1390dbf53357a94a70bb4d5049e1d674869c3293e578c12db8bd760c8fef61f237caa86b15c
 EBUILD zsh-completion-20091203-r1.ebuild 1038 SHA256 91993b911f3a0e01dfdc535830ada1f3758dd5f6c54b3e8960f3e6deec897666 SHA512 ea3d0a4bf38c8cb37cb0ea0658af46ed6ec26054ebb9bdd4f7c047e98700b768c2183cf053b32f870c1ef532256583efed517c5f881fee17365c55ecfd9dc64e WHIRLPOOL bf5c9c95e1d6bb27d5bed22c28452fcbbad16149e15b31bad9f6c9ab8acd1cbd4e58de1eece591c0516cc1e164c62cbf0d14faa296578c9a6d0d6789219724c3
+EBUILD zsh-completion-20130808-r1.ebuild 1095 SHA256 b83f6fa9dbfa0b10a16dc0a530acb0994fe6836634a76ed0f0be76b4869856f3 SHA512 db579b099d8f47fc620cf17aa8700ebfc3503be52b5f926c9f02834e8c4f4d33a2c31c5affc78c4877c722c8a8308901838ea05abcd2a16efe1c293431cf8839 WHIRLPOOL fab7cea2b51f423f523ec82a07d0f9ee4b3037e9fb311c672389960a258aca3113076e724e14746244cab31e0ce8e913710311037af3060f572352fa9ea24183
 EBUILD zsh-completion-20130808.ebuild 983 SHA256 54d6532422b96ea5d950b059c616c4954c1c02fcf50d8a455dceda4d5f502c75 SHA512 3e25d2c1933c4b9380dc505bd3fdad7672946a95fe110a613dd36775e15104bdc9376b1fffcae3463511da35be815312f9a40b581ec65ec8b58d49bc8fe6e2a2 WHIRLPOOL 45b194b5aa4d0ac2a5c71d0167bf1ef3650a699817f19be4a28403df048357bb562d63ae8e3d6f68e25ac629d4bf3cf22be3f8ed251db69b6cb28070935dda95
-EBUILD zsh-completion-99999999.ebuild 638 SHA256 9bdff1602774a77a957bfb4a43375351c3467d5463c7409f8f22715a257b3d5d SHA512 b83c19dddaa112ac60af6879b10a1328dbdaa4a49933904c4e5fb317a1ac9b98d7e4cc22a2cf466dc9dc259d3862fc59fcebcfdffb00d14b8cd9bbce78527d7a WHIRLPOOL 0f3ab0bcf3c3176fab55429357b318cfc5817769403cd5ef7a0282f5cea065967b8ccfc954f1d902d48fd6263b2b4333b3651704e5ee12dba2e3eb3e8a09c9fc
-MISC ChangeLog 7975 SHA256 6a4fc26462ddfc986dc47f537956d77949d3ce6f809ebd5afdf8737a177efa90 SHA512 f4616631487e51edb05a52b13c01372fe4dc73f2e55593128f5ed9aeac42c888306888b66f9bc3763f8831029d928f1bffbdc37aa714e892dba8b5f75430e8fc WHIRLPOOL 29a2942fb128c90a04cb057ea2c1c5f90660ff635ef3243bbbefa554ce26e562792baf11bfecfcd93e9b28e53c5fa42d0b6799e41d545d08b9eed0d7e0996643
+EBUILD zsh-completion-99999999.ebuild 676 SHA256 33ee0d2e6e3f698738a2bfa96c1bc4aa05fccc87311924995832cf417d67f97f SHA512 82bcfe38e35d11d459f2c54fe6daee5f1499e31341eb63b975266cb11751ed5ce185a78e3e5021119104348837670d870d5fffaf7a42b56e65815400395399be WHIRLPOOL 5d9de55865d961408e13e7f49662e753791c553354b15ad53bbabb30c3cd6a72094d1913ae3031818ea9000ebe4eca0edd0451bacd3ec0ba0777300d8b25d057
+MISC ChangeLog 8248 SHA256 dd49baababf3c062604fd44145e6f0f6365f9ae957ba5cdce07bfd3674ae7044 SHA512 82359637c3628b75149659a424a1dde735ff37cce2ee38b67492d43ebfe57798e96f369ea195f4ecd4b6aa4c318102745e188b768779ae85eefd485e30ffde65 WHIRLPOOL 0b1cbc894b4b4f2a908083ec317378172a3efe3abb62123310641ed3b4043530f4e5c4df08445dc455d75642fa4fc92481437ff75d89d3bbe1a197e4929bf937
 MISC metadata.xml 258 SHA256 5d9cb5f6599e3297f3e1b511f86b755c36241d2b243832dd530a2a2f0958d31a SHA512 6a78bb414565e8c7c22127f5244f06ef650acbb6f1db80c93dc1dbc7d76a860b7df469eed45363e81bbd5c4270a3421f8b445fcca4ce533298815e2cd22004af WHIRLPOOL 1e2543825e58fb3c72f560a5104fcce64e2a7e7cbf69ceea444677b941f43fea77d36a63b82a266dde180600d3e767314d39a8b490d137fc4c3119742aa2e097
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iKYEAREIAGYFAlQ+e4lfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
-bnBncC5maWZ0aGhvcnNlbWFuLm5ldDFGNDg1MzU4NjMzRTAyNzA3RkY0ODA1QzAz
-RUUwM0ExQ0U1RDU0RTgACgkQA+4Doc5dVOiL+QCfVooLDgrnVUVR+THRjZy/DG4N
-KiIAn2Hj1yTR5k/WT7v2rtjS2f7Yrh2n
-=3zCH
+iQEcBAEBCAAGBQJUbvewAAoJECo/aRed9267TFIH/RDpV7pOy2Mbv3A1WKw/qhWD
+3+BNeBhIjX8SZpaxPG7LlUtVFZE7WM9q/UvR4fx3ScvG44jMoFJ+BHNyXE5Io8Ce
+st6kXP03s9Di/r4ICx8BQbSAzwBut2Uzk0IbVtsMc2a+uoEla+O68ZevSJevbrqz
+b4Qi3rrBMFKQ6tbY7eBdsAhW2VDlazzQqfMEFj7fIY1k83zzXlzGvfJQzEw+EvwL
+ROdX77DFvQAv2QARO328GJNUlBJoOYenF90HEqyitPigqCV+97UmHvlX4Z01wWBt
+ONtku50s6IqQKlfv5CgqqOgH+S44TIBnJPwPdFaJDSCEoEj63NkwA3fByw35nVQ=
+=YmX7
 -----END PGP SIGNATURE-----
diff --git a/app-shells/zsh-completion/files/zsh-completion-20130808-eselect.patch b/app-shells/zsh-completion/files/zsh-completion-20130808-eselect.patch
new file mode 100644
index 000000000000..7f0146491449
--- /dev/null
+++ b/app-shells/zsh-completion/files/zsh-completion-20130808-eselect.patch
@@ -0,0 +1,121 @@
+Author: Vikraman Choudhury <vikraman@gentoo.org>
+Date:   Fri Jan 24 04:17:16 2014 +0530
+
+    Use --{color,colour} options
+    
+    --no-{color,colour} is deprecated and removed in eselect 1.4.
+
+    Fix command for listing eselect modules
+
+--- a/_eselect
++++ b/_eselect
+@@ -15,7 +15,7 @@ _eselect_env () {
+ _eselect_binutils () {
+ 	local binutilslist
+         if (( $words[(I)(set)] )); then
+-	  binutilslist=(${${${(M)${(f)"$(eselect --no-color binutils list)"}## *}// \**/}//(  \[*\]   |  \[*\]  )/})
++	  binutilslist=(${${${(M)${(f)"$(eselect --color=no binutils list)"}## *}// \**/}//(  \[*\]   |  \[*\]  )/})
+ 	  _values "available binutils version" $binutilslist[@] && return 0
+         fi
+ 	_values "binutils options" \
+@@ -30,7 +30,7 @@ _eselect_binutils () {
+ _eselect_kernel () {
+ 	local kernellist
+         if (( $words[(I)(set)] )); then
+-	  kernellist=(${${${(M)${(f)"$(eselect --no-color kernel list)"}## *}// \**/}//(  \[*\]   |  \[*\]  )/})
++	  kernellist=(${${${(M)${(f)"$(eselect --color=no kernel list)"}## *}// \**/}//(  \[*\]   |  \[*\]  )/})
+ 	  _values "available kernel version" $kernellist[@] && return 0
+         fi
+ 	_values "kenrel options" \
+@@ -44,7 +44,7 @@ _eselect_kernel () {
+ _eselect_ctags () {
+ 	local ctagslist
+         if (( $words[(I)(set)] )); then
+-	  ctagslist=(${${${(M)${(f)"$(eselect --no-color ctags list)"}## *}// \**/}//(  \[*\]   |  \[*\]  )/})
++	  ctagslist=(${${${(M)${(f)"$(eselect --color=no ctags list)"}## *}// \**/}//(  \[*\]   |  \[*\]  )/})
+ 	  _values "available ctags version" $ctagslist[@] && return 0
+         fi
+ 	_values "ctags options" \
+@@ -59,7 +59,7 @@ _eselect_ctags () {
+ _eselect_profile () {
+ 	local profilelist
+         if (( $words[(I)(set)] )); then
+-	  profilelist=(${${${(M)${(f)"$(eselect --no-color profile list)"}## *}// \**/}//(  \[*\]   |  \[*\]  )/})
++	  profilelist=(${${${(M)${(f)"$(eselect --color=no profile list)"}## *}// \**/}//(  \[*\]   |  \[*\]  )/})
+ 	  _values -w "available profiles" $profilelist[@] \
+ 	  "--force[Forcibly set the symlink]" && return 0
+         fi
+@@ -74,10 +74,10 @@ _eselect_profile () {
+ _eselect_fontconfig () {
+ 	local fclistenabled fclistdisabled
+         if (( $words[(I)(enable)] )); then
+-	  fclistdisabled=(${${${${(M)${(f)"$(eselect --no-color fontconfig list)"}## *}#*\*}// \**/}//(  \[*\]   |  \[*\]  )/})
++	  fclistdisabled=(${${${${(M)${(f)"$(eselect --color=no fontconfig list)"}## *}#*\*}// \**/}//(  \[*\]   |  \[*\]  )/})
+ 	  _values -w ".conf to enable" $fclistdisabled[@] && return 0
+ 	elif (( $words[(I)(disable)] )); then
+-	  fclistenabled=(${${${(M)${(M)${(f)"$(eselect --no-color fontconfig list)"}## *}#*\*}// \**/}//(  \[*\]   |  \[*\]  )/})
++	  fclistenabled=(${${${(M)${(M)${(f)"$(eselect --color=no fontconfig list)"}## *}#*\*}// \**/}//(  \[*\]   |  \[*\]  )/})
+ 	  _values -w ".conf to disable" $fclistenabled[@] && return 0
+         fi
+ 	_values "fontconfig options" \
+@@ -91,7 +91,7 @@ _eselect_fontconfig () {
+ _eselect_opengl () {
+ 	local opengllist
+ 	if (( $words[(I)(set)] )); then
+-		opengllist=(${${${(M)${(f)"$(eselect --no-color opengl list)"}## *}// \**/}//(  \[*\]   |  \[*\]  )/})
++		opengllist=(${${${(M)${(f)"$(eselect --color=no opengl list)"}## *}// \**/}//(  \[*\]   |  \[*\]  )/})
+ 		_values -w "opengl implementations and options" $opengllist[@] \
+ 		"--use-old[If an implementationis already set, use that one instead]" \
+ 		"--prefix[Set the source prefix]:path:_files -/" \
+@@ -109,7 +109,7 @@ _eselect_opengl () {
+ _eselect_vi () {
+ 	local vilist
+ 	if (( $words[(I)(set)] )); then
+-	  vilist=(${${${(M)${(f)"$(eselect --no-color vi list)"}## *}// \**/}//(  \[*\]   |  \[*\]  )/})
++	  vilist=(${${${(M)${(f)"$(eselect --color=no vi list)"}## *}// \**/}//(  \[*\]   |  \[*\]  )/})
+ 	  _values -w "vi implementation" $vilist[@] && return 0
+ 	elif (( $words[(I)(update)] )); then
+ 	  _values -w "option" "--if-unset[Do not override existing implementation]" && return 0
+@@ -127,35 +127,35 @@ _eselect () {
+   local globopts sedcmd modnames modopts
+ 
+   globopts=(
+-  	"--no-colour[Disable coloured output]" \
+-  	"--no-color[Disable coloured output]"
++  	"--colour=no[Disable coloured output]" \
++  	"--color=no[Disable coloured output]"
+   		)
+-  modnames=(${${${(M)${(f)"$(eselect --no-color list-modules)"}## *}//   */}//  /})
++  modnames=(${${${(M)${(f)"$(eselect --color=no modules list)"}## *}//   */}//  /})
+ 
+   if ((CURRENT == 2)); then
+     _arguments -s \
+       "$globopts[@]" \
+       "*:portage:_values 'eselect modules' \$modnames[@]" && return 0
+   elif ((CURRENT == 3)); then
+-    if [[ $words[2] == --no-colour || $words[2] == --no-color ]]; then
++    if [[ $words[2] == --colour=no || $words[2] == --color=no ]]; then
+       _arguments -s \
+         "*:portage:_values 'eselect modules' \$modnames[@]" && return 0
+     elif (( $modnames[(I)$words[2]] )); then
+       if [[ "$words[2]" == (env|binutils|kernel|ctags|profile|fontconfig|opengl|vi) ]]; then
+           _eselect_$words[2] "$@"
+       else
+-        modopts=(${${${(M)${(f)"$(eselect --no-color $words[2] usage)"}## *}//   */}//  /})
++        modopts=(${${${(M)${(f)"$(eselect --color=no $words[2] usage)"}## *}//   */}//  /})
+         _arguments -s \
+           "*:portage:_values 'eselect $words[2] options' \$modopts[@]" && return 0
+       fi
+     fi
+   elif ((CURRENT >= 4)); then
+-    if (( $words[(I)(--no-color|--no-colour)] )); then
++    if (( $words[(I)(--color=no|--colour=no)] )); then
+       if (( $modnames[(I)$words[3]] )); then
+         if [[ "$words[3]" == (env|binutils|kernel|ctags|profile|fontconfig|opengl|vi) ]]; then
+           _eselect_$words[3] "$@"
+         else
+-          modopts=(${${${${(M)${(f)"$(eselect --no-color $words[3] usage)"}## *}//   */}//  /}// *})
++          modopts=(${${${${(M)${(f)"$(eselect --color=no $words[3] usage)"}## *}//   */}//  /}// *})
+            _arguments -s \
+               "*:portage:_values 'eselect $words[3] options' \$modopts[@]" && return 0
+         fi
diff --git a/app-shells/zsh-completion/zsh-completion-20130808-r1.ebuild b/app-shells/zsh-completion/zsh-completion-20130808-r1.ebuild
new file mode 100644
index 000000000000..c456ae19a5af
--- /dev/null
+++ b/app-shells/zsh-completion/zsh-completion-20130808-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh-completion/zsh-completion-20130808-r1.ebuild,v 1.1 2014/11/21 08:28:32 pinkbyte Exp $
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Programmable Completion for zsh (includes emerge and ebuild commands)"
+HOMEPAGE="http://git.overlays.gentoo.org/gitweb/?p=proj/zsh-completion.git"
+SRC_URI="http://dev.gentoo.org/~radhermit/dist/${P}.tar.bz2"
+
+LICENSE="ZSH"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris"
+
+RDEPEND=">=app-shells/zsh-4.3.5"
+
+src_prepare() {
+	# bug #491430
+	epatch "${FILESDIR}/${P}-eselect.patch"
+
+	epatch_user
+}
+
+src_install() {
+	insinto /usr/share/zsh/site-functions
+	doins _*
+
+	dodoc AUTHORS
+}
+
+pkg_postinst() {
+	elog
+	elog "If you happen to compile your functions, you may need to delete"
+	elog "~/.zcompdump{,.zwc} and recompile to make zsh-completion available"
+	elog "to your shell."
+	elog
+}
diff --git a/app-shells/zsh-completion/zsh-completion-99999999.ebuild b/app-shells/zsh-completion/zsh-completion-99999999.ebuild
index 678d79d0d817..9689e1524275 100644
--- a/app-shells/zsh-completion/zsh-completion-99999999.ebuild
+++ b/app-shells/zsh-completion/zsh-completion-99999999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh-completion/zsh-completion-99999999.ebuild,v 1.1 2013/02/07 20:54:33 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh-completion/zsh-completion-99999999.ebuild,v 1.2 2014/11/21 08:28:32 pinkbyte Exp $
 
 EAPI=5
 
-inherit git-2
+inherit eutils git-2
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/zsh-completion.git"
 
@@ -16,6 +16,10 @@ SLOT="0"
 
 RDEPEND=">=app-shells/zsh-4.3.5"
 
+src_prepare() {
+	epatch_user
+}
+
 src_install() {
 	insinto /usr/share/zsh/site-functions
 	doins _*