[gentoo-commits] repo/gentoo:master commit in: sci-calculators/hcalc/, sci-calculators/hcalc/files/

[gentoo-commits] repo/gentoo:master commit in: sci-calculators/hcalc/, sci-calculators/hcalc/files/

[Justin Lecher]

commit:     787abf1ee13ef54d05f3cde84b07036967802d93
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  2 22:05:56 2017 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Jan  2 22:09:09 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=787abf1e

sci-calculators/hcalc: Drop old

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 sci-calculators/hcalc/Manifest               |  1 -
 sci-calculators/hcalc/files/1.0-gentoo.patch | 57 ----------------------------
 sci-calculators/hcalc/hcalc-1.0-r1.ebuild    | 36 ------------------
 3 files changed, 94 deletions(-)

diff --git a/sci-calculators/hcalc/Manifest b/sci-calculators/hcalc/Manifest
index cce0563..03b0e9a 100644
--- a/sci-calculators/hcalc/Manifest
+++ b/sci-calculators/hcalc/Manifest
@@ -1,2 +1 @@
 DIST hcalc-1.2.tar.xz 15456 SHA256 4e453e6ed9f83689c63f913492725e5243d9511eb8892520ba2ea202c1feb5bc SHA512 c21dac80d31f7adc5a1e7a02e5a755ac8d68547a9f25622d55e6d87c924a2535ac496ecfebcae52b1995aa414362a9005be4e2b390d0e01dab22bd692b16bf49 WHIRLPOOL b6232b4535f87db41ed040acb53067de927e30c280b09300807e77dd0c367929ec48c22e80417540f0df49330d41d687edd47752fa729f0641579214a9ccbc6e
-DIST hcalc.tar.gz 6014 SHA256 03f6fcdeb9cfafc54d4d9a138ae3489c90b529b3576434847bcc753359bdccf8 SHA512 24962ad7fc321435646b69a269780ca2c4466c3911a91e77cc13ec18c9e6ad9ce353ae58accb2f337309f1e962d59b3ab98a9a66ba119859a529106ba4f249e8 WHIRLPOOL 092369945603bcc9702526e76dcbb2244d3871a3ef20ae73c6d990c27cc1ba3980c086394fb7cddb103b7678c7d96fcfeeb1939f3d357b3f80f42d69882982d0

diff --git a/sci-calculators/hcalc/files/1.0-gentoo.patch b/sci-calculators/hcalc/files/1.0-gentoo.patch
deleted file mode 100644
index a2b2403..00000000
--- a/sci-calculators/hcalc/files/1.0-gentoo.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 5386821..eb5db3e 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,5 +1,5 @@
--CC = gcc
--CFLAGS = -g -O2 -MMD
-+CC ?= gcc
-+CFLAGS += -MMD
- 
- OBJS = \
- 	hcalc.o \
-@@ -10,7 +10,7 @@ OBJS = \
- 	$E
- 
- hcalc : $(OBJS)
--	gcc -o $@ $^ -L/usr/X11R6/lib -lXpm -lX11
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ -lXpm -lX11
- 
- clean :
- 	-rm -f *.o *.d *~ \#* hcalc core
-diff --git a/draw.c b/draw.c
-index 5bde83d..c3bdeb2 100644
---- a/draw.c
-+++ b/draw.c
-@@ -3,6 +3,7 @@
-    http://www.delorie.com/store/hcalc/
- */
- #include "hcalc.h"
-+#include <string.h>
- 
- static char shown_offsets[15];
- static int shown_bitmask;
-diff --git a/input.c b/input.c
-index d7de47c..f1d45f5 100644
---- a/input.c
-+++ b/input.c
-@@ -5,6 +5,7 @@
- #include "hcalc.h"
- #include <ctype.h>
- #include <string.h>
-+#include <stdlib.h>
- 
- char pending_op = 0;
- int making_number = 0;
-diff --git a/setupx.c b/setupx.c
-index 238c1e2..74e574b 100644
---- a/setupx.c
-+++ b/setupx.c
-@@ -3,6 +3,7 @@
-    http://www.delorie.com/store/hcalc/
- */
- #include "hcalc.h"
-+#include <stdlib.h>
- 
- Display *display=0;
- int screen=0;

diff --git a/sci-calculators/hcalc/hcalc-1.0-r1.ebuild b/sci-calculators/hcalc/hcalc-1.0-r1.ebuild
deleted file mode 100644
index a920e55..00000000
--- a/sci-calculators/hcalc/hcalc-1.0-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="DJ's Hex Calculator"
-HOMEPAGE="http://www.delorie.com/store/hcalc/"
-SRC_URI="http://www.delorie.com/store/hcalc/${PN}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-gentoo.patch
-	tc-export CC
-}
-
-src_install() {
-	dobin ${PN}
-}
-
-pkg_postinst() {
-	einfo "Enter hcalc to run and use kill or ctrl-c to exit."
-}

[gentoo-commits] repo/gentoo:master commit in: sci-calculators/hcalc/, sci-calculators/hcalc/files/

[Andreas Sturmlechner]

commit:     160aedda3f88e8934ee3fef1c7f54db25e811dba
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 30 18:08:28 2025 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Sep 30 18:09:15 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=160aedda

sci-calculators/hcalc: update EAPI 7 -> 8

Closes: https://bugs.gentoo.org/952071
Closes: https://bugs.gentoo.org/957237
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-calculators/hcalc/files/hcalc-1.2-cmake4.patch | 8 ++++++++
 sci-calculators/hcalc/hcalc-1.2-r1.ebuild          | 7 ++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/sci-calculators/hcalc/files/hcalc-1.2-cmake4.patch b/sci-calculators/hcalc/files/hcalc-1.2-cmake4.patch
new file mode 100644
index 000000000000..7f8e47adf5a5
--- /dev/null
+++ b/sci-calculators/hcalc/files/hcalc-1.2-cmake4.patch
@@ -0,0 +1,8 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required (VERSION 2.6) 
++cmake_minimum_required (VERSION 3.10)
+ project (hcalc C)
+ 
+ find_package(X11)

diff --git a/sci-calculators/hcalc/hcalc-1.2-r1.ebuild b/sci-calculators/hcalc/hcalc-1.2-r1.ebuild
index 7f9ac30de30d..d237345158d7 100644
--- a/sci-calculators/hcalc/hcalc-1.2-r1.ebuild
+++ b/sci-calculators/hcalc/hcalc-1.2-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake
 
 DESCRIPTION="DJ's Hex Calculator"
-HOMEPAGE="http://www.delorie.com/store/hcalc/ https://github.com/jlec/hcalc"
+HOMEPAGE="https://www.delorie.com/store/hcalc/ https://github.com/jlec/hcalc"
 SRC_URI="https://github.com/jlec/hcalc/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="GPL-2"
@@ -21,6 +21,7 @@ DEPEND="${RDEPEND}"
 PATCHES=(
 	"${FILESDIR}"/${P}-fno-common.patch
 	"${FILESDIR}"/${P}-clang16.patch
+	"${FILESDIR}"/${P}-cmake4.patch # bug 952071, downstream patch
 )
 
 pkg_postinst() {