app-misc/rbutil: Bump to 1.4.1, EAPI 7

Package-Manager: Portage-2.3.80, Repoman-2.3.19
Signed-off-by: James Le Cuirot <chewi@gentoo.org>

diff --git a/app-misc/rbutil/Manifest b/app-misc/rbutil/Manifest
index 4103d5345824ba53963a26457111d8131c501dec..6bfa48b15a8e4bef74869e4de7e61f249276a07f 100644 (file)
--- a/app-misc/rbutil/Manifest
+++ b/app-misc/rbutil/Manifest
@@ -1 +1,2 @@
 DIST RockboxUtility-v1.4.0-src.tar.bz2 1181116 BLAKE2B 64d0cbedb3917a8f3f79e2b47b8eb230bb5fd6627ffd0647d5fbb42973d07675ee8a8f0eb9ae6e3481a8bd4cb4a183fb463bf97a1edbb2a74076e7a595f09ade SHA512 705723d6ee2231c3b79d0c67cabc7c6c00d3f1a76a970c1bd15e028a98b4a25de987b0921ea932ca0098defbec0bc9bde9d9ed3a79dd46f81da18bb5472be9fe
+DIST RockboxUtility-v1.4.1-src.tar.bz2 1427019 BLAKE2B b4d5e7e74c46c32138c564ebe5b81233ac47ddabe51241e7c6cfef9d5ca25f85b53166a840e5aadec0e021ad206e5d987c71d617c56aee425ece0321aea5edb2 SHA512 24e4ac7b99618d40044bd8248e6755b40e77e333902ddd898e57b33c50705e97fdc5a751be49f8e5ded445b4f712bdd5310b266ff82680ea76488d8bfc8e17c2

diff --git a/app-misc/rbutil/files/rbutil-1.4.1-quazip.patch b/app-misc/rbutil/files/rbutil-1.4.1-quazip.patch
new file mode 100644 (file)
index 0000000..596127c
--- /dev/null
+++ b/app-misc/rbutil/files/rbutil-1.4.1-quazip.patch
@@ -0,0 +1,63 @@
+This patch is a simplified version of a patch I have sent upstream.
+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
+@@ -22,9 +22,9 @@
+ #include "progressloggerinterface.h"
+ #include "Logger.h"
+ 
+-#include "quazip/quazip.h"
+-#include "quazip/quazipfile.h"
+-#include "quazip/quazipfileinfo.h"
++#include <quazip5/quazip.h>
++#include <quazip5/quazipfile.h>
++#include <quazip5/quazipfileinfo.h>
+ 
+ 
+ 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
+@@ -21,9 +21,9 @@
+ 
+ #include <QtCore>
+ #include "archiveutil.h"
+-#include "quazip/quazip.h"
+-#include "quazip/quazipfile.h"
+-#include "quazip/quazipfileinfo.h"
++#include <quazip5/quazip.h>
++#include <quazip5/quazipfile.h>
++#include <quazip5/quazipfileinfo.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
+@@ -131,7 +131,7 @@
+ 
+ DEPENDPATH = $$INCLUDEPATH
+ 
+-LIBS += -L$$OUT_PWD -L$$MYLIBBUILDDIR
++LIBS += -L$$OUT_PWD -L$$MYLIBBUILDDIR -lquazip5
+ # append all RBLIBS to LIBS
+ for(rblib, RBLIBS) {
+     LIBS += -l$$rblib
+@@ -142,7 +142,6 @@
+ 
+ # on win32 libz is linked implicitly.
+ !win32 {
+-    LIBS += -lz
+ }
+ 
+ # 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.1.ebuild b/app-misc/rbutil/rbutil-1.4.1.ebuild
new file mode 100644 (file)
index 0000000..88610ad
--- /dev/null
+++ b/app-misc/rbutil/rbutil-1.4.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop qmake-utils xdg
+
+DESCRIPTION="Rockbox open source firmware manager for music players"
+HOMEPAGE="https://www.rockbox.org/wiki/RockboxUtility"
+SRC_URI="https://download.rockbox.org/${PN}/source/RockboxUtility-v${PV}-src.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug"
+
+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
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/linguist-tools:5"
+
+S="${WORKDIR}/RockboxUtility-v${PV}/${PN}/${PN}qt"
+
+PATCHES=(
+       "${FILESDIR}"/${PN}-1.4.1-quazip.patch
+)
+
+src_prepare() {
+       xdg_src_prepare
+       rm -rv quazip/ zlib/ || die
+}
+
+src_configure() {
+       # Generate binary translations.
+       lrelease ${PN}qt.pro || die
+
+       # noccache is required to call the correct compiler.
+       eqmake5 CONFIG+="noccache $(use debug && echo dbg)"
+}
+
+src_install() {
+       local icon size
+       for icon in icons/rockbox-*.png; do
+               size=${icon##*-}
+               size=${size%%.*}
+               newicon -s "${size}" "${icon}" rockbox.png
+       done
+
+       dobin RockboxUtility
+       make_desktop_entry RockboxUtility "Rockbox Utility" rockbox
+       dodoc changelog.txt
+}