gentoo resync : 15.12.2019

3 files changed, 29 insertions, 55 deletions

diff --git a/app-misc/rbutil/Manifest b/app-misc/rbutil/Manifest
index 2d3028feb209..77af4de6cf8f 100644
--- a/app-misc/rbutil/Manifest
+++ b/app-misc/rbutil/Manifest
@@ -1,4 +1,4 @@
-AUX quazip.patch 2401 BLAKE2B c011701e4f416289a5bfc681f2ce3184db091a744192e4b48ae9a42939e862739b030d88caff41a74c4b2ec5ad19e2e0bfa9c3ca0b9dc39f3413cbac41f06714 SHA512 34f2cb3d95ae3ed94adb25964f9009be8f5bab9a93df7ea993797065d297993d1f83a495eef9ee9c3339f8ba6f1e2b6778f8ecd667cf9538d84387373e7322dc
-DIST RockboxUtility-v1.4.0-src.tar.bz2 1181116 BLAKE2B 64d0cbedb3917a8f3f79e2b47b8eb230bb5fd6627ffd0647d5fbb42973d07675ee8a8f0eb9ae6e3481a8bd4cb4a183fb463bf97a1edbb2a74076e7a595f09ade SHA512 705723d6ee2231c3b79d0c67cabc7c6c00d3f1a76a970c1bd15e028a98b4a25de987b0921ea932ca0098defbec0bc9bde9d9ed3a79dd46f81da18bb5472be9fe
-EBUILD rbutil-1.4.0.ebuild 1368 BLAKE2B ea42c5d6fb96eb01e93487f4e05a8747c9395cf033544a51b1b6f37474356af846aeed0b765c6ab0049b2cdf1230e90a10550a6d715545a2400c5f1bb1dbb759 SHA512 90867d25c0140517d1df46bd0fb78670a5a9e430bc935d91a0b475bce706c087749fe47f17ecac8a78807e60541ef4834943c2c4904e771406202568b105dda0
+AUX rbutil-1.4.1-quazip.patch 1733 BLAKE2B 3a8d88de80189199abcf17cd8149cbf702465227c50b686a36a55e701a00f32e242386ca57c8ba96c0ac253fd3bbd1a8c829bb517ed0e9ae47e1815e8983749f SHA512 d36edacd17078fb2b1d31aa1e7096b37ddf69ba51132aa77aa042989302e8c368d53b2ebee9d9018f8c376cf2e5efd7c37361f2d0319d236ac68326d4eed1608
+DIST RockboxUtility-v1.4.1-src.tar.bz2 1427019 BLAKE2B b4d5e7e74c46c32138c564ebe5b81233ac47ddabe51241e7c6cfef9d5ca25f85b53166a840e5aadec0e021ad206e5d987c71d617c56aee425ece0321aea5edb2 SHA512 24e4ac7b99618d40044bd8248e6755b40e77e333902ddd898e57b33c50705e97fdc5a751be49f8e5ded445b4f712bdd5310b266ff82680ea76488d8bfc8e17c2
+EBUILD rbutil-1.4.1.ebuild 1280 BLAKE2B 93cf012a90e7f259b0778efd197409c9db66d652586373861eb239bf642b6a0e0285a6741103186c6c3eb81ea5813159e717e02c7800abb9f54bb3a49d286f05 SHA512 62ae9d21440557666df61f096fc131b99472ad0869403fc0dcbd0a3acf5851200eabf29ca8ba8e07daed36850545e26bb921eee8aab902a2f98dc431b34d985f
 MISC metadata.xml 247 BLAKE2B 158fa8dff063e01e64b4835fa1f199518ecf7d81282ee8c893efc0d4d73454e16adb3189ee8cd1272bbada6fb5ffc2b5aadbd796490c829cba1a4b8e3e20f29f SHA512 8bffd29ab89c8dc401ad49655e30a6bd3a953bf8f6c9309b318f3b03ed7bcf2e5c10533ac70967e549edcd512f6be13b9bce3e36175286370ba499dcb119f6fc
diff --git a/app-misc/rbutil/files/quazip.patch b/app-misc/rbutil/files/rbutil-1.4.1-quazip.patch
index 9d803712209e..596127c34060 100644
--- a/app-misc/rbutil/files/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	2014-01-05 22:44:53.000000000 +0000
-+++ b/base/ziputil.cpp	2018-02-25 10:55:36.994002648 +0000
+--- a/base/ziputil.cpp	2019-11-10 06:45:49.000000000 +0000
++++ b/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	2014-01-05 22:44:54.000000000 +0000
-+++ b/base/ziputil.h	2018-02-25 10:55:28.513838004 +0000
+--- a/base/ziputil.h	2019-11-10 06:45:49.000000000 +0000
++++ b/base/ziputil.h	2019-12-04 22:38:34.443112450 +0000
 @@ -21,9 +21,9 @@
  
  #include <QtCore>
@@ -35,41 +35,10 @@ diff -Naur a/base/ziputil.h b/base/ziputil.h
  
  class ZipUtil : public ArchiveUtil
  {
-diff -Naur a/rbutilqt.pri b/rbutilqt.pri
---- a/rbutilqt.pri	2014-01-05 22:44:57.000000000 +0000
-+++ b/rbutilqt.pri	2018-02-25 10:54:39.793852035 +0000
-@@ -69,12 +69,6 @@
-  base/rockboxinfo.cpp \
-  ../../tools/mkboot.c \
-  ../../tools/iriver.c \
-- quazip/quazip.cpp \
-- quazip/quazipfile.cpp \
-- quazip/quazipnewinfo.cpp \
-- quazip/unzip.c \
-- quazip/zip.c \
-- quazip/ioapi.c \
-  base/ziputil.cpp \
-  gui/comboboxviewdelegate.cpp \
-  gui/selectiveinstallwidget.cpp \
-@@ -156,14 +150,6 @@
-  base/rockboxinfo.h \
-  ../../tools/mkboot.h \
-  ../../tools/iriver.h \
-- quazip/crypt.h \
-- quazip/ioapi.h \
-- quazip/quazipfile.h \
-- quazip/quazipfileinfo.h \
-- quazip/quazip.h \
-- quazip/quazipnewinfo.h \
-- quazip/unzip.h \
-- quazip/zip.h \
-  base/ziputil.h \
-  lame/lame.h \
-  gui/comboboxviewdelegate.h \
 diff -Naur a/rbutilqt.pro b/rbutilqt.pro
---- a/rbutilqt.pro	2014-01-05 22:45:00.000000000 +0000
-+++ b/rbutilqt.pro	2018-02-25 10:55:04.577357613 +0000
-@@ -114,7 +114,7 @@
+--- a/rbutilqt.pro	2019-11-10 06:45:50.000000000 +0000
++++ b/rbutilqt.pro	2019-12-04 22:43:30.144259710 +0000
+@@ -131,7 +131,7 @@
  
  DEPENDPATH = $$INCLUDEPATH
  
@@ -78,7 +47,7 @@ diff -Naur a/rbutilqt.pro b/rbutilqt.pro
  # append all RBLIBS to LIBS
  for(rblib, RBLIBS) {
      LIBS += -l$$rblib
-@@ -122,7 +122,6 @@
+@@ -142,7 +142,6 @@
  
  # on win32 libz is linked implicitly.
  !win32 {
@@ -86,3 +55,9 @@ diff -Naur a/rbutilqt.pro b/rbutilqt.pro
  }
  
  # Add a (possibly found) libspeex now, don't do this before -lrbspeex!
+@@ -271,5 +270,4 @@
+ 
+ # source files are separate.
+ include(rbutilqt.pri)
+-include(quazip/quazip.pri)
+ include(logger/logger.pri)
diff --git a/app-misc/rbutil/rbutil-1.4.0.ebuild b/app-misc/rbutil/rbutil-1.4.1.ebuild
index 0982dffdb4b5..88610ad3d9bc 100644
--- a/app-misc/rbutil/rbutil-1.4.0.ebuild
+++ b/app-misc/rbutil/rbutil-1.4.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit desktop gnome2-utils qmake-utils
+inherit desktop qmake-utils xdg
 
 DESCRIPTION="Rockbox open source firmware manager for music players"
 HOMEPAGE="https://www.rockbox.org/wiki/RockboxUtility"
@@ -13,26 +13,29 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE="debug"
 
-RDEPEND="dev-libs/quazip
+RDEPEND="
+	dev-libs/crypto++:=
+	dev-libs/quazip
 	dev-qt/qtcore:5=
 	dev-qt/qtgui:5=
 	dev-qt/qtnetwork:5=
 	dev-qt/qtwidgets:5=
 	media-libs/speex
 	media-libs/speexdsp
-	virtual/libusb:1"
+	virtual/libusb:1
+"
 
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/linguist-tools:5"
 
 S="${WORKDIR}/RockboxUtility-v${PV}/${PN}/${PN}qt"
 
 PATCHES=(
-	"${FILESDIR}"/quazip.patch
+	"${FILESDIR}"/${PN}-1.4.1-quazip.patch
 )
 
 src_prepare() {
-	default
+	xdg_src_prepare
 	rm -rv quazip/ zlib/ || die
 }
 
@@ -56,7 +59,3 @@ src_install() {
 	make_desktop_entry RockboxUtility "Rockbox Utility" rockbox
 	dodoc changelog.txt
 }
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }