diff options
-rw-r--r-- | app-shells/zsh/ChangeLog | 3 | ||||
-rw-r--r-- | app-shells/zsh/metadata.xml | 1 | ||||
-rw-r--r-- | app-shells/zsh/zsh-99999999.ebuild | 24 | ||||
-rw-r--r-- | profiles/use.local.desc | 1 | ||||
-rw-r--r-- | www-plugins/stylish/ChangeLog | 5 | ||||
-rw-r--r-- | www-plugins/stylish/Manifest | 2 | ||||
-rw-r--r-- | www-plugins/stylish/stylish-1.4.0.ebuild (renamed from www-plugins/stylish/stylish-1.3.3.ebuild) | 2 |
7 files changed, 14 insertions, 24 deletions
diff --git a/app-shells/zsh/ChangeLog b/app-shells/zsh/ChangeLog index 3a643318..9e4630b2 100644 --- a/app-shells/zsh/ChangeLog +++ b/app-shells/zsh/ChangeLog @@ -4,6 +4,9 @@ *zsh-99999999 (29 May 2013) + 16 Nov 2013; Martin Väth <martin@mvath.de>: + Remove necessity for USE=custom-ctype. + 13 Nov 2013; Martin Väth <martin@mvath.de>: Fix HELPDIR path. Revision bump to force change. Do not use-enable compile. I submitted help installation upstream; this is used unconditionally if diff --git a/app-shells/zsh/metadata.xml b/app-shells/zsh/metadata.xml index a2d109ef..07c08323 100644 --- a/app-shells/zsh/metadata.xml +++ b/app-shells/zsh/metadata.xml @@ -36,7 +36,6 @@ <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-99999999.ebuild b/app-shells/zsh/zsh-99999999.ebuild index 1391fc44..85a566f3 100644 --- a/app-shells/zsh/zsh-99999999.ebuild +++ b/app-shells/zsh/zsh-99999999.ebuild @@ -58,7 +58,7 @@ esac LICENSE="ZSH gdbm? ( GPL-2 )" SLOT="0" -IUSE="caps compile custom-ctype" +IUSE="caps compile" COMPLETIONS="AIX BSD Cygwin Darwin Debian +Linux Mandriva openSUSE Redhat Solaris +Unix +X" for curr in ${COMPLETIONS} do case ${curr} in @@ -146,7 +146,8 @@ src_prepare() { file='Src/Zle/complete.mdd' for i in ${COMPLETIONS} do case ${i} in - [+-]*) i=${i#?} + [+-]*) + i=${i#?};; esac grep -q "Completion\/${i}" -- "${S}/${file}" \ || die "${file} does not contain Completion/${i}" @@ -223,24 +224,7 @@ generate_run_help() ( export GROFF_NO_SGR= export MANWIDTH=80 export LANG=C - unset MANPL MANROFFSEQ LC_ALL - 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 + unset ${!MAN*} ${!LESS} ${!LC_*} 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 8a9963b8..218c052d 100644 --- a/profiles/use.local.desc +++ b/profiles/use.local.desc @@ -28,7 +28,6 @@ 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_Android - Install zsh completions for Android-related programs app-shells/zsh-completion:completion_Gentoo - Install zsh completions for Gentoo and portage diff --git a/www-plugins/stylish/ChangeLog b/www-plugins/stylish/ChangeLog index f26460b6..783a5cc7 100644 --- a/www-plugins/stylish/ChangeLog +++ b/www-plugins/stylish/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*stylish-1.4.0 (16 Nov 2013) + + 16 Nov 2013; Martin Väth <martin@mvath.de>: + Version bump, remove old ebuild. + *stylish-1.3.3 (31 Aug 2013) 12 Oct 2013; Martin Väth <martin@mvath.de>: diff --git a/www-plugins/stylish/Manifest b/www-plugins/stylish/Manifest index 7a842a20..e53661f4 100644 --- a/www-plugins/stylish/Manifest +++ b/www-plugins/stylish/Manifest @@ -1 +1 @@ -DIST stylish-1.3.3-tb+fx+an+sm-linux.xpi 282174 SHA256 0b7df751c68f99785320d411b4a825baa859572edfd397c763e684a9892864ff SHA512 2a3306b02a8700960662e2db6618238e9efe5c19dd55a806dbed848cd051d7f683bceac93272bf83f73e7804e91c59d03e19861b35e6ba8ba3ccfd0f84596152 WHIRLPOOL 7db5b264de8bde057f064a728c1571a27f5c3f37a812a2f409db50142512917939e416d250118000e86c2424adcf8bef947d8449c210bf8c1f19d3e0cd26295d +DIST stylish-1.4.0-an+fx+tb+sm-linux.xpi 290572 SHA256 7760984f5ba8bcac7038b0bb649bdc9b1372c9a4fe9084b3bbbf339ad54ffd43 SHA512 87189eff0577f0056de93329a5c9300ed869d51e8924d33088232367402a82aef54ab3ae1b9da2897bc86e0001d80e740cc2b0d06be396b208061858d777c753 WHIRLPOOL 02992686d8adfbf2d613476cc0b19f2c4b59a2e2fafc5d95b3895abe7fba494ab2fa114d2adb67ce6c126a79eb0c509a7dd33833bcb5da5f9cf7acdf685bda70 diff --git a/www-plugins/stylish/stylish-1.3.3.ebuild b/www-plugins/stylish/stylish-1.4.0.ebuild index b44466cf..3c5e6cb2 100644 --- a/www-plugins/stylish/stylish-1.3.3.ebuild +++ b/www-plugins/stylish/stylish-1.4.0.ebuild @@ -8,7 +8,7 @@ RESTRICT="mirror" DESCRIPTION="Mozilla plugin to modify style of certain web pages (e.g. Gentoo forums)" HOMEPAGE="https://addons.mozilla.org/firefox/addon/stylish/" -SRC_URI="http://addons.cdn.mozilla.net/storage/public-staging/2108/${P}-tb+fx+an+sm-linux.xpi" +SRC_URI="http://addons.cdn.mozilla.net/storage/public-staging/2108/${P}-an+fx+tb+sm-linux.xpi" LICENSE="GPL-2" SLOT="0" |