Updated for Japanese support. #22899

5 files changed, 55 insertions, 14 deletions

diff --git a/sys-apps/groff/ChangeLog b/sys-apps/groff/ChangeLog
index 42e9edd784cb..4f420c7127ee 100644
--- a/sys-apps/groff/ChangeLog
+++ b/sys-apps/groff/ChangeLog
@@ -1,12 +1,17 @@
 # ChangeLog for sys-apps/groff
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/ChangeLog,v 1.23 2003/05/19 00:43:19 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/ChangeLog,v 1.24 2003/06/19 01:10:25 nakano Exp $
 
-  18 May 2003; Tavis Ormandy <taviso@gentoo.org> groff-1.18.1-r1.ebuild:
-  stripping some flags if cxx is being used.
 
 *groff-1.18.1-r2 (18 Mar 2003)
 
+  19 Jun 2003; Masatomo Nakano <nakano@gentoo.org> groff-1.18.1-r2.ebuild,
+  files/groff_1.18.1-7-fix.patch:
+  Added Japanese support. #22899. Thanks to MATSUU Takuto <matsuu@7501.net>
+
+  18 May 2003; Tavis Ormandy <taviso@gentoo.org> groff-1.18.1-r1.ebuild:
+  stripping some flags if cxx is being used.
+
   09 May 2003; Guy Martin <gmsoft@gentoo.org> groff-1.18.1-r2.ebuild :
   Filter the -march=2.0 on hppa because it gave a b0rked groff.
   Added hppa to KEYWORDS.
diff --git a/sys-apps/groff/Manifest b/sys-apps/groff/Manifest
index e4b6d8acb700..3cef7fd64841 100644
--- a/sys-apps/groff/Manifest
+++ b/sys-apps/groff/Manifest
@@ -2,8 +2,8 @@ MD5 08c3ac78421c1e68a2a1d1c7d2692d7d groff-1.18.1-r1.ebuild 2362
 MD5 c8af8f191d314dd261e95b0899a39f60 groff-1.18-r2.ebuild 1858
 MD5 2a129c095f7329b3d87e9365ae1bb840 groff-1.16.1-r1.ebuild 806
 MD5 1e429ccdad4d2c2cf1d7dbc6330dabcf groff-1.18.1.ebuild 2008
-MD5 6f4be28775da19c5bba1956e25d1f08d groff-1.18.1-r2.ebuild 2833
-MD5 b517ce27b12e6ed1920bf7b603cf5f65 ChangeLog 3606
+MD5 79f7971aa834b0934d13bb30b9ba7273 groff-1.18.1-r2.ebuild 2933
+MD5 fb364e9bcf62f2c7810d6a30dfa462dd ChangeLog 3793
 MD5 8021cdd54a071a70e89c00463440264b groff-1.17.2-r3.ebuild 2051
 MD5 650d4c9d7f794722765d91610aee56a1 groff-1.18-r3.ebuild 1961
 MD5 a94a3de58bb54769a2793e1f8602a618 files/groff_1.18.1-7-fix.patch 551
diff --git a/sys-apps/groff/files/digest-groff-1.18.1-r2 b/sys-apps/groff/files/digest-groff-1.18.1-r2
index 94400bd5b25d..09b570a44a72 100644
--- a/sys-apps/groff/files/digest-groff-1.18.1-r2
+++ b/sys-apps/groff/files/digest-groff-1.18.1-r2
@@ -1 +1,2 @@
 MD5 4c7a1b478d230696f14743772f31639f groff-1.18.1.tar.gz 2250463
+MD5 957fad244caa648fdf3d6395ca27aa2e groff_1.18.1-7.diff.gz 115348
diff --git a/sys-apps/groff/files/groff_1.18.1-7-fix.patch b/sys-apps/groff/files/groff_1.18.1-7-fix.patch
new file mode 100644
index 000000000000..b063603c2a19
--- /dev/null
+++ b/sys-apps/groff/files/groff_1.18.1-7-fix.patch
@@ -0,0 +1,20 @@
+diff -urN groff-1.18.1-orig/tmac/docj.tmac groff-1.18.1/tmac/docj.tmac
+--- groff-1.18.1.orig/tmac/docj.tmac	2003-02-20 12:31:28.000000000 +0900
++++ groff-1.18.1/tmac/docj.tmac	2003-02-20 12:34:30.000000000 +0900
+@@ -49,14 +49,14 @@
+ .de sO
+ .mso mdoc/\\$1
+ ..
++.sO doc-doc-common
++.sO doc-doc-syms
+ .if t \{\
+ .       sO docj-ditroff
+ .\}
+ .if n \{\
+ .       sO docj-nroff
+ .\}
+-.sO doc-common
+-.sO doc-syms
+ .\" NS Db macro - start/stop DEBUG MODE
+ .\" NS Db register DEBUG MODE
+ .\" NS iN register DEBUG MODE (inline if 1, to stderr if 0 (default))
diff --git a/sys-apps/groff/groff-1.18.1-r2.ebuild b/sys-apps/groff/groff-1.18.1-r2.ebuild
index 747eb1784a1c..6ea5ce57df04 100644
--- a/sys-apps/groff/groff-1.18.1-r2.ebuild
+++ b/sys-apps/groff/groff-1.18.1-r2.ebuild
@@ -1,14 +1,16 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/groff-1.18.1-r2.ebuild,v 1.2 2003/05/09 01:57:54 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/groff-1.18.1-r2.ebuild,v 1.3 2003/06/19 01:10:25 nakano Exp $
 
-IUSE=""
+IUSE="X cjk"
 
 inherit eutils
 
 S="${WORKDIR}/${P}"
 DESCRIPTION="Text formatter used for man pages"
-SRC_URI="ftp://gatekeeper.dec.com/pub/GNU/groff/${P}.tar.gz"
+MB_PATCH="${P/-/_}-7"
+SRC_URI="ftp://gatekeeper.dec.com/pub/GNU/groff/${P}.tar.gz
+	cjk? ( http://people.debian.org/~ukai/groff/${MB_PATCH}.diff.gz )"
 HOMEPAGE="http://www.gnu.org/software/groff/groff.html"
 
 KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips hppa ~arm"
@@ -23,6 +25,17 @@ PDEPEND=">=sys-apps/man-1.5k-r1"
 src_unpack() {
 	unpack ${A}
 	cd ${S}
+
+	if [ "`use cjk`" ]; then
+		# multibyte patch contains no-color-segfault
+		epatch ${WORKDIR}/${MB_PATCH}.diff
+		epatch ${FILESDIR}/${MB_PATCH}-fix.patch
+	else
+		# Do not segfault if no color is defined in input, bug #14329
+		# <azarah@gentoo.org> (08 Feb 2003)
+		epatch ${FILESDIR}/${P}-no-color-segfault.patch
+	fi
+
 	# Fix the info pages to have .info extensions,
 	# else they do not get gzipped.
 	epatch ${FILESDIR}/groff-1.18-infoext.patch
@@ -31,10 +44,6 @@ src_unpack() {
 	# depend on netpbm.
 	epatch ${FILESDIR}/groff-1.18-no-netpbm-depend.patch
 
-	# Do not segfault if no color is defined in input, bug #14329
-	# <azarah@gentoo.org> (08 Feb 2003)
-	epatch ${FILESDIR}/${P}-no-color-segfault.patch
-
 	# Make dashes the same as minus on the keyboard so that you
 	# can search for it. Fixes #17580 and #16108
 	# Thanks to James Cloos <cloos@jhcloos.com>
@@ -42,6 +51,8 @@ src_unpack() {
 }
 
 src_compile() {
+	local myconf=""
+
 	# Fix problems with not finding g++
 	[ -z "${CC}" ] && export CC="gcc"
 	[ -z "${CXX}" ] && export CXX="g++"
@@ -51,12 +62,16 @@ src_compile() {
 		export CFLAGS="${CFLAGS/-march=2.0/}"
 		export CXXFLAGS="${CXXFLAGS/-march=2.0/}"
 	fi
-						
+
+	if [ "`use cjk`" ]; then
+		myconf="${myconf} --enable-multibyte"
+	fi
 
 	./configure --host=${CHOST} \
 		--prefix=/usr \
 		--mandir=/usr/share/man \
-		--infodir=\${inforoot} || die
+		--infodir=\${inforoot} \
+		${myconf} || die
 		
 	# emake doesn't work
 	make || die