public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-i18n/nkf/
Date: Tue,  4 Oct 2022 07:09:41 +0000 (UTC)	[thread overview]
Message-ID: <1664867365.40f93f66cdb909189c0a501418dffa6e11fa7711.sam@gentoo> (raw)

commit:     40f93f66cdb909189c0a501418dffa6e11fa7711
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  4 06:53:14 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Oct  4 07:09:25 2022 +0000
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 <sam <AT> 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


             reply	other threads:[~2022-10-04  7:09 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-04  7:09 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-04-14  6:11 [gentoo-commits] repo/gentoo:master commit in: app-i18n/nkf/ Akinori Hattori
2024-04-14  6:11 Akinori Hattori
2024-04-14  6:11 Akinori Hattori
2023-10-01 18:14 Arthur Zamarin
2023-09-08  9:29 Sam James
2023-09-08  9:29 Sam James
2023-09-08  0:12 Sam James
2023-09-07 23:03 Sam James
2023-04-30  5:30 Akinori Hattori
2023-04-30  5:30 Akinori Hattori
2022-10-04  2:46 Sam James
2022-02-01 18:51 Michał Górny
2021-09-26 17:52 Sam James
2021-09-26  5:01 Sam James
2021-09-26  5:01 Sam James
2021-09-26  5:01 Sam James
2021-09-26  5:01 Sam James
2021-08-25  4:35 Arthur Zamarin
2021-01-06 13:13 Fabian Groffen
2020-05-18 13:02 Agostino Sarubbo
2020-05-18 13:01 Agostino Sarubbo
2020-05-18 13:00 Agostino Sarubbo
2020-05-18 12:55 Agostino Sarubbo
2020-05-18 12:38 Agostino Sarubbo
2020-05-17 18:01 Sergei Trofimovich
2020-05-16 14:48 Akinori Hattori
2020-05-16 14:48 Akinori Hattori
2020-05-16 14:48 Akinori Hattori
2020-05-16 14:48 Akinori Hattori
2020-05-16 14:48 Akinori Hattori
2020-05-07 13:18 Michał Górny
2019-06-18  0:35 Aaron Bauman
2018-07-31 12:33 Akinori Hattori
2018-07-31 12:33 Akinori Hattori
2016-06-25 15:39 Ulrich Müller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1664867365.40f93f66cdb909189c0a501418dffa6e11fa7711.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox