gentoo resync : 30.05.2020

6 files changed, 85 insertions, 36 deletions

diff --git a/app-i18n/nkf/Manifest b/app-i18n/nkf/Manifest
index 44bd33cb9568..ff8f73bc0f4f 100644
--- a/app-i18n/nkf/Manifest
+++ b/app-i18n/nkf/Manifest
@@ -1,10 +1,9 @@
-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
+AUX nkf-2.1.4-test.patch 145 BLAKE2B 8e8fc2069b8f2fc039cd4bb791c90f37eeb17d26289ca485998530c7ae400e1d4b4ad5d188a2550b42881ff1e85000c0c80034ecc8642f8a53ca1c9d8f029d8c SHA512 c5086a135667440ac289079f401ccf674110db88d0c170652caf9ad5ad341513737c42cf01481b468fbcbf612f250cd0fa5c734a625c66cfdd5702a295707efc
+AUX nkf-python.patch 285 BLAKE2B 439d4009b56cd6469fc7d717b91bf0b89fcbf275d87081359eeb7ade447c76261465703ba33836b9d9a87b4da482dd9cea8bdd46818a43a0b27eb4e7182ae371 SHA512 4c9bc8468656ffb09033f6564775686e1bc2bc99c8e4856c7f38de87b4c3c842bdf6798924ea97a5da2b1b697d7aaca62556c836d122dd496e278b223c3d48f3
 DIST nkf-2.1.4.tar.gz 232479 BLAKE2B 81887b8b0422e92b2fa2be285c1d9fa4da16d572ca50e1fbeef7be4f50af9ba9b64ef140163e325e57c351dd384ee8b09849bad7c37b03d48a9cb4b88f2ee199 SHA512 8667c20a6c5e9c0c6df7ebe2571bcf24090f04dafd306d32f07312acd659ea026a91d31521b4b213f77aba8218159effd73607d0b7236b7287e4a4cde8cc62b9
-DIST nkf.1j 24160 BLAKE2B 1d461dbacfb6e5ee358d7ea162582da5042a03f02448791c4ed33a10e9eb6e5907220db8d70aea691e3908252daffcbacdaab1b9fe52b0e4e25f7b590e5bca72 SHA512 4680dfb59ceb9db5031ecefeca808e34202c841309d5b634cdd7aa89ee97118701ddeddb0ae18a2cf791987929dc9c5a528275cb1f63b1742eac2197ac9c1416
+DIST nkf-2.1.5.tar.gz 215879 BLAKE2B b5ae8f51b0ed97261f9e82ad469adbc9e469e709dc5acb64bfba48881555931eade5fcb772e7956a7401399008ec33bd57c8d6d8b5790eefe4d69d4e1dabed7c SHA512 fa5b683184481b25249872e7902033a72b6a6219b4c63d508a738710029430733e78cfa13b3d69dc281676762765e0452c92244a3855d3acbb5e23aa63214847
 DIST python-nkf-0.2.0_p20141211.tar.gz 187761 BLAKE2B b607e155934dd14ad4d29298f209a233d846122299326df48e45339661d1cd08a789f5278928cb4a32c747673723f5f8877d98c7a6200af6b2dbbf29cd100f00 SHA512 5a493f32244e3cb72d188fa39b810baef31ce5f530309797a05474e3f58cf22fd5f8b6c66cdf5268451c49ffb759c476c707329ce1ccf42da0362ad4f5c24d71
-EBUILD nkf-2.1.3-r2.ebuild 1684 BLAKE2B 8d163de8197a52c0ad0054d14b8899cd6f05f4ac0468318d58a345b0afcfaf1c4ad36ad028686b42a568022226c45124e9f022e421136757edc001c1f8831502 SHA512 1ecddea3aef41246748bda0b999afbf3b0acaef17c02f4dbd6d8a36b41a0cfff1669b871f5b9f69f5924c898ee7c1674e9ddca76e336b95709835468c808e147
-EBUILD nkf-2.1.4.ebuild 1787 BLAKE2B 290bdfbaeeeb51ebc69f74843ccb1724e879941c713a09caa7843f66fe4e752ce18e081cf2836ec7821d4c249f68a86c000f2cd9d4a7477c5382a540894a7b39 SHA512 7b5444e0a3da445f58627ebbbefb88b1d60571a2ec4b7664571507b2ffcbe752f6d1d7dd604e62f4152a4a1a68a0e3ef5983f0c2de4f6a6bb424362fdd56a8c8
+DIST python-nkf-0.2.0_p20191121.tar.gz 188496 BLAKE2B f7c9baaff8129956b7981011634f7ee5ece97e1b6650551a5cc2b50ff51a0c96a454f39e888c80120242a12b202c0422c0ecfc21858b1822a4959ff4c108b10d SHA512 ae1494ebdd488dc40802178a1b7b05c9a9b0bcf9cf9fa5017c6bc9f153c01b475c00f993489a21f643acc4ad61595c38c5afe28f3512a4d24f36eda7abd33958
+EBUILD nkf-2.1.4.ebuild 2284 BLAKE2B d1f140750fe2115ec9db10d9800b80506c4c6e6f40bb7abaf0db0ac06a557554587db35affd02bc21d7c0efe2b648db67149d4eadb9afae92c3c3a07d66a4950 SHA512 918615a41b12f6db0a6801087e95369eeb13fb206115f74b71c97b7d4b43276260483d1af65ce82732eb71767cbcf5e1b71ebe8cd02e395f8d29d282526b1c48
+EBUILD nkf-2.1.5.ebuild 2246 BLAKE2B 480d9cfffaac6349a9e1282db886741d13a48f130c0050d2a50a134480b511080aefb8b87fd5609ebe59cec6ac78e2c4df499c17f1e195284f70092b0247cb53 SHA512 c4fd73ad50bbfa01baadf62969871e3badbfeb8307855d38e6bcd2b6c4e93b0c9127630d758f992c16fc5c295912385c6577636d364525de2e938a879130d272
 MISC metadata.xml 310 BLAKE2B 5db509d8ef0ebd0727be43314f12d877a704ff9eb8b9cde61733c4dbad8196780c07c9de484f29786116e7fe9267ca3f6be9f727be9f4fa34e582b23fa586594 SHA512 2db03c97fb76c37b779c7f6e467c03b2bc08d2642090cc27a99ae07296edcde04924e37c8a3e6cb23d61552e8cf4bee273e5c17077fac0ae0ea3458aaa81eacd
diff --git a/app-i18n/nkf/files/nkf-2.1.3-strip.patch b/app-i18n/nkf/files/nkf-2.1.3-strip.patch
deleted file mode 100644
index 5cfac8820f82..000000000000
--- a/app-i18n/nkf/files/nkf-2.1.3-strip.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/NKF.python/setup.py
-+++ b/NKF.python/setup.py
-@@ -8,5 +8,4 @@
-        author="Matsumoto Tadashi",
-        author_email="ma2@city.plala.jp",
-        ext_modules = [
--               Extension("nkf", ["NKF_python.c"],
--                         extra_link_args = ['-s'])])
-+               Extension("nkf", ["NKF_python.c"])])
diff --git a/app-i18n/nkf/files/nkf-2.1.4-test.patch b/app-i18n/nkf/files/nkf-2.1.4-test.patch
new file mode 100644
index 000000000000..26964ef4d64b
--- /dev/null
+++ b/app-i18n/nkf/files/nkf-2.1.4-test.patch
@@ -0,0 +1,11 @@
+--- a/test.pl
++++ b/test.pl
+@@ -120,7 +120,7 @@
+     return;
+ }
+ 
+-do "nkf_test.pl";
++do "./nkf_test.pl";
+ unlink "nkf.in";
+ unlink "nkf.out";
+ 
diff --git a/app-i18n/nkf/files/nkf-2.1.4-python.patch b/app-i18n/nkf/files/nkf-python.patch
index 6f9e2e687e07..6f9e2e687e07 100644
--- a/app-i18n/nkf/files/nkf-2.1.4-python.patch
+++ b/app-i18n/nkf/files/nkf-python.patch
diff --git a/app-i18n/nkf/nkf-2.1.4.ebuild b/app-i18n/nkf/nkf-2.1.4.ebuild
index 25f4cbcc3d49..a470fb8bf853 100644
--- a/app-i18n/nkf/nkf-2.1.4.ebuild
+++ b/app-i18n/nkf/nkf-2.1.4.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
-PYTHON_COMPAT=( python3_6 )
+EAPI="7"
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_OPTIONAL="1"
+DISTUTILS_USE_SETUPTOOLS="no"
 
 inherit distutils-r1 perl-module toolchain-funcs vcs-snapshot
 
@@ -10,14 +12,29 @@ PY_P="python-${PN}-0.2.0_p20141211"
 PY_COMMIT="000915e115acac57a1fdbceb1e6361788af83a3d"
 
 DESCRIPTION="Network Kanji code conversion Filter with UTF-8/16 support"
-HOMEPAGE="https://ja.osdn.net/projects/nkf/"
+HOMEPAGE="https://osdn.net/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 ~sparc ~x86 ~x86-macos"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-macos"
 IUSE="perl python l10n_ja"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/setuptools[${PYTHON_USEDEP}]
+		')
+	)"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-test.patch )
+
+src_unpack() {
+	use python && vcs-snapshot_src_unpack || default
+}
 
 src_prepare() {
 	sed -i \
@@ -26,7 +43,10 @@ src_prepare() {
 		Makefile
 	if use python; then
 		mv "${WORKDIR}"/${PY_P} NKF.python || die
-		eapply "${FILESDIR}"/${P}-python.patch
+		eapply "${FILESDIR}"/${PN}-python.patch
+		cd NKF.python
+		distutils-r1_src_prepare
+		cd - >/dev/null
 	fi
 
 	default
@@ -39,6 +59,11 @@ src_configure() {
 		perl-module_src_configure
 		cd - >/dev/null
 	fi
+	if use python; then
+		cd NKF.python
+		distutils-r1_src_configure
+		cd - >/dev/null
+	fi
 }
 
 src_compile() {
diff --git a/app-i18n/nkf/nkf-2.1.3-r2.ebuild b/app-i18n/nkf/nkf-2.1.5.ebuild
index ee2518acd6d2..718622f52d28 100644
--- a/app-i18n/nkf/nkf-2.1.3-r2.ebuild
+++ b/app-i18n/nkf/nkf-2.1.5.ebuild
@@ -1,33 +1,50 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
-PYTHON_COMPAT=( python2_7 )
+EAPI="7"
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_OPTIONAL="1"
+DISTUTILS_USE_SETUPTOOLS="no"
 
-inherit distutils-r1 perl-module toolchain-funcs
+inherit distutils-r1 perl-module toolchain-funcs vcs-snapshot
+
+PY_P="python-${PN}-0.2.0_p20191121"
+PY_COMMIT="c2c6724714b66f295137c8818dae4c09fc09e0a3"
 
 DESCRIPTION="Network Kanji code conversion Filter with UTF-8/16 support"
-HOMEPAGE="https://ja.osdn.net/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 )"
+HOMEPAGE="https://osdn.net/projects/nkf/"
+SRC_URI="mirror://sourceforge.jp/${PN}/70406/${P}.tar.gz
+	python? ( https://github.com/fumiyas/python-${PN}/archive/${PY_COMMIT}.tar.gz -> ${PY_P}.tar.gz )"
 
-LICENSE="ZLIB"
+LICENSE="ZLIB python? ( BSD )"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86 ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-macos"
 IUSE="perl python l10n_ja"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/setuptools[${PYTHON_USEDEP}]
+		')
+	)"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	use python && vcs-snapshot_src_unpack || default
+}
 
 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
+		mv "${WORKDIR}"/${PY_P} NKF.python || die
+		eapply "${FILESDIR}"/${PN}-python.patch
+		cd NKF.python
+		distutils-r1_src_prepare
+		cd - >/dev/null
 	fi
 
 	default
@@ -40,6 +57,11 @@ src_configure() {
 		perl-module_src_configure
 		cd - >/dev/null
 	fi
+	if use python; then
+		cd NKF.python
+		distutils-r1_src_configure
+		cd - >/dev/null
+	fi
 }
 
 src_compile() {
@@ -70,6 +92,7 @@ src_install() {
 	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
@@ -84,7 +107,7 @@ src_install() {
 		cd NKF.python
 		docinto python
 		DOCS= distutils-r1_src_install
-		dodoc README
+		dodoc CHANGES README.md
 		cd - >/dev/null
 	fi
 }