gentoo resync : 03.03.2021

10 files changed, 90 insertions, 113 deletions

diff --git a/sci-calculators/Manifest.gz b/sci-calculators/Manifest.gz
index 93011eb8ee4d..ded40cc3256f 100644
--- a/sci-calculators/Manifest.gz
+++ b/sci-calculators/Manifest.gz
diff --git a/sci-calculators/bc-gh/Manifest b/sci-calculators/bc-gh/Manifest
index 297293d98018..ca10f3df2ab9 100644
--- a/sci-calculators/bc-gh/Manifest
+++ b/sci-calculators/bc-gh/Manifest
@@ -1,5 +1,7 @@
 DIST bc-3.2.3.tar.xz 225420 BLAKE2B 6d1ec825a03f77a8024ff69f80eaa09301effc1281663aaf33c530d89c917b9cad41813aca731577fae1eb8dfb1c6e3023e54da0cfd89ea2e5aa413f84c347b3 SHA512 efd040d46f2ed1eff5a2eb336e55fd465176c23c728935ee488a474b2f0c8dddd275805ee3be79f20afc523a183adb3d88a0e7bee095047912cf70741e2c0b32
 DIST bc-3.2.6.tar.xz 234964 BLAKE2B 4127d1910ee33f7f113c8dd3604bf7c5efacbcb3ae163d943ca9c62e6b1e9769f32766034931aaa3f2251f825cef86e812aaf1974fec643dbe355156c33a8054 SHA512 4b1f43bb0bcd720d2140d41e089aa78fe8d07903fb745ed1a641ffe25fe46f439e480a1e11b687b7555881bd1ee4044c071c50e4bacd579b8909c704db7a6ede
+DIST bc-3.3.0.tar.xz 229580 BLAKE2B 0528d50f566fce648561276434eed45a82fb1dc2d3c56a684758daa866802e7a3781a0e0d6a0993cdc356b416f5ff998de5c51a5e203d2ff415d6b098fb1743a SHA512 b8d0b6d6d9c5d4fc62df62d1b9b7e7006a8b430e063fe0d5f646cfaeb4c6fc9c7037b644e853b7ae7d5c5f42f079221e9cdc32564d70c9ddd6bb867ddc7056de
 EBUILD bc-gh-3.2.3.ebuild 469 BLAKE2B 57a00dbc077c768449ea40a0e02a9a5ec54bfe0aac1d0b0d02aa9153559fc52b0b9de63c771a68908f49ccda6d7d37683fa499dc7d59199119ad7917c25f2d70 SHA512 8fdf5ab52e9d391b4622b693aa30296c9838275c54d15de312db40957819ab378acc3a0e0a76b5221d0497c28082a640c70973ddcf55209d1601050975db6d3f
 EBUILD bc-gh-3.2.6.ebuild 469 BLAKE2B de445258a29c37f7d6539dcc0be67c3531e4489fd7ccc10441816ce84f0b425c8ae656276071e09efbc0841cf05a807342d2a6a9f5959c14120e59aa435014ed SHA512 3af7bf904de23c93e952b1f713a747770899cb7cc819a0120acc04ad2db22145f50de34512c3b90ed5e227a5a82616a50063dc6ee956de8cddf0276ca04b6c61
+EBUILD bc-gh-3.3.0.ebuild 469 BLAKE2B de445258a29c37f7d6539dcc0be67c3531e4489fd7ccc10441816ce84f0b425c8ae656276071e09efbc0841cf05a807342d2a6a9f5959c14120e59aa435014ed SHA512 3af7bf904de23c93e952b1f713a747770899cb7cc819a0120acc04ad2db22145f50de34512c3b90ed5e227a5a82616a50063dc6ee956de8cddf0276ca04b6c61
 MISC metadata.xml 941 BLAKE2B 89c83ee3282f1344a8c0243597f178c6acf696ca4ed5f6eafaefbb451487e659b0bc49927a8bec8f07469b4b3ba66d3e0c2d919ee9d9e40792bc7731145bf76c SHA512 be367aa0eb1befcfddcda11253bf959f5467a9687e6522756708ee19672302ebd4bf4f9d6920e3acc43666ee97fa8d48abe62dd666a33fc70fc5675c1c22b79e
diff --git a/sci-calculators/bc-gh/bc-gh-3.3.0.ebuild b/sci-calculators/bc-gh/bc-gh-3.3.0.ebuild
new file mode 100644
index 000000000000..89c8c7658afa
--- /dev/null
+++ b/sci-calculators/bc-gh/bc-gh-3.3.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Implementation of POSIX bc with GNU extensions"
+HOMEPAGE="https://github.com/gavinhoward/bc"
+SRC_URI="https://github.com/gavinhoward/bc/releases/download/${PV}/bc-${PV}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+S="${WORKDIR}/bc-${PV}"
+
+src_configure() {
+	EXECSUFFIX="-gh" PREFIX="${EPREFIX}/usr" ./configure.sh -GTl || die
+}
diff --git a/sci-calculators/qalculate-gtk/Manifest b/sci-calculators/qalculate-gtk/Manifest
index 9d61391738ec..ca5e9f16b36a 100644
--- a/sci-calculators/qalculate-gtk/Manifest
+++ b/sci-calculators/qalculate-gtk/Manifest
@@ -1,5 +1,3 @@
-DIST qalculate-gtk-3.15.0.tar.gz 2715732 BLAKE2B 7047befbf3a56e53c06d78dc33a515e4a8e59a665202f7a203b61e8f6b5e03b7d52d4a9a1514a92901249f65586552e14b8fd8a24e2d10a15875168d54467e74 SHA512 c5dfe308b13e04644452cfd3a4ce48f170d2599b6b3fb94a64dd78763f3546e44c0f940881d70a4727898feeb7b99a15104442d462f76382eec10cfbc0ed6393
 DIST qalculate-gtk-3.16.0.tar.gz 2338500 BLAKE2B f252f6e19eeb7ae1e35e865111b72dd65837aba246719018e241aebd4f7b1358c342fc5d659b1d9ccf777130e2c443143e578156da5445dba5656c04ed8d18ef SHA512 42e6bd86df451e9a9dc92fd930f675195f7539feb7f2db2a8e04ebee96482d3bcda45530feafb71be00489d81d27027a9758a3e79a1ea912887bf082d034fe74
-EBUILD qalculate-gtk-3.15.0.ebuild 832 BLAKE2B ffc06d6244e250c65768a3b0a043b967cbadf0722efb21274f4f361400bb523cf675c902048c14995e3704dd4ed1261b13070a4b22409029d8dd0b8fd6047911 SHA512 3d83ad288d1a0ee431d4b5f286ebd774990bc7be24381dafa85d0a2cb25fca1014407e54a0f3b840b3107da743b3fb133c5ceee651fe7e741db784e383046965
-EBUILD qalculate-gtk-3.16.0.ebuild 837 BLAKE2B 45b200d5c537a2e3a21164745453f4e5a695d34d35fd904625fb81ff12b1610b3476b2cd4dfa440529add8152c6548ca3c49c57daede82308ca8170b2c7fa897 SHA512 da59de0085ad2fe6886b9cb9df44d7b0a7f500daf43ed9ff370bc2880898cb00327bc9c1e089eb2792363404d85d98efe58b9b2f6aa9e8e92613d77afe64c84d
+EBUILD qalculate-gtk-3.16.0.ebuild 833 BLAKE2B b9b52935aee02c975bfd9291f329c4f687de4e8a687c0437a65b0878bef6d3427740ff51e730fa9a64fa904c0a8b7e743e57a418b201efc90384964d27d7406a SHA512 c27fe2db8f888c0f5d9bfba751a537434798c3f2edc1dbc85689913dc20426f8e0134457aa08055f71b48d0dec6544490f2ba8f215a03637801cfd112fa38051
 MISC metadata.xml 606 BLAKE2B 0d52327ba35512f67f66d9c98323e941e177b2d7f9479e1ed94aea588427b8979624fe5e62f33e8f7b2071ec79f10b1546fbc83437572d0f5ea9da387f9e6b10 SHA512 596bbb4219292b494c2b1c367190ccdd09045fe4c00d1a935ef6180cc1bfedd1d0b233ce98855cb4162766a6bf4c1fe5be3e7e2d582d321c94848c9a4921eaca
diff --git a/sci-calculators/qalculate-gtk/qalculate-gtk-3.15.0.ebuild b/sci-calculators/qalculate-gtk/qalculate-gtk-3.15.0.ebuild
deleted file mode 100644
index 1234757d9b28..000000000000
--- a/sci-calculators/qalculate-gtk/qalculate-gtk-3.15.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome2
-
-DESCRIPTION="Modern multi-purpose calculator"
-HOMEPAGE="https://qalculate.github.io/"
-SRC_URI="https://github.com/Qalculate/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-libs/glib:2
-	>=sci-libs/libqalculate-3.8.0:=
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/pango"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-text/rarian
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_prepare() {
-	# Required by src_test() and `make check`
-	echo data/calendarconversion.ui > po/POTFILES.skip || die
-	echo data/periodictable.ui >> po/POTFILES.skip || die
-
-	gnome2_src_prepare
-}
diff --git a/sci-calculators/qalculate-gtk/qalculate-gtk-3.16.0.ebuild b/sci-calculators/qalculate-gtk/qalculate-gtk-3.16.0.ebuild
index a6d0a39d19b6..799f3d4c83ae 100644
--- a/sci-calculators/qalculate-gtk/qalculate-gtk-3.16.0.ebuild
+++ b/sci-calculators/qalculate-gtk/qalculate-gtk-3.16.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Qalculate/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-libs/glib:2
diff --git a/sci-calculators/speedcrunch/Manifest b/sci-calculators/speedcrunch/Manifest
index bb98305544f8..8d24fa0788a0 100644
--- a/sci-calculators/speedcrunch/Manifest
+++ b/sci-calculators/speedcrunch/Manifest
@@ -1,3 +1,4 @@
+AUX speedcrunch-0.12.0-appdata.patch 735 BLAKE2B ab1a2370841d37c5830de6352c7ace2f676dd8465331c52ef9faa0598feb92eef30e61113cb19c2c95b48815de2dd6faa7a19d17b47d8c368e997ef2f9481284 SHA512 245ed9eeed5c18638a91c7b14714feca3bc075ad33ab52945e4c1f069a4467524c717c6ec14b8f084fae0796bfbc31641779e5eb95f2f89d7149e4022c6bee4d
 DIST speedcrunch-0.12.0.tar.gz 3667420 BLAKE2B d983c22cbed9f3496bf7cadf670db3e7af4461a37e5fe151094ecaf6077cabffea84e4530c9b18145a220f09336d70567c96509b99c3b6a18f967aa97051d66e SHA512 9f93936311e227ed0aff374adae408f212e6d63174154931ecb19a31f1a6f360b9548989bbdc5988d03a7600f2d3e466ef18bf5f071002b99f22b22e773143eb
-EBUILD speedcrunch-0.12.0.ebuild 1493 BLAKE2B fbefa5e3e918a7b718fa73ac0b0469dfd812043767ebe590ab84c6e5391f00a80c9ad101c416c3ef37b34fdf11728008458a9e0cbab7148e73fc3d7a6abfcd98 SHA512 f2694f43ea92d32118b706518c4a9dcebede987f78bcc9b50e29064ed995c7da2f90d9cc7b3d41f63f28437f52c4ff689a764b4b5604af3aa7203d89ed3bbca9
+EBUILD speedcrunch-0.12.0-r1.ebuild 852 BLAKE2B 1bc6284c1381b778b4bb0dc4f063b74b8d97cb5a43e75ad68e7a3809319bcc73d03f3c8a6328c01d656ca846f963baaf9cd9e44f3e301ddedbf0617681200dee SHA512 9bf2ed5053923b382094bb6dc177e6971dd938c237622cfad4e0b992b3d6f629ae6be61c3b72d3ed88b23a06cacb334b57b1eb7468eb2326d3a6339ad74c5dd2
 MISC metadata.xml 409 BLAKE2B 261f3c71d410f91768e5fe45a0528ced66cedeba01017bb4734374af47c4589e925744582596847965df8618ce38036c6fb2754dc630252e05ca0d83e38b4665 SHA512 fd59fda5037f0f541c3dbffaa3c0d31eba7dac4c41ac7b6120784bce55454bf2f96b31f846919f0e981f584d288b069a3f13222345b421d67233b4b23eb7c0c5
diff --git a/sci-calculators/speedcrunch/files/speedcrunch-0.12.0-appdata.patch b/sci-calculators/speedcrunch/files/speedcrunch-0.12.0-appdata.patch
new file mode 100644
index 000000000000..cf312944f907
--- /dev/null
+++ b/sci-calculators/speedcrunch/files/speedcrunch-0.12.0-appdata.patch
@@ -0,0 +1,26 @@
+From 3caeaa7eec01f64e769351355dff0fedd95a25fd Mon Sep 17 00:00:00 2001
+From: Felix Krull <f_krull@gmx.de>
+Date: Mon, 7 Aug 2017 16:19:22 +0200
+Subject: [PATCH] Install appdata file into new metadata path.
+
+*asturm 2021-02-28: Backported to 0.12.0.
+
+---
+ src/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1fa32ac..fb333f4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -113,7 +113,7 @@
+ if(NOT WIN32)
+     set(SHAREDIR "share/")
+     set(MENUDIR "${SHAREDIR}/applications/")
+-    set(APPDATADIR "${SHAREDIR}/appdata/")
++    set(APPDATADIR "${SHAREDIR}/metainfo/")
+     set(ICONDIR "${SHAREDIR}/pixmaps/")
+     set(BINDIR "bin")
+ else(NOT WIN32)
+-- 
+2.10.5
diff --git a/sci-calculators/speedcrunch/speedcrunch-0.12.0-r1.ebuild b/sci-calculators/speedcrunch/speedcrunch-0.12.0-r1.ebuild
new file mode 100644
index 000000000000..cc9c48df2737
--- /dev/null
+++ b/sci-calculators/speedcrunch/speedcrunch-0.12.0-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake desktop xdg-utils
+
+DESCRIPTION="Fast and usable calculator for power users"
+HOMEPAGE="https://speedcrunch.org/"
+SRC_URI="https://bitbucket.org/heldercorreia/${PN}/get/release-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/heldercorreia-speedcrunch-ea93b21f9498/src"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qthelp:5
+	dev-qt/qtwidgets:5
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-appdata.patch" )
+
+src_install() {
+	use doc && local HTML_DOCS=( ../doc/build_html_embedded/. )
+	cmake_src_install
+	doicon -s scalable ../gfx/speedcrunch.svg
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/sci-calculators/speedcrunch/speedcrunch-0.12.0.ebuild b/sci-calculators/speedcrunch/speedcrunch-0.12.0.ebuild
deleted file mode 100644
index 2214915fea67..000000000000
--- a/sci-calculators/speedcrunch/speedcrunch-0.12.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES=(
-ar ca cs da de el en-GB en-US es-AR es-ES et eu fi fr he hu id it ja ko
-lt lv nb nl pl pt-BR pt-PT ro ru sk sv tr uz vi zh-CN
-)
-
-CMAKE_MAKEFILE_GENERATOR=ninja
-
-inherit cmake-utils gnome2-utils
-
-DESCRIPTION="Fast and usable calculator for power users"
-HOMEPAGE="http://speedcrunch.org/"
-SRC_URI="https://bitbucket.org/heldercorreia/${PN}/get/release-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc ${PLOCALES[@]/#/l10n_}"
-
-DEPEND="
-dev-qt/qtcore:5
-dev-qt/qthelp:5
-dev-qt/qtsql:5
-dev-qt/qtwidgets:5
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/heldercorreia-speedcrunch-ea93b21f9498/src"
-
-src_prepare() {
-	local i
-	for i in "${PLOCALES[@]}" ; do
-		use l10n_${i} || \
-			sed "\|locale/${i/-/_}|d" -i resources/speedcrunch.qrc || die
-	done
-
-	cmake-utils_src_prepare
-}
-
-src_install() {
-	cmake-utils_src_install
-	cd .. || die
-	doicon -s scalable gfx/speedcrunch.svg
-
-	if use doc ; then
-		local i doclangs
-		for i in de en_US es_ES fr ; do
-			use l10n_${i/_/-} && doclangs+=" ${i}"
-		done
-
-		if [[ -z ${doclangs} ]] ; then
-			ewarn "Couldn't find a matching translation for documentation. Defaulting to: en_US"
-			doclangs="en_US"
-		fi
-
-		for i in ${doclangs} ; do
-			dodoc -r doc/build_html_embedded/${i}*/
-		done
-	fi
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}