From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 04CDF1382C5 for ; Fri, 2 Mar 2018 07:46:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 153B9E08EA; Fri, 2 Mar 2018 07:46:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E6345E08EA for ; Fri, 2 Mar 2018 07:46:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AE2A0335C34 for ; Fri, 2 Mar 2018 07:46:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F26B61E7 for ; Fri, 2 Mar 2018 07:46:52 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1519976794.3818e5b88335efd19375516ef8e9d9c6f2d6a2b6.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-process/htop/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-process/htop/htop-2.1.0-r1.ebuild X-VCS-Directories: sys-process/htop/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 3818e5b88335efd19375516ef8e9d9c6f2d6a2b6 X-VCS-Branch: master Date: Fri, 2 Mar 2018 07:46:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 4b045804-72c5-4731-b61d-97ec9a96dc88 X-Archives-Hash: 3e85243ad7acaf1949c2300060cceb6e commit: 3818e5b88335efd19375516ef8e9d9c6f2d6a2b6 Author: Lars Wendler gentoo org> AuthorDate: Fri Mar 2 07:46:34 2018 +0000 Commit: Lars Wendler gentoo org> CommitDate: Fri Mar 2 07:46:34 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3818e5b8 sys-process/htop: Fixed build with python2_7 Closes: https://bugs.gentoo.org/649250 Package-Manager: Portage-2.3.24, Repoman-2.3.6 sys-process/htop/htop-2.1.0-r1.ebuild | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys-process/htop/htop-2.1.0-r1.ebuild b/sys-process/htop/htop-2.1.0-r1.ebuild index a6d93f24ee2..14a9ecd0dfb 100644 --- a/sys-process/htop/htop-2.1.0-r1.ebuild +++ b/sys-process/htop/htop-2.1.0-r1.ebuild @@ -28,7 +28,6 @@ DOCS=( ChangeLog README ) CONFIG_CHECK="~TASKSTATS ~TASK_XACCT ~TASK_IO_ACCOUNTING ~CGROUPS" PATCHES=( - "${FILESDIR}/${PN}-2.1.0-MakeHeader-python3.patch" #646880 # Fixes from upstream (can usually be removed with next version bump) "${FILESDIR}/${P}-sysmacros.patch" @@ -54,6 +53,8 @@ src_prepare() { rm missing || die default + use python_single_target_python2_7 || \ + eapply "${FILESDIR}/${PN}-2.1.0-MakeHeader-python3.patch" #646880 eautoreconf python_fix_shebang scripts/MakeHeader.py }