From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1028582-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 E3EEA138334 for <garchives@archives.gentoo.org>; Thu, 7 Jun 2018 17:46:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CACCAE0AFD; Thu, 7 Jun 2018 17:46:53 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 80F13E0AFD for <gentoo-commits@lists.gentoo.org>; Thu, 7 Jun 2018 17:46:53 +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 86A28335C79 for <gentoo-commits@lists.gentoo.org>; Thu, 7 Jun 2018 17:46:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D818E29E for <gentoo-commits@lists.gentoo.org>; Thu, 7 Jun 2018 17:46:49 +0000 (UTC) From: "Johannes Huber" <johu@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, "Johannes Huber" <johu@gentoo.org> Message-ID: <1528393593.0e8cf43b7f4b5102c69aa5dcad2f4d157375c742.johu@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/skrooge/files/, app-office/skrooge/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/skrooge/Manifest app-office/skrooge/files/skrooge-2.12.0-qt-5.11.patch app-office/skrooge/skrooge-2.12.0.ebuild X-VCS-Directories: app-office/skrooge/files/ app-office/skrooge/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: 0e8cf43b7f4b5102c69aa5dcad2f4d157375c742 X-VCS-Branch: master Date: Thu, 7 Jun 2018 17:46:49 +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-Archives-Salt: 6c7156ca-7aa4-4d25-9171-dc42102a3b26 X-Archives-Hash: 9a53c3dc0253a09c2d8e6cd49e867e5b commit: 0e8cf43b7f4b5102c69aa5dcad2f4d157375c742 Author: Johannes Huber <johu <AT> gentoo <DOT> org> AuthorDate: Thu Jun 7 17:46:33 2018 +0000 Commit: Johannes Huber <johu <AT> gentoo <DOT> org> CommitDate: Thu Jun 7 17:46:33 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e8cf43b app-office/skrooge: Remove 2.12.0 Package-Manager: Portage-2.3.40, Repoman-2.3.9 app-office/skrooge/Manifest | 1 - .../skrooge/files/skrooge-2.12.0-qt-5.11.patch | 40 --------- app-office/skrooge/skrooge-2.12.0.ebuild | 98 ---------------------- 3 files changed, 139 deletions(-) diff --git a/app-office/skrooge/Manifest b/app-office/skrooge/Manifest index 701743e5aa2..4a215895fc4 100644 --- a/app-office/skrooge/Manifest +++ b/app-office/skrooge/Manifest @@ -1,2 +1 @@ -DIST skrooge-2.12.0.tar.xz 20289828 BLAKE2B 999f100fffca3b8fff5e343b1137fc51e337428cdbd89f7e5eb72811e3e5e1522cc257e6be83aad57cf4ec66fefd061b685d94caaadcc27182f32da13d57014f SHA512 348262a7e86f6b3f9fa028fea324eeb73c96e03a77d16774ae9f4b554c1893aca7a002bcf3160d4055cfe8aaceeb76a364e71e7f605382cfe1a801eca1ca874f DIST skrooge-2.13.0.tar.xz 20432856 BLAKE2B 5e5ace28f0a3d0f60decb8bcb63fde3d9ed5dc79103ce8d2f4bad2be33b3e4896f19aac4954668bee194362b3b860f0e585e902ed54563b0a82ee36ab41263a7 SHA512 7c5543a4c26953c89a1a67b653bdf5fa7f4baa14d96e763d868f27b288a0f9d7d4bc2994436a4e749d4fd7db999c16b6fcee69817be0774c6e171e49d69e30ba diff --git a/app-office/skrooge/files/skrooge-2.12.0-qt-5.11.patch b/app-office/skrooge/files/skrooge-2.12.0-qt-5.11.patch deleted file mode 100644 index e1a9bbbd328..00000000000 --- a/app-office/skrooge/files/skrooge-2.12.0-qt-5.11.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 38e61d2cd8a4a4b863801f8a5097b8b51b0c8e93 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Tue, 17 Apr 2018 23:49:52 +0200 -Subject: [PATCH] Fix build with Qt 5.11 (missing QHeaderView) - -Reviewers: #skrooge - -Differential Revision: https://phabricator.kde.org/D12297 ---- - plugins/skrooge/skrooge_operation/skgsplittabledelegate.cpp | 1 + - skgbasegui/skggraphicsview.cpp | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/plugins/skrooge/skrooge_operation/skgsplittabledelegate.cpp b/plugins/skrooge/skrooge_operation/skgsplittabledelegate.cpp -index aa171913c..930c4ea3e 100644 ---- a/plugins/skrooge/skrooge_operation/skgsplittabledelegate.cpp -+++ b/plugins/skrooge/skrooge_operation/skgsplittabledelegate.cpp -@@ -24,6 +24,7 @@ - #include <ksqueezedtextlabel.h> - #include <kformat.h> - -+#include <QHeaderView> - #include <qpainter.h> - - #include "skgbasegui_settings.h" -diff --git a/skgbasegui/skggraphicsview.cpp b/skgbasegui/skggraphicsview.cpp -index 4c4557880..7143ade3b 100644 ---- a/skgbasegui/skggraphicsview.cpp -+++ b/skgbasegui/skggraphicsview.cpp -@@ -21,6 +21,7 @@ - */ - #include "skggraphicsview.h" - -+#include <QHeaderView> - #include <qmenu.h> - #include <qdesktopservices.h> - #include <qprinter.h> --- -2.17.0 - diff --git a/app-office/skrooge/skrooge-2.12.0.ebuild b/app-office/skrooge/skrooge-2.12.0.ebuild deleted file mode 100644 index 122a2459f9f..00000000000 --- a/app-office/skrooge/skrooge-2.12.0.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -KDE_HANDBOOK="optional" -KDE_TEST="forceoptional" -VIRTUALX_REQUIRED="test" -inherit kde5 - -DESCRIPTION="Personal finances manager, aiming at being simple and intuitive" -HOMEPAGE="https://skrooge.org/" -[[ ${PV} == 9999 ]] || SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" - -LICENSE="GPL-2" -KEYWORDS="amd64 x86" -IUSE="activities designer kde ofx" - -COMMON_DEPEND=" - $(add_frameworks_dep karchive) - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kio) - $(add_frameworks_dep kitemviews) - $(add_frameworks_dep knewstuff) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep knotifyconfig) - $(add_frameworks_dep kparts) - $(add_frameworks_dep kservice) - $(add_frameworks_dep ktextwidgets) - $(add_frameworks_dep kwallet) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kxmlgui) - $(add_qt_dep qtconcurrent) - $(add_qt_dep qtdbus) - $(add_qt_dep qtdeclarative 'widgets') - $(add_qt_dep qtgui) - $(add_qt_dep qtnetwork) - $(add_qt_dep qtprintsupport) - $(add_qt_dep qtscript) - $(add_qt_dep qtsql) - $(add_qt_dep qtsvg) - $(add_qt_dep qtwebkit) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtxml) - app-crypt/qca:2[qt5(+)] - dev-db/sqlcipher - dev-libs/grantlee:5 - activities? ( $(add_frameworks_dep kactivities) ) - kde? ( $(add_frameworks_dep krunner) ) - ofx? ( dev-libs/libofx ) -" -DEPEND="${COMMON_DEPEND} - $(add_frameworks_dep kguiaddons) - $(add_frameworks_dep kjobwidgets) - $(add_frameworks_dep kwindowsystem) - dev-libs/libxslt - virtual/pkgconfig - x11-misc/shared-mime-info - designer? ( - $(add_frameworks_dep kdesignerplugin) - $(add_qt_dep designer) - ) -" -RDEPEND="${COMMON_DEPEND} - !app-office/skrooge:4 -" - -REQUIRED_USE="test? ( designer )" - -# hangs + installs files -RESTRICT+=" test" - -PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" ) - -src_configure() { - local mycmakeargs=( - -DSKG_BUILD_TEST=$(usex test) - -DSKG_DESIGNER=$(usex designer) - $(cmake-utils_use_find_package activities KF5Activities) - $(cmake-utils_use_find_package kde KF5Runner) - $(cmake-utils_use_find_package ofx LibOfx) - ) - - kde5_src_configure -} - -src_test() { - local mycmakeargs=( - -DSKG_BUILD_TEST=ON - ) - kde5_src_test -}