Gentoo Archives: gentoo-commits

From: Georgy Yakovlev <gyakovlev@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/binwalk/
Date: Tue, 13 Oct 2020 01:31:17
Message-Id: 1602552079.0b3922b77df0d7042837081c111535252b189a4f.gyakovlev@gentoo
1 commit: 0b3922b77df0d7042837081c111535252b189a4f
2 Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
3 AuthorDate: Mon Oct 12 17:51:21 2020 +0000
4 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
5 CommitDate: Tue Oct 13 01:21:19 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b3922b7
7
8 app-misc/binwalk: correct DISTUTILS_USE_SETUPTOOLS
9
10 Closes: https://bugs.gentoo.org/746305
11 Package-Manager: Portage-3.0.4, Repoman-3.0.1
12 Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
13 Closes: https://github.com/gentoo/gentoo/pull/17905
14 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
15
16 app-misc/binwalk/binwalk-2.2.0.ebuild | 4 +++-
17 app-misc/binwalk/binwalk-9999.ebuild | 4 +++-
18 2 files changed, 6 insertions(+), 2 deletions(-)
19
20 diff --git a/app-misc/binwalk/binwalk-2.2.0.ebuild b/app-misc/binwalk/binwalk-2.2.0.ebuild
21 index 63018b781dd..62d89035280 100644
22 --- a/app-misc/binwalk/binwalk-2.2.0.ebuild
23 +++ b/app-misc/binwalk/binwalk-2.2.0.ebuild
24 @@ -2,7 +2,9 @@
25 # Distributed under the terms of the GNU General Public License v2
26
27 EAPI=7
28 -PYTHON_COMPAT=( python{3_6,3_7,3_8} )
29 +
30 +DISTUTILS_USE_SETUPTOOLS=no
31 +PYTHON_COMPAT=( python3_{6..8} )
32
33 inherit distutils-r1
34
35
36 diff --git a/app-misc/binwalk/binwalk-9999.ebuild b/app-misc/binwalk/binwalk-9999.ebuild
37 index a32600fbb9e..7f094556433 100644
38 --- a/app-misc/binwalk/binwalk-9999.ebuild
39 +++ b/app-misc/binwalk/binwalk-9999.ebuild
40 @@ -2,7 +2,9 @@
41 # Distributed under the terms of the GNU General Public License v2
42
43 EAPI=7
44 -PYTHON_COMPAT=( python{3_6,3_7,3_8} )
45 +
46 +DISTUTILS_USE_SETUPTOOLS=no
47 +PYTHON_COMPAT=( python3_{6..8} )
48
49 inherit distutils-r1