aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-04-20 08:02:25 (GMT)
committerZac Medico <zmedico@gentoo.org>2010-04-20 08:02:25 (GMT)
commit978994aec411b0a935624d3da10ba0700d603e13 (patch)
tree2d8c28d8fdf9f4dd098b633ff4df85975448aa6f
parentFix typo in check for shared libraries lacking NEEDED entries. (diff)
downloadportage-978994aec411b0a935624d3da10ba0700d603e13.zip
portage-978994aec411b0a935624d3da10ba0700d603e13.tar.gz
portage-978994aec411b0a935624d3da10ba0700d603e13.tar.bz2
Bug #316311 - Prefer -i18n option of doman to filename language suffix
(EAPI 4). Thanks to Ulrich Müller <ulm@g.o> for this patch from bug #303919.
-rwxr-xr-xbin/ebuild-helpers/doman8
1 files changed, 5 insertions, 3 deletions
diff --git a/bin/ebuild-helpers/doman b/bin/ebuild-helpers/doman
index 85d5e2b..e428b72 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