commit: bb865282cf6b4aa9d58ef227d58c1ff002afe4b2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Dec 13 23:03:36 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Dec 13 23:03:36 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb865282
app-office/skrooge: Drop 2.15.0 Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> app-office/skrooge/Manifest | 1 - .../files/skrooge-2.14.0-designer-optional.patch | 100 --------------------- app-office/skrooge/skrooge-2.15.0.ebuild | 98 -------------------- 3 files changed, 199 deletions(-) diff --git a/app-office/skrooge/Manifest b/app-office/skrooge/Manifest index 3b347b4440f..22b69ba3585 100644 --- a/app-office/skrooge/Manifest +++ b/app-office/skrooge/Manifest @@ -1,2 +1 @@ -DIST skrooge-2.15.0.tar.xz 20704388 BLAKE2B 37280e039595b5c7b3cb1af0fd20f66cc96c5796995c7a9ef4b83878c9a835856e54804ca312bcbb46d6de599a17dd49e45ef0e1dc1e6492b642ed36d88d731b SHA512 c49f8a84d7339ff2b96f27a7895bbfe5f75c33534c7c4f95e47ebd9787bf3e80847139e4a257bc3bdd12e853bfd2131173a66c436cbc3165e1ac7a5ae684eab0 DIST skrooge-2.16.2.tar.xz 21005424 BLAKE2B c8e11df29defc714fe71ad4f488cd6207dcc8bfc0cbee28422682f9c683ed7af8200b84f90cfdd0ca6d0bd0292dab46724c6b9afa0155c9f1603bbbe189b001d SHA512 4bc7de279cf55888a258700c2a8450270904066684b1ce0b121cf5eb966da174d969daa3db432781de62d94420e706ab5364e386e053dde7617d967442eae397 diff --git a/app-office/skrooge/files/skrooge-2.14.0-designer-optional.patch b/app-office/skrooge/files/skrooge-2.14.0-designer-optional.patch deleted file mode 100644 index e34e80b78af..00000000000 --- a/app-office/skrooge/files/skrooge-2.14.0-designer-optional.patch +++ /dev/null @@ -1,100 +0,0 @@ -From b83f0a0d1171fab0d839de23b97e0ffe3aae4d3e Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <[email protected]> -Date: Wed, 5 Sep 2018 08:46:09 +0200 -Subject: [PATCH] Fix build with SKG_DESIGNER=OFF - -Summary: cmake was adding designerplugin code to build with SKG_DESIGNER=OFF. - -Reviewers: #skrooge - -Differential Revision: https://phabricator.kde.org/D15282 ---- - skgbankgui/CMakeLists.txt | 12 +++++++---- - skgbasegui/CMakeLists.txt | 44 +++++++++++++++++++++------------------ - 2 files changed, 32 insertions(+), 24 deletions(-) - -diff --git a/skgbankgui/CMakeLists.txt b/skgbankgui/CMakeLists.txt -index 9bb197f3d..17c7c6ca2 100644 ---- a/skgbankgui/CMakeLists.txt -+++ b/skgbankgui/CMakeLists.txt -@@ -26,12 +26,16 @@ SET(skgbankgui_SRCS - skgpredicatcreator.cpp - skgquerydelegate.cpp - skgunitcombobox.cpp -+) - -- skgquerycreatordesignerplugin.cpp -- skgbkwidgetcollectiondesignerplugin.cpp -- skgpredicatcreatordesignerplugin.cpp -- skgunitcomboboxdesignerplugin.cpp -+IF(SKG_DESIGNER) -+ SET(skgbankgui_SRCS ${skgbankgui_SRCS} -+ skgquerycreatordesignerplugin.cpp -+ skgbkwidgetcollectiondesignerplugin.cpp -+ skgpredicatcreatordesignerplugin.cpp -+ skgunitcomboboxdesignerplugin.cpp - ) -+ENDIF() - - SET(LIBS Qt5::Xml skgbankmodeler skgbasemodeler skgbasegui) - IF(SKG_DESIGNER) -diff --git a/skgbasegui/CMakeLists.txt b/skgbasegui/CMakeLists.txt -index 112efe267..81b0bf8de 100644 ---- a/skgbasegui/CMakeLists.txt -+++ b/skgbasegui/CMakeLists.txt -@@ -63,28 +63,32 @@ SET(skgbasegui_SRCS - skgshow.cpp - skgwidgetselector.cpp - skgsimpleperiodedit.cpp -- -- skgwidgetcollectiondesignerplugin.cpp -- skgtabwidgetdesignerplugin.cpp -- skgtablewidgetdesignerplugin.cpp -- skgtableviewdesignerplugin.cpp -- skgfilteredtableviewdesignerplugin.cpp -- skgtreeviewdesignerplugin.cpp -- skgcomboboxdesignerplugin.cpp -- skgcolorbuttondesignerplugin.cpp -- skgwidgetselectordesignerplugin.cpp -- skgwebviewdesignerplugin.cpp -- skgzoomselectordesignerplugin.cpp -- skgcalculatoreditdesignerplugin.cpp -- skggraphicsviewdesignerplugin.cpp -- skgshowdesignerplugin.cpp -- skgtablewithgraphdesignerplugin.cpp -- skgdateeditdesignerplugin.cpp -- skgprogressbardesignerplugin.cpp -- skgperiodeditdesignerplugin.cpp -- skgsimpleperiodeditdesignerplugin.cpp - ) - -+IF(SKG_DESIGNER) -+ SET(skgbasegui_SRCS ${skgbasegui_SRCS} -+ skgwidgetcollectiondesignerplugin.cpp -+ skgtabwidgetdesignerplugin.cpp -+ skgtablewidgetdesignerplugin.cpp -+ skgtableviewdesignerplugin.cpp -+ skgfilteredtableviewdesignerplugin.cpp -+ skgtreeviewdesignerplugin.cpp -+ skgcomboboxdesignerplugin.cpp -+ skgcolorbuttondesignerplugin.cpp -+ skgwidgetselectordesignerplugin.cpp -+ skgwebviewdesignerplugin.cpp -+ skgzoomselectordesignerplugin.cpp -+ skgcalculatoreditdesignerplugin.cpp -+ skggraphicsviewdesignerplugin.cpp -+ skgshowdesignerplugin.cpp -+ skgtablewithgraphdesignerplugin.cpp -+ skgdateeditdesignerplugin.cpp -+ skgprogressbardesignerplugin.cpp -+ skgperiodeditdesignerplugin.cpp -+ skgsimpleperiodeditdesignerplugin.cpp -+ ) -+ENDIF() -+ - SET(LIBS KF5::Parts KF5::KIOFileWidgets KF5::NotifyConfig KF5::Notifications Qt5::QuickWidgets Qt5::PrintSupport Qt5::Svg skgbasemodeler) - IF(SKG_DESIGNER) - SET(LIBS ${LIBS} Qt5::Designer) --- -2.18.0 - diff --git a/app-office/skrooge/skrooge-2.15.0.ebuild b/app-office/skrooge/skrooge-2.15.0.ebuild deleted file mode 100644 index e4af19a2944..00000000000 --- a/app-office/skrooge/skrooge-2.15.0.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# 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}/${PN}-2.14.0-designer-optional.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 -}
