Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-process/htop/
Date: Fri, 02 Mar 2018 07:46:58
Message-Id: 1519976794.3818e5b88335efd19375516ef8e9d9c6f2d6a2b6.polynomial-c@gentoo
1 commit: 3818e5b88335efd19375516ef8e9d9c6f2d6a2b6
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Fri Mar 2 07:46:34 2018 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Fri Mar 2 07:46:34 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3818e5b8
7
8 sys-process/htop: Fixed build with python2_7
9
10 Closes: https://bugs.gentoo.org/649250
11 Package-Manager: Portage-2.3.24, Repoman-2.3.6
12
13 sys-process/htop/htop-2.1.0-r1.ebuild | 3 ++-
14 1 file changed, 2 insertions(+), 1 deletion(-)
15
16 diff --git a/sys-process/htop/htop-2.1.0-r1.ebuild b/sys-process/htop/htop-2.1.0-r1.ebuild
17 index a6d93f24ee2..14a9ecd0dfb 100644
18 --- a/sys-process/htop/htop-2.1.0-r1.ebuild
19 +++ b/sys-process/htop/htop-2.1.0-r1.ebuild
20 @@ -28,7 +28,6 @@ DOCS=( ChangeLog README )
21 CONFIG_CHECK="~TASKSTATS ~TASK_XACCT ~TASK_IO_ACCOUNTING ~CGROUPS"
22
23 PATCHES=(
24 - "${FILESDIR}/${PN}-2.1.0-MakeHeader-python3.patch" #646880
25
26 # Fixes from upstream (can usually be removed with next version bump)
27 "${FILESDIR}/${P}-sysmacros.patch"
28 @@ -54,6 +53,8 @@ src_prepare() {
29 rm missing || die
30
31 default
32 + use python_single_target_python2_7 || \
33 + eapply "${FILESDIR}/${PN}-2.1.0-MakeHeader-python3.patch" #646880
34 eautoreconf
35 python_fix_shebang scripts/MakeHeader.py
36 }