gentoo resync : 03.09.2021

5 files changed, 14 insertions, 110 deletions

diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 716de09893e8..8ca7a4c8b26c 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/grisbi/Manifest b/app-office/grisbi/Manifest
index 2d3aeda90827..178ec50de5cf 100644
--- a/app-office/grisbi/Manifest
+++ b/app-office/grisbi/Manifest
@@ -1,7 +1,7 @@
 DIST grisbi-1.2.2.tar.bz2 7325947 BLAKE2B 559ffc8c46edc629fd17aa38042a7d9a39dd9c1866bddc86560bae2750a53916a6e0a451dc6e482b9d21bc1d8d493701d656dfa85b131f5f9b5b3c014249dcd2 SHA512 7d627f9ae588c0d5a8235bb86f3ed160a572114ccfec1dce9c7137296e5525411600033ca4e42b242004edddc42f2160e95c18c0c0cd13516cf62486e081acdd
-DIST grisbi-2.0.3.tar.bz2 7504520 BLAKE2B 28f9fd2535d3d863a4b36237f5dbb0947631764738a45869ad9c15750235cd741043382041eb40189ccbf34901527b950378e086e6f87a1beeeccd1c64f6be7a SHA512 2fdc93051399be2e7818890a88078f0c18976efe703a4f1ca9177484eb30def0533f35c6b7362b62dc29872596d9bb28494045ca2c137eec192d8c9bdde0e8aa
 DIST grisbi-2.0.4.tar.bz2 7506352 BLAKE2B 4c1717b934677b01cc3bb90ff67a3a2cb48c640e81fae40579d7f7007f72ac93f8d0b68fa0e72e41bf383e5be68316d7cc042a4067dfbf5286e28434932c8764 SHA512 755440aaab3d1db82eeca9fce8d63751c8073d082bcff5d97a11a87b1af47e2bbdc44be34270fbad311e3641fbf263f206996833dd08fd1ac27774b28a1fa3b5
+DIST grisbi-2.0.5.tar.bz2 7465632 BLAKE2B c70fd313660d8fbc0d93d86d89f7470564a0865b8423ae0e8a2f40fc1f4dbe959ed37141963dbc5ab9e6154ff71af3120303bd4c6ccc5554d1da75200c6e8a84 SHA512 16535cbdf0647abc60878bc5a21b22d76090d6a5dab89a9e1ff4029eef25f284a627555ec0724977ba01313f33aee06489b908aaa6600a566f86a87b5f33b7f9
 EBUILD grisbi-1.2.2.ebuild 922 BLAKE2B 5ccfffe049917476a6fbd56db945a8c08aa10a084caee25f86f1e46d5be0d128ea85a52f0cb7de3a51d641911533a88393397455e8d033316d1881c319ca9663 SHA512 2fc5986e2d6a32407663e0617422d478b214c1e348cbd97f10254d9c18b9ace971879b5ccd295fe5a6ec97a53233746ffd539f35fd4e771819fac0ec5f4b53f8
-EBUILD grisbi-2.0.3.ebuild 901 BLAKE2B 03beb7048d726a5fba536c2a14b596d20e6d60f2961c68bd746c6e93712c41a7adf1bffd2b90540eaffbf159627bea2a4f1153e2e2cb5cb522b9d3aad537f087 SHA512 687005e88b2ba1a8e47c963557077bed7fbacca6fc518806b460a75ac077bd7125b7f8f62013645b6810c56745cb06d052d284b93c115c9afeb69cdedc8660df
 EBUILD grisbi-2.0.4.ebuild 901 BLAKE2B 03beb7048d726a5fba536c2a14b596d20e6d60f2961c68bd746c6e93712c41a7adf1bffd2b90540eaffbf159627bea2a4f1153e2e2cb5cb522b9d3aad537f087 SHA512 687005e88b2ba1a8e47c963557077bed7fbacca6fc518806b460a75ac077bd7125b7f8f62013645b6810c56745cb06d052d284b93c115c9afeb69cdedc8660df
+EBUILD grisbi-2.0.5.ebuild 971 BLAKE2B 318c8f437b11af0e471871dff1996b9d91c233f870dd9f7d8f63b4d4e2218a465b1506761a5d55f39a1bf50817e698257f5f8ff24f4730328c3a26060f8f38d0 SHA512 6fe3fc8d1a08af975914892cc4579ea2d9f2b6983059d463b0e83450975f03d301814cef566e67e73841e3ccd126a3426fd976fcde466fddcfcb01c74fb3f95a
 MISC metadata.xml 741 BLAKE2B 04b4958b26b7c8fb99d314cf0a6e09743b9f30ef68e0c05293ac83518b07eb50ee752da9b616579192a2459b5fc856f58bfd66f3b0a7dcc15193b57e83819123 SHA512 74f2fc45820a853a6589a1dc78e93bceecd702c47da3cd6377adca6a62414328630243b6c0496d8efaec399b21678cf2a3805c6e1757cf71f694ac1acb418663
diff --git a/app-office/grisbi/grisbi-2.0.3.ebuild b/app-office/grisbi/grisbi-2.0.5.ebuild
index 8dd1a9b71823..4af337a5e9fa 100644
--- a/app-office/grisbi/grisbi-2.0.3.ebuild
+++ b/app-office/grisbi/grisbi-2.0.5.ebuild
@@ -12,21 +12,25 @@ IUSE="goffice nls ofx ssl"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 RDEPEND="
-	>=dev-libs/libxml2-2.5:2
-	>=dev-libs/glib-2.44.0:2
-	>=x11-libs/gtk+-3.20:3
+	dev-libs/glib:2
+	dev-libs/libxml2:2
+	gnome-extra/libgsf
+	sys-libs/zlib
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/pango
 	x11-misc/xdg-utils
-	>=gnome-extra/libgsf-1.14
 	ssl? ( >=dev-libs/openssl-1.0.0:0= )
 	ofx? ( >=dev-libs/libofx-0.9.0:= )
 	goffice? ( >=x11-libs/goffice-0.10.0 )
 "
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-util/intltool
+	virtual/pkgconfig"
 
 src_configure() {
 	gnome2_src_configure \
diff --git a/app-office/skrooge/Manifest b/app-office/skrooge/Manifest
index 07629f6c199e..33cbe1877908 100644
--- a/app-office/skrooge/Manifest
+++ b/app-office/skrooge/Manifest
@@ -1,5 +1,3 @@
-DIST skrooge-2.24.6.tar.xz 22187100 BLAKE2B 8657397c1faef949e4d2aa5a23b35433695329e9b00e62f11e4b60b78b3d0e92c32ff93219a4931b9baa08ae1bbdc18285728c97b0d49ca71bad37ee37b01a83 SHA512 a253bdcd966dbb3b0b2b078a88b8de7e9fbdf7700ce91850c0a174c3bb2f56aa04a00250e8164a5e9387699b4a6162052edb4a064293360a3b5ef62c350912df
 DIST skrooge-2.26.1.tar.xz 22138584 BLAKE2B 15328406763c69a1a746dc099be815e8c49163c5e99e5d8c985a368b1d629759c519b261b2f06b27e83bb538f6ccbf4a2a2d25ca31262f0e407805639bab7d8d SHA512 03263689310e1c7538acdd133f7b6cfcd67c51a4d426ee4512609408c91968a1369f2ef09da851958c210b4399c706ad35af5b384fcea8ec7a25705a548ae537
-EBUILD skrooge-2.24.6.ebuild 2556 BLAKE2B d1c89d00e4e0b8b870a9500fff0bb90a877fbddc8df3f397133d63c5f6d700051d7289bd662edd8921e30796fb978d43c9320ca8e1387025a68c0ae26f9ea685 SHA512 55046b4cffc5a83e7157f77021a8245fd0658ee837b5aee69e5b690ac4302e43a36e78fe3626320bef7ad89f13107e16f42464eec55ffa6a6a643e345ee3560c
 EBUILD skrooge-2.26.1.ebuild 2575 BLAKE2B 0445fae5ae7cb96843099fed8146182c3c6952ce3b6caf3c1579e1b49aed73deecf700875903513a686ba6b4b9bd61cfd56f7be9fbe6c44268517431e754b92a SHA512 f1eb690fb6e6d0880649a4676937ebcada9933d218552d60b6942ecdfb9bed419c5866d93f4064fd82fc18eefe9e35b76bc8bc2e796244aab47518a186266236
 MISC metadata.xml 392 BLAKE2B 70cf59ffffe1d2e5b08f188dfe2ca42dd67bdd5af8349bbe2bcfdcb75636e585898d4091f697d4585978766896170e61c9ad24a9e15e8b420133998136cf1e4b SHA512 5ac64d6c97dbafd48049babc61f82c960c9c9b3f91faa406610dc0af6ff6f32595d3e23861237b14bb0aedd3e4231b87c3fd928bf96d9f74eaeb02e464df6ad8
diff --git a/app-office/skrooge/skrooge-2.24.6.ebuild b/app-office/skrooge/skrooge-2.24.6.ebuild
deleted file mode 100644
index 751142bacca0..000000000000
--- a/app-office/skrooge/skrooge-2.24.6.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-ECM_TEST="forceoptional"
-KFMIN=5.74.0
-QTMIN=5.15.1
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Personal finances manager, aiming at being simple and intuitive"
-HOMEPAGE="https://skrooge.org/"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="5"
-IUSE="activities kde ofx"
-
-BDEPEND="
-	dev-libs/libxslt
-	virtual/pkgconfig
-"
-COMMON_DEPEND="
-	>=app-crypt/qca-2.3.0:2
-	dev-db/sqlcipher
-	dev-libs/grantlee:5
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtscript-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5=
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
-	kde? ( >=kde-frameworks/krunner-${KFMIN}:5 )
-	ofx? ( dev-libs/libofx:= )
-"
-DEPEND="${COMMON_DEPEND}
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-"
-
-# hangs + installs files (also requires KF5DesignerPlugin)
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		-DSKG_WEBENGINE=ON
-		-DSKG_DESIGNER=OFF
-		$(cmake_use_find_package activities KF5Activities)
-		$(cmake_use_find_package kde KF5Runner)
-		$(cmake_use_find_package ofx LibOfx)
-		-DSKG_BUILD_TEST=$(usex test)
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	local mycmakeargs=(
-		-DSKG_BUILD_TEST=ON
-	)
-	ecm_src_test
-}