gentoo resync : 12.03.2021

4 files changed, 164 insertions, 0 deletions

diff --git a/app-office/libalkimia/Manifest b/app-office/libalkimia/Manifest
index 27891295bb07..101aa5321f90 100644
--- a/app-office/libalkimia/Manifest
+++ b/app-office/libalkimia/Manifest
@@ -1,4 +1,8 @@
 AUX libalkimia-8.0.3-cmake.patch 1447 BLAKE2B 0e6c9d928461943950f6e3c49188c3a9e7c53061b43ec6683e76f44fe731a2eeabe74e5a6d49cd56a3e975093ac2b031a48d6bb9514e22e4cbd1f7434fcead37 SHA512 6353bb424077df9befa451df792c2c94d96e70572ae50b2f9ed122d9fa36fe2bc268d2b75a21fd35b25b2ab3c17296e9b2153e5051c241ecc710cc0be156b356
+AUX libalkimia-8.1.0-cmake.patch 1453 BLAKE2B 9dfb249e5fa95e78083f1f010960253915831888959944511d6e945a81f1f24a9e060c76e4927ac98ea8847c46b04dd8a1910079deb2ec0514a5b20d7c977d52 SHA512 61396c87615fd1105d1a3f10b687f987aaad6ca533b42ba36e9e5179a375e505652afad097726e8f2fd7da893c9593fe990461e7afa85b72933e803a8cf743db
+AUX libalkimia-8.1.0-missing-header.patch 733 BLAKE2B 9b8892938b68ae8cfb7eb7d47361f2f196a4c214e6f226bc85520f890d611e506fd575143b1754e748a8ad834168999e1535feb5b3a4d9b565f52332e4bc09b8 SHA512 2e678505952c6b8aa9db893c39fc5fa300c83c0970d64f81d86acc95ff7b0cb98daf2cb84a06b12ebdbc285319960497403321e48b52e388dd424505c02ee638
 DIST alkimia-8.0.4.tar.xz 221108 BLAKE2B 90a89bfc76998aeec95989455d62b2a46e06e86f01b96d0a28e3226ec4228108b35a9ca9f8d50f95a32130e39b4954515e205f40d6aad6346bc9310fd31dff75 SHA512 49b771ac28ec76143cf1237a21a834fa38689c91c773a472cc090e94f49287a79ad7790ef068cd6bebc4e64aa97e5026a9ea5be841bbdb3ca89b00b6ca7acc27
+DIST alkimia-8.1.0.tar.xz 230804 BLAKE2B 9cc005f8550181b4bf5dd945ac22592d711f0e9689758d56c62272d4879181f73faeaebecab24d74a790f6c6d1a59c42295ceb2c23d09195a76f7e6b6b4e53c0 SHA512 c3d0851ec6e5af7f690059f2c80942bbe69c6bde946898ba4a124c344dd47e0fba4e6ed0a5320e36385c060c49d5eeaaca35bc0a41410ef4ad849a4f9541d4d3
 EBUILD libalkimia-8.0.4.ebuild 2000 BLAKE2B 73f280dc5f7f8e389d6348abca1ebb1372c474ae0b88aa5e4a0b53f4fe2ef9b8ba73acd4c0f0cd0cddd8d041df649601b16ec0a47d14310ed755ae00b1d68071 SHA512 cb870fefdb9e734b0333b51cbd62dfd916ff7270ea6091761bae9555a531a4839c54235add2eec0aca3d67a8ee5bf3ea422002c11e1b864fdec14100053625cc
+EBUILD libalkimia-8.1.0.ebuild 2038 BLAKE2B 110d3b2bd82611f2b6b550d64146d46d7b8e7e5ad28ada42839abfc5f0e728bc40f2f41c2b9529e09878a61e1440ed96f55f116115e85fb71220658def9a6ab5 SHA512 8a5904e50163037d49cc258503dd1055e1e5fafd5e33cd4b68ae8e7c352845b10f07f2d74d25847b6e37971f551d71459a6f5546e358525c6531dfc1ffd881c1
 MISC metadata.xml 351 BLAKE2B 2ef8ddf9828250cbd533cbee3e394319db2bfef425a2b2a8b560a79b936f5e2137b37737355a2f45989d811e9d5dd93d0fc7ed6ad2dc9ddb4f4b49519db76818 SHA512 b5f8205d1cbe54b56e39a5291655927261bad8cbc6bc768285e2d2362f0f1f1697c40cdbe494679ac38d23efb4a143820a684dc571a59f983fb0cfa6cd5308f4
diff --git a/app-office/libalkimia/files/libalkimia-8.1.0-cmake.patch b/app-office/libalkimia/files/libalkimia-8.1.0-cmake.patch
new file mode 100644
index 000000000000..652e951c4bce
--- /dev/null
+++ b/app-office/libalkimia/files/libalkimia-8.1.0-cmake.patch
@@ -0,0 +1,54 @@
+From d413b91839ca0e66beb56a71625e3194df1a6599 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Wed, 12 Jun 2019 19:44:12 +0200
+Subject: [PATCH 1/2] Use non-deprecated KDE_INSTALL_TARGETS_DEFAULT_ARGS for
+ alkimia target
+
+---
+ src/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 7c0f0f7..0774032 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -147,7 +147,7 @@ set(INCLUDE_INSTALL_DIR include/alkimia/${ALKIMIA_INCLUDE_SUFFIX})
+ 
+ install(TARGETS alkimia
+     EXPORT  alkimiaTargets
+-    ${INSTALL_TARGETS_DEFAULT_ARGS}
++    ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}
+ )
+ 
+ if(BUILD_QT4)
+-- 
+2.23.0
+
+
+From 1fd611bcc060e779ac62f5f69d956c6dee2b3383 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Wed, 12 Jun 2019 16:43:54 +0200
+Subject: [PATCH 2/2] Fix pkgconfig libdir path
+
+---
+ src/libalkimia.pc.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/libalkimia.pc.in b/src/libalkimia.pc.in
+index c2087c9..6ada277 100644
+--- a/src/libalkimia.pc.in
++++ b/src/libalkimia.pc.in
+@@ -4,8 +4,8 @@
+ # General installation directories
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=@CMAKE_INSTALL_PREFIX@
+-libdir=@KDE4_LIB_DIR@
+-includedir=@INCLUDE_INSTALL_DIR@
++libdir=@CMAKE_INSTALL_FULL_LIBDIR@
++includedir=${prefix}/@INCLUDE_INSTALL_DIR@
+ 
+ # Human-readable name
+ Name: Alkimia
+-- 
+2.23.0
+
diff --git a/app-office/libalkimia/files/libalkimia-8.1.0-missing-header.patch b/app-office/libalkimia/files/libalkimia-8.1.0-missing-header.patch
new file mode 100644
index 000000000000..c1f1ff463ee3
--- /dev/null
+++ b/app-office/libalkimia/files/libalkimia-8.1.0-missing-header.patch
@@ -0,0 +1,25 @@
+From 0e398425030bae0cfe7be70ce82d61e674160a97 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Fri, 5 Mar 2021 22:40:40 +0100
+Subject: [PATCH] Add missing QUrl include with -DBUILD_WITH_WEBENGINE=no
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ tools/onlinequoteseditor/mainwindow.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tools/onlinequoteseditor/mainwindow.cpp b/tools/onlinequoteseditor/mainwindow.cpp
+index fad7e85..d5a3026 100644
+--- a/tools/onlinequoteseditor/mainwindow.cpp
++++ b/tools/onlinequoteseditor/mainwindow.cpp
+@@ -28,6 +28,7 @@
+ #include <QComboBox>
+ #include <QDockWidget>
+ #include <QLineEdit>
++#include <QUrl>
+ 
+ class MainWindow::Private
+ {
+-- 
+2.30.1
+
diff --git a/app-office/libalkimia/libalkimia-8.1.0.ebuild b/app-office/libalkimia/libalkimia-8.1.0.ebuild
new file mode 100644
index 000000000000..aa2e49145433
--- /dev/null
+++ b/app-office/libalkimia/libalkimia-8.1.0.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+KDE_ORG_NAME="alkimia"
+KFMIN=5.74.0
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${KDE_ORG_NAME}/${PV}/${KDE_ORG_NAME}-${PV}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Library with common classes and functionality used by KDE finance applications"
+HOMEPAGE="https://www.linux-apps.com/content/show.php/libalkimia?content=137323
+https://community.kde.org/Alkimia"
+
+LICENSE="LGPL-2.1"
+SLOT="0/8"
+IUSE="doc gmp plasma webengine"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	!gmp? ( sci-libs/mpir:=[cxx] )
+	gmp? ( dev-libs/gmp:0=[cxx] )
+	plasma? (
+		>=kde-frameworks/kpackage-${KFMIN}:5
+		>=kde-frameworks/plasma-${KFMIN}:5
+	)
+	webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5 )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-cmake.patch"
+	"${FILESDIR}/${P}-missing-header.patch" # bug 774321
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_FINANCEQUOTE=OFF
+		-DBUILD_TOOLS=ON
+		-DBUILD_WITH_WEBKIT=OFF
+		-DBUILD_DOXYGEN_DOCS=$(usex doc)
+		$(cmake_use_find_package !gmp MPIR)
+		-DBUILD_APPLETS=$(usex plasma)
+		-DBUILD_WITH_WEBENGINE=$(usex webengine)
+	)
+	ecm_src_configure
+}
+
+src_test() {
+	# Depends on BUILD_WITH_WEBKIT, bug 736128
+	local myctestargs=(
+		-E "(alkonlinequotestest)"
+	)
+	ecm_src_test
+}