[gentoo-commits] repo/gentoo:master commit in: app-i18n/nkf/
commit: e50adaa19441d067f9970934f19e801afa3a5a9d
Author: Akinori Hattori gentoo org>
AuthorDate: Sun Apr 14 05:54:05 2024 +
Commit: Akinori Hattori gentoo org>
CommitDate: Sun Apr 14 06:10:42 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e50adaa1
app-i18n/nkf: update PYTHON_COMPAT
Closes: https://bugs.gentoo.org/929324
Signed-off-by: Akinori Hattori gentoo.org>
app-i18n/nkf/nkf-2.1.5-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-i18n/nkf/nkf-2.1.5-r1.ebuild b/app-i18n/nkf/nkf-2.1.5-r1.ebuild
index c7174e579705..5c009ec1ef8a 100644
--- a/app-i18n/nkf/nkf-2.1.5-r1.ebuild
+++ b/app-i18n/nkf/nkf-2.1.5-r1.ebuild
@@ -3,7 +3,7 @@
EAPI="8"
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..12} )
DISTUTILS_USE_PEP517="setuptools"
DISTUTILS_OPTIONAL="1"
DISTUTILS_EXT="1"
[gentoo-commits] repo/gentoo:master commit in: app-i18n/nkf/
commit: 937e03546bd168779c059ff1fe8d2c0f098ee10a
Author: Akinori Hattori gentoo org>
AuthorDate: Sun Apr 14 05:48:56 2024 +
Commit: Akinori Hattori gentoo org>
CommitDate: Sun Apr 14 06:10:40 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=937e0354
app-i18n/nkf: drop old
Signed-off-by: Akinori Hattori gentoo.org>
app-i18n/nkf/nkf-2.1.5.ebuild | 112 --
1 file changed, 112 deletions(-)
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..
--- 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
-}
[gentoo-commits] repo/gentoo:master commit in: app-i18n/nkf/
commit: 9bef7cdc537fd5b649d935e7e9af747582605419
Author: Akinori Hattori gentoo org>
AuthorDate: Sun Apr 14 05:52:38 2024 +
Commit: Akinori Hattori gentoo org>
CommitDate: Sun Apr 14 06:10:41 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bef7cdc
app-i18n/nkf: migrate to PEP 517
Closes: https://bugs.gentoo.org/909877
Signed-off-by: Akinori Hattori gentoo.org>
app-i18n/nkf/nkf-2.1.5-r1.ebuild | 12
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/app-i18n/nkf/nkf-2.1.5-r1.ebuild b/app-i18n/nkf/nkf-2.1.5-r1.ebuild
index 44490ab3b00b..c7174e579705 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} )
+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
[gentoo-commits] repo/gentoo:master commit in: app-i18n/nkf/
commit: 6de122e26ce8dc9116bdf9aa666d1eaa228b0810
Author: Arthur Zamarin gentoo org>
AuthorDate: Sun Oct 1 18:13:33 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sun Oct 1 18:13:33 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6de122e2
app-i18n/nkf: Stabilize 2.1.5-r1 ppc, #913831
Signed-off-by: Arthur Zamarin gentoo.org>
app-i18n/nkf/nkf-2.1.5-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-i18n/nkf/nkf-2.1.5-r1.ebuild b/app-i18n/nkf/nkf-2.1.5-r1.ebuild
index c39a4c68fac4..44490ab3b00b 100644
--- a/app-i18n/nkf/nkf-2.1.5-r1.ebuild
+++ b/app-i18n/nkf/nkf-2.1.5-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/70406/${P}.tar.gz
LICENSE="ZLIB python? ( BSD )"
SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
IUSE="perl python l10n_ja"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
[gentoo-commits] repo/gentoo:master commit in: app-i18n/nkf/
commit: 69a949e5344b1578f6e88d5c4f73a455be1ac271
Author: Sam James gentoo org>
AuthorDate: Fri Sep 8 09:28:00 2023 +
Commit: Sam James gentoo org>
CommitDate: Fri Sep 8 09:28:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69a949e5
app-i18n/nkf: Stabilize 2.1.5-r1 x86, #913831
Signed-off-by: Sam James gentoo.org>
app-i18n/nkf/nkf-2.1.5-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-i18n/nkf/nkf-2.1.5-r1.ebuild b/app-i18n/nkf/nkf-2.1.5-r1.ebuild
index 0af517a65f08..c39a4c68fac4 100644
--- a/app-i18n/nkf/nkf-2.1.5-r1.ebuild
+++ b/app-i18n/nkf/nkf-2.1.5-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/70406/${P}.tar.gz
LICENSE="ZLIB python? ( BSD )"
SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ppc64 sparc x86"
IUSE="perl python l10n_ja"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
[gentoo-commits] repo/gentoo:master commit in: app-i18n/nkf/
commit: 71e2181e271c59c26e08240967132b6a0c38d571
Author: Sam James gentoo org>
AuthorDate: Fri Sep 8 09:28:00 2023 +
Commit: Sam James gentoo org>
CommitDate: Fri Sep 8 09:28:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71e2181e
app-i18n/nkf: Stabilize 2.1.5-r1 ppc64, #913831
Signed-off-by: Sam James gentoo.org>
app-i18n/nkf/nkf-2.1.5-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-i18n/nkf/nkf-2.1.5-r1.ebuild b/app-i18n/nkf/nkf-2.1.5-r1.ebuild
index 0ad4c12c4da9..0af517a65f08 100644
--- a/app-i18n/nkf/nkf-2.1.5-r1.ebuild
+++ b/app-i18n/nkf/nkf-2.1.5-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/70406/${P}.tar.gz
LICENSE="ZLIB python? ( BSD )"
SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ppc64 sparc ~x86"
IUSE="perl python l10n_ja"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
[gentoo-commits] repo/gentoo:master commit in: app-i18n/nkf/
commit: db6857c286e7b627bfc5db1d533ba96da8fc1776
Author: Sam James gentoo org>
AuthorDate: Fri Sep 8 00:12:35 2023 +
Commit: Sam James gentoo org>
CommitDate: Fri Sep 8 00:12:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db6857c2
app-i18n/nkf: Stabilize 2.1.5-r1 amd64, #913831
Signed-off-by: Sam James gentoo.org>
app-i18n/nkf/nkf-2.1.5-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-i18n/nkf/nkf-2.1.5-r1.ebuild b/app-i18n/nkf/nkf-2.1.5-r1.ebuild
index d470064a2155..0ad4c12c4da9 100644
--- a/app-i18n/nkf/nkf-2.1.5-r1.ebuild
+++ b/app-i18n/nkf/nkf-2.1.5-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/70406/${P}.tar.gz
LICENSE="ZLIB python? ( BSD )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86"
IUSE="perl python l10n_ja"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
[gentoo-commits] repo/gentoo:master commit in: app-i18n/nkf/
commit: 3b17c678a6338ef4df12cc6abfdc6303182d9f46
Author: Sam James gentoo org>
AuthorDate: Thu Sep 7 23:02:07 2023 +
Commit: Sam James gentoo org>
CommitDate: Thu Sep 7 23:02:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b17c678
app-i18n/nkf: Stabilize 2.1.5-r1 sparc, #913831
Signed-off-by: Sam James gentoo.org>
app-i18n/nkf/nkf-2.1.5-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-i18n/nkf/nkf-2.1.5-r1.ebuild b/app-i18n/nkf/nkf-2.1.5-r1.ebuild
index 14f66607f991..d470064a2155 100644
--- a/app-i18n/nkf/nkf-2.1.5-r1.ebuild
+++ b/app-i18n/nkf/nkf-2.1.5-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/70406/${P}.tar.gz
LICENSE="ZLIB python? ( BSD )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86"
IUSE="perl python l10n_ja"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
[gentoo-commits] repo/gentoo:master commit in: app-i18n/nkf/
commit: 90b6438cfe4346e0f3c20eddb11e380bc3d75d04
Author: Akinori Hattori gentoo org>
AuthorDate: Sun Apr 30 05:28:21 2023 +
Commit: Akinori Hattori gentoo org>
CommitDate: Sun Apr 30 05:28:21 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90b6438c
app-i18n/nkf: update to EAPI 8
Signed-off-by: Akinori Hattori gentoo.org>
app-i18n/nkf/nkf-2.1.5-r1.ebuild | 2 +-
app-i18n/nkf/nkf-2.1.5.ebuild| 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-i18n/nkf/nkf-2.1.5-r1.ebuild b/app-i18n/nkf/nkf-2.1.5-r1.ebuild
index c527d6409893..341d504ae43d 100644
--- a/app-i18n/nkf/nkf-2.1.5-r1.ebuild
+++ b/app-i18n/nkf/nkf-2.1.5-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
PYTHON_COMPAT=( python3_{9..10} )
DISTUTILS_OPTIONAL="1"
diff --git a/app-i18n/nkf/nkf-2.1.5.ebuild b/app-i18n/nkf/nkf-2.1.5.ebuild
index f99a5da18d02..d13ccd9da8a8 100644
--- a/app-i18n/nkf/nkf-2.1.5.ebuild
+++ b/app-i18n/nkf/nkf-2.1.5.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
PYTHON_COMPAT=( python3_{9..10} )
DISTUTILS_OPTIONAL="1"
[gentoo-commits] repo/gentoo:master commit in: app-i18n/nkf/
commit: bba45d107b2a009bb963a1d903795f1e981bc95f
Author: Akinori Hattori gentoo org>
AuthorDate: Sun Apr 30 05:29:27 2023 +
Commit: Akinori Hattori gentoo org>
CommitDate: Sun Apr 30 05:29:27 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bba45d10
app-i18n/nkf: update PYTHON_COMPAT
Closes: https://bugs.gentoo.org/896560
Signed-off-by: Akinori Hattori gentoo.org>
app-i18n/nkf/nkf-2.1.5-r1.ebuild | 2 +-
app-i18n/nkf/nkf-2.1.5.ebuild| 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-i18n/nkf/nkf-2.1.5-r1.ebuild b/app-i18n/nkf/nkf-2.1.5-r1.ebuild
index 341d504ae43d..14f66607f991 100644
--- a/app-i18n/nkf/nkf-2.1.5-r1.ebuild
+++ b/app-i18n/nkf/nkf-2.1.5-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
DISTUTILS_OPTIONAL="1"
inherit distutils-r1 perl-module toolchain-funcs vcs-snapshot
diff --git a/app-i18n/nkf/nkf-2.1.5.ebuild b/app-i18n/nkf/nkf-2.1.5.ebuild
index d13ccd9da8a8..a437dd676a61 100644
--- a/app-i18n/nkf/nkf-2.1.5.ebuild
+++ b/app-i18n/nkf/nkf-2.1.5.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
DISTUTILS_OPTIONAL="1"
inherit distutils-r1 perl-module toolchain-funcs vcs-snapshot
[gentoo-commits] repo/gentoo:master commit in: app-i18n/nkf/
commit: 40f93f66cdb909189c0a501418dffa6e11fa7711
Author: Sam James gentoo org>
AuthorDate: Tue Oct 4 06:53:14 2022 +
Commit: Sam James gentoo org>
CommitDate: Tue Oct 4 07:09:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40f93f66
app-i18n/nkf: conditionally apply python patch
Closes: https://bugs.gentoo.org/874813
Signed-off-by: Sam James gentoo.org>
app-i18n/nkf/nkf-2.1.5-r1.ebuild | 8 +++-
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/app-i18n/nkf/nkf-2.1.5-r1.ebuild b/app-i18n/nkf/nkf-2.1.5-r1.ebuild
index 095d49cf0515..eefdc0f710d5 100644
--- a/app-i18n/nkf/nkf-2.1.5-r1.ebuild
+++ b/app-i18n/nkf/nkf-2.1.5-r1.ebuild
@@ -29,11 +29,6 @@ BDEPEND="python? (
dev-python/setuptools[${PYTHON_USEDEP}]
)"
-PATCHES=(
- "${FILESDIR}"/${P}-python-ssize_t.patch
- "${FILESDIR}"/${PN}-2.1.5-python-ssize_t-deux.patch
-)
-
src_unpack() {
use python && vcs-snapshot_src_unpack || default
}
@@ -46,6 +41,9 @@ src_prepare() {
if use python; then
mv "${WORKDIR}"/${PY_P} NKF.python || die
eapply "${FILESDIR}"/${PN}-python.patch
+ eapply "${FILESDIR}"/${P}-python-ssize_t.patch
+ eapply "${FILESDIR}"/${PN}-2.1.5-python-ssize_t-deux.patch
+
cd NKF.python || die
distutils-r1_src_prepare
cd - >/dev/null || die
[gentoo-commits] repo/gentoo:master commit in: app-i18n/nkf/, app-i18n/nkf/files/
commit: d7838f82889905b9bb599a551b8ed2a89a7181a0
Author: Sam James gentoo org>
AuthorDate: Tue Oct 4 05:00:18 2022 +
Commit: Sam James gentoo org>
CommitDate: Tue Oct 4 05:07:12 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7838f82
app-i18n/nkf: fix build w/ Clang 15
Closes: https://bugs.gentoo.org/874303
Signed-off-by: Sam James gentoo.org>
.../nkf/files/nkf-2.1.5-python-ssize_t-deux.patch | 45
app-i18n/nkf/files/nkf-2.1.5-python-ssize_t.patch | 71 +
app-i18n/nkf/nkf-2.1.5-r1.ebuild | 117 +
3 files changed, 233 insertions(+)
diff --git a/app-i18n/nkf/files/nkf-2.1.5-python-ssize_t-deux.patch
b/app-i18n/nkf/files/nkf-2.1.5-python-ssize_t-deux.patch
new file mode 100644
index ..355951cab319
--- /dev/null
+++ b/app-i18n/nkf/files/nkf-2.1.5-python-ssize_t-deux.patch
@@ -0,0 +1,45 @@
+https://github.com/fumiyas/python-nkf/pull/7
+
+From abdebb9d49619d9b9cafa172d2ad7c171f3977d4 Mon Sep 17 00:00:00 2001
+From: Sam James
+Date: Tue, 4 Oct 2022 05:56:12 +0100
+Subject: [PATCH] Use designated initialiser syntax for PyModuleDef
+
+Fixes build with Clang. Switch to the more readable designated
+initialiser syntax to avoid having to lookup member order.
+
+Before, Clang would complain:
+```
+nkf.c:205:3: error: incompatible pointer to integer conversion initializing
'Py_ssize_t' (aka 'long') with an expression of type 'void *' [-Wint-conversion]
+ NULL,
+ ^~~~
+/usr/lib/llvm/16/bin/../../../../lib/clang/16.0.0/include/stddef.h:89:16:
note: expanded from macro 'NULL'
+ ^~
+2 warnings and 1 error generated.
+```
+
+This is because some of PyModuleDef's members are actually
+Py_ssize_t so chucking a NULL in looks like a codesmell to Clang.
+
+Bug: https://bugs.gentoo.org/874303
+Signed-off-by: Sam James
+--- a/NKF.python/nkf.c
b/NKF.python/nkf.c
+@@ -200,14 +200,8 @@ nkfmethods[] = {
+ static struct PyModuleDef
+ moduledef = {
+ PyModuleDef_HEAD_INIT,
+- "nkf",
+- NULL,
+- NULL,
+- nkfmethods,
+- NULL,
+- NULL,
+- NULL,
+- NULL
++ .m_name = "nkf",
++ .m_methods = nkfmethods
+ };
+
+ /* Module initialization function */
+
diff --git a/app-i18n/nkf/files/nkf-2.1.5-python-ssize_t.patch
b/app-i18n/nkf/files/nkf-2.1.5-python-ssize_t.patch
new file mode 100644
index ..6aa986866e0d
--- /dev/null
+++ b/app-i18n/nkf/files/nkf-2.1.5-python-ssize_t.patch
@@ -0,0 +1,71 @@
+https://github.com/nurse/nkf/commit/8246108073f739d45a21ef42ad2d9342fa3c6c28
+
+From 8246108073f739d45a21ef42ad2d9342fa3c6c28 Mon Sep 17 00:00:00 2001
+From: slic
+Date: Sun, 6 Mar 2022 18:05:54 +0900
+Subject: [PATCH] fix: python3 extention ABI # variant when parsing warning
+
+--- a/NKF.python3/NKF_python.c
b/NKF.python3/NKF_python.c
+@@ -20,6 +20,8 @@ Changes.
+ **THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE.
+ ***/
+
++#define PY_SSIZE_T_CLEAN
++
+ #include "Python.h"
+ #include
+
+@@ -33,7 +35,7 @@ Changes.
+ #undef FALSE
+ #define putchar(c) pynkf_putchar(c)
+
+-static int pynkf_ibufsize, pynkf_obufsize;
++static Py_ssize_t pynkf_ibufsize, pynkf_obufsize;
+ static unsigned char *pynkf_inbuf, *pynkf_outbuf;
+ static int pynkf_icount,pynkf_ocount;
+ static unsigned char *pynkf_iptr, *pynkf_optr;
+@@ -62,7 +64,7 @@ pynkf_ungetc(int c, FILE *f)
+ static void
+ pynkf_putchar(int c)
+ {
+- size_t size;
++ Py_ssize_t size;
+ unsigned char *p;
+
+ if (pynkf_guess_flag) {
+@@ -89,7 +91,7 @@ pynkf_putchar(int c)
+ #include "../nkf.c"
+
+ static PyObject *
+-pynkf_convert(unsigned char* str, int strlen, char* opts, int optslen)
++pynkf_convert(unsigned char* str, Py_ssize_t strlen, char* opts, Py_ssize_t
optslen)
+ {
+ PyObject * res;
+
+@@ -157,12 +159,12 @@ static
+ PyObject *pynkf_nkf(PyObject *self, PyObject *args)
+ {
+ unsigned char *str;
+- int strlen;
++ Py_ssize_t strlen;
+ char *opts;
+- int optslen;
++ Py_ssize_t optslen;
+ PyObject* res;
+
+- if (!PyArg_ParseTuple(args, "s#y#", , , , )) {
++ if (!PyArg_ParseTuple(args, "s#s#", , , , )) {
+ return NULL;
+ }
+ res = pynkf_convert(str, strlen, opts, optslen);
+@@ -178,7 +180,7 @@ PyObject *pynkf_guess(PyObject *self, PyObject *args)
+ int strlen;
+ PyObject* res;
+
+- if (!PyArg_ParseTuple(args, "y#", , )) {
++ if (!PyArg_ParseTuple(args, "s#", , )) {
+ return NULL;
+ }
+ res = pynkf_convert_guess(str, strlen);
+
diff --git a/app-i18n/nkf/nkf-2.1.5-r1.ebuild b/app-i18n/nkf/nkf-2.1.5-r1.ebuild
new file mode 100644
index ..095d49cf0515
--- /dev/null
+++ b/app-i18n/nkf/nkf-2.1.5-r1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_OPTIONAL="1"
+
+inherit distutils-r1 perl-module toolchain-funcs vcs-snapshot
+
[gentoo-commits] repo/gentoo:master commit in: app-i18n/nkf/
commit: 0a0701f6fd81deed791277c019f114636b8f8bc9 Author: Sam James gentoo org> AuthorDate: Tue Oct 4 02:02:58 2022 + Commit: Sam James gentoo org> CommitDate: Tue Oct 4 02:46:40 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a0701f6 app-i18n/nkf: add github upstream metadata Signed-off-by: Sam James gentoo.org> app-i18n/nkf/metadata.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app-i18n/nkf/metadata.xml b/app-i18n/nkf/metadata.xml index 7eb84b5ec91c..414beff9a719 100644 --- a/app-i18n/nkf/metadata.xml +++ b/app-i18n/nkf/metadata.xml @@ -7,5 +7,7 @@ nkf + nurse/nkf + fumiyas/python-nkf
[gentoo-commits] repo/gentoo:master commit in: app-i18n/nkf/
commit: 5c8d6b26ab019f9df1be183ef76f35a2468b15ea
Author: Michał Górny gentoo org>
AuthorDate: Tue Feb 1 18:41:18 2022 +
Commit: Michał Górny gentoo org>
CommitDate: Tue Feb 1 18:51:38 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c8d6b26
app-i18n/nkf: Remove DISTUTILS_USE_SETUPTOOLS
DISTUTILS_USE_SETUPTOOLS is not used with DISTUTILS_OPTIONAL, and now it
triggers a QA warning. Remove it.
Signed-off-by: Michał Górny gentoo.org>
app-i18n/nkf/nkf-2.1.4.ebuild | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/app-i18n/nkf/nkf-2.1.4.ebuild b/app-i18n/nkf/nkf-2.1.4.ebuild
index 6e5c65352486..ac04c630c7d8 100644
--- a/app-i18n/nkf/nkf-2.1.4.ebuild
+++ b/app-i18n/nkf/nkf-2.1.4.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
PYTHON_COMPAT=( python3_{7,8} )
DISTUTILS_OPTIONAL="1"
-DISTUTILS_USE_SETUPTOOLS="no"
inherit distutils-r1 perl-module toolchain-funcs vcs-snapshot
[gentoo-commits] repo/gentoo:master commit in: app-i18n/nkf/
commit: f778a8ce2815caae45505afacca346737f392a28
Author: Sam James gentoo org>
AuthorDate: Sun Sep 26 17:51:41 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun Sep 26 17:51:41 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f778a8ce
app-i18n/nkf: Stabilize 2.1.5 ppc, #814869
Signed-off-by: Sam James gentoo.org>
app-i18n/nkf/nkf-2.1.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-i18n/nkf/nkf-2.1.5.ebuild b/app-i18n/nkf/nkf-2.1.5.ebuild
index 3a2cebad7c7..fe8b98b53eb 100644
--- a/app-i18n/nkf/nkf-2.1.5.ebuild
+++ b/app-i18n/nkf/nkf-2.1.5.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/70406/${P}.tar.gz
LICENSE="ZLIB python? ( BSD )"
SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
IUSE="perl python l10n_ja"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
[gentoo-commits] repo/gentoo:master commit in: app-i18n/nkf/
commit: 52650b7ee3c10c9d2be3d68617dfb8ee8c90efc9
Author: Sam James gentoo org>
AuthorDate: Sun Sep 26 05:00:32 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun Sep 26 05:00:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52650b7e
app-i18n/nkf: Stabilize 2.1.5 x86, #814869
Signed-off-by: Sam James gentoo.org>
app-i18n/nkf/nkf-2.1.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-i18n/nkf/nkf-2.1.5.ebuild b/app-i18n/nkf/nkf-2.1.5.ebuild
index 196915731c9..27f93e7edc6 100644
--- a/app-i18n/nkf/nkf-2.1.5.ebuild
+++ b/app-i18n/nkf/nkf-2.1.5.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/70406/${P}.tar.gz
LICENSE="ZLIB python? ( BSD )"
SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
IUSE="perl python l10n_ja"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
[gentoo-commits] repo/gentoo:master commit in: app-i18n/nkf/
commit: 3766d3e68efed5de309928eeccfecb8865d6d5f7
Author: Sam James gentoo org>
AuthorDate: Sun Sep 26 05:01:31 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun Sep 26 05:01:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3766d3e6
app-i18n/nkf: Stabilize 2.1.5 ppc64, #814869
Signed-off-by: Sam James gentoo.org>
app-i18n/nkf/nkf-2.1.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-i18n/nkf/nkf-2.1.5.ebuild b/app-i18n/nkf/nkf-2.1.5.ebuild
index 27f93e7edc6..01285ea29ca 100644
--- a/app-i18n/nkf/nkf-2.1.5.ebuild
+++ b/app-i18n/nkf/nkf-2.1.5.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/70406/${P}.tar.gz
LICENSE="ZLIB python? ( BSD )"
SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86"
IUSE="perl python l10n_ja"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
[gentoo-commits] repo/gentoo:master commit in: app-i18n/nkf/
commit: 2492d0e3562233223de09b2069c9e3509815b2da
Author: Sam James gentoo org>
AuthorDate: Sun Sep 26 05:01:37 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun Sep 26 05:01:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2492d0e3
app-i18n/nkf: Stabilize 2.1.5 sparc, #814869
Signed-off-by: Sam James gentoo.org>
app-i18n/nkf/nkf-2.1.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-i18n/nkf/nkf-2.1.5.ebuild b/app-i18n/nkf/nkf-2.1.5.ebuild
index 01285ea29ca..3a2cebad7c7 100644
--- a/app-i18n/nkf/nkf-2.1.5.ebuild
+++ b/app-i18n/nkf/nkf-2.1.5.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/70406/${P}.tar.gz
LICENSE="ZLIB python? ( BSD )"
SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ppc64 sparc x86"
IUSE="perl python l10n_ja"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
[gentoo-commits] repo/gentoo:master commit in: app-i18n/nkf/
commit: 578b49756c480c5739afe61e5172f901ffee9170
Author: Sam James gentoo org>
AuthorDate: Sun Sep 26 04:59:22 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun Sep 26 04:59:22 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=578b4975
app-i18n/nkf: Stabilize 2.1.5 amd64, #814869
Signed-off-by: Sam James gentoo.org>
app-i18n/nkf/nkf-2.1.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-i18n/nkf/nkf-2.1.5.ebuild b/app-i18n/nkf/nkf-2.1.5.ebuild
index 7720d4a3fae..196915731c9 100644
--- a/app-i18n/nkf/nkf-2.1.5.ebuild
+++ b/app-i18n/nkf/nkf-2.1.5.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/70406/${P}.tar.gz
LICENSE="ZLIB python? ( BSD )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="perl python l10n_ja"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
[gentoo-commits] repo/gentoo:master commit in: app-i18n/nkf/
commit: f000d15e32ab37449521db8932e99691f7cc594c
Author: Arthur Zamarin gentoo org>
AuthorDate: Wed Aug 25 04:31:51 2021 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Wed Aug 25 04:35:11 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f000d15e
app-i18n/nkf: enable py3.{9,10}, add die calls, clean deps
Closes: https://bugs.gentoo.org/800602
Signed-off-by: Arthur Zamarin gentoo.org>
app-i18n/nkf/nkf-2.1.5.ebuild | 47 +--
1 file changed, 23 insertions(+), 24 deletions(-)
diff --git a/app-i18n/nkf/nkf-2.1.5.ebuild b/app-i18n/nkf/nkf-2.1.5.ebuild
index e937e5a5aeb..7720d4a3fae 100644
--- a/app-i18n/nkf/nkf-2.1.5.ebuild
+++ b/app-i18n/nkf/nkf-2.1.5.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="7"
-PYTHON_COMPAT=( python3_{7,8} )
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
DISTUTILS_OPTIONAL="1"
-DISTUTILS_USE_SETUPTOOLS="no"
inherit distutils-r1 perl-module toolchain-funcs vcs-snapshot
@@ -22,13 +22,12 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="perl python l10n_ja"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RDEPEND="python? (
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}"
+BDEPEND="python? (
${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-python/setuptools[${PYTHON_USEDEP}]
- ')
+ dev-python/setuptools[${PYTHON_USEDEP}]
)"
-DEPEND="${RDEPEND}"
src_unpack() {
use python && vcs-snapshot_src_unpack || default
@@ -42,9 +41,9 @@ src_prepare() {
if use python; then
mv "${WORKDIR}"/${PY_P} NKF.python || die
eapply "${FILESDIR}"/${PN}-python.patch
- cd NKF.python
+ cd NKF.python || die
distutils-r1_src_prepare
- cd - >/dev/null
+ cd - >/dev/null || die
fi
default
@@ -53,37 +52,37 @@ src_prepare() {
src_configure() {
default
if use perl; then
- cd NKF.mod
+ cd NKF.mod || die
perl-module_src_configure
- cd - >/dev/null
+ cd - >/dev/null || die
fi
if use python; then
- cd NKF.python
+ cd NKF.python || die
distutils-r1_src_configure
- cd - >/dev/null
+ cd - >/dev/null || die
fi
}
src_compile() {
emake CC="$(tc-getCC)"
if use perl; then
- cd NKF.mod
+ cd NKF.mod || die
perl-module_src_compile
- cd - >/dev/null
+ cd - >/dev/null || die
fi
if use python; then
- cd NKF.python
+ cd NKF.python || die
distutils-r1_src_compile
- cd - >/dev/null
+ cd - >/dev/null || die
fi
}
src_test() {
default
if use perl; then
- cd NKF.mod
+ cd NKF.mod || die
perl-module_src_test
- cd - >/dev/null
+ cd - >/dev/null || die
fi
}
@@ -98,16 +97,16 @@ src_install() {
dodoc ${PN}.doc
if use perl; then
- cd NKF.mod
+ cd NKF.mod || die
docinto perl
perl-module_src_install
- cd - >/dev/null
+ cd - >/dev/null || die
fi
if use python; then
- cd NKF.python
+ cd NKF.python || die
docinto python
DOCS= distutils-r1_src_install
dodoc CHANGES README.md
- cd - >/dev/null
+ cd - >/dev/null || die
fi
}
[gentoo-commits] repo/gentoo:master commit in: app-i18n/nkf/
commit: 7b2ad43a69ccfb0b0bb7c4b107ff79f0a5f41e15
Author: Fabian Groffen gentoo org>
AuthorDate: Wed Jan 6 13:13:50 2021 +
Commit: Fabian Groffen gentoo org>
CommitDate: Wed Jan 6 13:13:50 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b2ad43a
app-i18n/nkf: drop x86-macos
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Fabian Groffen gentoo.org>
app-i18n/nkf/nkf-2.1.4.ebuild | 4 ++--
app-i18n/nkf/nkf-2.1.5.ebuild | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/app-i18n/nkf/nkf-2.1.4.ebuild b/app-i18n/nkf/nkf-2.1.4.ebuild
index a470fb8bf85..6dc52c42736 100644
--- a/app-i18n/nkf/nkf-2.1.4.ebuild
+++ b/app-i18n/nkf/nkf-2.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/64158/${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"
IUSE="perl python l10n_ja"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/app-i18n/nkf/nkf-2.1.5.ebuild b/app-i18n/nkf/nkf-2.1.5.ebuild
index 718622f52d2..d2e6c75e1d3 100644
--- a/app-i18n/nkf/nkf-2.1.5.ebuild
+++ b/app-i18n/nkf/nkf-2.1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/70406/${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"
IUSE="perl python l10n_ja"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
[gentoo-commits] repo/gentoo:master commit in: app-i18n/nkf/, app-i18n/nkf/files/
commit: 86705e51452695c1d5781de24949fae2b4f29c1e
Author: Akinori Hattori gentoo org>
AuthorDate: Mon May 18 14:13:20 2020 +
Commit: Akinori Hattori gentoo org>
CommitDate: Mon May 18 14:13:20 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86705e51
app-i18n/nkf: drop old
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Akinori Hattori gentoo.org>
app-i18n/nkf/Manifest| 3 -
app-i18n/nkf/files/nkf-2.1.3-strip.patch | 9 ---
app-i18n/nkf/nkf-2.1.3-r2.ebuild | 109 ---
3 files changed, 121 deletions(-)
diff --git a/app-i18n/nkf/Manifest b/app-i18n/nkf/Manifest
index b6aa6e00fce..eeec965bb7b 100644
--- a/app-i18n/nkf/Manifest
+++ b/app-i18n/nkf/Manifest
@@ -1,7 +1,4 @@
-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-2.1.5.tar.gz 215879 BLAKE2B
b5ae8f51b0ed97261f9e82ad469adbc9e469e709dc5acb64bfba48881555931eade5fcb772e7956a7401399008ec33bd57c8d6d8b5790eefe4d69d4e1dabed7c
SHA512
fa5b683184481b25249872e7902033a72b6a6219b4c63d508a738710029430733e78cfa13b3d69dc281676762765e0452c92244a3855d3acbb5e23aa63214847
-DIST nkf.1j 24160 BLAKE2B
1d461dbacfb6e5ee358d7ea162582da5042a03f02448791c4ed33a10e9eb6e5907220db8d70aea691e3908252daffcbacdaab1b9fe52b0e4e25f7b590e5bca72
SHA512
4680dfb59ceb9db5031ecefeca808e34202c841309d5b634cdd7aa89ee97118701ddeddb0ae18a2cf791987929dc9c5a528275cb1f63b1742eac2197ac9c1416
DIST python-nkf-0.2.0_p20141211.tar.gz 187761 BLAKE2B
b607e155934dd14ad4d29298f209a233d846122299326df48e45339661d1cd08a789f5278928cb4a32c747673723f5f8877d98c7a6200af6b2dbbf29cd100f00
SHA512
5a493f32244e3cb72d188fa39b810baef31ce5f530309797a05474e3f58cf22fd5f8b6c66cdf5268451c49ffb759c476c707329ce1ccf42da0362ad4f5c24d71
DIST python-nkf-0.2.0_p20191121.tar.gz 188496 BLAKE2B
f7c9baaff8129956b7981011634f7ee5ece97e1b6650551a5cc2b50ff51a0c96a454f39e888c80120242a12b202c0422c0ecfc21858b1822a4959ff4c108b10d
SHA512
ae1494ebdd488dc40802178a1b7b05c9a9b0bcf9cf9fa5017c6bc9f153c01b475c00f993489a21f643acc4ad61595c38c5afe28f3512a4d24f36eda7abd33958
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 5cfac8820f8..000
--- 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="m...@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/nkf-2.1.3-r2.ebuild b/app-i18n/nkf/nkf-2.1.3-r2.ebuild
deleted file mode 100644
index a4a6e0e67a3..000
--- a/app-i18n/nkf/nkf-2.1.3-r2.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_OPTIONAL="1"
-DISTUTILS_USE_SETUPTOOLS="no"
-
-inherit distutils-r1 perl-module toolchain-funcs
-
-DESCRIPTION="Network Kanji code conversion Filter with UTF-8/16 support"
-HOMEPAGE="https://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 )"
-
-LICENSE="ZLIB"
-SLOT="0"
-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_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
[gentoo-commits] repo/gentoo:master commit in: app-i18n/nkf/
commit: caa6921ea93be23bfcbf30a6a7e9dea1b9240058
Author: Agostino Sarubbo gentoo org>
AuthorDate: Mon May 18 13:02:00 2020 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Mon May 18 13:02:00 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=caa6921e
app-i18n/nkf: x86 stable wrt bug #723400
Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo gentoo.org>
app-i18n/nkf/nkf-2.1.4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-i18n/nkf/nkf-2.1.4.ebuild b/app-i18n/nkf/nkf-2.1.4.ebuild
index d346a49a80a..a470fb8bf85 100644
--- a/app-i18n/nkf/nkf-2.1.4.ebuild
+++ b/app-i18n/nkf/nkf-2.1.4.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/64158/${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} )"
[gentoo-commits] repo/gentoo:master commit in: app-i18n/nkf/
commit: 39e4624373e04f5b812ebad05c5acfa65e7be40e
Author: Agostino Sarubbo gentoo org>
AuthorDate: Mon May 18 13:01:04 2020 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Mon May 18 13:01:04 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39e46243
app-i18n/nkf: ppc64 stable wrt bug #723400
Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo gentoo.org>
app-i18n/nkf/nkf-2.1.4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-i18n/nkf/nkf-2.1.4.ebuild b/app-i18n/nkf/nkf-2.1.4.ebuild
index b1faff5217c..d346a49a80a 100644
--- a/app-i18n/nkf/nkf-2.1.4.ebuild
+++ b/app-i18n/nkf/nkf-2.1.4.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/64158/${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} )"
[gentoo-commits] repo/gentoo:master commit in: app-i18n/nkf/
commit: 4e6264f2362b435e61aea52b9569a646cd1424e6
Author: Agostino Sarubbo gentoo org>
AuthorDate: Mon May 18 13:00:01 2020 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Mon May 18 13:00:01 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e6264f2
app-i18n/nkf: ppc stable wrt bug #723400
Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo gentoo.org>
app-i18n/nkf/nkf-2.1.4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-i18n/nkf/nkf-2.1.4.ebuild b/app-i18n/nkf/nkf-2.1.4.ebuild
index da16ac50628..b1faff5217c 100644
--- a/app-i18n/nkf/nkf-2.1.4.ebuild
+++ b/app-i18n/nkf/nkf-2.1.4.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/64158/${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} )"
[gentoo-commits] repo/gentoo:master commit in: app-i18n/nkf/
commit: 24232b21cc04b717b9ff3e280a1b3a08d74b8a9b
Author: Agostino Sarubbo gentoo org>
AuthorDate: Mon May 18 12:54:34 2020 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Mon May 18 12:54:34 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24232b21
app-i18n/nkf: amd64 stable wrt bug #723400
Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo gentoo.org>
app-i18n/nkf/nkf-2.1.4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-i18n/nkf/nkf-2.1.4.ebuild b/app-i18n/nkf/nkf-2.1.4.ebuild
index 8f5d615054d..da16ac50628 100644
--- a/app-i18n/nkf/nkf-2.1.4.ebuild
+++ b/app-i18n/nkf/nkf-2.1.4.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/64158/${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} )"
[gentoo-commits] repo/gentoo:master commit in: app-i18n/nkf/
commit: 23692ae22fa56a35d68ade5f0652d002ec4d1722
Author: Agostino Sarubbo gentoo org>
AuthorDate: Mon May 18 12:38:37 2020 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Mon May 18 12:38:37 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23692ae2
app-i18n/nkf: sparc stable wrt bug #723400
Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo gentoo.org>
app-i18n/nkf/nkf-2.1.4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-i18n/nkf/nkf-2.1.4.ebuild b/app-i18n/nkf/nkf-2.1.4.ebuild
index 98564b76343..8f5d615054d 100644
--- a/app-i18n/nkf/nkf-2.1.4.ebuild
+++ b/app-i18n/nkf/nkf-2.1.4.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/64158/${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} )"
[gentoo-commits] repo/gentoo:master commit in: app-i18n/nkf/
commit: f7f92996abda722ffd9cce9231f6abf12612a0d2
Author: Rolf Eike Beer sf-mail de>
AuthorDate: Sun May 17 14:38:35 2020 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Sun May 17 18:01:37 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7f92996
app-i18n/nkf: drop to ~hppa
Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Rolf Eike Beer sf-mail.de>
Signed-off-by: Sergei Trofimovich gentoo.org>
app-i18n/nkf/nkf-2.1.3-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-i18n/nkf/nkf-2.1.3-r2.ebuild b/app-i18n/nkf/nkf-2.1.3-r2.ebuild
index 6c07e5dae6e..a4a6e0e67a3 100644
--- a/app-i18n/nkf/nkf-2.1.3-r2.ebuild
+++ b/app-i18n/nkf/nkf-2.1.3-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/59912/${P}.tar.gz
LICENSE="ZLIB"
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} )"
[gentoo-commits] repo/gentoo:master commit in: app-i18n/nkf/files/, app-i18n/nkf/
commit: d875f9f50262cf76895e910410d55a52658fc2f5
Author: Akinori Hattori gentoo org>
AuthorDate: Sat May 16 14:34:54 2020 +
Commit: Akinori Hattori gentoo org>
CommitDate: Sat May 16 14:47:46 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d875f9f5
app-i18n/nkf: rename patch
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Akinori Hattori gentoo.org>
app-i18n/nkf/files/{nkf-2.1.4-python.patch => nkf-python.patch} | 0
app-i18n/nkf/nkf-2.1.4.ebuild | 2 +-
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-i18n/nkf/files/nkf-2.1.4-python.patch
b/app-i18n/nkf/files/nkf-python.patch
similarity index 100%
rename from app-i18n/nkf/files/nkf-2.1.4-python.patch
rename to 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 e229db43399..4810641db1b 100644
--- a/app-i18n/nkf/nkf-2.1.4.ebuild
+++ b/app-i18n/nkf/nkf-2.1.4.ebuild
@@ -41,7 +41,7 @@ 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
[gentoo-commits] repo/gentoo:master commit in: app-i18n/nkf/
commit: 59fb8b4cf6f43a18c90b26df88ffd07aedab823d
Author: Akinori Hattori gentoo org>
AuthorDate: Sat May 16 13:49:44 2020 +
Commit: Akinori Hattori gentoo org>
CommitDate: Sat May 16 14:47:41 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59fb8b4c
app-i18n/nkf: update to EAPI 7
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Akinori Hattori gentoo.org>
app-i18n/nkf/nkf-2.1.4.ebuild | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/app-i18n/nkf/nkf-2.1.4.ebuild b/app-i18n/nkf/nkf-2.1.4.ebuild
index 25f4cbcc3d4..6f616167fa7 100644
--- a/app-i18n/nkf/nkf-2.1.4.ebuild
+++ b/app-i18n/nkf/nkf-2.1.4.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI="7"
PYTHON_COMPAT=( python3_6 )
inherit distutils-r1 perl-module toolchain-funcs vcs-snapshot
@@ -19,6 +19,10 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-macos"
IUSE="perl python l10n_ja"
+src_unpack() {
+ use python && vcs-snapshot_src_unpack || default
+}
+
src_prepare() {
sed -i \
-e "/^CFLAGS/{ s/-g -O2//; s/=/+=/; }" \
[gentoo-commits] repo/gentoo:master commit in: app-i18n/nkf/
commit: 8a104ee555fd1826885b708d79dc8a4aa62589f2
Author: Akinori Hattori gentoo org>
AuthorDate: Sat May 16 13:55:27 2020 +
Commit: Akinori Hattori gentoo org>
CommitDate: Sat May 16 14:47:44 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a104ee5
app-i18n/nkf: update PYTHON_COMPAT
Closes: https://bugs.gentoo.org/718220
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Akinori Hattori gentoo.org>
app-i18n/nkf/nkf-2.1.4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-i18n/nkf/nkf-2.1.4.ebuild b/app-i18n/nkf/nkf-2.1.4.ebuild
index 3ebf5b10a78..0e5fcaa2bbe 100644
--- a/app-i18n/nkf/nkf-2.1.4.ebuild
+++ b/app-i18n/nkf/nkf-2.1.4.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
inherit distutils-r1 perl-module toolchain-funcs vcs-snapshot
[gentoo-commits] repo/gentoo:master commit in: app-i18n/nkf/
commit: fc44b576f81ef08320480c9b4c1cfe00f842bee9
Author: Akinori Hattori gentoo org>
AuthorDate: Sat May 16 14:32:02 2020 +
Commit: Akinori Hattori gentoo org>
CommitDate: Sat May 16 14:47:45 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc44b576
app-i18n/nkf: fix build with USE=python
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Akinori Hattori gentoo.org>
app-i18n/nkf/nkf-2.1.3-r2.ebuild | 19 +++
app-i18n/nkf/nkf-2.1.4.ebuild| 19 +++
2 files changed, 38 insertions(+)
diff --git a/app-i18n/nkf/nkf-2.1.3-r2.ebuild b/app-i18n/nkf/nkf-2.1.3-r2.ebuild
index 5aebc9371fa..6c07e5dae6e 100644
--- a/app-i18n/nkf/nkf-2.1.3-r2.ebuild
+++ b/app-i18n/nkf/nkf-2.1.3-r2.ebuild
@@ -3,6 +3,8 @@
EAPI="6"
PYTHON_COMPAT=( python2_7 )
+DISTUTILS_OPTIONAL="1"
+DISTUTILS_USE_SETUPTOOLS="no"
inherit distutils-r1 perl-module toolchain-funcs
@@ -16,6 +18,15 @@ LICENSE="ZLIB"
SLOT="0"
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_prepare() {
sed -i \
@@ -28,6 +39,9 @@ src_prepare() {
if use python; then
mv "${WORKDIR}"/NKF.python . || die
eapply "${FILESDIR}"/${P}-strip.patch
+ cd NKF.python
+ distutils-r1_src_prepare
+ cd - >/dev/null
fi
default
@@ -40,6 +54,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.4.ebuild b/app-i18n/nkf/nkf-2.1.4.ebuild
index 0e5fcaa2bbe..e229db43399 100644
--- a/app-i18n/nkf/nkf-2.1.4.ebuild
+++ b/app-i18n/nkf/nkf-2.1.4.ebuild
@@ -3,6 +3,8 @@
EAPI="7"
PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_OPTIONAL="1"
+DISTUTILS_USE_SETUPTOOLS="no"
inherit distutils-r1 perl-module toolchain-funcs vcs-snapshot
@@ -18,6 +20,15 @@ LICENSE="ZLIB python? ( BSD )"
SLOT="0"
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
@@ -31,6 +42,9 @@ src_prepare() {
if use python; then
mv "${WORKDIR}"/${PY_P} NKF.python || die
eapply "${FILESDIR}"/${P}-python.patch
+ cd NKF.python
+ distutils-r1_src_prepare
+ cd - >/dev/null
fi
default
@@ -43,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() {
[gentoo-commits] repo/gentoo:master commit in: app-i18n/nkf/
commit: 93ec62530190eaf6218de351770db6f9e933b147
Author: Akinori Hattori gentoo org>
AuthorDate: Sat May 16 13:51:27 2020 +
Commit: Akinori Hattori gentoo org>
CommitDate: Sat May 16 14:47:42 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93ec6253
app-i18n/nkf: update HOMEPAGE
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Akinori Hattori gentoo.org>
app-i18n/nkf/nkf-2.1.3-r2.ebuild | 2 +-
app-i18n/nkf/nkf-2.1.4.ebuild| 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-i18n/nkf/nkf-2.1.3-r2.ebuild b/app-i18n/nkf/nkf-2.1.3-r2.ebuild
index ee2518acd6d..5aebc9371fa 100644
--- a/app-i18n/nkf/nkf-2.1.3-r2.ebuild
+++ b/app-i18n/nkf/nkf-2.1.3-r2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1 perl-module toolchain-funcs
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}/59912/${P}.tar.gz
l10n_ja? ( https://dev.gentoo.org/~naota/files/${PN}.1j )
python? ( https://dev.gentoo.org/~naota/files/NKF_python20090602.tgz )"
diff --git a/app-i18n/nkf/nkf-2.1.4.ebuild b/app-i18n/nkf/nkf-2.1.4.ebuild
index 6f616167fa7..3ebf5b10a78 100644
--- a/app-i18n/nkf/nkf-2.1.4.ebuild
+++ b/app-i18n/nkf/nkf-2.1.4.ebuild
@@ -10,7 +10,7 @@ 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 )"
[gentoo-commits] repo/gentoo:master commit in: app-i18n/nkf/
commit: 4f0563b37231b8ec6645ce943ed9660dfc6a952a
Author: Akinori Hattori gentoo org>
AuthorDate: Sat May 16 14:47:04 2020 +
Commit: Akinori Hattori gentoo org>
CommitDate: Sat May 16 14:47:49 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f0563b3
app-i18n/nkf: new upstream release
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Akinori Hattori gentoo.org>
app-i18n/nkf/Manifest | 2 +
app-i18n/nkf/nkf-2.1.5.ebuild | 113 ++
2 files changed, 115 insertions(+)
diff --git a/app-i18n/nkf/Manifest b/app-i18n/nkf/Manifest
index 5376dcc7dea..b6aa6e00fce 100644
--- a/app-i18n/nkf/Manifest
+++ b/app-i18n/nkf/Manifest
@@ -1,5 +1,7 @@
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-2.1.5.tar.gz 215879 BLAKE2B
b5ae8f51b0ed97261f9e82ad469adbc9e469e709dc5acb64bfba48881555931eade5fcb772e7956a7401399008ec33bd57c8d6d8b5790eefe4d69d4e1dabed7c
SHA512
fa5b683184481b25249872e7902033a72b6a6219b4c63d508a738710029430733e78cfa13b3d69dc281676762765e0452c92244a3855d3acbb5e23aa63214847
DIST nkf.1j 24160 BLAKE2B
1d461dbacfb6e5ee358d7ea162582da5042a03f02448791c4ed33a10e9eb6e5907220db8d70aea691e3908252daffcbacdaab1b9fe52b0e4e25f7b590e5bca72
SHA512
4680dfb59ceb9db5031ecefeca808e34202c841309d5b634cdd7aa89ee97118701ddeddb0ae18a2cf791987929dc9c5a528275cb1f63b1742eac2197ac9c1416
DIST python-nkf-0.2.0_p20141211.tar.gz 187761 BLAKE2B
b607e155934dd14ad4d29298f209a233d846122299326df48e45339661d1cd08a789f5278928cb4a32c747673723f5f8877d98c7a6200af6b2dbbf29cd100f00
SHA512
5a493f32244e3cb72d188fa39b810baef31ce5f530309797a05474e3f58cf22fd5f8b6c66cdf5268451c49ffb759c476c707329ce1ccf42da0362ad4f5c24d71
+DIST python-nkf-0.2.0_p20191121.tar.gz 188496 BLAKE2B
f7c9baaff8129956b7981011634f7ee5ece97e1b6650551a5cc2b50ff51a0c96a454f39e888c80120242a12b202c0422c0ecfc21858b1822a4959ff4c108b10d
SHA512
ae1494ebdd488dc40802178a1b7b05c9a9b0bcf9cf9fa5017c6bc9f153c01b475c00f993489a21f643acc4ad61595c38c5afe28f3512a4d24f36eda7abd33958
diff --git a/app-i18n/nkf/nkf-2.1.5.ebuild b/app-i18n/nkf/nkf-2.1.5.ebuild
new file mode 100644
index 000..718622f52d2
--- /dev/null
+++ b/app-i18n/nkf/nkf-2.1.5.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_OPTIONAL="1"
+DISTUTILS_USE_SETUPTOOLS="no"
+
+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 ~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 python; then
+ mv "${WORKDIR}"/${PY_P} NKF.python || die
+ eapply "${FILESDIR}"/${PN}-python.patch
+ cd NKF.python
+ distutils-r1_src_prepare
+ cd - >/dev/null
+ fi
+
+ default
+}
+
+src_configure() {
+ default
+ if use perl; then
+ cd NKF.mod
+ perl-module_src_configure
+ cd - >/dev/null
+ fi
+ if use python; then
+ cd NKF.python
+ distutils-r1_src_configure
+
[gentoo-commits] repo/gentoo:master commit in: app-i18n/nkf/files/, app-i18n/nkf/
commit: c6c893cd975f79848ccbfe7c78a46d48db86ad86
Author: Akinori Hattori gentoo org>
AuthorDate: Sat May 16 14:44:35 2020 +
Commit: Akinori Hattori gentoo org>
CommitDate: Sat May 16 14:47:47 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6c893cd
app-i18n/nkf: fix tests
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Akinori Hattori gentoo.org>
app-i18n/nkf/files/nkf-2.1.4-test.patch | 11 +++
app-i18n/nkf/nkf-2.1.4.ebuild | 2 ++
2 files changed, 13 insertions(+)
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 000..26964ef4d64
--- /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/nkf-2.1.4.ebuild b/app-i18n/nkf/nkf-2.1.4.ebuild
index 4810641db1b..98564b76343 100644
--- a/app-i18n/nkf/nkf-2.1.4.ebuild
+++ b/app-i18n/nkf/nkf-2.1.4.ebuild
@@ -30,6 +30,8 @@ RDEPEND="python? (
)"
DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}"/${P}-test.patch )
+
src_unpack() {
use python && vcs-snapshot_src_unpack || default
}
[gentoo-commits] repo/gentoo:master commit in: app-i18n/nkf/
commit: 6ed5a4da703db158a0bb04008174c32f20dc3079
Author: Michał Górny gentoo org>
AuthorDate: Thu May 7 13:10:06 2020 +
Commit: Michał Górny gentoo org>
CommitDate: Thu May 7 13:18:00 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ed5a4da
app-i18n/nkf: Remove py2.7 where possible
Signed-off-by: Michał Górny gentoo.org>
app-i18n/nkf/nkf-2.1.4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-i18n/nkf/nkf-2.1.4.ebuild b/app-i18n/nkf/nkf-2.1.4.ebuild
index 313a6e04ac4..25f4cbcc3d4 100644
--- a/app-i18n/nkf/nkf-2.1.4.ebuild
+++ b/app-i18n/nkf/nkf-2.1.4.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
inherit distutils-r1 perl-module toolchain-funcs vcs-snapshot
[gentoo-commits] repo/gentoo:master commit in: app-i18n/nkf/
commit: 25293b3e098b3bbc073d1c392faebf16a484d694
Author: Michael Mair-Keimberger gmail com>
AuthorDate: Sat Jun 1 15:48:56 2019 +
Commit: Aaron Bauman gentoo org>
CommitDate: Tue Jun 18 00:35:03 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25293b3e
app-i18n/nkf: update HOMEPAGE
Signed-off-by: Michael Mair-Keimberger gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/12149
Signed-off-by: Aaron Bauman gentoo.org>
app-i18n/nkf/nkf-2.1.3-r2.ebuild | 4 ++--
app-i18n/nkf/nkf-2.1.4.ebuild| 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app-i18n/nkf/nkf-2.1.3-r2.ebuild b/app-i18n/nkf/nkf-2.1.3-r2.ebuild
index 21daf284bc4..987c68e8253 100644
--- a/app-i18n/nkf/nkf-2.1.3-r2.ebuild
+++ b/app-i18n/nkf/nkf-2.1.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -7,7 +7,7 @@ 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/;
+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 )"
diff --git a/app-i18n/nkf/nkf-2.1.4.ebuild b/app-i18n/nkf/nkf-2.1.4.ebuild
index 18988591902..8d94ae69111 100644
--- a/app-i18n/nkf/nkf-2.1.4.ebuild
+++ b/app-i18n/nkf/nkf-2.1.4.ebuild
@@ -10,7 +10,7 @@ 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/;
+HOMEPAGE="https://ja.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 )"
[gentoo-commits] repo/gentoo:master commit in: app-i18n/nkf/, app-i18n/nkf/files/
commit: 3c10dea506923c49468ff262e256aa38fdaa6dab
Author: Akinori Hattori gentoo org>
AuthorDate: Tue Jul 31 12:43:29 2018 +
Commit: Akinori Hattori gentoo org>
CommitDate: Tue Jul 31 12:43:29 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c10dea5
app-i18n/nkf: new upstream release
Package-Manager: Portage-2.3.40, Repoman-2.3.9
app-i18n/nkf/Manifest | 2 +
app-i18n/nkf/files/nkf-2.1.4-python.patch | 13 +
app-i18n/nkf/nkf-2.1.4.ebuild | 90 +++
3 files changed, 105 insertions(+)
diff --git a/app-i18n/nkf/Manifest b/app-i18n/nkf/Manifest
index d45655ec517..5376dcc7dea 100644
--- a/app-i18n/nkf/Manifest
+++ b/app-i18n/nkf/Manifest
@@ -1,3 +1,5 @@
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
+DIST python-nkf-0.2.0_p20141211.tar.gz 187761 BLAKE2B
b607e155934dd14ad4d29298f209a233d846122299326df48e45339661d1cd08a789f5278928cb4a32c747673723f5f8877d98c7a6200af6b2dbbf29cd100f00
SHA512
5a493f32244e3cb72d188fa39b810baef31ce5f530309797a05474e3f58cf22fd5f8b6c66cdf5268451c49ffb759c476c707329ce1ccf42da0362ad4f5c24d71
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 000..6f9e2e687e0
--- /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.4.ebuild b/app-i18n/nkf/nkf-2.1.4.ebuild
new file mode 100644
index 000..9f6f6f5d630
--- /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
[gentoo-commits] repo/gentoo:master commit in: app-i18n/nkf/
commit: 1348200690ff829d9e909c71bf30375b19461472
Author: nilburn gmail com>
AuthorDate: Wed Aug 26 07:03:15 2015 +
Commit: Akinori Hattori gentoo org>
CommitDate: Tue Jul 31 12:31:54 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13482006
app-i18n/nkf: fix install with USE=perl
Closes: https://bugs.gentoo.org/558784
Package-Manager: Portage-2.3.40, Repoman-2.3.9
.../{nkf-2.1.3-r1.ebuild => nkf-2.1.3-r2.ebuild} | 11 +++-
app-i18n/nkf/nkf-2.1.3.ebuild | 68 --
2 files changed, 10 insertions(+), 69 deletions(-)
diff --git a/app-i18n/nkf/nkf-2.1.3-r1.ebuild b/app-i18n/nkf/nkf-2.1.3-r2.ebuild
similarity index 88%
rename from app-i18n/nkf/nkf-2.1.3-r1.ebuild
rename to app-i18n/nkf/nkf-2.1.3-r2.ebuild
index 23f6161b389..21daf284bc4 100644
--- a/app-i18n/nkf/nkf-2.1.3-r1.ebuild
+++ b/app-i18n/nkf/nkf-2.1.3-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/59912/${P}.tar.gz
LICENSE="ZLIB"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd
~x86-fbsd ~x86-macos"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
~x86-macos"
IUSE="perl python l10n_ja"
src_prepare() {
@@ -33,6 +33,15 @@ src_prepare() {
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
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 4c6a6142c01..000
--- 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
-}
[gentoo-commits] repo/gentoo:master commit in: app-i18n/nkf/
commit: 0a34c1def507077e7e937442941ee2e06b14626f
Author: Akinori Hattori gentoo org>
AuthorDate: Tue Jul 31 12:18:52 2018 +
Commit: Akinori Hattori gentoo org>
CommitDate: Tue Jul 31 12:18:52 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a34c1de
app-i18n/nkf: update to EAPI 6
Package-Manager: Portage-2.3.40, Repoman-2.3.9
app-i18n/nkf/nkf-2.1.3-r1.ebuild | 60 +++-
1 file changed, 34 insertions(+), 26 deletions(-)
diff --git a/app-i18n/nkf/nkf-2.1.3-r1.ebuild b/app-i18n/nkf/nkf-2.1.3-r1.ebuild
index 240a559e772..23f6161b389 100644
--- a/app-i18n/nkf/nkf-2.1.3-r1.ebuild
+++ b/app-i18n/nkf/nkf-2.1.3-r1.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
+EAPI="6"
PYTHON_COMPAT=( python2_7 )
-inherit eutils distutils-r1 perl-module toolchain-funcs
+
+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/nkf/59912/${P}.tar.gz
- l10n_ja? ( https://dev.gentoo.org/~naota/files/nkf.1j )
+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"
@@ -18,56 +19,63 @@ IUSE="perl python l10n_ja"
src_prepare() {
sed -i \
- -e '/^CFLAGS/{s|-g -O2||;s|=|+=|;}' \
- -e '/-o nkf/s:$(CFLAGS):$(CFLAGS) $(LDFLAGS):' \
- Makefile || die
-
+ -e "/^CFLAGS/{ s/-g -O2//; s/=/+=/; }" \
+ -e "/ -o ${PN}/s/\(-o \)/\$(LDFLAGS) \1/" \
+ Makefile
if use l10n_ja; then
- cp "${DISTDIR}"/nkf.1j "${S}" || die
+ cp "${DISTDIR}"/${PN}.1j ${PN}.ja.1 || die
fi
-
if use python; then
- mv "${WORKDIR}/NKF.python" "${S}" || die
- epatch "${FILESDIR}"/${P}-strip.patch
+ mv "${WORKDIR}"/NKF.python . || die
+ eapply "${FILESDIR}"/${P}-strip.patch
fi
+
+ default
}
src_compile() {
- emake CC="$(tc-getCC)" nkf || die
+ emake CC="$(tc-getCC)"
if use perl; then
- cd "${S}/NKF.mod"
+ cd NKF.mod
perl-module_src_compile
+ cd - >/dev/null
fi
if use python; then
- cd "${S}/NKF.python"
+ cd NKF.python
distutils-r1_src_compile
+ cd - >/dev/null
fi
}
src_test() {
- emake test || die
+ default
if use perl; then
- cd "${S}/NKF.mod"
+ cd NKF.mod
perl-module_src_test
+ cd - >/dev/null
fi
}
src_install() {
- dobin nkf || die
- doman nkf.1
+ dobin ${PN}
+ doman ${PN}.1
if use l10n_ja; then
- ./nkf -e nkf.1j > nkf.1
- doman -i18n=ja nkf.1
+ doman ${PN}.ja.1
fi
- dodoc nkf.doc
+ dodoc ${PN}.doc
if use perl; then
- cd "${S}/NKF.mod"
+ cd NKF.mod
+ docinto perl
perl-module_src_install
+ cd - >/dev/null
fi
if use python; then
- cd "${S}/NKF.python"
- distutils-r1_src_install
+ cd NKF.python
+ docinto python
+ DOCS= distutils-r1_src_install
+ dodoc README
+ cd - >/dev/null
fi
}
[gentoo-commits] repo/gentoo:master commit in: app-i18n/nkf/
commit: 3102634ae10bf6d9c0a0745867de6b449cdb003f
Author: Ulrich Müller gentoo org>
AuthorDate: Sat Jun 25 15:26:31 2016 +
Commit: Ulrich Müller gentoo org>
CommitDate: Sat Jun 25 15:39:37 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3102634a
app-i18n/nkf: Migrate from LINGUAS to L10N.
Package-Manager: portage-2.3.0
app-i18n/nkf/nkf-2.1.3-r1.ebuild | 10 +-
app-i18n/nkf/nkf-2.1.3.ebuild| 6 +++---
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/app-i18n/nkf/nkf-2.1.3-r1.ebuild b/app-i18n/nkf/nkf-2.1.3-r1.ebuild
index c2b2e22..b80be95 100644
--- a/app-i18n/nkf/nkf-2.1.3-r1.ebuild
+++ b/app-i18n/nkf/nkf-2.1.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -9,13 +9,13 @@ 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? ( https://dev.gentoo.org/~naota/files/nkf.1j )
+ 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 linguas_ja"
+IUSE="perl python l10n_ja"
src_prepare() {
sed -i \
@@ -23,7 +23,7 @@ src_prepare() {
-e '/-o nkf/s:$(CFLAGS):$(CFLAGS) $(LDFLAGS):' \
Makefile || die
- if use linguas_ja; then
+ if use l10n_ja; then
cp "${DISTDIR}"/nkf.1j "${S}" || die
fi
@@ -57,7 +57,7 @@ src_install() {
dobin nkf || die
doman nkf.1
- if use linguas_ja; then
+ if use l10n_ja; then
./nkf -e nkf.1j > nkf.1
doman -i18n=ja nkf.1
fi
diff --git a/app-i18n/nkf/nkf-2.1.3.ebuild b/app-i18n/nkf/nkf-2.1.3.ebuild
index 44cd1e6..68520ee 100644
--- a/app-i18n/nkf/nkf-2.1.3.ebuild
+++ b/app-i18n/nkf/nkf-2.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge.jp/nkf/59912/${P}.tar.gz
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"
+IUSE="perl python l10n_ja"
src_prepare() {
sed -i \
@@ -52,7 +52,7 @@ src_install() {
dobin nkf || die
doman nkf.1
- if use linguas_ja; then
+ if use l10n_ja; then
./nkf -e nkf.1j > nkf.1
doman -i18n=ja nkf.1
fi
