gentoo resync : 03.03.2021

4 files changed, 68 insertions, 73 deletions

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
-}