commit:     db84d66e0a2cb1e4155c4635791e1a8b05046e02
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  8 11:00:36 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Jun  8 11:11:10 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db84d66e

media-video/kaffeine: Version bump 2.0.2

Add patch to remove bogus dependency on kde-frameworks/kidletime.

Gentoo-bug: 585158

Package-Manager: portage-2.3.0_rc1

 media-video/kaffeine/Manifest                      |  1 +
 .../files/kaffeine-2.0.2-bogus-dependency.patch    | 51 +++++++++++++++++++
 media-video/kaffeine/kaffeine-2.0.2.ebuild         | 58 ++++++++++++++++++++++
 3 files changed, 110 insertions(+)

diff --git a/media-video/kaffeine/Manifest b/media-video/kaffeine/Manifest
index 485617f..849eee2 100644
--- a/media-video/kaffeine/Manifest
+++ b/media-video/kaffeine/Manifest
@@ -1,3 +1,4 @@
 DIST kaffeine-1.2.2.tar.gz 489727 SHA256 
b6476a93ddbf84142d4fe29f0757de871e11ce6ca32590affe863a75a231c8cb SHA512 
31db518943c223e635822369548949a0c2162cdbbe59edbadb77f4820acf697293d67681553d5552b9435471240fee551786c8c652f1ae5ab9cfe9b8a9cf4459
 WHIRLPOOL 
232f4875398c4ce889cbf1f3d0aeadefce09d5c6ed64aaf82df9fb57472b7fc814f20fb0fec54db715b45965ff79ae2ae064bb008c4c5fcf96d5b4dd3c860157
 DIST kaffeine-1.3.1.tar.gz 1011607 SHA256 
af3abe58e038478a0e50449d414c4885ff3e7a898724cf4216054a0360838aa6 SHA512 
c0674153147dea231f8b1cd1d6de245d4af13893904937856371d9e1f2bd1b8df4d4389b324a02b34630cebb134ae47e9c405bcfa909b7fa680e2ff034db4471
 WHIRLPOOL 
49e5f528223b651e9f46fc44f0a94f69d15e743af31e53192473b95bb338b03bfcc93861343496ca29a55d8356ddf58789c75ed493beee42b22b47a69c083fea
 DIST kaffeine-2.0.1.tar.bz2 278474 SHA256 
0400aa7e5acb3b19694e4568e77a7e267c2110b24d3855152263604e91324ba7 SHA512 
9c7c8d7879cb071d3d3291f218faa662183783717398818e48143718a219c6139423e5347a33a4d0e8ffe854754f58afea005a1b771c55ba29c6df00e44492d5
 WHIRLPOOL 
b51b476c1df97970446ddb41599b2e0447a67ac6a6661bc114513ac6480411688ef332e5e7147eed8b86d798e764a84d26bd65e5bd12f50fe01ec8f03d965403
+DIST kaffeine-2.0.2.tar.xz 1766100 SHA256 
47e1ea39e5ee8bee0d8af2f7ef15ef7a6c6edffc55e4881bc74b06f38448ed2c SHA512 
98cd33db8f00a284fa7ac4484e0f10d133c8d9eeee6c477459e76c2bcc78713aa10f3a0afdc81a1518a16059f1debc5e6063c1212dba0687d8002db24616c3b7
 WHIRLPOOL 
186c3714250d60a1657e37e5b84329adca6d7e44506a81b1400d8280fc5cde5ee2d8c35c96c2f659e4193d13b6cbe9cc2773ff4dc0cb80487528e139b17c2b9f

diff --git a/media-video/kaffeine/files/kaffeine-2.0.2-bogus-dependency.patch 
b/media-video/kaffeine/files/kaffeine-2.0.2-bogus-dependency.patch
new file mode 100644
index 0000000..1416898
--- /dev/null
+++ b/media-video/kaffeine/files/kaffeine-2.0.2-bogus-dependency.patch
@@ -0,0 +1,51 @@
+From 83d870fea86d1f12e4760ac0f29b0a4db7cb0cfe Mon Sep 17 00:00:00 2001
+From: Johannes Huber <[email protected]>
+Date: Wed, 8 Jun 2016 13:04:25 +0200
+Subject: [PATCH] Remove unused dependency KIdleTime
+
+---
+ CMakeLists.txt           | 1 -
+ src/CMakeLists.txt       | 2 +-
+ src/dvb/dvbrecording.cpp | 1 -
+ 3 files changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3b4a7f5..30642a0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -58,7 +58,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
+       KIO             # KFileWidget
+       Solid
+       Notifications
+-      IdleTime
+       DBusAddons
+ )
+ find_package(KF5DocTools ${KF5_MIN_VERSION} QUIET)
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 9ae14a0..634c78c 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -44,7 +44,7 @@ configure_file(config-kaffeine.h.cmake 
${CMAKE_BINARY_DIR}/config-kaffeine.h)
+ 
+ add_executable(kaffeine ${kaffeinedvb_SRCS} ${kaffeine_SRCS})
+ target_link_libraries(kaffeine Qt5::Sql Qt5::X11Extras KF5::KIOWidgets 
KF5::XmlGui KF5::I18n KF5::Solid
+-                    KF5::KIOCore KF5::KIOFileWidgets KF5::Notifications 
KF5::IdleTime
++                    KF5::KIOCore KF5::KIOFileWidgets KF5::Notifications
+                     KF5::DBusAddons ${X11_Xscreensaver_LIB} ${VLC_LIBRARY})
+ 
+ if(HAVE_DVB)
+diff --git a/src/dvb/dvbrecording.cpp b/src/dvb/dvbrecording.cpp
+index e30fa82..d18adaa 100644
+--- a/src/dvb/dvbrecording.cpp
++++ b/src/dvb/dvbrecording.cpp
+@@ -23,7 +23,6 @@
+ # define qInfo qDebug
+ #endif
+ 
+-#include <KIdleTime>
+ #include <QCoreApplication>
+ #include <QDataStream>
+ #include <QDir>
+-- 
+2.8.4
+

diff --git a/media-video/kaffeine/kaffeine-2.0.2.ebuild 
b/media-video/kaffeine/kaffeine-2.0.2.ebuild
new file mode 100644
index 0000000..dbb6fa7
--- /dev/null
+++ b/media-video/kaffeine/kaffeine-2.0.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Media player with digital TV support by KDE"
+HOMEPAGE="https://kaffeine.kde.org/";
+SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+
+LICENSE="GPL-2 FDL-1.2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="
+       $(add_frameworks_dep kconfig)
+       $(add_frameworks_dep kconfigwidgets)
+       $(add_frameworks_dep kcoreaddons)
+       $(add_frameworks_dep kdbusaddons)
+       $(add_frameworks_dep ki18n)
+       $(add_frameworks_dep kio)
+       $(add_frameworks_dep knotifications)
+       $(add_frameworks_dep kwidgetsaddons)
+       $(add_frameworks_dep kxmlgui)
+       $(add_frameworks_dep solid)
+       $(add_qt_dep qtdbus)
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtnetwork)
+       $(add_qt_dep qtsql 'sqlite')
+       $(add_qt_dep qtwidgets)
+       $(add_qt_dep qtx11extras)
+       $(add_qt_dep qtxml)
+       media-libs/libv4l
+       media-video/vlc[X]
+       x11-libs/libXScrnSaver
+"
+DEPEND="${CDEPEND}
+       sys-devel/gettext
+       virtual/pkgconfig
+"
+RDEPEND="${CDEPEND}
+       !media-video/kaffeine:4
+"
+
+DOCS=( Changelog NOTES README )
+
+PATCHES=( "${FILESDIR}/${P}-bogus-dependency.patch" )
+
+src_configure() {
+       # tools working on $HOME directory for a local git checkout
+       local mycmakeargs=(
+               -DBUILD_TOOLS=OFF
+       )
+
+       kde5_src_configure
+}

Reply via email to