From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 20 Apr 2010 08:02:25 +0000 (-0700)
Subject: Bug #316311 - Prefer -i18n option of doman to filename language suffix
X-Git-Tag: v2.2_rc68~649
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=978994aec411b0a935624d3da10ba0700d603e13;p=portage.git

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.
---

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