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 61DFD1382C5 for ; Sat, 13 Feb 2021 09:55:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 97708E087F; Sat, 13 Feb 2021 09:54:59 +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 7D7B2E087F for ; Sat, 13 Feb 2021 09:54:59 +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 8CC26340FF2 for ; Sat, 13 Feb 2021 09:54:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2B6AF4C for ; Sat, 13 Feb 2021 09:54:57 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1613210074.6c9d623b817d83875351c916cca8121454e249b6.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/slurm/, net-analyzer/slurm/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/slurm/files/slurm-0.4.3-fix-includes.patch net-analyzer/slurm/slurm-0.4.3.ebuild X-VCS-Directories: net-analyzer/slurm/ net-analyzer/slurm/files/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 6c9d623b817d83875351c916cca8121454e249b6 X-VCS-Branch: master Date: Sat, 13 Feb 2021 09:54:57 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0fb7c817-897a-4c9b-85d4-46ad92447890 X-Archives-Hash: e21a138a4a6047001bed36cbc8a496cf commit: 6c9d623b817d83875351c916cca8121454e249b6 Author: David Seifert gentoo org> AuthorDate: Sat Feb 13 09:54:34 2021 +0000 Commit: David Seifert gentoo org> CommitDate: Sat Feb 13 09:54:34 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c9d623b net-analyzer/slurm: Fix includes * Port to EAPI 7 * Use patch from Alpine Bug: https://bugs.gentoo.org/757054 Closes: https://bugs.gentoo.org/713664 Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: David Seifert gentoo.org> .../slurm/files/slurm-0.4.3-fix-includes.patch | 22 ++++++++++++++ net-analyzer/slurm/slurm-0.4.3.ebuild | 34 +++++++++------------- 2 files changed, 36 insertions(+), 20 deletions(-) diff --git a/net-analyzer/slurm/files/slurm-0.4.3-fix-includes.patch b/net-analyzer/slurm/files/slurm-0.4.3-fix-includes.patch new file mode 100644 index 00000000000..9e933ffc509 --- /dev/null +++ b/net-analyzer/slurm/files/slurm-0.4.3-fix-includes.patch @@ -0,0 +1,22 @@ +--- a/os.h ++++ b/os.h +@@ -177,7 +177,7 @@ + #elif defined (__linux__) /* L I N U X */ + #include + #include +-#include ++#include + #include + #include + #include +@@ -195,8 +195,8 @@ + #include + #include + #include +-#include +-#include ++#include ++#include + #elif defined (__Solaris__) /* S O L A R I S */ + #include + #define NO_CURSES_E 1 diff --git a/net-analyzer/slurm/slurm-0.4.3.ebuild b/net-analyzer/slurm/slurm-0.4.3.ebuild index 95641beb1b2..da86bb68d8b 100644 --- a/net-analyzer/slurm/slurm-0.4.3.ebuild +++ b/net-analyzer/slurm/slurm-0.4.3.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit cmake-utils +EAPI=7 + +inherit cmake DESCRIPTION="Realtime network interface monitor based on FreeBSD's pppstatus" HOMEPAGE="https://github.com/mattthias/slurm" @@ -12,26 +13,19 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~sparc ~x86" -RDEPEND=" - sys-libs/ncurses:* -" -DEPEND=" - ${RDEPEND} -" +RDEPEND="sys-libs/ncurses:=" +DEPEND="${RDEPEND}" + +S="${WORKDIR}/${PN}-upstream" + PATCHES=( "${FILESDIR}"/${PN}-0.3.3-overflow.patch "${FILESDIR}"/${P}-tinfo.patch "${FILESDIR}"/${P}-version.patch -) -DOCS=( - AUTHORS - ChangeLog - FAQ - KEYS - README - THANKS - THEMES.txt - TODO + "${FILESDIR}"/${P}-fix-includes.patch ) -S=${WORKDIR}/${PN}-upstream +src_install() { + cmake_src_install + dodoc KEYS THEMES.txt +}