From 978994aec411b0a935624d3da10ba0700d603e13 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 20 Apr 2010 01:02:25 -0700 Subject: [PATCH] =?utf8?q?Bug=20#316311=20-=20Prefer=20-i18n=20option=20of?= =?utf8?q?=20doman=20to=20filename=20language=20suffix=20(EAPI=204).=20Tha?= =?utf8?q?nks=20to=20Ulrich=20M=C3=BCller=20=20for=20this=20patch?= =?utf8?q?=20from=20bug=20#303919.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- bin/ebuild-helpers/doman | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/bin/ebuild-helpers/doman b/bin/ebuild-helpers/doman index 85d5e2b4f..e428b7292 100755 --- a/bin/ebuild-helpers/doman +++ b/bin/ebuild-helpers/doman @@ -30,13 +30,15 @@ for x in "$@" ; do suffix=${realname##*.} fi - if ! hasq "${EAPI:-0}" 0 1 && \ - [[ $x =~ (.*)\.([a-z][a-z](_[A-Z][A-Z])?)\.(.*) ]] ; then + if hasq "${EAPI:-0}" 2 3 || [[ -z ${i18n} ]] \ + && ! hasq "${EAPI:-0}" 0 1 \ + && [[ $x =~ (.*)\.([a-z][a-z](_[A-Z][A-Z])?)\.(.*) ]] + then name=${BASH_REMATCH[1]##*/}.${BASH_REMATCH[4]} mandir=${BASH_REMATCH[2]}/man${suffix:0:1} else name=${x##*/} - mandir=${i18n}man${suffix:0:1} + mandir=${i18n#/}man${suffix:0:1} fi -- 2.26.2