Fix broken Japanese man page, patch by Takurou Kitagawa. #519466

Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0xF8551514

3 files changed, 96 insertions, 5 deletions

diff --git a/app-i18n/nkf/ChangeLog b/app-i18n/nkf/ChangeLog
index cd1205a0b41c..465eea69aee6 100644
--- a/app-i18n/nkf/ChangeLog
+++ b/app-i18n/nkf/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-i18n/nkf
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/nkf/ChangeLog,v 1.61 2014/08/09 08:30:22 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/nkf/ChangeLog,v 1.62 2014/08/28 08:15:40 naota Exp $
+
+*nkf-2.1.3-r1 (28 Aug 2014)
+
+  28 Aug 2014; Naohiro Aota <naota@gentoo.org> +nkf-2.1.3-r1.ebuild:
+  Fix broken Japanese man page, patch by Takurou Kitagawa. #519466
 
   09 Aug 2014; Jeroen Roovers <jer@gentoo.org> nkf-2.1.3.ebuild:
   Make USE=python mv/patch conditional again (bug #519464 by Takurou Kitagawa).
diff --git a/app-i18n/nkf/Manifest b/app-i18n/nkf/Manifest
index 84249c51da34..79b88f23e35e 100644
--- a/app-i18n/nkf/Manifest
+++ b/app-i18n/nkf/Manifest
@@ -4,13 +4,25 @@ Hash: SHA256
 AUX nkf-2.1.3-strip.patch 328 SHA256 b6b35874a1aa5785a58693ef27e8e8096b9dd6a5513e58b865dc8f517cbab303 SHA512 a23bf0164bcf765f3b846a564c55bd783362e6f84b6f582d4d84b5ec8b711ca07d23d104ef5de2e84de5d6754b064034736ecadc5ceab6bda9ad59f00f2f527d WHIRLPOOL 153749a8531cfe8488a067e1173a86a9a0385cf64933684197740cf95202989830d637d74db4940dddbda2a5c7807d082491c2b203ac08750625cc9851ab4d35
 DIST NKF_python20090602.tgz 2318 SHA256 c86336e52398d836d6db4f9f169d11b4003ac02681b5e3395cd64c7823beb504 SHA512 3baee969daaba43e7ddee0d3b6d3d73ed67cfb0a3c3cbdabcdcda9fa1e61ccf374cd686ee096d031c3c48541c6be6daacf82e3b05885de63b88344d137c306d9 WHIRLPOOL adea94cd33b4421754be16f64f70dd56a3cd7394852f16fb74bde812ef7c30c6d67285f0b832cdba941039755fb57f97592b94f127a020cdcbd064a4d0f67b58
 DIST nkf-2.1.3.tar.gz 195020 SHA256 8cb430ae69a1ad58b522eb4927b337b5b420bbaeb69df255919019dc64b72fc2 SHA512 e40798d4084657b545bdaa9904229b0a424a9be076c16993b97d206c3e82490c45288eaab417c6eea70b770f89530f90e98e1a659f8f7e4b928eea4396d1e738 WHIRLPOOL 360ab7047da404159d8c9ce736f5d389934bbe33e3feae488be8df7aa87c48c2c39fba9e6a60a5fbd7850311303f906d3c544a48fdfb6163bf1ae106f0aaf639
+DIST nkf.1j 24160 SHA256 6738707f5e8f2c95a79a7faa83864ecc98e2485ed7fd22c30c959e85d67c3d47 SHA512 4680dfb59ceb9db5031ecefeca808e34202c841309d5b634cdd7aa89ee97118701ddeddb0ae18a2cf791987929dc9c5a528275cb1f63b1742eac2197ac9c1416 WHIRLPOOL 015ea200a9b781556bda7833044481c9686a65f92e7100d648da53d0e5277f03241936f18f5552c5e2b7ea71b3a9d0232bea2ed61496b61890cd7837f525e47b
+EBUILD nkf-2.1.3-r1.ebuild 1677 SHA256 835f7a1e4f9774bdeb5a342c91eb04e9cacbe367a3be7e0a82c907217dbe84bc SHA512 d5f63ca919508f9cc7f4da8aeded1a109328cbe6fd1766f307e3cf4a56c05ae1afe083854d63abd0e5062c6fe4f3ac71e70d38a3d610af06d2a277cdba3fb4de WHIRLPOOL 2b60a0d4e6cc4682b5673d5a77365e9a81d3f74fda8c23a9829105c93f427af3a583dd4f725f8ed2bc972121638f49f28185ebc8b84890aa343524292cb9e09f
 EBUILD nkf-2.1.3.ebuild 1536 SHA256 13d8413572dc3550d00418738dbaa6cee7c15bb4138f0687cee441350320bc83 SHA512 7e7fc74ef497c524e70aa79a8607ba79656b5e6017c375413e5fb4a9d6df0f935f76064952a0b24fddc64e2b0f951ae927c2f40fc9fb40e5320ac62019b1d536 WHIRLPOOL 201d0b6709bb284974f9c6a4653ec5830443e649aa8402e697959f9e19370c789d71b2df2f809ca426b0871d9ed60c49c427576d5fe6e421eb152897e709590d
-MISC ChangeLog 7338 SHA256 dfc0bc34e04905d13493f3e75d26ddf66f91c151f3efb90efa5a86890d7d2e4d SHA512 796df31c3a08a7ee9690a5fc869a6ed63dbe824531a6b1d4f6ff255472e10c7087a042dce875132357eb2b134ce6c9122df20679a68f3f34acd5ba3e9dbec1f6 WHIRLPOOL 6db5c9f7ad4001ca8856a5d385a08d59c9d1d2c4c0d32cfffb41585ad14c06d413b8ce89a4a273cabd6c7dc8536b47ee5d58b388bd80d7e459db7239c6f3b9a0
+MISC ChangeLog 7506 SHA256 faf0c6c7428a290bd7f3e9f2ec3a55b2d9fb840b3c6792afb0a5ca16eb7f188b SHA512 da993aaa81269e731cb3f66470c33fcf31374f4b922629440908c9d2c69892f7f0ea0d04d435ae007d16fdff48dad1419e855bd1f5033ee68f5ecb6021a9efa4 WHIRLPOOL 7a87343b45afe420ddd7210555e8d42fa4061ea662c5fce44b519f0345b3abd8482001872aa9ff1c105e83aef1fbda5a284f0ccfd29b2b54b3a0b54d6b730e40
 MISC metadata.xml 156 SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215 SHA512 e46682afa9f674a8685beb29de6485f750484180d86f8980a3c5c220861f38495ac6f4ceda7cf21c317c640d0d218af3ea9bc1a406b207124c1ffb4bcc99628b WHIRLPOOL 347b826ae650374a01eb144ef127dea2fb96c8646b9a1e4b142bce523822988c4597bc2980cc29dcbfeabc1e44ba70136ddea73f1837d4c6ef7d5e3e9d1d1268
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPl3CAACgkQVWmRsqeSphODsACeNdfl+DSGgE7qlc5xQjDBJIG/
-g44An0KBbvYJJ0g7K+4IkKqrbGnZxe0b
-=Wp5s
+iQIcBAEBCAAGBQJT/uUzAAoJEDYO1FT4VRUUU6QP/iIkPqVWwpV/ZynrxKa9tA+V
+pf2d08n6JDHdidZuHGK205f9jBScpmqLIU5+AVMBQ8JowRfJQ/NLxh8yD6mKzjux
+AYqYvNYRZcx0CgoTLf8c/xN5/bgm6Xrlv65xQpsp18zlakF5zb5WulCtGOSxCiBd
+xyzUaqb2Dzz8w76v+bjeqmeFReC/L999H+TfM6+jzUN+UHL4TAFM/L4VwMqxmqeO
+cO4CYqoWsDes7QWWaM/w5yrIhbeHtURIKGIU9/Wk6TEccNIwhsFQIyUOxvZ16rYA
+asgjY2qHGLTHZQgtMjlsQjNQ7R5hiz8j/e39arbGMasA033TO8rwGRuRm3VgtiD+
+8phgkm1VC0WZqyEPTDIu6NY11D8+YNvlWLbW9bHmp83nqrNxrHiozFCbHOcHPBl+
+LxYoRsWGrJEgAu/ZdI0oNIfkNKwkfUDoonsZ9hnw03//MljyO7M0Wa4/mTz4LDgo
+gKGEur4XbiEPb7as5748TDgxonQWG1+cCINuheqU7Js+vjQzWoFg7RqusyfmpT6A
+cTHTDeT0PyHGAA72hm8G32o4w6SkhZYys0mUUBrC4J89BNl/0ZziZumAm5Uiv6Ca
+/8NCHxxeYw298lA9rYlfOBwBhb+vom3ODFQlsKdUK7u8+xau85XYfbkXVH8WtszD
+8283qnPaI+iX921Jp6ui
+=WP4V
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/nkf/nkf-2.1.3-r1.ebuild b/app-i18n/nkf/nkf-2.1.3-r1.ebuild
new file mode 100644
index 000000000000..3df434016508
--- /dev/null
+++ b/app-i18n/nkf/nkf-2.1.3-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/nkf/nkf-2.1.3-r1.ebuild,v 1.1 2014/08/28 08:15:40 naota Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_6,2_7} )
+inherit eutils distutils-r1 perl-module toolchain-funcs
+
+DESCRIPTION="Network Kanji code conversion Filter with UTF-8/16 support"
+HOMEPAGE="http://sourceforge.jp/projects/nkf/"
+SRC_URI="mirror://sourceforge.jp/nkf/59912/${P}.tar.gz
+	linguas_ja? ( http://dev.gentoo.org/~naota/files/nkf.1j )
+	python? ( http://dev.gentoo.org/~naota/files/NKF_python20090602.tgz )"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-macos"
+IUSE="perl python linguas_ja"
+
+src_prepare() {
+	sed -i \
+		-e '/^CFLAGS/{s|-g -O2||;s|=|+=|;}' \
+		-e '/-o nkf/s:$(CFLAGS):$(CFLAGS) $(LDFLAGS):' \
+		Makefile || die
+
+	if use linguas_ja; then
+		cp "${DISTDIR}"/nkf.1j "${S}" || die
+	fi
+
+	if use python; then
+		mv "${WORKDIR}/NKF.python" "${S}" || die
+		epatch "${FILESDIR}"/${P}-strip.patch
+	fi
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" nkf || die
+	if use perl; then
+		cd "${S}/NKF.mod"
+		perl-module_src_compile
+	fi
+	if use python; then
+		cd "${S}/NKF.python"
+		distutils-r1_src_compile
+	fi
+}
+
+src_test() {
+	emake test || die
+	if use perl; then
+		cd "${S}/NKF.mod"
+		perl-module_src_test
+	fi
+}
+
+src_install() {
+	dobin nkf || die
+	doman nkf.1
+
+	if use linguas_ja; then
+		./nkf -e nkf.1j > nkf.1
+		doman -i18n=ja nkf.1
+	fi
+	dodoc nkf.doc
+
+	if use perl; then
+		cd "${S}/NKF.mod"
+		perl-module_src_install
+	fi
+	if use python; then
+		cd "${S}/NKF.python"
+		distutils-r1_src_install
+	fi
+}