From 6abbf81ef2f298e3221ff5e67a1f3c5f23958212 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Mon, 14 Dec 2020 13:26:14 +0000
Subject: gentoo resync : 14.12.2020

---
 sci-calculators/hcalc/Manifest                         |  3 ++-
 sci-calculators/hcalc/files/hcalc-1.2-fno-common.patch | 13 +++++++++++++
 sci-calculators/hcalc/hcalc-1.2-r1.ebuild              |  9 +++++----
 3 files changed, 20 insertions(+), 5 deletions(-)
 create mode 100644 sci-calculators/hcalc/files/hcalc-1.2-fno-common.patch

(limited to 'sci-calculators/hcalc')

diff --git a/sci-calculators/hcalc/Manifest b/sci-calculators/hcalc/Manifest
index 5f80dbe7c938..ea9f2bf97c37 100644
--- a/sci-calculators/hcalc/Manifest
+++ b/sci-calculators/hcalc/Manifest
@@ -1,3 +1,4 @@
+AUX hcalc-1.2-fno-common.patch 213 BLAKE2B 0800a555e6e4938a0b45e8231c43598814d9c0d427f8a508904a6b6811481063c74222558738820785eab9f81e314fe0e65a6ac881c1a32d9cba20e945b2252e SHA512 3dfa05c69df04c887931614367cc6a7e978ed57ad4ea1ddef897d9b7e71d271c763d7fea64291be3f06d1bf9e0b003c0ec09757c221d5ce71f479f6aa3e0df20
 DIST hcalc-1.2.tar.xz 15456 BLAKE2B 0423d9e208eb804289f20ebe2011620adc35eb926645934d5a46141ce250831234fb6317ccf532ba02a990789d647ccceb1732b1dd10dd368786204ed68241f3 SHA512 c21dac80d31f7adc5a1e7a02e5a755ac8d68547a9f25622d55e6d87c924a2535ac496ecfebcae52b1995aa414362a9005be4e2b390d0e01dab22bd692b16bf49
-EBUILD hcalc-1.2-r1.ebuild 539 BLAKE2B f9ce814fe4521f0fe661aee371a26a797f2de56a5dab4cc5f23c2fc41af301d4414dc332b21d359c38ae740826afad1047d3886c2b9a01745dc6a191a484751e SHA512 2e0909fc2931f0e709142c8657df1db459baa478e14f65876f76086b8db632cb3a38d55459c1313d59d6986accacc29bc80c053351379f4cde675b948829b70a
+EBUILD hcalc-1.2-r1.ebuild 571 BLAKE2B e7c2db4f2d98d0d662f7b55af515310de230fec2431ffc9a306029aa0191eb0ace12f6fe669e0e14423a5fa14dd88a2d8ac9450ac8365eff7c7254f8d170deb7 SHA512 4b9c94b2913556176d79fea7b777aa628a5282f18152090ea0832dca92e25a226b72c792aa4c75c2f61e68d3326434cf600099d2fa1087ab4fc661a5fc1c3f1f
 MISC metadata.xml 338 BLAKE2B fb4b1e01580deed6dd66a84da366f6b206ce5812d37fbda52dc15afd3ddee86e0a41d91578bf8b4ce6699a1f477b712371316bba0f35c851fe5e5e12885916f8 SHA512 22d8e0d0a68f19e337497b9ffe74d36e77825d0bd3bfbf845c8007f81aac888166f29480265c3473b3337980e3148837785f7be9e79b88446c96e6147e15bbea
diff --git a/sci-calculators/hcalc/files/hcalc-1.2-fno-common.patch b/sci-calculators/hcalc/files/hcalc-1.2-fno-common.patch
new file mode 100644
index 000000000000..b8bdcc73e305
--- /dev/null
+++ b/sci-calculators/hcalc/files/hcalc-1.2-fno-common.patch
@@ -0,0 +1,13 @@
+--- a/hcalc.h
++++ b/hcalc.h
+@@ -25,8 +25,8 @@
+ extern Pixmap face;
+ extern Pixmap chars;
+ 
+-int bit_on;
+-int bit_off;
++extern int bit_on;
++extern int bit_off;
+ 
+ extern int char_to_x[256];
+ extern char charmap[];
diff --git a/sci-calculators/hcalc/hcalc-1.2-r1.ebuild b/sci-calculators/hcalc/hcalc-1.2-r1.ebuild
index bbd0de3fcfac..6a6b90666a0a 100644
--- a/sci-calculators/hcalc/hcalc-1.2-r1.ebuild
+++ b/sci-calculators/hcalc/hcalc-1.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="DJ's Hex Calculator"
 HOMEPAGE="http://www.delorie.com/store/hcalc/ https://github.com/jlec/hcalc"
@@ -12,13 +12,14 @@ SRC_URI="https://github.com/downloads/jlec/hcalc/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE=""
 
 RDEPEND="
 	x11-libs/libX11
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}"
 
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
+
 pkg_postinst() {
 	einfo "Enter hcalc to run and use kill or ctrl-c to exit."
 }
-- 
cgit v1.2.3