From 9c417bacd51da6d8b57fa9f37425161d30d4b95b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 28 Nov 2020 20:40:51 +0000 Subject: gentoo resync : 28.11.2020 --- app-text/hnb/Manifest | 3 ++- app-text/hnb/files/hnb-1.9.18-fno-common.patch | 27 ++++++++++++++++++++++++++ app-text/hnb/hnb-1.9.18-r1.ebuild | 27 ++++++++++++++------------ 3 files changed, 44 insertions(+), 13 deletions(-) create mode 100644 app-text/hnb/files/hnb-1.9.18-fno-common.patch (limited to 'app-text/hnb') diff --git a/app-text/hnb/Manifest b/app-text/hnb/Manifest index 2e4e83202df6..8d36266df643 100644 --- a/app-text/hnb/Manifest +++ b/app-text/hnb/Manifest @@ -1,6 +1,7 @@ AUX hnb-1.9.18-flags.patch 2527 BLAKE2B cdfd66a4907d3431bb704f4f4b922543b2793cf6a1156e54ec363279a8771ab819340c6537522004f362371a7e410a4d68eff8dd1cb9881d0996969b9abc705f SHA512 672e8836a0766d0b922359572aff8319aa701a10863fb618bcd74c52980303d0e3158f3de7ca50cb05367296c7121c510a4e900d60721dee33b4e657a8a07e5a +AUX hnb-1.9.18-fno-common.patch 518 BLAKE2B e92840f441129d0aa74e0b4fc965fffac52de7f381c439b8f853a3318b16c18ad918d12825564fd24cca9debdf368eb8a66c944d9f956d8acf70f78d82073610 SHA512 b61134e3790c204c153c3d12b602254ed196ba84b385e65a8b8da70c56141535416430bd988183e30a95108ac64cbd0af36e0f9f16a1ca13af7bbba936483734 AUX hnb-1.9.18-include.patch 244 BLAKE2B 68ca79ccfd2f3b282d0d0f2ab7f633caf82b1a7e7c67b403a766db7a45365dd3f3ff0d25dd4d2ab496eebef4044688045f54e0e1f723b721616b34a59968c775 SHA512 5fa1b46221068885d9d2e2bde2f647c9f6756173af2f6568e4f32a00f64d6d753ed2aa2b841f7c1206afbd3d6af849bc374e8a29e84d2140c68cfa6627f4cb62 AUX hnb-1.9.18-printf.patch 216 BLAKE2B 446e1d5338509fd67726c663c68ee5dda70d20777ebc6344224377acf36edfc6b57e60c7490a059991a7fa08e3c0e4b928f55f012e0b3e580bf14686cde50490 SHA512 2638a268020ca55619be92921698e82d540b1f7bf75af3014339ae7e5f674e9f28e3618bd195f0e946f5276c0c2464e2336883db90af2036d2b356f1c9680e53 DIST hnb-1.9.18.tar.gz 166043 BLAKE2B 9d4257a4b76fb1458ed5df2743997bdfa416faad9ac328693a636250c0f3c8bf9fe6244436c36a4c5efaec254da1d89afb5e5d1afc8c438309851091530a43cc SHA512 9919a5d6512b6da3d19cc8efbed21d4452a2f6a343a38758c36728f73415b6e8ad57e24ff3eec17eb4e1e53b458d579c165ae1ad906f5b75f2fd42897159a30f -EBUILD hnb-1.9.18-r1.ebuild 794 BLAKE2B 3b834f83848265dd3137dfc8c0c2ece75f9c5c734a6bf6242d7ff2285f5d11ca1ecb5b550066dd392b3399fc04137eb4f40997f48f8241727496743f67f83ee0 SHA512 642fde554203fa300e8b883a8580a85207d0ad34e4c5382f90ca5f79f9152a8c8bdcfb376b7211ecf6f0618fb7eb0b79e277cb04c75ca9c39054b927afa8a833 +EBUILD hnb-1.9.18-r1.ebuild 833 BLAKE2B 717b47e92a3e23b0d9f7e0bc9f5215a16e7fc7fcd7951754c0e4f5b29062d450f0561b5985e275c076c6537e37f0f5bae284663ad7dadd0d6035ce32edf1cbe3 SHA512 f2ca0899f1c3f0a832ecd8bc3c77bfffec5e6bdf33ce33d2be619be6eba5a2a685e1ff1cdadb58e287eeaaee7b7765ad7f74b44ea26941f95008d9e9051dc0d8 MISC metadata.xml 521 BLAKE2B 763dfba52975b9c55ad9b91ff304dc5555d60e4d425f0349fdb8ca475368956b941ab0a771019943628836fc2a7c68ffc63b329922b6249c04891084fb5bd53f SHA512 109d368df00aef9bb47380f20afb9695a877425a557ff188d16c37037160c6342cd6533f858ca224d197ce1b4c21e7b456584753de264e412d0b22a3cb16d903 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 000000000000..89a4321c4144 --- /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 a38796bc73be..2c262725c22e 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 -- cgit v1.2.3