gentoo resync : 19.11.2017

3 files changed, 2 insertions, 101 deletions

diff --git a/app-office/skrooge/Manifest b/app-office/skrooge/Manifest
index 5424b418703d..033809ef658d 100644
--- a/app-office/skrooge/Manifest
+++ b/app-office/skrooge/Manifest
@@ -1,9 +1,7 @@
 DIST skrooge-2.10.5.tar.xz 19309980 SHA256 56a0124dec34e6e96a5e71ff0e825a7ec79f32a69ef0ccdc5f0f9b753d8c3eb0 SHA512 02fdee00b430ffba8c05222b87da31f5d2390634e816e141806fc4e3cceab83134ccda9619ff944f70eb704af4d2ee08338bf196ad7dcea8221a05d13e1b4c8e WHIRLPOOL 362d2269ec371a50dd1f15e7a21f2fcfe3341e49a446f4668b49ad32c895835ed8115b183b2c00ce2959046f545951570ab303b06c5f97764f03a70f19185c4c
-DIST skrooge-2.8.1.tar.xz 19299556 SHA256 8f166db74a27db0ce0ea197f89dfd021224afc3e4875e36438a4496f10746460 SHA512 864de0c9e8876b87ab4100b0d48ea8e573655ebad5175333230ff715faa46077b96e25b91e767da864196960de14df9b9fee5b561e4d51b03a80fb58a070755f WHIRLPOOL 12d1455493fd32dd61cb0543a2365444f0fd1fa5b08214760f7c3b58836c3ac55a480f322cbea61eb13675b9698531fa860f8a2b4c9a915a789fc95bedc8b269
 DIST skrooge-2.9.0.tar.xz 19310412 SHA256 ad02403026b649203f0381cc599a7754d36f41cc75cc03d14e63bfdb666e7bb5 SHA512 cbcd1e9c00509d6aa387f83f3a245b20c856e936095d8bb16ec7ab6898131a24edda8a4e9ee20323c7d04ab56194b8d4720a77b8d10699e64e8dbacbe9bb868c WHIRLPOOL 2ecc558add9160c724e2ff9623baa205e54ce45b385f63cc1d2151ce75dc79c65e7608abf419721761c19f3cffbe80a16db9876bdc4cc756d531a85a42bbec28
 EBUILD skrooge-2.10.5.ebuild 2339 SHA256 f5e194c99d8e553eb35df21654870f14ea92e6d7ba958db3f396c6196f93b079 SHA512 2ab11c195b33ed6420d5598ec62a1b9acd4f9442cfb9409d7530439ed16b0ad6fec195f6d1fbfd4234ce23d8c2c6717308896b704378b045752b5b9e903aaaf4 WHIRLPOOL 034b85c7cbd1cb3051a26eeaddfd84bb761d6045df6e98387ea1012d80047e4f992dd09f9ff16056ec12ab21f10831dbd3e9b6f2941bad96a207704ae9d342e7
-EBUILD skrooge-2.8.1.ebuild 2378 SHA256 6b8bf7c8e125340c9455fbb4b55626e57bd5a9e144baa6c5821abf3ea0c863bd SHA512 97656a9c035eacfe6c84e7de28b25e87ada7a75ada19f9a934bf8917912f8df2dc7f3f10e7e3d7f2800e8fe76736dbed916461c97d6314729d85a04c05694512 WHIRLPOOL 1888b863f9cd1148a9c96ce246bd4957c6df8db858a92e98a0fd068aaef867d519456e21e705c7328f3dd39ed8f11b21297b33c8a664a5260f77751547cece31
-EBUILD skrooge-2.9.0.ebuild 2357 SHA256 c1cced63935b82c937a2b41b4b11f89ab4a3591879ea07cc32d0153dc57c947b SHA512 32db5ca9bc680c021fc62f4c3ee3b3fca440e3632f9c0a9496cef968267b2fb99bcae078fe9f02ecbc83782e3a01512df3c1a5812ad63d86016a991a0ce949b6 WHIRLPOOL d4ef8f7c1344d5ebd485ccaa185233ce0b18d077b0eb722ace8b0b42dba2238df262dae78127bcb4400086e46a720824788ee3085f9bf4c1ad8829a2347d7a2b
+EBUILD skrooge-2.9.0.ebuild 2356 SHA256 9774f6431c953818ba8e10c3b9de1bbc73b24b421f6265d2881dbe0cc34e14f3 SHA512 419bc8eb3f35b8c6e1aedcd0e6c6dbec9359caecc7ec36602204f3d4163909120beee5ca691ae60f215154c17944c92da6177ee4d68752e43618deb168856f00 WHIRLPOOL a1e459c3563b226d63fe511fd702c301b1bae8ab28b011a474b4a2096b01213bec8640fbc1e0ea700a33c79cd0ec9ad79cc5c5974d466e03fc5f2e14d8ab9c48
 MISC ChangeLog 5561 SHA256 1110215fd08a502383ffbf0423e129641ee4e2ea414870a3b69818f0c78c1452 SHA512 df19ef19bbc8271c422d023c058cd8f09d5fd9af3feeb89d4d6a0a6c53115f63d8c67a6ed08d6a137d96228335132f699018470b743fff0842f6fec9c96b81d4 WHIRLPOOL 40fa6f40a4b1c4062fcf86a2edf42098a9631f7acb882c0ca1d8ded6b54a5a6ee3f2830f79e39debeefb9ca499b2372e6f4ca8b4f71e8fe3e1cc58ebac475c82
 MISC ChangeLog-2015 8892 SHA256 a428dc33a49b06f1c0fc4112bcf8a410e52e5b3c54bbaf852fcfddc3435f611c SHA512 091c8d08ff7e915d806b73a348b695f6dd753ab8467ba9435b20d5823aac546ef60efd3d133f0a862c4bae0ec107d77c0d8457ff90ee373ff00acb9c7f9df92e WHIRLPOOL fed33ca76b80601d2aedb861872862bb3431b3f37cb34ddbeea02d322c766bd67a053d544e179aeef8a2f7ba2b482f9e984469fcdef56751d3c265048f6d20a8
 MISC metadata.xml 400 SHA256 1825b5ed49f1564202924631d9168f8c37966157f6e4c7da29fb8f875801bcf1 SHA512 50120cec8f5798f6b104c6e1fd05b831f2f280e2f3bab8aa66667a3da1bb351a955b671d16cf4e30b44b0738625424fe4a32bb8a677947d147031964e108dcb0 WHIRLPOOL 52eb2aeb63da65ed1aea3e9d2a02bce49df2795f43af23966fb4bfdf3e8f04dd3b10736abc14df8483231f222c0d86f860f803b5c21e66d3919cc5f0c9716822
diff --git a/app-office/skrooge/skrooge-2.8.1.ebuild b/app-office/skrooge/skrooge-2.8.1.ebuild
deleted file mode 100644
index 44321985ac26..000000000000
--- a/app-office/skrooge/skrooge-2.8.1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_GCC_MINIMAL="4.9"
-KDE_HANDBOOK="optional"
-KDE_TEST="forceoptional"
-QT_MINIMAL="5.7.0"
-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 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"
-
-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
-}
diff --git a/app-office/skrooge/skrooge-2.9.0.ebuild b/app-office/skrooge/skrooge-2.9.0.ebuild
index 271b305b96e6..816df0558d4c 100644
--- a/app-office/skrooge/skrooge-2.9.0.ebuild
+++ b/app-office/skrooge/skrooge-2.9.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://skrooge.org/"
 [[ ${PV} == 9999 ]] || SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="activities designer kde ofx"
 
 COMMON_DEPEND="