kde-misc/tellico: Add back USE=cddb

Reported-by: Arfrever

Package-Manager: portage-2.3.3

2 files changed, 48 insertions, 10 deletions

diff --git a/kde-misc/tellico/files/tellico-3.0-kf5cddb.patch b/kde-misc/tellico/files/tellico-3.0-kf5cddb.patch
new file mode 100644
index 000000000000..28f31e2edf52
--- /dev/null
+++ b/kde-misc/tellico/files/tellico-3.0-kf5cddb.patch
@@ -0,0 +1,35 @@
+commit 6325d19525d71051ccbd1dc2a030a0839c95c7d9
+Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date:   Sun Feb 12 19:48:26 2017 +0100
+
+    Drop search for obsolete Libkcddb, don't be quiet about KF5Cddb
+    
+    KF5-based releases are found by KF5Cddb since 16.12.0.
+    
+    REVIEW: 129945
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2b286cf..893b2d6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -128,18 +128,11 @@ if(KDEPIMLIBS_FOUND)
+ endif(KDEPIMLIBS_FOUND)
+ 
+ # There is a port of libkcddb to use KF5 style linking and headers
+-find_package(KF5Cddb QUIET)
++find_package(KF5Cddb)
+ set_package_properties(KF5Cddb PROPERTIES
+     DESCRIPTION "Support for CDDB searches"
+-    URL "http://projects.kde.org/projects/kde/kdemultimedia/libkcddb"
++    URL "https://cgit.kde.org/libkcddb.git"
+     TYPE OPTIONAL)
+-if(NOT KF5Cddb_FOUND)
+-  find_package(Libkcddb 5.0)
+-  set_package_properties(Libkcddb PROPERTIES
+-      DESCRIPTION "Support for CDDB searches"
+-      URL "http://projects.kde.org/projects/kde/kdemultimedia/libkcddb"
+-      TYPE OPTIONAL)
+-endif(NOT KF5Cddb_FOUND)
+ 
+ find_package(Taglib)
+ set_package_properties(Taglib PROPERTIES
diff --git a/kde-misc/tellico/tellico-3.0.ebuild b/kde-misc/tellico/tellico-3.0.ebuild
index 2b61d25f3dee..32abb1df3c05 100644
--- a/kde-misc/tellico/tellico-3.0.ebuild
+++ b/kde-misc/tellico/tellico-3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -9,16 +9,15 @@ KDE_TEST="forceoptional"
 VIRTUALX_REQUIRED="test"
 inherit kde5
 
-DESCRIPTION="A collection manager for the KDE environment"
+DESCRIPTION="A collection manager based on KDE Frameworks"
 HOMEPAGE="http://tellico-project.org/"
 SRC_URI="http://tellico-project.org/files/${P}.tar.xz"
 
 LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="5"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug discid pdf scanner semantic-desktop taglib v4l xmp yaz"
+IUSE="cddb discid pdf scanner semantic-desktop taglib v4l xmp yaz"
 
-RDEPEND="
+COMMON_DEPEND="
 	$(add_frameworks_dep karchive)
 	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kcompletion)
@@ -51,6 +50,7 @@ RDEPEND="
 	dev-libs/btparse
 	dev-libs/libxml2
 	dev-libs/libxslt
+	cddb? ( $(add_kdeapps_dep libkcddb) )
 	discid? ( media-libs/libdiscid )
 	pdf? ( app-text/poppler[qt5] )
 	scanner? ( $(add_kdeapps_dep libksane) )
@@ -59,28 +59,31 @@ RDEPEND="
 	v4l? ( >=media-libs/libv4l-0.8.3 )
 	xmp? ( >=media-libs/exempi-2 )
 	yaz? ( >=dev-libs/yaz-2:0 )
-	!kde-misc/tellico:4
 "
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
 	sys-devel/gettext
 "
+RDEPEND="${COMMON_DEPEND}
+	!kde-misc/tellico:4
+"
 
 # tests need network access
 RESTRICT="test"
 
 DOCS=( AUTHORS ChangeLog README )
 
+PATCHES=( "${FILESDIR}"/${P}-kf5cddb.patch )
+
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_DISABLE_FIND_PACKAGE_Csv=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_KF5Cddb=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_Libkcddb=ON
-		-DENABLE_WEBCAM=$(usex v4l)
+		$(cmake-utils_use_find_package cddb KF5Cddb)
 		$(cmake-utils_use_find_package discid DiscID)
 		$(cmake-utils_use_find_package pdf PopplerQt5)
 		$(cmake-utils_use_find_package scanner KF5Sane)
 		$(cmake-utils_use_find_package semantic-desktop KF5FileMetaData)
 		$(cmake-utils_use_find_package taglib Taglib)
+		-DENABLE_WEBCAM=$(usex v4l)
 		$(cmake-utils_use_find_package xmp Exempi)
 		$(cmake-utils_use_find_package yaz Yaz)
 	)