fix previous commit so it doesnt kill all USE=-cjk users

Package-Manager: portage-2.1.2_rc4-r2

diff --git a/sys-apps/groff/Manifest b/sys-apps/groff/Manifest
index 49990c888f0ad630bd62da46a407007b2912e305..dd57ba5dde48a43ea1ee40a7c932b3131face42c 100644 (file)
--- a/sys-apps/groff/Manifest
+++ b/sys-apps/groff/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX groff-1.18-infoext.patch 673 RMD160 f0038c01fd702c543240ea79220b0b2eaebd6285 SHA1 9035cb640de6f8ad9f681b0768d3624412406daa SHA256 aeaf8f2058504c98a8f4f7a99332b4862f613d610bcd948455d9460e07c4b0b6
 MD5 c43ddaf604dd389afc6107d79b90ce6c files/groff-1.18-infoext.patch 673
 RMD160 f0038c01fd702c543240ea79220b0b2eaebd6285 files/groff-1.18-infoext.patch 673
@@ -34,10 +37,10 @@ EBUILD groff-1.18.1.1.ebuild 2901 RMD160 0c1499a4f2a2f909238b3e04c0a51722b236948
 MD5 58a16e396482725113fd175f84eaa71d groff-1.18.1.1.ebuild 2901
 RMD160 0c1499a4f2a2f909238b3e04c0a51722b2369487 groff-1.18.1.1.ebuild 2901
 SHA256 d5e55f0fd66a55785371e2ea8c69967056434be60ae7f75c100b198afd1495c1 groff-1.18.1.1.ebuild 2901
-EBUILD groff-1.19.2-r1.ebuild 2519 RMD160 336715ff7eb2fde569d7b3b963b59169cd29b879 SHA1 9e2bd353804180995f1cba6508eff5e6a9ecc4da SHA256 ee979a1e9044860fe4ef090df5a9bdf5d96f5cf6ad5ebd37d1a6705ea17f423f
-MD5 68b77d5bd5668d3dcc1a04c59365b871 groff-1.19.2-r1.ebuild 2519
-RMD160 336715ff7eb2fde569d7b3b963b59169cd29b879 groff-1.19.2-r1.ebuild 2519
-SHA256 ee979a1e9044860fe4ef090df5a9bdf5d96f5cf6ad5ebd37d1a6705ea17f423f groff-1.19.2-r1.ebuild 2519
+EBUILD groff-1.19.2-r1.ebuild 2477 RMD160 eb259ae7da2392d61660ca0896eb5e44558dc316 SHA1 46688c6efef023a44dd0a4657a20ccbee0d9a8f9 SHA256 54dcafc01d8be2710afc62a14171de7d756a5b76f38586544b73f3bc6ec7a7c9
+MD5 e9e27593eb1ed4520198627fd0b34900 groff-1.19.2-r1.ebuild 2477
+RMD160 eb259ae7da2392d61660ca0896eb5e44558dc316 groff-1.19.2-r1.ebuild 2477
+SHA256 54dcafc01d8be2710afc62a14171de7d756a5b76f38586544b73f3bc6ec7a7c9 groff-1.19.2-r1.ebuild 2477
 MISC ChangeLog 10898 RMD160 87b4336357d8c6e3150f6daa09548558d51f2525 SHA1 8c2f36baaa53851c05e5f29e96ef67b1b00ec1f0 SHA256 5885c715e82e126798334e5d8d7870726e4cf43dd39851e6530001bec4aed26c
 MD5 c70c36e043a65fdbb6df9fb61b908bfa ChangeLog 10898
 RMD160 87b4336357d8c6e3150f6daa09548558d51f2525 ChangeLog 10898
@@ -52,3 +55,10 @@ SHA256 d12724927ef4b1c5279f1e4e6dd7acc11a875f50af8c79aec47ffd88ee8efeae files/di
 MD5 70f6b75efd3a05a24339ea8d0881804c files/digest-groff-1.19.2-r1 515
 RMD160 1cca63d735d0fff253b21c61f7fe68053a952fc5 files/digest-groff-1.19.2-r1 515
 SHA256 498177c9549e0a83bf5aa3f3a8e5f41deeb09094c9c6f52fc6d55806e4100972 files/digest-groff-1.19.2-r1 515
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFFlnAk8bi6rjpTunYRAohfAJ0Tv2NLmsGPZOP5y/f4ElcYmKSSUgCfZlDb
+KtiifgKN9/40TkL5NZVe9mU=
+=W/aI
+-----END PGP SIGNATURE-----

diff --git a/sys-apps/groff/groff-1.19.2-r1.ebuild b/sys-apps/groff/groff-1.19.2-r1.ebuild
index 4e4201b3a2eb82839817060f2f167433d681579c..2b2f7cf6cbd33304e100e04e511eb71b5bfcf643 100644 (file)
--- a/sys-apps/groff/groff-1.19.2-r1.ebuild
+++ b/sys-apps/groff/groff-1.19.2-r1.ebuild
@@ -1,7 +1,9 @@
 # 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.2-r1.ebuild,v 1.17 2006/12/30 13:44:18 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/groff-1.19.2-r1.ebuild,v 1.18 2006/12/30 13:55:47 vapier Exp $
 
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
 inherit eutils flag-o-matic toolchain-funcs multilib autotools
 
 MB_PATCH="groff_1.18.1-7" #"${P/-/_}-7"
@@ -21,8 +23,6 @@ src_unpack() {
        unpack ${A}
        cd "${S}"
 
-       use cjk && epatch "${WORKDIR}"/groff-1.19.2-japanese.patch #134377
-
        # Fix the info pages to have .info extensions,
        # else they do not get gzipped.
        epatch "${FILESDIR}"/${P}-infoext.patch
@@ -46,8 +46,10 @@ src_unpack() {
                        doc/Makefile.sub || die "cross-compile sed failed"
        fi
 
-       # The Big Japanese patch screw up autotools. See bug #134377.
-       use cjk && eautoreconf || die "eautoreconf failed"
+       if use cjk ; then
+               epatch "${WORKDIR}"/groff-1.19.2-japanese.patch #134377
+               eautoreconf
+       fi
 }
 
 src_compile() {