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 70F5913835B for ; Fri, 27 Nov 2020 17:37:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9287DE0848; Fri, 27 Nov 2020 17:37:13 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 7BBBBE0848 for ; Fri, 27 Nov 2020 17:37:13 +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 67EE43414C4 for ; Fri, 27 Nov 2020 17:37:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8DA8646E for ; Fri, 27 Nov 2020 17:37:10 +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: <1606498606.21b2dac90d38b07b6f1aad1bd4aec2681c4e6e8c.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/hnb/files/, app-text/hnb/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/hnb/files/hnb-1.9.18-fno-common.patch app-text/hnb/hnb-1.9.18-r1.ebuild X-VCS-Directories: app-text/hnb/ app-text/hnb/files/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 21b2dac90d38b07b6f1aad1bd4aec2681c4e6e8c X-VCS-Branch: master Date: Fri, 27 Nov 2020 17:37:10 +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: 41d7a9c0-2800-4e21-bee6-3628256c6b29 X-Archives-Hash: 3c9aed7e962d068d0bbac9a82e5eb4a3 commit: 21b2dac90d38b07b6f1aad1bd4aec2681c4e6e8c Author: Jakov Smolic sartura hr> AuthorDate: Fri Nov 27 17:36:46 2020 +0000 Commit: David Seifert gentoo org> CommitDate: Fri Nov 27 17:36:46 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21b2dac9 app-text/hnb: port to EAPI 7 Closes: https://bugs.gentoo.org/707720 Package-Manager: Portage-3.0.9, Repoman-3.0.1 Signed-off-by: Jakov Smolic sartura.hr> Signed-off-by: David Seifert gentoo.org> app-text/hnb/files/hnb-1.9.18-fno-common.patch | 27 ++++++++++++++++++++++++++ app-text/hnb/hnb-1.9.18-r1.ebuild | 27 ++++++++++++++------------ 2 files changed, 42 insertions(+), 12 deletions(-) diff --git a/app-text/hnb/files/hnb-1.9.18-fno-common.patch b/app-text/hnb/files/hnb-1.9.18-fno-common.patch new file mode 100644 index 00000000000..89a4321c414 --- /dev/null +++ b/app-text/hnb/files/hnb-1.9.18-fno-common.patch @@ -0,0 +1,27 @@ +--- a/src/ui.h ++++ b/src/ui.h +@@ -38,6 +38,9 @@ extern int hnb_edit_posup; + extern int hnb_edit_posdown; + + extern int ui_inited; ++extern int nodes_above; ++extern int active_line; ++extern int nodes_below; + + void ui_getstr (char *prompt, char *datastorage); + +--- a/src/ui_draw.c ++++ b/src/ui_draw.c +@@ -39,9 +39,9 @@ + + #define KEEPLINES 5 + +-int nodes_above; +-int active_line; +-int nodes_below; ++extern int nodes_above; ++extern int active_line; ++extern int nodes_below; + + static Node *up (Node *sel, Node *node) + { diff --git a/app-text/hnb/hnb-1.9.18-r1.ebuild b/app-text/hnb/hnb-1.9.18-r1.ebuild index a38796bc73b..2c262725c22 100644 --- a/app-text/hnb/hnb-1.9.18-r1.ebuild +++ b/app-text/hnb/hnb-1.9.18-r1.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils toolchain-funcs +EAPI=7 + +inherit toolchain-funcs DESCRIPTION="A program to organize many kinds of data in one place" HOMEPAGE="http://hnb.sourceforge.net/" @@ -13,20 +14,22 @@ LICENSE="GPL-2" KEYWORDS="amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" RDEPEND="sys-libs/ncurses" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${P}-flags.patch + "${FILESDIR}"/${P}-include.patch + "${FILESDIR}"/${P}-printf.patch + "${FILESDIR}"/${P}-fno-common.patch +) src_prepare() { + default + rm -r ${P} || die rm src/cli_history.o || die - epatch \ - "${FILESDIR}"/${P}-flags.patch \ - "${FILESDIR}"/${P}-include.patch \ - "${FILESDIR}"/${P}-printf.patch - tc-export AR CC PKG_CONFIG # bug #532552