gentoo auto-resync : 30:09:2022 - 15:24:40

4 files changed, 51 insertions, 43 deletions

diff --git a/sci-calculators/Manifest.gz b/sci-calculators/Manifest.gz
index 5277a3c82d88..01f2e2dae180 100644
--- a/sci-calculators/Manifest.gz
+++ b/sci-calculators/Manifest.gz
diff --git a/sci-calculators/hexcalc/Manifest b/sci-calculators/hexcalc/Manifest
index 2ad62898c0fa..8add43769816 100644
--- a/sci-calculators/hexcalc/Manifest
+++ b/sci-calculators/hexcalc/Manifest
@@ -1,5 +1,5 @@
 AUX hexcalc-keypad.diff 3715 BLAKE2B 347de906fa53ffdb9064e997a169e2ec31f519e0ed1d91e7e13c3681eef08abbbd8bce6ba8cd6d98dddd0e56b5aaf1073b1f9da16c2d208b7c6d755edf2f0cdf SHA512 812c6bd3b53a18a75b1ed553f1e58f6a08b48ba264787fa69f9577798b483797871ff47dd5ccd4c075989c9f9f6a6f00b7457deafc463b90e76e78e0507af259
 AUX hexcalc-order.diff 972 BLAKE2B 487e44a612c939879e168fbb67dea418c234197387923e58874e83e484166784ac7c6564b92bbb798b17985438f1d1a51bfe0dd17af223af6660a9e28269d406 SHA512 8a1049372f638822e7197ca56ee336d1b5ac4a0fcf24846705f14f80495c13bad390b7ddd5e43c84e47739521a5fab1a35c435125b4b919aedbd35c09ee583d7
 DIST hexcalc-1.11.tar.Z 18033 BLAKE2B 6f6c8102cd1a2ffdb325bc0805bea02d8e186bc3da7cda3dd4830882f384cfaecc7dc1d0fc8873718bc850f80010a875653864be92edd6519ae4fd5033e53498 SHA512 f684d6d6bd6df3f7f0dd626345d8ef166b12513bb378e74f8c59c2b92970f99c665ca32585217e75d55bf0fd93b5fc5c6a5b73e8b438f4821c13219f8ac74766
-EBUILD hexcalc-1.11-r3.ebuild 794 BLAKE2B ea155173487a01e107d7cc60fbc7e02063f1cc4dd99560299c33675b15ddf335fe867b13f328a751adace1f30c3413365c1370ed9588815e3302dc76289e6700 SHA512 64280ed30fb9fadb6708cbb23d12fab5152e49527d6b00d3016216d08a0095447c799554fb41c948da0c374767e2f6d131b9de5fcce23a3ce57247e232741044
+EBUILD hexcalc-1.11-r4.ebuild 910 BLAKE2B 06f0ab9c2619a5bd72571ccf0967216ef2e0acc03064b4a08a338d864bba87f35ccc6f2a0b637cfafbc1a8fdc42940f5b1766b6d3c413530456e58791bec7664 SHA512 c6f128d0e6851afd7471e04ec64a90a072ddeacf86927f2105a722e23993388a786150fe718ea41296be29acb7f77479ccab8acd45dc27558e292540b334af64
 MISC metadata.xml 254 BLAKE2B b855316ec6a32691e84730979c9a077765d46802f09c19f3a06f2cddf677674c9a2ea24c9b57a0fc6344d7f70276ca507a68f5fa690555360665ac494fca54c2 SHA512 5f6faacd216c7ece09e847c09115add5261e7a899e0b0c9304f2ee72e2d0ad208338939e4e37946008bdc81fbbacf415fb220c5c1f9832b17f18c6778d0c0368
diff --git a/sci-calculators/hexcalc/hexcalc-1.11-r3.ebuild b/sci-calculators/hexcalc/hexcalc-1.11-r3.ebuild
deleted file mode 100644
index c9740ad088e8..000000000000
--- a/sci-calculators/hexcalc/hexcalc-1.11-r3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="A simple hex calculator for X"
-HOMEPAGE="ftp://ftp.x.org/R5contrib/"
-SRC_URI="mirror://gentoo/${P}.tar.Z"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="x11-libs/libXaw"
-DEPEND="${RDEPEND}
-	>=x11-misc/imake-1.0.8-r1
-	app-text/rman"
-
-S=${WORKDIR}/${PN}
-
-PATCHES=( "${FILESDIR}"/${PN}-{keypad,order}.diff )
-
-src_configure() {
-	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
-		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf || die
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		CCLINK="$(tc-getCC)" \
-		LDOPTIONS="${LDFLAGS}"
-}
-
-src_install() {
-	dobin ${PN}
-	newman ${PN}.{man,1}
-}
diff --git a/sci-calculators/hexcalc/hexcalc-1.11-r4.ebuild b/sci-calculators/hexcalc/hexcalc-1.11-r4.ebuild
new file mode 100644
index 000000000000..20e117cd6853
--- /dev/null
+++ b/sci-calculators/hexcalc/hexcalc-1.11-r4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Simple hex calculator for X"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="mirror://gentoo/${P}.tar.Z"
+S="${WORKDIR}/${PN}"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXt"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto"
+BDEPEND="
+	app-text/rman
+	sys-devel/gcc
+	>=x11-misc/imake-1.0.8-r1"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-keypad.diff
+	"${FILESDIR}"/${PN}-order.diff
+)
+
+src_configure() {
+	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
+		IMAKECPP="${IMAKECPP:-${CHOST}-gcc -E}" xmkmf || die
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		CCLINK="$(tc-getCC)" \
+		LDOPTIONS="${LDFLAGS}"
+}
+
+src_install() {
+	dobin ${PN}
+	newman ${PN}.{man,1}
+}