3 files changed, 50 insertions, 3 deletions

diff --git a/finance/kmymoney-kde4/Makefile b/finance/kmymoney-kde4/Makefile
index 0645460296a3..aa694c0557c5 100644
--- a/finance/kmymoney-kde4/Makefile
+++ b/finance/kmymoney-kde4/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	kmymoney
 PORTVERSION=	4.8.1.1
+PORTREVISION=	1
 CATEGORIES=	finance kde
 MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION}/src
 PKGNAMESUFFIX=	-kde4
@@ -13,8 +14,7 @@ LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libboost_graph.so:devel/boost-libs \
-		libalkimia.so:finance/libalkimia \
-		libgmp.so:math/gmp \
+		libalkimia.so:finance/alkimia-qt4 \
 		libgpgme.so:security/gpgme \
 		libassuan.so:security/libassuan \
 		libgpg-error.so:security/libgpg-error
diff --git a/finance/kmymoney-kde4/files/patch-CMakeLists.txt b/finance/kmymoney-kde4/files/patch-CMakeLists.txt
index 4494bb4e76dd..0352ba250888 100644
--- a/finance/kmymoney-kde4/files/patch-CMakeLists.txt
+++ b/finance/kmymoney-kde4/files/patch-CMakeLists.txt
@@ -1,7 +1,9 @@
 Suppress numerous CMake warnings. Upstream has CMP0071 set to OLD behavior
 in the 5.x version, and build fails if set to NEW.
 
---- CMakeLists.txt.orig	2018-04-12 15:58:03 UTC
+Allow building with LibAlkimia 7.x
+
+--- CMakeLists.txt.orig	2017-12-23 22:30:29 UTC
 +++ CMakeLists.txt
 @@ -9,6 +9,9 @@ set(CMAKE_AUTOMOC TRUE)
  
@@ -13,3 +15,28 @@ in the 5.x version, and build fails if set to NEW.
    if(POLICY CMP0017)
      cmake_policy(SET CMP0017 NEW)
    endif(POLICY CMP0017)
+@@ -118,11 +121,19 @@ if(DOXYGEN_FOUND)
+ endif(DOXYGEN_FOUND)
+ 
+ find_package(LibAlkimia REQUIRED)
+-#TODO: remove when LibAlkimia minimum version will be raised
+-if (NOT LIBALKIMIA_LIBRARIES AND LIBALKIMIA_LIBRARY)
+-  # LibAlkimia 4.3.2 does not properly define LIBALKIMIA_LIBRARIES
+-  find_package(GMP REQUIRED)
+-  set(LIBALKIMIA_LIBRARIES ${GMP_LIBRARIES} ${LIBALKIMIA_LIBRARY} )
++if("${LibAlkimia_VERSION_MAJOR}" EQUAL 7 OR "${LibAlkimia_VERSION_MAJOR}" GREATER 7)
++  set(LIBALKIMIA_LIBRARIES Alkimia::alkimia)
++else()
++  #TODO: remove when LibAlkimia minimum version will be raised
++  if (NOT "${LIBALKIMIA_LIBRARIES}" AND "${LIBALKIMIA_LIBRARY}")
++    # LibAlkimia 4.3.2 does not properly define LIBALKIMIA_LIBRARIES
++    find_package(GMP REQUIRED)
++    set(LIBALKIMIA_LIBRARIES ${GMP_LIBRARIES} ${LIBALKIMIA_LIBRARY} )
++  endif()
++endif()
++# make sure LIBALKIMIA_LIBRARIES is set
++if("${LibAlkimia_FOUND}" AND NOT "${LIBALKIMIA_LIBRARIES}")
++  set(LIBALKIMIA_LIBRARIES Alkimia::alkimia)
+ endif()
+ # make sure we have the matching version of LibAlkimia (not too new)
+ if(${LibAlkimia_FOUND})
diff --git a/finance/kmymoney-kde4/files/patch-kmymoney_dialogs_settings_CMakeLists.txt b/finance/kmymoney-kde4/files/patch-kmymoney_dialogs_settings_CMakeLists.txt
new file mode 100644
index 000000000000..8fde853af582
--- /dev/null
+++ b/finance/kmymoney-kde4/files/patch-kmymoney_dialogs_settings_CMakeLists.txt
@@ -0,0 +1,20 @@
+Fix intermittent build failures when kmymoneysettings.h is not generated
+early enough.
+
+--- kmymoney/dialogs/settings/CMakeLists.txt.orig	2018-04-13 10:02:11 UTC
++++ kmymoney/dialogs/settings/CMakeLists.txt
+@@ -4,6 +4,8 @@ add_custom_command(
+   COMMAND ${KDE4_KCFGC_EXECUTABLE} -d ${CMAKE_CURRENT_BINARY_DIR}/ ${CMAKE_SOURCE_DIR}/kmymoney/kmymoney.kcfg ${CMAKE_SOURCE_DIR}/kmymoney/kmymoneysettings.kcfgc
+   )
+ 
++add_custom_target(generate-kmymoneysettings_h DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/kmymoneysettings.h)
++
+ set (libsettings_a_SOURCES
+   ${CMAKE_CURRENT_BINARY_DIR}/kmymoneysettings.cpp
+   ksettingscolors.cpp
+@@ -31,4 +33,5 @@ kde4_add_ui_files(libsettings_a_SOURCES ${libsettings_
+ 
+ kde4_add_library(settings STATIC ${libsettings_a_SOURCES})
+ 
++add_dependencies(settings generate-kmymoneysettings_h)
+ add_dependencies(settings widgets kmm_config)