Update finance/skrooge to 2.7.0

* SQLCipher is no longer optional, so drop the option again.
* There is no need for conflicts and suffixes.

Reviewed by:	rakuco, fluffy
Approved by:	rakuco (mentor)
Differential Revision:	https://reviews.freebsd.org/D9336

3 files changed, 14 insertions, 39 deletions

diff --git a/finance/skrooge/Makefile b/finance/skrooge/Makefile
index 1d030cd3e4b1..5e7a8736c959 100644
--- a/finance/skrooge/Makefile
+++ b/finance/skrooge/Makefile
@@ -1,10 +1,9 @@
 # $FreeBSD$
 
 PORTNAME=	skrooge
-PORTVERSION=	2.6.0
+PORTVERSION=	2.7.0
 CATEGORIES=	finance kde
 MASTER_SITES=	KDE/stable/${PORTNAME}
-PKGNAMESUFFIX=	-kf5
 DIST_SUBDIR=	KDE/${PORTNAME}
 
 MAINTAINER=	kde@FreeBSD.org
@@ -15,46 +14,27 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	xsltproc:textproc/libxslt
 LIB_DEPENDS=	libofx.so:finance/libofx \
-		libqca-qt5.so:devel/qca-qt5
+		libqca-qt5.so:devel/qca-qt5 \
+		libsqlcipher.so:databases/sqlcipher
 
 USES=		cmake:outsource compiler:c++11-lib desktop-file-utils \
-		gettext grantlee:5 kde:5 pkgconfig shared-mime-info tar:xz
+		gettext grantlee:5 kde:5 pkgconfig shared-mime-info \
+		sqlite:3 tar:xz
 USE_KDE=	activities archive attica5 auth bookmarks codecs completion \
 		config configwidgets coreaddons crash dbusaddons \
 		designerplugin doctools ecm emoticons guiaddons i18n \
 		iconthemes init itemmodels itemviews jobwidgets \
-		kdelibs4support kio newstuff notifications notifyconfig parts \
-		runner service solid sonnet textwidgets unitconversion wallet \
-		widgetsaddons windowsystem xmlgui
+		kdelibs4support kio newstuff notifications notifyconfig \
+		package parts plasma-framework runner service solid sonnet \
+		textwidgets unitconversion wallet widgetsaddons windowsystem \
+		xmlgui
 USE_QT5=	concurrent core dbus designer gui network printsupport qml \
 		quick script sql svg webkit widgets xml \
 		qmake_build buildtools_build
 
-CONFLICTS_INSTALL=	${PORTNAME}-kde4-*
-
 USE_LDCONFIG=	yes
 
-PLIST_SUB=	SHLIB_VER=${PORTVERSION} \
-		SHLIB_SHVER=${PORTVERSION:R:R}
-
-OPTIONS_SINGLE=		SQL
-OPTIONS_SINGLE_SQL=	SQLITE SQLCIPHER
-OPTIONS_SUB=		YES
-OPTIONS_DEFAULT=	SQLITE
-
-SQLITE_USES=		sqlite:3
-SQLITE_CMAKE_ON=	-DSKG_CIPHER:BOOL=OFF
-SQLCIPHER_DESC=		Use encrypted database
-SQLCIPHER_LIB_DEPENDS=	libsqlcipher.so:databases/sqlcipher
-SQLCIPHER_CMAKE_ON=	-DSKG_CIPHER:BOOL=ON
-SQLCIPHER_PLIST_SUB+=	SQLCIPHER=""
-SQLCIPHER_PLIST_SUB_OFF+=	SQLCIPHER="@comment "
-
-post-patch:
-.for i in skgbankgui skgbankmodeler skgbasegui skgbasemodeler skroogeakonadi
-	${REINPLACE_CMD} -e 's|LIBRARY NAMELINK_SKIP||g' \
-		${PATCH_WRKSRC}/${i}/CMakeLists.txt
-.endfor
+PLIST_SUB=	SHLIB_VER="${PORTVERSION}"
 
 # Skrooge creates several empty directories due to how it calls CMake's
 # install(DIRECTORY ...) function, so we need some code to remove them.
diff --git a/finance/skrooge/distinfo b/finance/skrooge/distinfo
index 10d12be7de5e..b27a32d89f7a 100644
--- a/finance/skrooge/distinfo
+++ b/finance/skrooge/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1483098093
-SHA256 (KDE/skrooge/skrooge-2.6.0.tar.xz) = f76be3a3033190da5324202da2592550cc64bcc8569c7ad3bcce989e93314d8f
-SIZE (KDE/skrooge/skrooge-2.6.0.tar.xz) = 17878228
+TIMESTAMP = 1485371408
+SHA256 (KDE/skrooge/skrooge-2.7.0.tar.xz) = 9dc8275f17f366156f2863501512320bdf6fa0c2a8834a36fd598840954d30f7
+SIZE (KDE/skrooge/skrooge-2.7.0.tar.xz) = 17880592
diff --git a/finance/skrooge/pkg-plist b/finance/skrooge/pkg-plist
index 6c3ca4d65f97..9eda366747e7 100644
--- a/finance/skrooge/pkg-plist
+++ b/finance/skrooge/pkg-plist
@@ -2,16 +2,12 @@ bin/skrooge
 bin/skroogeconvert
 etc/xdg/skrooge_monthly.knsrc
 etc/xdg/skrooge_unit.knsrc
-lib/libskgbankgui.so
 lib/libskgbankgui.so.2
 lib/libskgbankgui.so.%%SHLIB_VER%%
-lib/libskgbankmodeler.so
 lib/libskgbankmodeler.so.2
 lib/libskgbankmodeler.so.%%SHLIB_VER%%
-lib/libskgbasegui.so
 lib/libskgbasegui.so.2
 lib/libskgbasegui.so.%%SHLIB_VER%%
-lib/libskgbasemodeler.so
 lib/libskgbasemodeler.so.2
 lib/libskgbasemodeler.so.%%SHLIB_VER%%
 %%QT_PLUGINDIR%%/designer/libskgbankguidesigner.so
@@ -60,7 +56,7 @@ lib/libskgbasemodeler.so.%%SHLIB_VER%%
 %%QT_PLUGINDIR%%/skrooge_search.so
 %%QT_PLUGINDIR%%/skrooge_tracker.so
 %%QT_PLUGINDIR%%/skrooge_unit.so
-%%SQLCIPHER%%%%QT_PLUGINDIR%%/sqldrivers/libskgsqlcipher.so
+%%QT_PLUGINDIR%%/sqldrivers/libskgsqlcipher.so
 share/applications/org.kde.skrooge.desktop
 share/config.kcfg/skgbasegui_settings.kcfg
 share/config.kcfg/skgbookmark_settings.kcfg
@@ -858,5 +854,4 @@ share/mime/packages/x-skg.xml
 %%DATADIR%%/quotes/BitcoinCharts.txt
 %%DATADIR%%/quotes/GrandTrunk.txt
 %%DATADIR%%/quotes/Skrooge.txt
-%%DATADIR%%/quotes/Stooq monthly history.txt
 %%DATADIR%%/quotes/Stooq.txt