gentoo auto-resync : 23:09:2022 - 23:30:45

4 files changed, 3 insertions, 98 deletions

diff --git a/app-emulation/plus42/Manifest b/app-emulation/plus42/Manifest
index 6485ecfee130..56888a7025f0 100644
--- a/app-emulation/plus42/Manifest
+++ b/app-emulation/plus42/Manifest
@@ -1,10 +1,7 @@
 AUX plus42-1.0.4-fix-build-intel-lib.patch 758 BLAKE2B 800005751f0cbe9e89ffe94d5d25ab0a30cc1329ba79442d687f9fcd22e2edd080a43d816c8843e58827592c8c1932714fdd0012f8e643bb4c28d5cf23f9ade4 SHA512 73107855344c054318c678cffff9e39c89718d7d7d6445fc158109b8f678ebb95780a80584aa556c6076bf4c98c1d788dca09c9b727992374543c245c7400976
-AUX plus42-1.0.4-fix-makefile.patch 1127 BLAKE2B 09d8835127583a24f34138f70662f2d629c3f8a754558b5b29898892a644e5d63d920009b5062a650fa178097d0ecd9a80b5cae740e54a40758fe5dd9a9abacb SHA512 de695e593836d12702eb56319b3c2ab8acd30daa020568a8d64cf1f73b43547e7aea5dc48f4148500309db4e4bfa4fda359e989eb322e032721c281bcb5a97ea
 AUX plus42-1.0.9-fix-makefile.patch 713 BLAKE2B fb8ca302a324122cee89d7f3ddab2a0521c8dee1e910ae50efe7ee74ed3781ac7e3c017cc7afbd601cf41527afd61d979396400a5e6dc8e1714ff853ba25a4eb SHA512 532c8b2d88324e3b38ab568beb1ed9b7fce6e91c894c6438657a800ccd32759c82ce9bcbea3828a04985eef18c278004e0a068b88695da5f0e75bd996c6d2fd3
-DIST plus42-upstream-1.0.4.tgz 7583399 BLAKE2B 801c125e8b320a2ae2220595aa6244451f55938db644beb5e619c7789b506ada86b4f22e62c724af19da1240aa6c0fad791e2d6176eb4787435f16c1a44aaccc SHA512 a9c23b582047767fe0c57f35fdb4dfb72d7fdf480106a64f1d1151541c5d08e8a1a973156b0e2e5e9ca2f4f74acfbde2a1d69590c02f480d52dec20981be6c6e
-DIST plus42-upstream-1.0.6.tgz 7583604 BLAKE2B 3cfdf41ee3ba627cfe5191cf9c0e452917b8511931206fd46df8516a225c7e0e447d8410348d9ab324269a3182dd9c4708ac881f46ae5058fdd4784acec82e2d SHA512 9f4573de916ba20fae4400f50cbf64b9bfbc452b4b51e4c674cffd5129cac9c9828eee33ab613abed6d94c5863797c17e3bd78b0df50bbaa8e0f9594450713ab
+DIST plus42-upstream-1.0.10.tgz 7585424 BLAKE2B c27f5e653e07986a092efc34ed6aaf7de2b1e6c20db3300fc6bd35337032a57b4623cf9d5ecb1b0e56e1a7b6d92a4b5d04be0b9dea9fade9d0e7efe86901ca8d SHA512 d504988c5bfcf1e554ee7478c5c6d0cc7472e3ba9904fb45d2ea77bf05307e0def79002785551b6a876d714d5d4279728b329c63c7108a935b06967c65441083
 DIST plus42-upstream-1.0.9.tgz 7585218 BLAKE2B e6c09c985fcf3f037a0c1dc1f4f445ef18c4f73962ffbf46939b91d5a96c9f079bd36b328b30fcae42f0bc13ebee7a1f56e51762f225f41fb715ab88e8b93d56 SHA512 77c06cf33d375f513c6806910f6b8bdda865853e7890922174364a7d2a07e35a6bbae2e62800c7658be01fe8b3aafbfc7f53a19451475b411865fe69bef090d8
-EBUILD plus42-1.0.4.ebuild 1000 BLAKE2B a78dc6655b48c8a0ae3c71044dbeaa446049f75c98a2083438911c2ad9ca033316739a2dd06abd68e248b77aaeb5784bd475480b3ba32946fe850f50e696213f SHA512 891c87820a5f89907aa66e5ad6a848f832f1cd80d8457403572f9f65a24bc078add1c90a8791676d6bd59304bcfb238bd8cfc41620fdde79542903cfdced70dc
-EBUILD plus42-1.0.6.ebuild 1000 BLAKE2B a78dc6655b48c8a0ae3c71044dbeaa446049f75c98a2083438911c2ad9ca033316739a2dd06abd68e248b77aaeb5784bd475480b3ba32946fe850f50e696213f SHA512 891c87820a5f89907aa66e5ad6a848f832f1cd80d8457403572f9f65a24bc078add1c90a8791676d6bd59304bcfb238bd8cfc41620fdde79542903cfdced70dc
+EBUILD plus42-1.0.10.ebuild 972 BLAKE2B 03c21304c358e2ff239fce280bfa8d594a4e6f65031df09f9a360841d4f37abd784c1d6e502d42c95069bbef30e254513660524022bac7c8768a27f617b929d7 SHA512 fa349ee9772897a65465e67af8baf88683ef35658316259a40260f69111afa81b513f9c92191cba3c82da36e3fc0de9179c188179a42e2ee0ecaa92cd6f83df8
 EBUILD plus42-1.0.9.ebuild 1000 BLAKE2B 92d6952d31fff32a1c02616a44fc1cc78b8de1ce0d7d47d95a869514a395f46529a6c835ebab86dc22b81f33293f7e699d839291b478504a78a90c364a1096dd SHA512 50a4568e937b5f3be015d71f40b3ade6327f1f1debc2857d6726e473931ac485005943a2307a7cfb9efeef1f35d03194aadcf5363efcd713f0457e80e1467aa6
 MISC metadata.xml 353 BLAKE2B 62d2057ed40527ddee3b747c7d702009bba223521e3264af5905506515fc67a6baf27938ae03d664eeb713aaeac898b7a1eee0682b69f3659b4dbc6e7eddaef8 SHA512 9633917e4a226c142672cd8bb91d3ca5ec40a2b4600bc8ba60ea959dc871f54881dc331ca5ed0030a4afcbad426c7528667b61289e4ed77e19aa3e9d1c816ce2
diff --git a/app-emulation/plus42/files/plus42-1.0.4-fix-makefile.patch b/app-emulation/plus42/files/plus42-1.0.4-fix-makefile.patch
deleted file mode 100644
index be7b40fbcd48..000000000000
--- a/app-emulation/plus42/files/plus42-1.0.4-fix-makefile.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -Naur plus42-upstream-1.0.4.orig/gtk/Makefile plus42-upstream-1.0.4/gtk/Makefile
---- plus42-upstream-1.0.4.orig/gtk/Makefile	2022-05-17 11:47:13.000000000 +0200
-+++ plus42-upstream-1.0.4/gtk/Makefile	2022-05-22 21:41:34.492591806 +0200
-@@ -15,7 +15,7 @@
- # along with this program; if not, see http://www.gnu.org/licenses/.
- ###############################################################################
- 
--CFLAGS = -MMD \
-+CFLAGS := -MMD \
- 	 -Wall \
- 	 -Wno-parentheses \
- 	 -Wno-write-strings \
-@@ -35,11 +35,13 @@
- 	 -DDECIMAL_GLOBAL_ROUNDING=1 \
- 	 -DDECIMAL_GLOBAL_ROUNDING_ACCESS_FUNCTIONS=1 \
- 	 -DDECIMAL_GLOBAL_EXCEPTION_FLAGS=1 \
--	 -DDECIMAL_GLOBAL_EXCEPTION_FLAGS_ACCESS_FUNCTIONS=1
-+	 -DDECIMAL_GLOBAL_EXCEPTION_FLAGS_ACCESS_FUNCTIONS=1 \
-+	 ${CFLAGS}
- 
--CXXFLAGS = $(CFLAGS) \
-+CXXFLAGS := $(CFLAGS) \
- 	 -fno-rtti \
--	 -D_WCHAR_T_DEFINED
-+	 -D_WCHAR_T_DEFINED \
-+	 ${CXXFLAGS}
- 
- LIBS = gcc111libbid.a $(shell pkg-config --libs gtk+-3.0)
- 
-@@ -118,7 +120,7 @@
- 	./keymap2cc
- 
- gcc111libbid.a:
--	sh ./build-intel-lib.sh
-+	+sh ./build-intel-lib.sh
- 	ln -s IntelRDFPMathLib20U1/TESTS/readtest.c
- 
- symlinks:
diff --git a/app-emulation/plus42/plus42-1.0.4.ebuild b/app-emulation/plus42/plus42-1.0.10.ebuild
index 8239110a87e8..a369e270c0d9 100644
--- a/app-emulation/plus42/plus42-1.0.4.ebuild
+++ b/app-emulation/plus42/plus42-1.0.10.ebuild
@@ -28,14 +28,10 @@ DOCS=( CREDITS HISTORY README )
 S="${WORKDIR}/${MY_PV}"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-1.0.4-fix-makefile.patch"
+	"${FILESDIR}/${PN}-1.0.9-fix-makefile.patch"
 	"${FILESDIR}/${PN}-1.0.4-fix-build-intel-lib.patch"
 )
 
-src_prepare() {
-	default
-}
-
 src_compile() {
 	local myconf
 	use alsa && myconf="AUDIO_ALSA=yes"
diff --git a/app-emulation/plus42/plus42-1.0.6.ebuild b/app-emulation/plus42/plus42-1.0.6.ebuild
deleted file mode 100644
index 8239110a87e8..000000000000
--- a/app-emulation/plus42/plus42-1.0.6.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-MY_PV="${PN}-upstream-${PV}"
-
-DESCRIPTION="An Enhanced HP-42S Calculator Simulator"
-HOMEPAGE="https://thomasokken.com/plus42/"
-SRC_URI="https://thomasokken.com/plus42/upstream/${MY_PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+alsa"
-
-DEPEND="dev-libs/atk
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	alsa? ( media-libs/alsa-lib )"
-
-RDEPEND="${DEPEND}"
-
-DOCS=( CREDITS HISTORY README )
-S="${WORKDIR}/${MY_PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.0.4-fix-makefile.patch"
-	"${FILESDIR}/${PN}-1.0.4-fix-build-intel-lib.patch"
-)
-
-src_prepare() {
-	default
-}
-
-src_compile() {
-	local myconf
-	use alsa && myconf="AUDIO_ALSA=yes"
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" ${myconf} -C gtk
-	emake -C gtk clean
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" BCD_MATH=1 ${myconf} -C gtk
-}
-
-src_install() {
-	default
-	dobin gtk/plus42bin gtk/plus42dec
-}