gentoo auto-resync : 15:04:2024 - 12:04:02

3 files changed, 10 insertions, 119 deletions

diff --git a/app-i18n/nkf/Manifest b/app-i18n/nkf/Manifest
index eae26e112fa9..515d3b9b98df 100644
--- a/app-i18n/nkf/Manifest
+++ b/app-i18n/nkf/Manifest
@@ -3,6 +3,5 @@ AUX nkf-2.1.5-python-ssize_t.patch 2102 BLAKE2B 4032c12fc124efe3c44c4fbf81c6b72b
 AUX nkf-python.patch 285 BLAKE2B 439d4009b56cd6469fc7d717b91bf0b89fcbf275d87081359eeb7ade447c76261465703ba33836b9d9a87b4da482dd9cea8bdd46818a43a0b27eb4e7182ae371 SHA512 4c9bc8468656ffb09033f6564775686e1bc2bc99c8e4856c7f38de87b4c3c842bdf6798924ea97a5da2b1b697d7aaca62556c836d122dd496e278b223c3d48f3
 DIST nkf-2.1.5.tar.gz 215879 BLAKE2B b5ae8f51b0ed97261f9e82ad469adbc9e469e709dc5acb64bfba48881555931eade5fcb772e7956a7401399008ec33bd57c8d6d8b5790eefe4d69d4e1dabed7c SHA512 fa5b683184481b25249872e7902033a72b6a6219b4c63d508a738710029430733e78cfa13b3d69dc281676762765e0452c92244a3855d3acbb5e23aa63214847
 DIST python-nkf-0.2.0_p20191121.tar.gz 188496 BLAKE2B f7c9baaff8129956b7981011634f7ee5ece97e1b6650551a5cc2b50ff51a0c96a454f39e888c80120242a12b202c0422c0ecfc21858b1822a4959ff4c108b10d SHA512 ae1494ebdd488dc40802178a1b7b05c9a9b0bcf9cf9fa5017c6bc9f153c01b475c00f993489a21f643acc4ad61595c38c5afe28f3512a4d24f36eda7abd33958
-EBUILD nkf-2.1.5-r1.ebuild 2427 BLAKE2B 34a953ebb6129b478f81d58854ebe620e87aaccb65bf33b298dd104295de69755e9901c0082ee43b60aa47c958e6bf363c1476a4dc684cc4a9656e5e346dca72 SHA512 83be5d02684bf0dcef6bd05327b79ed256852a32a51d1442791e398b5dae9d8600a5d3498a5cd9de4911e48f8467587eaae98439955b8daa65f5c653eabe968c
-EBUILD nkf-2.1.5.ebuild 2316 BLAKE2B d56debab7300a71e005b6275c955886e6e52a8266386cdc7acdff2646ba02ee312e822230eac044c1deaada4f85ec8d2eafac2fb145e6a30e797939824d4c9b8 SHA512 fd5b432e14807922520f89684bf52123a2f5968acc1be4609fcaed7007ae3b3d374c63269a2ba913866319247e44dc65ed7550d71aec87c2c87f02f1a8418267
+EBUILD nkf-2.1.5-r1.ebuild 2493 BLAKE2B 0e22b0f69e92b457ab626e1a29adbf064234ea2c6ba6c2d0a3f3ead84b9940700f9322ffc9a2afc59f39a7cfffe559903ed89d11cf637ef622d2c859679c2470 SHA512 d855e9f86d3a40fa6bba0755c42bb3353bc701e308566996a21dc05391265d32973d8b5f9b5d9af3e9ae37a5786c2e5ebcb9fd05db6d645771cc44397367139c
 MISC metadata.xml 408 BLAKE2B b84991c18d84658969ef2b7ed339f908b4bc9e2c1e03167950bac4950a18a1aefdbd7f603f82e1858ac62b6c07fc6711fc1cf7b8a1a859c2e6c510833cc589a6 SHA512 3783846f3ebf23b12c22d23e213c3ee38cb92e39921165fc108ec8d0973d1c2d093d4119733dcc1f459409b7323a8b6b368e1642e98146524bee572078add284
diff --git a/app-i18n/nkf/nkf-2.1.5-r1.ebuild b/app-i18n/nkf/nkf-2.1.5-r1.ebuild
index 44490ab3b00b..5c009ec1ef8a 100644
--- a/app-i18n/nkf/nkf-2.1.5-r1.ebuild
+++ b/app-i18n/nkf/nkf-2.1.5-r1.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=8
+EAPI="8"
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..12} )
+DISTUTILS_USE_PEP517="setuptools"
 DISTUTILS_OPTIONAL="1"
+DISTUTILS_EXT="1"
 
 inherit distutils-r1 perl-module toolchain-funcs vcs-snapshot
 
@@ -26,7 +28,7 @@ RDEPEND="python? ( ${PYTHON_DEPS} )"
 DEPEND="${RDEPEND}"
 BDEPEND="python? (
 		${PYTHON_DEPS}
-		dev-python/setuptools[${PYTHON_USEDEP}]
+		${DISTUTILS_DEPS}
 	)"
 
 src_unpack() {
@@ -40,9 +42,11 @@ src_prepare() {
 		Makefile
 	if use python; then
 		mv "${WORKDIR}"/${PY_P} NKF.python || die
+		sed -i "s/-/_/g" NKF.python/setup.cfg
+
 		eapply "${FILESDIR}"/${PN}-python.patch
 		eapply "${FILESDIR}"/${P}-python-ssize_t.patch
-		eapply "${FILESDIR}"/${PN}-2.1.5-python-ssize_t-deux.patch
+		eapply "${FILESDIR}"/${P}-python-ssize_t-deux.patch
 
 		cd NKF.python || die
 		distutils-r1_src_prepare
diff --git a/app-i18n/nkf/nkf-2.1.5.ebuild b/app-i18n/nkf/nkf-2.1.5.ebuild
deleted file mode 100644
index a437dd676a61..000000000000
--- a/app-i18n/nkf/nkf-2.1.5.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_OPTIONAL="1"
-
-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://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 python? ( BSD )"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="perl python l10n_ja"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}"
-BDEPEND="python? (
-		${PYTHON_DEPS}
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	)"
-
-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 python; then
-		mv "${WORKDIR}"/${PY_P} NKF.python || die
-		eapply "${FILESDIR}"/${PN}-python.patch
-		cd NKF.python || die
-		distutils-r1_src_prepare
-		cd - >/dev/null || die
-	fi
-
-	default
-}
-
-src_configure() {
-	default
-	if use perl; then
-		cd NKF.mod || die
-		perl-module_src_configure
-		cd - >/dev/null || die
-	fi
-	if use python; then
-		cd NKF.python || die
-		distutils-r1_src_configure
-		cd - >/dev/null || die
-	fi
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-	if use perl; then
-		cd NKF.mod || die
-		perl-module_src_compile
-		cd - >/dev/null || die
-	fi
-	if use python; then
-		cd NKF.python || die
-		distutils-r1_src_compile
-		cd - >/dev/null || die
-	fi
-}
-
-src_test() {
-	default
-	if use perl; then
-		cd NKF.mod || die
-		perl-module_src_test
-		cd - >/dev/null || die
-	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 || die
-		docinto perl
-		perl-module_src_install
-		cd - >/dev/null || die
-	fi
-	if use python; then
-		cd NKF.python || die
-		docinto python
-		DOCS= distutils-r1_src_install
-		dodoc CHANGES README.md
-		cd - >/dev/null || die
-	fi
-}