--- /usr/portage/sys-apps/groff/groff-1.19.1-r2.ebuild	2006-05-08 13:36:27.000000000 +0900
+++ /usr/local/portage/sys-apps/groff/groff-1.19.1-r3.ebuild	2006-05-31 20:33:10.000000000 +0900
@@ -1,21 +1,38 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/groff-1.19.1-r2.ebuild,v 1.18 2006/05/08 04:14:27 vapier Exp $
+# $Header: $
 
-inherit eutils flag-o-matic toolchain-funcs
+inherit eutils flag-o-matic toolchain-funcs autotools
 
-MB_PATCH="groff_1.18.1-7" #"${P/-/_}-7"
 DESCRIPTION="Text formatter used for man pages"
 HOMEPAGE="http://www.gnu.org/software/groff/groff.html"
-SRC_URI="mirror://gnu/groff/${P}.tar.gz"
+
+JP_PATCH_REV="5111"
+SRC_URI="mirror://gnu/groff/${P}.tar.gz
+	cjk? mirror://gentoo/${P}-japanese-r${JP_PATCH_REV}.patch.gz"
+# FIXME:
+# See bug #134377.
+#
+# Actually, that gzip-ed patch is not mrrored by gentoo official servers.
+# For the time being, to test it requires to manually dwonload that patch
+# as big plain diff from Momonga Linux repos.
+#
+# http://developer.momonga-linux.org/viewcvs/*checkout*/trunk/pkgs/groff/groff-1.19.1-japanese.patch?rev=${JP_PATCH_REV}
+#
+# And then, rename & manually gzip it.
+# Then put it into distfiles dir, and re-generate its digest.
+#
+# Historically, the groff's patch for CJK is so big (HOW _CRAP_! :DDD).
+# Thus, according to portage policies,
+# such patch should be gzip-ed and put on outside of the tree.
+# It's mentioned SpanKY and solar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
-IUSE="X"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="X cjk"
 
-DEPEND=">=sys-apps/texinfo-4.7-r1
-	!app-i18n/man-pages-ja"
+DEPEND=">=sys-apps/texinfo-4.7-r1"
 PDEPEND=">=sys-apps/man-1.5k-r1"
 
 src_unpack() {
@@ -47,6 +64,9 @@
 	# Fix some headers to be compatible with gcc-4.1.0
 	epatch "${FILESDIR}"/${P}-gcc-4.1.patch
 
+	# CJK patch from Momonga Linux. See bug #134377.
+	use cjk && epatch "${WORKDIR}"/${P}-japanese-r${JP_PATCH_REV}.patch
+
 	# Make sure we can cross-compile this puppy
 	if tc-is-cross-compiler ; then
 		sed -i \
@@ -67,9 +87,17 @@
 	then
 		touch .dont-build-X
 	fi
+
+	# The Big CJK patch screw up autotools, should fix.
+	# See bug #134377.
+	use cjk && eautoreconf || die "eautoreconf failed. :("
 }
 
 src_compile() {
+	# For enable japanese for CJK support.
+	local myconf=""
+	use cjk && myconf="--enable-japanese"
+
 	# Fix problems with not finding g++
 	tc-export CC CXX
 
@@ -80,22 +108,21 @@
 	# -march=2.0 makes groff unable to finish the compile process
 	use hppa && replace-cpu-flags 2.0 1.0
 
-	# CJK doesnt work yet with groff-1.19
-	#	$(use_enable cjk multibyte)
-
 	# many fun sandbox errors with econf
+	# Added ${myconf} for CJK conditional patching. See bug #134377.
 	./configure \
 		--host=${CHOST} \
 		--prefix=/usr \
 		--mandir=/usr/share/man \
 		--infodir=\${inforoot} \
-		|| die
+		${myconf} \
+		|| die "./configure failed. :("
 	emake || die
 
 	if [ ! -f .dont-build-X ] ; then
 		cd ${S}/src/xditview
-		xmkmf || die
-		make depend all || die
+		xmkmf || die "xmkmf failed. :("
+		make depend all || die "make depend all failed. :("
 	fi
 }
 
@@ -106,7 +133,7 @@
 		manroot="${D}"/usr/share/man \
 		inforoot="${D}"/usr/share/info \
 		docdir="${D}"/usr/share/doc/${PF} \
-		install || die
+		install || die "make install failed. :("
 
 	# The following links are required for xman
 	dosym eqn /usr/bin/geqn
@@ -122,6 +149,6 @@
 			BINDIR=/usr/bin \
 			MANPATH=/usr/share/man \
 			install \
-			install.man || die
+			install.man || die "make install install.man failed. :("
 	fi
 }