From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1127577-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 510D8138334
for <garchives@archives.gentoo.org>; Wed, 4 Dec 2019 22:55:18 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 7ABD8E081A;
Wed, 4 Dec 2019 22:55:17 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 52642E081A
for <gentoo-commits@lists.gentoo.org>; Wed, 4 Dec 2019 22:55:17 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id A936834D7DB
for <gentoo-commits@lists.gentoo.org>; Wed, 4 Dec 2019 22:55:15 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 9D2868BC
for <gentoo-commits@lists.gentoo.org>; Wed, 4 Dec 2019 22:55:13 +0000 (UTC)
From: "James Le Cuirot" <chewi@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" <chewi@gentoo.org>
Message-ID: <1575500098.9753534ff28f2077179ae08a53593aefa1a1e882.chewi@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/rbutil/files/, app-misc/rbutil/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-misc/rbutil/Manifest app-misc/rbutil/files/quazip.patch app-misc/rbutil/rbutil-1.4.0.ebuild
X-VCS-Directories: app-misc/rbutil/ app-misc/rbutil/files/
X-VCS-Committer: chewi
X-VCS-Committer-Name: James Le Cuirot
X-VCS-Revision: 9753534ff28f2077179ae08a53593aefa1a1e882
X-VCS-Branch: master
Date: Wed, 4 Dec 2019 22:55:13 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 6940cb1f-690f-434b-aa2a-952294cddb68
X-Archives-Hash: 2bf931917ad5e9efd291c4a09ac6e8dd
commit: 9753534ff28f2077179ae08a53593aefa1a1e882
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 4 22:54:58 2019 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Wed Dec 4 22:54:58 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9753534f
app-misc/rbutil: Drop old 1.4.0
Package-Manager: Portage-2.3.80, Repoman-2.3.19
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
app-misc/rbutil/Manifest | 1 -
app-misc/rbutil/files/quazip.patch | 88 -------------------------------------
app-misc/rbutil/rbutil-1.4.0.ebuild | 62 --------------------------
3 files changed, 151 deletions(-)
diff --git a/app-misc/rbutil/Manifest b/app-misc/rbutil/Manifest
index 6bfa48b15a8..1c8a543cff7 100644
--- a/app-misc/rbutil/Manifest
+++ b/app-misc/rbutil/Manifest
@@ -1,2 +1 @@
-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/quazip.patch b/app-misc/rbutil/files/quazip.patch
deleted file mode 100644
index 9d803712209..00000000000
--- a/app-misc/rbutil/files/quazip.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-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 2014-01-05 22:44:53.000000000 +0000
-+++ b/base/ziputil.cpp 2018-02-25 10:55:36.994002648 +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 2014-01-05 22:44:54.000000000 +0000
-+++ b/base/ziputil.h 2018-02-25 10:55:28.513838004 +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.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 @@
-
- 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
-@@ -122,7 +122,6 @@
-
- # on win32 libz is linked implicitly.
- !win32 {
-- LIBS += -lz
- }
-
- # Add a (possibly found) libspeex now, don't do this before -lrbspeex!
diff --git a/app-misc/rbutil/rbutil-1.4.0.ebuild b/app-misc/rbutil/rbutil-1.4.0.ebuild
deleted file mode 100644
index 0982dffdb4b..00000000000
--- a/app-misc/rbutil/rbutil-1.4.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop gnome2-utils qmake-utils
-
-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/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}
- dev-qt/linguist-tools:5"
-
-S="${WORKDIR}/RockboxUtility-v${PV}/${PN}/${PN}qt"
-
-PATCHES=(
- "${FILESDIR}"/quazip.patch
-)
-
-src_prepare() {
- default
- 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
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }