gentoo resync : 04.08.2018

6 files changed, 198 insertions, 143 deletions

diff --git a/app-i18n/nkf/Manifest b/app-i18n/nkf/Manifest
index 24a420f5b121..6498bfadba7b 100644
--- a/app-i18n/nkf/Manifest
+++ b/app-i18n/nkf/Manifest
@@ -1,7 +1,10 @@
 AUX nkf-2.1.3-strip.patch 328 BLAKE2B 8cf9585ce7285ab5227bb5ace9d92fa559e5cee377b665e76792bd0d921ab8c638a60bdab1510879dbbc2dc4ac131fcd7e9d6ef7f525a02d44cbcbaa6b5a3db1 SHA512 a23bf0164bcf765f3b846a564c55bd783362e6f84b6f582d4d84b5ec8b711ca07d23d104ef5de2e84de5d6754b064034736ecadc5ceab6bda9ad59f00f2f527d
+AUX nkf-2.1.4-python.patch 285 BLAKE2B 439d4009b56cd6469fc7d717b91bf0b89fcbf275d87081359eeb7ade447c76261465703ba33836b9d9a87b4da482dd9cea8bdd46818a43a0b27eb4e7182ae371 SHA512 4c9bc8468656ffb09033f6564775686e1bc2bc99c8e4856c7f38de87b4c3c842bdf6798924ea97a5da2b1b697d7aaca62556c836d122dd496e278b223c3d48f3
 DIST NKF_python20090602.tgz 2318 BLAKE2B 54399912fce0f4486e4051825319294a214089a59fa9b40e93bdc77859e79e5586abf2d197511cb158b094663993a692c981885e9db8fe260a5a746771168509 SHA512 3baee969daaba43e7ddee0d3b6d3d73ed67cfb0a3c3cbdabcdcda9fa1e61ccf374cd686ee096d031c3c48541c6be6daacf82e3b05885de63b88344d137c306d9
 DIST nkf-2.1.3.tar.gz 195020 BLAKE2B 7ffd2acdc16d98cfe1e7a73ff5999756a1c46e5dbbbf349d296f11526c077c42a64b1657d3a6bf8bee1326768ec06fe9d2aea02e5f8ba02e77626bb1316d1484 SHA512 e40798d4084657b545bdaa9904229b0a424a9be076c16993b97d206c3e82490c45288eaab417c6eea70b770f89530f90e98e1a659f8f7e4b928eea4396d1e738
+DIST nkf-2.1.4.tar.gz 232479 BLAKE2B 81887b8b0422e92b2fa2be285c1d9fa4da16d572ca50e1fbeef7be4f50af9ba9b64ef140163e325e57c351dd384ee8b09849bad7c37b03d48a9cb4b88f2ee199 SHA512 8667c20a6c5e9c0c6df7ebe2571bcf24090f04dafd306d32f07312acd659ea026a91d31521b4b213f77aba8218159effd73607d0b7236b7287e4a4cde8cc62b9
 DIST nkf.1j 24160 BLAKE2B 1d461dbacfb6e5ee358d7ea162582da5042a03f02448791c4ed33a10e9eb6e5907220db8d70aea691e3908252daffcbacdaab1b9fe52b0e4e25f7b590e5bca72 SHA512 4680dfb59ceb9db5031ecefeca808e34202c841309d5b634cdd7aa89ee97118701ddeddb0ae18a2cf791987929dc9c5a528275cb1f63b1742eac2197ac9c1416
-EBUILD nkf-2.1.3-r1.ebuild 1555 BLAKE2B 00cdbe4640317471c98c918f467c44fd1c079550294ca78d6d369823422d484de72d71003d6c2c223d0f361116e9a0aba002b18e9463991e9f0d6968fbd2acf9 SHA512 873a402d6cd444119fc3cc806a97e0f057343b26c724b38076168c416cdb3f9ee5d65fe50ae475469f8d55ae51fe5a45a7487f42277513c4b25dbd3202ecc5e0
-EBUILD nkf-2.1.3.ebuild 1424 BLAKE2B d672889f8d8b195d9a1ed1e655fdf5fc6d5a0fd8e2cb835cd145f09fd1c736c20f6f5feb901559cdd2028d0ed3d8c212689649c34d86616eb897875e84c9873f SHA512 c3055e5c093fade5bf12ef16b46fb6f6a9c8b74c60d98a7e5c0e8b9e6beb68ae8fb9f11fa9e00afaf304945adc7133f06bfc05772ab2eb667c1f2b2a443da13b
+DIST python-nkf-0.2.0_p20141211.tar.gz 187761 BLAKE2B b607e155934dd14ad4d29298f209a233d846122299326df48e45339661d1cd08a789f5278928cb4a32c747673723f5f8877d98c7a6200af6b2dbbf29cd100f00 SHA512 5a493f32244e3cb72d188fa39b810baef31ce5f530309797a05474e3f58cf22fd5f8b6c66cdf5268451c49ffb759c476c707329ce1ccf42da0362ad4f5c24d71
+EBUILD nkf-2.1.3-r2.ebuild 1713 BLAKE2B 67720f1fb282fcbb006336a357b5a97824147d97788065157e8e5ed139a1f3c19df620d1a1cf80f25b7634a7a6c9cd1e709c23be35b8c3018d84ee8c1c1a98bb SHA512 24b3317c3203f148e171f0c211cafe1214b4c1b110ffcf01989b4c42830303f6d843533231051d0daddf86921769eb8ab7fd2bea2527ff1acf2a175248be9b4d
+EBUILD nkf-2.1.4.ebuild 1832 BLAKE2B 07177c1eace2718e5288a56aacc52ee4436cfc6b3774ac3a8da2eb7d4d000afd8e73fa91b2e09830d39e77aa3c637e99a99455b640702cb6a10f9fea2de1d2a6 SHA512 5534788beb13116dfbbfe547c273cf06c12c817d398ab71217819d817ab1d5da65b077f9aab036f5b9254603fb6739e0c765049209913a79f83d818f4e345359
 MISC metadata.xml 310 BLAKE2B 5db509d8ef0ebd0727be43314f12d877a704ff9eb8b9cde61733c4dbad8196780c07c9de484f29786116e7fe9267ca3f6be9f727be9f4fa34e582b23fa586594 SHA512 2db03c97fb76c37b779c7f6e467c03b2bc08d2642090cc27a99ae07296edcde04924e37c8a3e6cb23d61552e8cf4bee273e5c17077fac0ae0ea3458aaa81eacd
diff --git a/app-i18n/nkf/files/nkf-2.1.4-python.patch b/app-i18n/nkf/files/nkf-2.1.4-python.patch
new file mode 100644
index 000000000000..6f9e2e687e07
--- /dev/null
+++ b/app-i18n/nkf/files/nkf-2.1.4-python.patch
@@ -0,0 +1,13 @@
+--- a/NKF.python/nkf.c
++++ b/NKF.python/nkf.c
+@@ -78,8 +78,8 @@
+ }
+ 
+ #define PERL_XS 1
+-#include "nkf-dist/utf8tbl.c"
+-#include "nkf-dist/nkf.c"
++#include "../utf8tbl.c"
++#include "../nkf.c"
+ 
+ static PyObject *
+ pynkf_convert(unsigned char* str, int strlen, char* opts, int optslen)
diff --git a/app-i18n/nkf/nkf-2.1.3-r1.ebuild b/app-i18n/nkf/nkf-2.1.3-r1.ebuild
deleted file mode 100644
index 240a559e772a..000000000000
--- a/app-i18n/nkf/nkf-2.1.3-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_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
-	l10n_ja? ( https://dev.gentoo.org/~naota/files/nkf.1j )
-	python? ( https://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 l10n_ja"
-
-src_prepare() {
-	sed -i \
-		-e '/^CFLAGS/{s|-g -O2||;s|=|+=|;}' \
-		-e '/-o nkf/s:$(CFLAGS):$(CFLAGS) $(LDFLAGS):' \
-		Makefile || die
-
-	if use l10n_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 l10n_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
-}
diff --git a/app-i18n/nkf/nkf-2.1.3-r2.ebuild b/app-i18n/nkf/nkf-2.1.3-r2.ebuild
new file mode 100644
index 000000000000..21daf284bc4f
--- /dev/null
+++ b/app-i18n/nkf/nkf-2.1.3-r2.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python2_7 )
+
+inherit 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/${PN}/59912/${P}.tar.gz
+	l10n_ja? ( https://dev.gentoo.org/~naota/files/${PN}.1j )
+	python? ( https://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 l10n_ja"
+
+src_prepare() {
+	sed -i \
+		-e "/^CFLAGS/{ s/-g -O2//; s/=/+=/; }" \
+		-e "/ -o ${PN}/s/\(-o \)/\$(LDFLAGS) \1/" \
+		Makefile
+	if use l10n_ja; then
+		cp "${DISTDIR}"/${PN}.1j ${PN}.ja.1 || die
+	fi
+	if use python; then
+		mv "${WORKDIR}"/NKF.python . || die
+		eapply "${FILESDIR}"/${P}-strip.patch
+	fi
+
+	default
+}
+
+src_configure() {
+	default
+	if use perl; then
+		cd NKF.mod
+		perl-module_src_configure
+		cd - >/dev/null
+	fi
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+	if use perl; then
+		cd NKF.mod
+		perl-module_src_compile
+		cd - >/dev/null
+	fi
+	if use python; then
+		cd NKF.python
+		distutils-r1_src_compile
+		cd - >/dev/null
+	fi
+}
+
+src_test() {
+	default
+	if use perl; then
+		cd NKF.mod
+		perl-module_src_test
+		cd - >/dev/null
+	fi
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+
+	if use l10n_ja; then
+		doman ${PN}.ja.1
+	fi
+	dodoc ${PN}.doc
+
+	if use perl; then
+		cd NKF.mod
+		docinto perl
+		perl-module_src_install
+		cd - >/dev/null
+	fi
+	if use python; then
+		cd NKF.python
+		docinto python
+		DOCS= distutils-r1_src_install
+		dodoc README
+		cd - >/dev/null
+	fi
+}
diff --git a/app-i18n/nkf/nkf-2.1.3.ebuild b/app-i18n/nkf/nkf-2.1.3.ebuild
deleted file mode 100644
index 4c6a6142c01b..000000000000
--- a/app-i18n/nkf/nkf-2.1.3.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_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
-	python? ( https://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 l10n_ja"
-
-src_prepare() {
-	sed -i \
-		-e '/^CFLAGS/{s|-g -O2||;s|=|+=|;}' \
-		-e '/-o nkf/s:$(CFLAGS):$(CFLAGS) $(LDFLAGS):' \
-		Makefile || die
-
-	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 l10n_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
-}
diff --git a/app-i18n/nkf/nkf-2.1.4.ebuild b/app-i18n/nkf/nkf-2.1.4.ebuild
new file mode 100644
index 000000000000..9f6f6f5d6308
--- /dev/null
+++ b/app-i18n/nkf/nkf-2.1.4.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1 perl-module toolchain-funcs vcs-snapshot
+
+PY_P="python-${PN}-0.2.0_p20141211"
+PY_COMMIT="000915e115acac57a1fdbceb1e6361788af83a3d"
+
+DESCRIPTION="Network Kanji code conversion Filter with UTF-8/16 support"
+HOMEPAGE="http://sourceforge.jp/projects/nkf/"
+SRC_URI="mirror://sourceforge.jp/${PN}/64158/${P}.tar.gz
+	python? ( https://github.com/fumiyas/python-${PN}/archive/${PY_COMMIT}.tar.gz -> ${PY_P}.tar.gz )"
+
+LICENSE="ZLIB python? ( BSD )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-macos"
+IUSE="perl python l10n_ja"
+
+src_prepare() {
+	sed -i \
+		-e "/^CFLAGS/{ s/-g -O2//; s/=/+=/; }" \
+		-e "/ -o ${PN}/s/\(-o \)/\$(LDFLAGS) \1/" \
+		Makefile
+	if use python; then
+		mv "${WORKDIR}"/${PY_P} NKF.python || die
+		eapply "${FILESDIR}"/${P}-python.patch
+	fi
+
+	default
+}
+
+src_configure() {
+	default
+	if use perl; then
+		cd NKF.mod
+		perl-module_src_configure
+		cd - >/dev/null
+	fi
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+	if use perl; then
+		cd NKF.mod
+		perl-module_src_compile
+		cd - >/dev/null
+	fi
+	if use python; then
+		cd NKF.python
+		distutils-r1_src_compile
+		cd - >/dev/null
+	fi
+}
+
+src_test() {
+	default
+	if use perl; then
+		cd NKF.mod
+		perl-module_src_test
+		cd - >/dev/null
+	fi
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+
+	if use l10n_ja; then
+		iconv -f ISO-2022-JP-3 -t UTF-8 ${PN}.1j > ${PN}.ja.1 || die
+		doman ${PN}.ja.1
+	fi
+	dodoc ${PN}.doc
+
+	if use perl; then
+		cd NKF.mod
+		docinto perl
+		perl-module_src_install
+		cd - >/dev/null
+	fi
+	if use python; then
+		cd NKF.python
+		docinto python
+		DOCS= distutils-r1_src_install
+		dodoc CHANGES README.md
+		cd - >/dev/null
+	fi
+}