gentoo resync : 22.01.2021

4 files changed, 50 insertions, 12 deletions

diff --git a/app-misc/rbutil/Manifest b/app-misc/rbutil/Manifest
index e70f3a10ace3..0af00f07606a 100644
--- a/app-misc/rbutil/Manifest
+++ b/app-misc/rbutil/Manifest
@@ -1,4 +1,5 @@
-AUX rbutil-1.4.1-quazip.patch 1733 BLAKE2B 3a8d88de80189199abcf17cd8149cbf702465227c50b686a36a55e701a00f32e242386ca57c8ba96c0ac253fd3bbd1a8c829bb517ed0e9ae47e1815e8983749f SHA512 d36edacd17078fb2b1d31aa1e7096b37ddf69ba51132aa77aa042989302e8c368d53b2ebee9d9018f8c376cf2e5efd7c37361f2d0319d236ac68326d4eed1608
+AUX 0001-imxtools-sbtools-fix-compilation-with-gcc-10.patch 765 BLAKE2B f71598d503d5c9981b2955aa1eadf374d7bf00cc1af7b6733aee8009ff7bb20455a6539a7614ec742b4067e6a9337f1dfe713bfc19fb8344af6a43422867a148 SHA512 e9661c5365d2c71fe9f016d936b3d4c844c91cbc9649f877eee385ad894ff03bd3a8e90ecc504aaf1f21c7d339348f22b59a45859fe9b1527113ad7eb39dfd9e
+AUX rbutil-1.4.1-quazip.patch 1829 BLAKE2B 616af9d3d90384c70f717c363dfea2f4a7a3b9ad75438612a92e12997d2239d10860acc17fb8f2885ef6863764257c2756e03d9d2650e1af90e8f097607a3906 SHA512 6e30cfccb30d9f0dd677abd55fd2d53dc2cf8c06aadd8f278d119d1fca5c5a78e2adb84bf32feac37f6d82ba00e090b3693ef4d28c0f3234b8445368f4bd0cb0
 DIST RockboxUtility-v1.4.1-src.tar.bz2 1427019 BLAKE2B b4d5e7e74c46c32138c564ebe5b81233ac47ddabe51241e7c6cfef9d5ca25f85b53166a840e5aadec0e021ad206e5d987c71d617c56aee425ece0321aea5edb2 SHA512 24e4ac7b99618d40044bd8248e6755b40e77e333902ddd898e57b33c50705e97fdc5a751be49f8e5ded445b4f712bdd5310b266ff82680ea76488d8bfc8e17c2
-EBUILD rbutil-1.4.1.ebuild 1276 BLAKE2B 6d8ab15276a5d6d1212b35aea2a03c58c2c33cd043168b06e66412143ef3c7544cf00695941252699e3ab1064e5c4086d06f8e15d83d106029e5bd33a8ff0108 SHA512 01f1666681057ef4cc0c80f6e16cc26719209c55cac8e478e05720c5e9716dfcb0b2e37a52a59f519d1d130e1e2ef991ddba4ba7c10d5eae8f5714beb35e8006
+EBUILD rbutil-1.4.1.ebuild 1473 BLAKE2B 8eb9e602c3e3825771f4e7d5da3d902fb3c29ab7828c006262586e085323bebe0216b5585db5508b9211867b44ef72f3a4f9f52e7186b9749ac915ba7b28b75f SHA512 393d79bdde8b701cc5ca480d23ea2721cfdf24bc9f909916804e7d29b0554bdefa6f0a55d366f094b34756e9fd547f175e12d67a6bbcbb4fe9ee4ae14076d240
 MISC metadata.xml 247 BLAKE2B 158fa8dff063e01e64b4835fa1f199518ecf7d81282ee8c893efc0d4d73454e16adb3189ee8cd1272bbada6fb5ffc2b5aadbd796490c829cba1a4b8e3e20f29f SHA512 8bffd29ab89c8dc401ad49655e30a6bd3a953bf8f6c9309b318f3b03ed7bcf2e5c10533ac70967e549edcd512f6be13b9bce3e36175286370ba499dcb119f6fc
diff --git a/app-misc/rbutil/files/0001-imxtools-sbtools-fix-compilation-with-gcc-10.patch b/app-misc/rbutil/files/0001-imxtools-sbtools-fix-compilation-with-gcc-10.patch
new file mode 100644
index 000000000000..3ff18f2afcf1
--- /dev/null
+++ b/app-misc/rbutil/files/0001-imxtools-sbtools-fix-compilation-with-gcc-10.patch
@@ -0,0 +1,27 @@
+From 141c9c218c31dfd6f4f9e47f25cc2764d2bb4b63 Mon Sep 17 00:00:00 2001
+From: Martin Hauke <mardnh@gmx.de>
+Date: Sat, 13 Jun 2020 19:11:15 +0200
+Subject: [PATCH] imxtools/sbtools: fix compilation with gcc 10
+
+---
+ utils/imxtools/sbtools/misc.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/utils/imxtools/sbtools/misc.h b/utils/imxtools/sbtools/misc.h
+index f803fbb..5c6b2fc 100644
+--- a/utils/imxtools/sbtools/misc.h
++++ b/utils/imxtools/sbtools/misc.h
+@@ -40,8 +40,8 @@ extern bool g_debug;
+ extern bool g_force;
+ 
+ typedef struct crypto_key_t *key_array_t;
+-int g_nr_keys;
+-key_array_t g_key_array;
++extern int g_nr_keys;
++extern key_array_t g_key_array;
+ 
+ typedef void (*misc_printf_t)(void *user, const char *fmt, ...);
+ 
+-- 
+2.26.2
+
diff --git a/app-misc/rbutil/files/rbutil-1.4.1-quazip.patch b/app-misc/rbutil/files/rbutil-1.4.1-quazip.patch
index 596127c34060..2feabb771367 100644
--- a/app-misc/rbutil/files/rbutil-1.4.1-quazip.patch
+++ b/app-misc/rbutil/files/rbutil-1.4.1-quazip.patch
@@ -4,8 +4,8 @@ http://gerrit.rockbox.org/1825
 -- Chewi
 
 diff -Naur a/base/ziputil.cpp b/base/ziputil.cpp
---- a/base/ziputil.cpp	2019-11-10 06:45:49.000000000 +0000
-+++ b/base/ziputil.cpp	2019-12-04 22:38:34.443112450 +0000
+--- a/rbutil/rbutilqt/base/ziputil.cpp	2019-11-10 06:45:49.000000000 +0000
++++ b/rbutil/rbutilqt/base/ziputil.cpp	2019-12-04 22:38:34.443112450 +0000
 @@ -22,9 +22,9 @@
  #include "progressloggerinterface.h"
  #include "Logger.h"
@@ -20,8 +20,8 @@ diff -Naur a/base/ziputil.cpp b/base/ziputil.cpp
  
  ZipUtil::ZipUtil(QObject* parent) : ArchiveUtil(parent)
 diff -Naur a/base/ziputil.h b/base/ziputil.h
---- a/base/ziputil.h	2019-11-10 06:45:49.000000000 +0000
-+++ b/base/ziputil.h	2019-12-04 22:38:34.443112450 +0000
+--- a/rbutil/rbutilqt/base/ziputil.h	2019-11-10 06:45:49.000000000 +0000
++++ b/rbutil/rbutilqt/base/ziputil.h	2019-12-04 22:38:34.443112450 +0000
 @@ -21,9 +21,9 @@
  
  #include <QtCore>
@@ -36,8 +36,8 @@ diff -Naur a/base/ziputil.h b/base/ziputil.h
  class ZipUtil : public ArchiveUtil
  {
 diff -Naur a/rbutilqt.pro b/rbutilqt.pro
---- a/rbutilqt.pro	2019-11-10 06:45:50.000000000 +0000
-+++ b/rbutilqt.pro	2019-12-04 22:43:30.144259710 +0000
+--- a/rbutil/rbutilqt/rbutilqt.pro	2019-11-10 06:45:50.000000000 +0000
++++ b/rbutil/rbutilqt/rbutilqt.pro	2019-12-04 22:43:30.144259710 +0000
 @@ -131,7 +131,7 @@
  
  DEPENDPATH = $$INCLUDEPATH
diff --git a/app-misc/rbutil/rbutil-1.4.1.ebuild b/app-misc/rbutil/rbutil-1.4.1.ebuild
index 2478bc80799a..f558a5e9dd92 100644
--- a/app-misc/rbutil/rbutil-1.4.1.ebuild
+++ b/app-misc/rbutil/rbutil-1.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -28,26 +28,36 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="dev-qt/linguist-tools:5"
 
-S="${WORKDIR}/RockboxUtility-v${PV}/${PN}/${PN}qt"
+S="${WORKDIR}/RockboxUtility-v${PV}"
+QTDIR="${PN}/${PN}qt"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.4.1-quazip.patch
+	"${FILESDIR}"/0001-imxtools-sbtools-fix-compilation-with-gcc-10.patch
 )
 
 src_prepare() {
 	xdg_src_prepare
-	rm -rv quazip/ zlib/ || die
+	rm -rv "${QTDIR}"/{quazip,zlib}/ || die
 }
 
 src_configure() {
+	cd "${QTDIR}" || die
+
 	# Generate binary translations.
-	lrelease ${PN}qt.pro || die
+	"$(qt5_get_bindir)"/lrelease ${PN}qt.pro || die
 
 	# noccache is required to call the correct compiler.
 	eqmake5 CONFIG+="noccache $(use debug && echo dbg)"
 }
 
+src_compile() {
+	emake -C "${QTDIR}"
+}
+
 src_install() {
+	cd "${QTDIR}" || die
+
 	local icon size
 	for icon in icons/rockbox-*.png; do
 		size=${icon##*-}