| 1 |
commit: e9c0feaec1c93505f8569baa30ecf92f72389d9a |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Feb 12 19:10:09 2017 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 12 19:26:54 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9c0feae |
| 7 |
|
| 8 |
kde-misc/tellico: Add back USE=cddb |
| 9 |
|
| 10 |
Reported-by: Arfrever |
| 11 |
|
| 12 |
Package-Manager: portage-2.3.3 |
| 13 |
|
| 14 |
kde-misc/tellico/files/tellico-3.0-kf5cddb.patch | 35 ++++++++++++++++++++++++ |
| 15 |
kde-misc/tellico/tellico-3.0.ebuild | 23 +++++++++------- |
| 16 |
2 files changed, 48 insertions(+), 10 deletions(-) |
| 17 |
|
| 18 |
diff --git a/kde-misc/tellico/files/tellico-3.0-kf5cddb.patch b/kde-misc/tellico/files/tellico-3.0-kf5cddb.patch |
| 19 |
new file mode 100644 |
| 20 |
index 0000000000..28f31e2edf |
| 21 |
--- /dev/null |
| 22 |
+++ b/kde-misc/tellico/files/tellico-3.0-kf5cddb.patch |
| 23 |
@@ -0,0 +1,35 @@ |
| 24 |
+commit 6325d19525d71051ccbd1dc2a030a0839c95c7d9 |
| 25 |
+Author: Andreas Sturmlechner <andreas.sturmlechner@×××××.com> |
| 26 |
+Date: Sun Feb 12 19:48:26 2017 +0100 |
| 27 |
+ |
| 28 |
+ Drop search for obsolete Libkcddb, don't be quiet about KF5Cddb |
| 29 |
+ |
| 30 |
+ KF5-based releases are found by KF5Cddb since 16.12.0. |
| 31 |
+ |
| 32 |
+ REVIEW: 129945 |
| 33 |
+ |
| 34 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 35 |
+index 2b286cf..893b2d6 100644 |
| 36 |
+--- a/CMakeLists.txt |
| 37 |
++++ b/CMakeLists.txt |
| 38 |
+@@ -128,18 +128,11 @@ if(KDEPIMLIBS_FOUND) |
| 39 |
+ endif(KDEPIMLIBS_FOUND) |
| 40 |
+ |
| 41 |
+ # There is a port of libkcddb to use KF5 style linking and headers |
| 42 |
+-find_package(KF5Cddb QUIET) |
| 43 |
++find_package(KF5Cddb) |
| 44 |
+ set_package_properties(KF5Cddb PROPERTIES |
| 45 |
+ DESCRIPTION "Support for CDDB searches" |
| 46 |
+- URL "http://projects.kde.org/projects/kde/kdemultimedia/libkcddb" |
| 47 |
++ URL "https://cgit.kde.org/libkcddb.git" |
| 48 |
+ TYPE OPTIONAL) |
| 49 |
+-if(NOT KF5Cddb_FOUND) |
| 50 |
+- find_package(Libkcddb 5.0) |
| 51 |
+- set_package_properties(Libkcddb PROPERTIES |
| 52 |
+- DESCRIPTION "Support for CDDB searches" |
| 53 |
+- URL "http://projects.kde.org/projects/kde/kdemultimedia/libkcddb" |
| 54 |
+- TYPE OPTIONAL) |
| 55 |
+-endif(NOT KF5Cddb_FOUND) |
| 56 |
+ |
| 57 |
+ find_package(Taglib) |
| 58 |
+ set_package_properties(Taglib PROPERTIES |
| 59 |
|
| 60 |
diff --git a/kde-misc/tellico/tellico-3.0.ebuild b/kde-misc/tellico/tellico-3.0.ebuild |
| 61 |
index 2b61d25f3d..32abb1df3c 100644 |
| 62 |
--- a/kde-misc/tellico/tellico-3.0.ebuild |
| 63 |
+++ b/kde-misc/tellico/tellico-3.0.ebuild |
| 64 |
@@ -1,4 +1,4 @@ |
| 65 |
-# Copyright 1999-2016 Gentoo Foundation |
| 66 |
+# Copyright 1999-2017 Gentoo Foundation |
| 67 |
# Distributed under the terms of the GNU General Public License v2 |
| 68 |
# $Id$ |
| 69 |
|
| 70 |
@@ -9,16 +9,15 @@ KDE_TEST="forceoptional" |
| 71 |
VIRTUALX_REQUIRED="test" |
| 72 |
inherit kde5 |
| 73 |
|
| 74 |
-DESCRIPTION="A collection manager for the KDE environment" |
| 75 |
+DESCRIPTION="A collection manager based on KDE Frameworks" |
| 76 |
HOMEPAGE="http://tellico-project.org/" |
| 77 |
SRC_URI="http://tellico-project.org/files/${P}.tar.xz" |
| 78 |
|
| 79 |
LICENSE="|| ( GPL-2 GPL-3 )" |
| 80 |
-SLOT="5" |
| 81 |
KEYWORDS="~amd64 ~x86" |
| 82 |
-IUSE="debug discid pdf scanner semantic-desktop taglib v4l xmp yaz" |
| 83 |
+IUSE="cddb discid pdf scanner semantic-desktop taglib v4l xmp yaz" |
| 84 |
|
| 85 |
-RDEPEND=" |
| 86 |
+COMMON_DEPEND=" |
| 87 |
$(add_frameworks_dep karchive) |
| 88 |
$(add_frameworks_dep kcodecs) |
| 89 |
$(add_frameworks_dep kcompletion) |
| 90 |
@@ -51,6 +50,7 @@ RDEPEND=" |
| 91 |
dev-libs/btparse |
| 92 |
dev-libs/libxml2 |
| 93 |
dev-libs/libxslt |
| 94 |
+ cddb? ( $(add_kdeapps_dep libkcddb) ) |
| 95 |
discid? ( media-libs/libdiscid ) |
| 96 |
pdf? ( app-text/poppler[qt5] ) |
| 97 |
scanner? ( $(add_kdeapps_dep libksane) ) |
| 98 |
@@ -59,28 +59,31 @@ RDEPEND=" |
| 99 |
v4l? ( >=media-libs/libv4l-0.8.3 ) |
| 100 |
xmp? ( >=media-libs/exempi-2 ) |
| 101 |
yaz? ( >=dev-libs/yaz-2:0 ) |
| 102 |
- !kde-misc/tellico:4 |
| 103 |
" |
| 104 |
-DEPEND="${RDEPEND} |
| 105 |
+DEPEND="${COMMON_DEPEND} |
| 106 |
sys-devel/gettext |
| 107 |
" |
| 108 |
+RDEPEND="${COMMON_DEPEND} |
| 109 |
+ !kde-misc/tellico:4 |
| 110 |
+" |
| 111 |
|
| 112 |
# tests need network access |
| 113 |
RESTRICT="test" |
| 114 |
|
| 115 |
DOCS=( AUTHORS ChangeLog README ) |
| 116 |
|
| 117 |
+PATCHES=( "${FILESDIR}"/${P}-kf5cddb.patch ) |
| 118 |
+ |
| 119 |
src_configure() { |
| 120 |
local mycmakeargs=( |
| 121 |
-DCMAKE_DISABLE_FIND_PACKAGE_Csv=ON |
| 122 |
- -DCMAKE_DISABLE_FIND_PACKAGE_KF5Cddb=ON |
| 123 |
- -DCMAKE_DISABLE_FIND_PACKAGE_Libkcddb=ON |
| 124 |
- -DENABLE_WEBCAM=$(usex v4l) |
| 125 |
+ $(cmake-utils_use_find_package cddb KF5Cddb) |
| 126 |
$(cmake-utils_use_find_package discid DiscID) |
| 127 |
$(cmake-utils_use_find_package pdf PopplerQt5) |
| 128 |
$(cmake-utils_use_find_package scanner KF5Sane) |
| 129 |
$(cmake-utils_use_find_package semantic-desktop KF5FileMetaData) |
| 130 |
$(cmake-utils_use_find_package taglib Taglib) |
| 131 |
+ -DENABLE_WEBCAM=$(usex v4l) |
| 132 |
$(cmake-utils_use_find_package xmp Exempi) |
| 133 |
$(cmake-utils_use_find_package yaz Yaz) |
| 134 |
) |
Archives