gentoo resync : 30.09.2020

3 files changed, 48 insertions, 7 deletions

diff --git a/app-office/kraft/Manifest b/app-office/kraft/Manifest
index db161df21725..d7b722df03fb 100644
--- a/app-office/kraft/Manifest
+++ b/app-office/kraft/Manifest
@@ -1,3 +1,4 @@
-DIST kraft-0.90.tar.gz 705767 BLAKE2B 63f048be32e794e3c13d59ebbac90558e661eabe8b08270ea684adc338e2ae45b59cfbb3a746d1248ff8c0026308209f2821cac7c2feaf67af04903125be34c7 SHA512 1ca87a828e74b508b229787459f32e8ab5ad0ca4bf2630e236d65beaaa7503dc61af42d3b13106aeb6e43fcf3c419133958c5492a2c25c7233c9ac0205b3800c
-EBUILD kraft-0.90.ebuild 967 BLAKE2B f0be1cbdf09b2071b6838f14aaea4353ee02c7c9501bc1bbcb673d2517775f0cdc65ed962e82fa7ed54b59dc9b912078790a2c888e7144f44c59349746e2a22b SHA512 c6f27c8c46176f497481221a486ce047cd62d5c715718cdbc1fb99983c45a3e6e6f081bb3bfe94bfe44b17eb33c1fbff45adf250e15dec2330bd90118ee38a2b
+AUX kraft-0.95-i18n-warning.patch 1782 BLAKE2B ab0264bc3d07642d6e4b9bff6f3c23dc9726f959d279bf5f6ddf6b672d11c02583c5b75a2412292665e6722eac7af38a8afec13aa4811620cac687de96f3addb SHA512 52741ce146df9c577e3397acda94acac470eb1e3d36b74617148a5890d3aad27416f8c9e3bdc4afcce9af5b5947c0d6d19f529d2c416bb7609ce17f5a106065e
+DIST kraft-0.95.tar.gz 877790 BLAKE2B 4099845816191c5760f81a5512dc5d5afab1a76eb79c5d3fdead58d7a25342c4f461a6bf4d65313837d6bce32e80c1c8348f674b62358bb08cfdfd3ecf845bad SHA512 8070827a491b2a923b4608752ee2202377aeb2c472a3ee81feaad3b853d13bafe9f9c70719e1dfffeceb1492df80608327a56541453456be87a97bb3d5457f42
+EBUILD kraft-0.95.ebuild 1129 BLAKE2B 91b0ed6840cfae08dd1bd7a7d3779761bd8b5c728a7bd4a548d817fa37045ef6e23dabc2304cf7cebdafe46ec0c9d9b6f632d34d63a3a8c0e9e54dbce19d7a1c SHA512 01877c5fbda18e3a6b78cd7d12be5626c089560c8a8da8e268297cbd34e71695f266b31120075908fdf795ab06fee8b4e871b5e895dd4fa90bb4888f0fc4d742
 MISC metadata.xml 418 BLAKE2B b99b3d436a90af1cd1a791e8cd1aeaed2c654a659a45f5e88b5c5b0cd02d57bc15df8e225cd93e9041732dfbf45792721d29df8c2187d409ecf3a4202855266e SHA512 eb8a053a7375546c713741d2bcacdb4604c725322c6680d76eade40ea4166cf20d8ecef4c4f0a7ef4304961bf2740b8277f5372137e04d32a52bc254daf65232
diff --git a/app-office/kraft/files/kraft-0.95-i18n-warning.patch b/app-office/kraft/files/kraft-0.95-i18n-warning.patch
new file mode 100644
index 000000000000..2e189a233caf
--- /dev/null
+++ b/app-office/kraft/files/kraft-0.95-i18n-warning.patch
@@ -0,0 +1,35 @@
+From 1e8f15a6c54c0c29cb463deacefd1fe8b32ad41d Mon Sep 17 00:00:00 2001
+From: Klaas Freitag <kraft@freisturz.de>
+Date: Wed, 2 Sep 2020 18:32:14 +0200
+Subject: [PATCH] Fix call to i18n - same problem as before....
+
+Fixes #85
+---
+ src/prefsdialog.cpp | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/prefsdialog.cpp b/src/prefsdialog.cpp
+index 13b4bcb..ddce27d 100644
+--- a/src/prefsdialog.cpp
++++ b/src/prefsdialog.cpp
+@@ -335,15 +335,15 @@ QWidget* PrefsDialog::docTab()
+   const QDate d = QDate::currentDate();
+   mCbDateFormats->setToolTip( i18n( "The default date format for documents." ) );
+   QString formattedDate = d.toString(Qt::ISODate);
+-  mCbDateFormats->insertItem( 0, i18n("ISO-Format: %1").arg(formattedDate));
++  mCbDateFormats->insertItem( 0, i18n("ISO-Format: %1", formattedDate));
+   formattedDate = d.toString(Qt::DefaultLocaleShortDate);
+-  mCbDateFormats->insertItem( 1, i18n("Short-Date: %1").arg(formattedDate));
++  mCbDateFormats->insertItem( 1, i18n("Short-Date: %1", formattedDate));
+   formattedDate = d.toString(Qt::DefaultLocaleLongDate);
+-  mCbDateFormats->insertItem( 2, i18n("Long-Date: %1").arg(formattedDate));
++  mCbDateFormats->insertItem( 2, i18n("Long-Date: %1", formattedDate));
+   formattedDate = d.toString(Qt::RFC2822Date);
+-  mCbDateFormats->insertItem( 3, i18n("RFC 2822-Format: %1").arg(formattedDate));
++  mCbDateFormats->insertItem( 3, i18n("RFC 2822-Format: %1", formattedDate));
+   formattedDate = d.toString("dd.MM.yyyy");
+-  mCbDateFormats->insertItem( 4, i18n("\"German Format\": %1").arg(formattedDate));
++  mCbDateFormats->insertItem( 4, i18n("\"German Format\": %1", formattedDate));
+   mCbDateFormats->insertItem( 5, i18n("Custom Setting in Settingsfile"));
+   vboxLay->addLayout( butLay );
+ 
diff --git a/app-office/kraft/kraft-0.90.ebuild b/app-office/kraft/kraft-0.95.ebuild
index 989b08315cdb..e601fabc76db 100644
--- a/app-office/kraft/kraft-0.90.ebuild
+++ b/app-office/kraft/kraft-0.95.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-ECM_HANDBOOK="forceoptional"
+VIRTUALX_REQUIRED="test"
 inherit ecm
 
 DESCRIPTION="Software to manage quotes and invoices in small enterprises"
@@ -15,28 +15,33 @@ SLOT="5"
 KEYWORDS="~amd64 ~x86"
 IUSE="pim"
 
+RESTRICT+=" test" # requires package installed, bug 745408
+
 DEPEND="
 	dev-cpp/ctemplate
+	dev-libs/grantlee:5
 	dev-qt/qtgui:5
 	dev-qt/qtsql:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
 	kde-frameworks/kconfig:5
-	kde-frameworks/kconfigwidgets:5
 	kde-frameworks/kcontacts:5
-	kde-frameworks/kcoreaddons:5
 	kde-frameworks/ki18n:5
 	pim? (
-		kde-apps/akonadi:5
-		kde-apps/akonadi-contacts:5
+		>=kde-apps/akonadi-19.04.3:5
+		>=kde-apps/akonadi-contacts-19.04.3:5
+		kde-frameworks/kcoreaddons:5
 	)
 "
 RDEPEND="${DEPEND}"
 
 DOCS=( AUTHORS Changes.txt README.md Releasenotes.txt TODO )
 
+PATCHES=( "${FILESDIR}/${P}-i18n-warning.patch" )
+
 src_configure() {
 	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_Asciidoctor=ON
 		$(cmake_use_find_package pim KF5Akonadi)
 		$(cmake_use_find_package pim KF5AkonadiContact)
 	)