[gentoo-commits] proj/kde:master commit in: media-video/kaffeine/
commit: e756030db17e341d095fc9ce961987d5f8361120 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Sep 15 19:37:14 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Sep 15 19:47:37 2022 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=e756030d media-video/kaffeine: Fix HOMEPAGE, raise KFMIN to 5.92.0 Signed-off-by: Andreas Sturmlechner gentoo.org> media-video/kaffeine/kaffeine-.ebuild | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/media-video/kaffeine/kaffeine-.ebuild b/media-video/kaffeine/kaffeine-.ebuild index 71730b4c82..31ce3f97a6 100644 --- a/media-video/kaffeine/kaffeine-.ebuild +++ b/media-video/kaffeine/kaffeine-.ebuild @@ -4,26 +4,22 @@ EAPI=8 ECM_HANDBOOK="optional" -KFMIN=5.82.0 +KFMIN=5.92.0 QTMIN=5.15.5 inherit ecm kde.org -if [[ ${KDE_BUILD_TYPE} = release ]]; then +if [[ ${KDE_BUILD_TYPE} == release ]]; then SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" KEYWORDS="~amd64 ~x86" fi DESCRIPTION="Media player with digital TV support by KDE" -HOMEPAGE="https://userbase.kde.org/Kaffeine; +HOMEPAGE="https://apps.kde.org/kaffeine/ https://userbase.kde.org/Kaffeine; LICENSE="GPL-2+ handbook? ( FDL-1.3 )" SLOT="5" IUSE="dvb" -BDEPEND=" - sys-devel/gettext - virtual/pkgconfig -" DEPEND=" >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5 @@ -47,6 +43,10 @@ DEPEND=" dvb? ( media-libs/libv4l[dvb] ) " RDEPEND="${DEPEND}" +BDEPEND=" + sys-devel/gettext + virtual/pkgconfig +" DOCS=( Changelog NOTES README.md )
[gentoo-commits] proj/kde:master commit in: media-video/kaffeine/
commit: b86f48194630072a956fed3e61403ea2dce1e707 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat May 8 23:14:37 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Sep 15 19:47:37 2022 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=b86f4819 media-video/kaffeine: Add missing media-libs/libv4l[dvb] usedep Reported-by: Paul Gover yahoo.co.uk> Closes: https://bugs.gentoo.org/79 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> media-video/kaffeine/kaffeine-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-video/kaffeine/kaffeine-.ebuild b/media-video/kaffeine/kaffeine-.ebuild index 74f630097a..71730b4c82 100644 --- a/media-video/kaffeine/kaffeine-.ebuild +++ b/media-video/kaffeine/kaffeine-.ebuild @@ -44,7 +44,7 @@ DEPEND=" >=kde-frameworks/solid-${KFMIN}:5 media-video/vlc[X] x11-libs/libXScrnSaver - dvb? ( media-libs/libv4l ) + dvb? ( media-libs/libv4l[dvb] ) " RDEPEND="${DEPEND}"
[gentoo-commits] proj/kde:master commit in: media-video/kaffeine/
commit: 13db5528cb4ebccebf94b05dc21d681aba9f80b7 Author: Michael Palimaka gentoo org> AuthorDate: Thu Jan 25 14:31:12 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Jun 5 18:14:20 2019 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=13db5528 media-video/kaffeine: remove obsolete upstream metadata Package-Manager: Portage-2.3.19, Repoman-2.3.6 media-video/kaffeine/metadata.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/media-video/kaffeine/metadata.xml b/media-video/kaffeine/metadata.xml index 81fb67df1e..00c71c8a23 100644 --- a/media-video/kaffeine/metadata.xml +++ b/media-video/kaffeine/metadata.xml @@ -9,7 +9,4 @@ k...@gentoo.org Gentoo KDE Project - - kaffeine -
[gentoo-commits] proj/kde:master commit in: media-video/kaffeine/
commit: bb689dae91280f1a558ab92e073b0ad6aac7f41c Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Feb 17 10:36:34 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Feb 17 10:36:34 2019 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=bb689dae media-video/kaffeine: Sorting Package-Manager: Portage-2.3.60, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> media-video/kaffeine/kaffeine-.ebuild | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/media-video/kaffeine/kaffeine-.ebuild b/media-video/kaffeine/kaffeine-.ebuild index c0b71ef8d9..b6bb14b5b4 100644 --- a/media-video/kaffeine/kaffeine-.ebuild +++ b/media-video/kaffeine/kaffeine-.ebuild @@ -16,7 +16,11 @@ HOMEPAGE="https://userbase.kde.org/Kaffeine; LICENSE="GPL-2+ handbook? ( FDL-1.3 )" IUSE="dvb" -RDEPEND=" +BDEPEND=" + sys-devel/gettext + virtual/pkgconfig +" +DEPEND=" $(add_frameworks_dep kconfig) $(add_frameworks_dep kconfigwidgets) $(add_frameworks_dep kcoreaddons) @@ -38,11 +42,7 @@ RDEPEND=" x11-libs/libXScrnSaver dvb? ( media-libs/libv4l ) " -DEPEND="${RDEPEND}" -BDEPEND=" - sys-devel/gettext - virtual/pkgconfig -" +RDEPEND="${DEPEND}" DOCS=( Changelog NOTES README.md )
[gentoo-commits] proj/kde:master commit in: media-video/kaffeine/
commit: 883d63206aace061188ffe3b3cb4bf1782f7665f Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Jan 15 19:42:10 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Jan 15 19:42:10 2019 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=883d6320 media-video/kaffeine: Drop obsolete blocker Package-Manager: Portage-2.3.55, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> media-video/kaffeine/kaffeine-.ebuild | 7 ++- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/media-video/kaffeine/kaffeine-.ebuild b/media-video/kaffeine/kaffeine-.ebuild index de7e6cc533..be555d6f9c 100644 --- a/media-video/kaffeine/kaffeine-.ebuild +++ b/media-video/kaffeine/kaffeine-.ebuild @@ -16,7 +16,7 @@ HOMEPAGE="https://userbase.kde.org/Kaffeine; LICENSE="GPL-2+ handbook? ( FDL-1.3 )" IUSE="dvb" -CDEPEND=" +RDEPEND=" $(add_frameworks_dep kconfig) $(add_frameworks_dep kconfigwidgets) $(add_frameworks_dep kcoreaddons) @@ -38,13 +38,10 @@ CDEPEND=" x11-libs/libXScrnSaver dvb? ( media-libs/libv4l ) " -DEPEND="${CDEPEND} +DEPEND="${RDEPEND} sys-devel/gettext virtual/pkgconfig " -RDEPEND="${CDEPEND} - !media-video/kaffeine:4 -" DOCS=( Changelog NOTES README.md )
[gentoo-commits] proj/kde:master commit in: media-video/kaffeine/
commit: dafad605ac84bf12df25cfed6ade9dc2a08bafda Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Oct 2 19:51:26 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Oct 2 19:51:44 2018 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=dafad605 media-video/kaffeine: Fix HOMEPAGE Signed-off-by: Andreas Sturmlechner gentoo.org> Package-Manager: Portage-2.3.50, Repoman-2.3.11 media-video/kaffeine/kaffeine-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-video/kaffeine/kaffeine-.ebuild b/media-video/kaffeine/kaffeine-.ebuild index 7ae8acd549..526d14cba8 100644 --- a/media-video/kaffeine/kaffeine-.ebuild +++ b/media-video/kaffeine/kaffeine-.ebuild @@ -12,7 +12,7 @@ if [[ ${KDE_BUILD_TYPE} = release ]]; then fi DESCRIPTION="Media player with digital TV support by KDE" -HOMEPAGE="https://kaffeine.kde.org/; +HOMEPAGE="https://userbase.kde.org/Kaffeine; LICENSE="GPL-2+ handbook? ( FDL-1.3 )" IUSE="dvb"
[gentoo-commits] proj/kde:master commit in: media-video/kaffeine/
commit: 06a335c02f1a595eb4d8859a7536a671da1e42e3 Author: Johannes Huber gentoo org> AuthorDate: Sat May 5 14:42:54 2018 + Commit: Johannes Huber gentoo org> CommitDate: Sat May 5 14:42:54 2018 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=06a335c0 media-video/kaffeine: Release switch Package-Manager: Portage-2.3.36, Repoman-2.3.9 media-video/kaffeine/kaffeine-.ebuild | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/media-video/kaffeine/kaffeine-.ebuild b/media-video/kaffeine/kaffeine-.ebuild index bc4cdad5e4..7ae8acd549 100644 --- a/media-video/kaffeine/kaffeine-.ebuild +++ b/media-video/kaffeine/kaffeine-.ebuild @@ -6,11 +6,14 @@ EAPI=6 KDE_HANDBOOK="optional" inherit kde5 +if [[ ${KDE_BUILD_TYPE} = release ]]; then + KEYWORDS="~amd64 ~x86" + SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" +fi + DESCRIPTION="Media player with digital TV support by KDE" HOMEPAGE="https://kaffeine.kde.org/; - LICENSE="GPL-2+ handbook? ( FDL-1.3 )" -KEYWORDS="" IUSE="dvb" CDEPEND="
[gentoo-commits] proj/kde:master commit in: media-video/kaffeine/
commit: f50025ed8fa449346638871581ce76d448c7f959 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Dec 2 16:01:40 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Dec 2 16:01:40 2017 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=f50025ed media-video/kaffeine: Add USE=dvb Package-Manager: Portage-2.3.16, Repoman-2.3.6 media-video/kaffeine/kaffeine-.ebuild | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/media-video/kaffeine/kaffeine-.ebuild b/media-video/kaffeine/kaffeine-.ebuild index bfec86f8ed..cc383e6d79 100644 --- a/media-video/kaffeine/kaffeine-.ebuild +++ b/media-video/kaffeine/kaffeine-.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://kaffeine.kde.org/; LICENSE="GPL-2+ handbook? ( FDL-1.3 )" KEYWORDS="" -IUSE="" +IUSE="dvb" CDEPEND=" $(add_frameworks_dep kconfig) @@ -31,9 +31,9 @@ CDEPEND=" $(add_qt_dep qtwidgets) $(add_qt_dep qtx11extras) $(add_qt_dep qtxml) - media-libs/libv4l media-video/vlc[X] x11-libs/libXScrnSaver + dvb? ( media-libs/libv4l ) " DEPEND="${CDEPEND} sys-devel/gettext @@ -49,6 +49,7 @@ src_configure() { # tools working on $HOME directory for a local git checkout local mycmakeargs=( -DBUILD_TOOLS=OFF + $(cmake-utils_use_find_package dvb Libdvbv5) ) kde5_src_configure
[gentoo-commits] proj/kde:master commit in: media-video/kaffeine/
commit: 7d12dc0e64d8d5a2d619cc058de59b00e1e8e2c4 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Jul 10 17:51:43 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Jul 10 18:00:09 2017 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=7d12dc0e media-video/kaffeine: Add missing DEPEND Upstream commit 46e962d4c170641ee0030f6f3d2d46bf61c12a05 Package-Manager: Portage-2.3.6, Repoman-2.3.1 media-video/kaffeine/kaffeine-.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/media-video/kaffeine/kaffeine-.ebuild b/media-video/kaffeine/kaffeine-.ebuild index 77c7190f46..bfec86f8ed 100644 --- a/media-video/kaffeine/kaffeine-.ebuild +++ b/media-video/kaffeine/kaffeine-.ebuild @@ -21,6 +21,7 @@ CDEPEND=" $(add_frameworks_dep ki18n) $(add_frameworks_dep kio) $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kwindowsystem) $(add_frameworks_dep kxmlgui) $(add_frameworks_dep solid) $(add_qt_dep qtdbus)
[gentoo-commits] proj/kde:master commit in: media-video/kaffeine/
commit: 5944fd2dd536592c41c1815bb56c5d3cccd01c90 Author: Michael Palimaka gentoo org> AuthorDate: Sun Oct 9 16:17:45 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Oct 9 16:17:56 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=5944fd2d media-video/kaffeine: enable handbook and improve LICENSE Package-Manager: portage-2.3.1 media-video/kaffeine/kaffeine-.ebuild | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/media-video/kaffeine/kaffeine-.ebuild b/media-video/kaffeine/kaffeine-.ebuild index 9993a77..b8ada4a 100644 --- a/media-video/kaffeine/kaffeine-.ebuild +++ b/media-video/kaffeine/kaffeine-.ebuild @@ -4,11 +4,13 @@ EAPI=6 +KDE_HANDBOOK="optional" inherit kde5 DESCRIPTION="Media player with digital TV support by KDE" HOMEPAGE="https://kaffeine.kde.org/; -LICENSE="GPL-2 FDL-1.2" + +LICENSE="GPL-2+ handbook? ( FDL-1.3 )" KEYWORDS="" IUSE=""
[gentoo-commits] proj/kde:master commit in: media-video/kaffeine/files/, media-video/kaffeine/
commit: d730684f9edee9e8f54f3df38ff27ea5a967580f Author: Johannes Huber gentoo org> AuthorDate: Sun Jun 12 07:54:37 2016 + Commit: Johannes Huber gentoo org> CommitDate: Sun Jun 12 07:54:37 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=d730684f media-video/kaffeine: Sync with tree Package-Manager: portage-2.3.0_rc1 .../files/kaffeine-2.0.2-bogus-dependency.patch| 51 -- media-video/kaffeine/kaffeine-.ebuild | 5 +-- 2 files changed, 1 insertion(+), 55 deletions(-) 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 deleted file mode 100644 index 1416898..000 --- a/media-video/kaffeine/files/kaffeine-2.0.2-bogus-dependency.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 83d870fea86d1f12e4760ac0f29b0a4db7cb0cfe Mon Sep 17 00:00:00 2001 -From: Johannes Huber-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 - #include - #include - #include --- -2.8.4 - diff --git a/media-video/kaffeine/kaffeine-.ebuild b/media-video/kaffeine/kaffeine-.ebuild index c66a157..9993a77 100644 --- a/media-video/kaffeine/kaffeine-.ebuild +++ b/media-video/kaffeine/kaffeine-.ebuild @@ -19,7 +19,6 @@ CDEPEND=" $(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) @@ -42,9 +41,7 @@ RDEPEND="${CDEPEND} !media-video/kaffeine:4 " -DOCS=( Changelog NOTES README ) - -PATCHES=( "${FILESDIR}/${PN}-2.0.2-bogus-dependency.patch" ) +DOCS=( Changelog NOTES README.md ) src_configure() { # tools working on $HOME directory for a local git checkout
[gentoo-commits] proj/kde:master commit in: media-video/kaffeine/, media-video/kaffeine/files/
commit: b411bece209c9afe0098a8fef9e249d0c8f4230d Author: Johannes Huber gentoo org> AuthorDate: Wed Jun 8 11:22:01 2016 + Commit: Johannes Huber gentoo org> CommitDate: Wed Jun 8 11:22:01 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=b411bece media-video/kaffeine: Sync with tree Package-Manager: portage-2.3.0_rc1 .../files/kaffeine-2.0.2-bogus-dependency.patch| 51 ++ media-video/kaffeine/kaffeine-.ebuild | 4 +- 2 files changed, 52 insertions(+), 3 deletions(-) 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 000..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+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 + #include + #include + #include +-- +2.8.4 + diff --git a/media-video/kaffeine/kaffeine-.ebuild b/media-video/kaffeine/kaffeine-.ebuild index 0f3bafb..c66a157 100644 --- a/media-video/kaffeine/kaffeine-.ebuild +++ b/media-video/kaffeine/kaffeine-.ebuild @@ -44,9 +44,7 @@ RDEPEND="${CDEPEND} DOCS=( Changelog NOTES README ) -if [[ ${KDE_BUILD_TYPE} != live ]] ; then - S="${WORKDIR}" -fi +PATCHES=( "${FILESDIR}/${PN}-2.0.2-bogus-dependency.patch" ) src_configure() { # tools working on $HOME directory for a local git checkout
[gentoo-commits] proj/kde:master commit in: media-video/kaffeine/files/
commit: d4d5dbdbfd272e5aaf9c6c264bebf45ea2c1dfb1 Author: Johannes Huber gentoo org> AuthorDate: Fri Jun 3 20:33:07 2016 + Commit: Johannes Huber gentoo org> CommitDate: Fri Jun 3 20:33:07 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=d4d5dbdb media-video/kaffeine: Drop upstreamed patch Package-Manager: portage-2.3.0_rc1 .../files/kaffeine-2.0.1-desktop-file.patch| 25 -- 1 file changed, 25 deletions(-) diff --git a/media-video/kaffeine/files/kaffeine-2.0.1-desktop-file.patch b/media-video/kaffeine/files/kaffeine-2.0.1-desktop-file.patch deleted file mode 100644 index 1558aef..000 --- a/media-video/kaffeine/files/kaffeine-2.0.1-desktop-file.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 534d90f280b7aea3fa3006d858729cc2d606cee6 Mon Sep 17 00:00:00 2001 -From: Johannes Huber-Date: Fri, 3 Jun 2016 13:59:11 +0200 -Subject: [PATCH] Fix desktop file - - src/kaffeine.desktop | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/kaffeine.desktop b/src/kaffeine.desktop -index dee82c4..0095a07 100644 a/src/kaffeine.desktop -+++ b/src/kaffeine.desktop -@@ -127,7 +127,7 @@ GenericName[zh_CN]=媒体播放器 - GenericName[zh_TW]=媒體播放器 - Categories=Qt;KDE;AudioVideo;Player; - Icon=kaffeine --MimeType=application/ogg;application/ram;application/vnd.rn-realmedia;application/x-matroska;application/x-ogg;application/x-quicktime-media-link;application/x-shockwave-flash;application/x-shorten;application/xspf+xml;audio/ac3;audio/amr;audio/amr-wb;audio/basic;audio/flac;audio/mp4;audio/mpeg;audio/ogg;audio/vnd.rn-realaudio;audio/webm;audio/x-aiff;audio/x-flac;audio/x-it;audio/x-m4a;audio/x-m4b;audio/x-matroska;audio/x-mod;audio/x-mp3;audio/x-mpeg;audio/x-mpegurl;audio/x-ms-asx;audio/x-ms-wma;audio/x-musepack;audio/x-pn-realaudio;audio/x-pn-realaudio-plugin;audio/x-s3m;audio/x-scpls;audio/x-stm;audio/x-tta;audio/x-voc;audio/x-vorbis+ogg;audio/x-wav;audio/x-wavpack;audio/x-xm;image/vnd.rn-realpix;skip;video/dv;video/mp2t;video/mp4;video/mp4v-es;video/mpeg;video/msvideo;video/ogg;video/quicktime;video/vnd.rn-realvideo;video/webm;video/x-anim;video/x-avi;video/x-fli;video/x-flic;video/x-flv;video/x-matroska;video/x-mng;video/x-mpeg;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;vide o/x-nsv;video/x-ogm+ogg;x-content/audio-cdda;x-content/audio-player;x-content/video-dvd;x-content/video-svcd;x-content/video-vcd; -+MimeType=application/ogg;application/ram;application/vnd.rn-realmedia;application/x-matroska;application/x-ogg;application/x-quicktime-media-link;application/x-shockwave-flash;application/x-shorten;application/xspf+xml;audio/ac3;audio/amr;audio/amr-wb;audio/basic;audio/flac;audio/mp4;audio/mpeg;audio/ogg;audio/vnd.rn-realaudio;audio/webm;audio/x-aiff;audio/x-flac;audio/x-it;audio/x-m4a;audio/x-m4b;audio/x-matroska;audio/x-mod;audio/x-mp3;audio/x-mpeg;audio/x-mpegurl;audio/x-ms-asx;audio/x-ms-wma;audio/x-musepack;audio/x-pn-realaudio;audio/x-pn-realaudio-plugin;audio/x-s3m;audio/x-scpls;audio/x-stm;audio/x-tta;audio/x-voc;audio/x-vorbis+ogg;audio/x-wav;audio/x-wavpack;audio/x-xm;image/vnd.rn-realpix;x-scheme-handler/skip;video/dv;video/mp2t;video/mp4;video/mp4v-es;video/mpeg;video/msvideo;video/ogg;video/quicktime;video/vnd.rn-realvideo;video/webm;video/x-anim;video/x-avi;video/x-fli;video/x-flic;video/x-flv;video/x-matroska;video/x-mng;video/x-mpeg;video/x-ms-asf;video/x-ms-wmv;vid eo/x-msvideo;video/x-nsv;video/x-ogm+ogg;x-content/audio-cdda;x-content/audio-player;x-content/video-dvd;x-content/video-svcd;x-content/video-vcd; - Terminal=false - Type=Application - X-KDE-HasTempFileOption=true --- -2.8.3 -
[gentoo-commits] proj/kde:master commit in: media-video/kaffeine/
commit: 59389cc56888dc5bf72348085fa6c298ab87a054 Author: Johannes Huber gentoo org> AuthorDate: Fri Jun 3 14:37:47 2016 + Commit: Johannes Huber gentoo org> CommitDate: Fri Jun 3 14:37:47 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=59389cc5 media-video/kaffeine: Sync with tree Package-Manager: portage-2.3.0_rc1 media-video/kaffeine/kaffeine-.ebuild | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/media-video/kaffeine/kaffeine-.ebuild b/media-video/kaffeine/kaffeine-.ebuild index c696f1b..0f3bafb 100644 --- a/media-video/kaffeine/kaffeine-.ebuild +++ b/media-video/kaffeine/kaffeine-.ebuild @@ -19,6 +19,7 @@ CDEPEND=" $(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) @@ -43,7 +44,9 @@ RDEPEND="${CDEPEND} DOCS=( Changelog NOTES README ) -PATCHES=( "${FILESDIR}/${PN}-2.0.1-desktop-file.patch" ) +if [[ ${KDE_BUILD_TYPE} != live ]] ; then + S="${WORKDIR}" +fi src_configure() { # tools working on $HOME directory for a local git checkout
[gentoo-commits] proj/kde:master commit in: media-video/kaffeine/
commit: 9f7883d13979a2970917b9e04e89da3b3a4480ad Author: Johannes Huber gentoo org> AuthorDate: Fri Jun 3 13:27:20 2016 + Commit: Johannes Huber gentoo org> CommitDate: Fri Jun 3 13:27:20 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=9f7883d1 media-video/kaffeine: DEPEND on sys-devel/gettext Package-Manager: portage-2.3.0_rc1 media-video/kaffeine/kaffeine-.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/media-video/kaffeine/kaffeine-.ebuild b/media-video/kaffeine/kaffeine-.ebuild index 04f1a76..c696f1b 100644 --- a/media-video/kaffeine/kaffeine-.ebuild +++ b/media-video/kaffeine/kaffeine-.ebuild @@ -34,6 +34,7 @@ CDEPEND=" x11-libs/libXScrnSaver " DEPEND="${CDEPEND} + sys-devel/gettext virtual/pkgconfig " RDEPEND="${CDEPEND}
[gentoo-commits] proj/kde:master commit in: media-video/kaffeine/
commit: 77c54d649dd5924d6e96187af6a3ff8cce959b56 Author: Johannes Huber gentoo org> AuthorDate: Fri Jun 3 12:29:27 2016 + Commit: Johannes Huber gentoo org> CommitDate: Fri Jun 3 12:29:27 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=77c54d64 media-video/kaffeine: DEPEND on virtual/pkgconfig Package-Manager: portage-2.3.0_rc1 media-video/kaffeine/kaffeine-.ebuild | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/media-video/kaffeine/kaffeine-.ebuild b/media-video/kaffeine/kaffeine-.ebuild index 0736122..04f1a76 100644 --- a/media-video/kaffeine/kaffeine-.ebuild +++ b/media-video/kaffeine/kaffeine-.ebuild @@ -12,7 +12,7 @@ LICENSE="GPL-2 FDL-1.2" KEYWORDS="" IUSE="" -DEPEND=" +CDEPEND=" $(add_frameworks_dep kconfig) $(add_frameworks_dep kconfigwidgets) $(add_frameworks_dep kcoreaddons) @@ -33,7 +33,10 @@ DEPEND=" media-video/vlc[X] x11-libs/libXScrnSaver " -RDEPEND="${DEPEND} +DEPEND="${CDEPEND} + virtual/pkgconfig +" +RDEPEND="${CDEPEND} !media-video/kaffeine:4 "
[gentoo-commits] proj/kde:master commit in: media-video/kaffeine/, media-video/kaffeine/files/
commit: 734c14696a77d939076553320533cc4927865eac Author: Johannes Huber gentoo org> AuthorDate: Fri Jun 3 12:03:03 2016 + Commit: Johannes Huber gentoo org> CommitDate: Fri Jun 3 12:03:03 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=734c1469 media-video/kaffeine: Fix desktop file warning Package-Manager: portage-2.3.0_rc1 .../files/kaffeine-2.0.1-desktop-file.patch| 25 ++ media-video/kaffeine/kaffeine-.ebuild | 3 ++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/media-video/kaffeine/files/kaffeine-2.0.1-desktop-file.patch b/media-video/kaffeine/files/kaffeine-2.0.1-desktop-file.patch new file mode 100644 index 000..1558aef --- /dev/null +++ b/media-video/kaffeine/files/kaffeine-2.0.1-desktop-file.patch @@ -0,0 +1,25 @@ +From 534d90f280b7aea3fa3006d858729cc2d606cee6 Mon Sep 17 00:00:00 2001 +From: Johannes Huber+Date: Fri, 3 Jun 2016 13:59:11 +0200 +Subject: [PATCH] Fix desktop file + +--- + src/kaffeine.desktop | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/kaffeine.desktop b/src/kaffeine.desktop +index dee82c4..0095a07 100644 +--- a/src/kaffeine.desktop b/src/kaffeine.desktop +@@ -127,7 +127,7 @@ GenericName[zh_CN]=媒体播放器 + GenericName[zh_TW]=媒體播放器 + Categories=Qt;KDE;AudioVideo;Player; + Icon=kaffeine +-MimeType=application/ogg;application/ram;application/vnd.rn-realmedia;application/x-matroska;application/x-ogg;application/x-quicktime-media-link;application/x-shockwave-flash;application/x-shorten;application/xspf+xml;audio/ac3;audio/amr;audio/amr-wb;audio/basic;audio/flac;audio/mp4;audio/mpeg;audio/ogg;audio/vnd.rn-realaudio;audio/webm;audio/x-aiff;audio/x-flac;audio/x-it;audio/x-m4a;audio/x-m4b;audio/x-matroska;audio/x-mod;audio/x-mp3;audio/x-mpeg;audio/x-mpegurl;audio/x-ms-asx;audio/x-ms-wma;audio/x-musepack;audio/x-pn-realaudio;audio/x-pn-realaudio-plugin;audio/x-s3m;audio/x-scpls;audio/x-stm;audio/x-tta;audio/x-voc;audio/x-vorbis+ogg;audio/x-wav;audio/x-wavpack;audio/x-xm;image/vnd.rn-realpix;skip;video/dv;video/mp2t;video/mp4;video/mp4v-es;video/mpeg;video/msvideo;video/ogg;video/quicktime;video/vnd.rn-realvideo;video/webm;video/x-anim;video/x-avi;video/x-fli;video/x-flic;video/x-flv;video/x-matroska;video/x-mng;video/x-mpeg;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;vide o/x-nsv;video/x-ogm+ogg;x-content/audio-cdda;x-content/audio-player;x-content/video-dvd;x-content/video-svcd;x-content/video-vcd; ++MimeType=application/ogg;application/ram;application/vnd.rn-realmedia;application/x-matroska;application/x-ogg;application/x-quicktime-media-link;application/x-shockwave-flash;application/x-shorten;application/xspf+xml;audio/ac3;audio/amr;audio/amr-wb;audio/basic;audio/flac;audio/mp4;audio/mpeg;audio/ogg;audio/vnd.rn-realaudio;audio/webm;audio/x-aiff;audio/x-flac;audio/x-it;audio/x-m4a;audio/x-m4b;audio/x-matroska;audio/x-mod;audio/x-mp3;audio/x-mpeg;audio/x-mpegurl;audio/x-ms-asx;audio/x-ms-wma;audio/x-musepack;audio/x-pn-realaudio;audio/x-pn-realaudio-plugin;audio/x-s3m;audio/x-scpls;audio/x-stm;audio/x-tta;audio/x-voc;audio/x-vorbis+ogg;audio/x-wav;audio/x-wavpack;audio/x-xm;image/vnd.rn-realpix;x-scheme-handler/skip;video/dv;video/mp2t;video/mp4;video/mp4v-es;video/mpeg;video/msvideo;video/ogg;video/quicktime;video/vnd.rn-realvideo;video/webm;video/x-anim;video/x-avi;video/x-fli;video/x-flic;video/x-flv;video/x-matroska;video/x-mng;video/x-mpeg;video/x-ms-asf;video/x-ms-wmv;vid eo/x-msvideo;video/x-nsv;video/x-ogm+ogg;x-content/audio-cdda;x-content/audio-player;x-content/video-dvd;x-content/video-svcd;x-content/video-vcd; + Terminal=false + Type=Application + X-KDE-HasTempFileOption=true +-- +2.8.3 + diff --git a/media-video/kaffeine/kaffeine-.ebuild b/media-video/kaffeine/kaffeine-.ebuild index 2e712c2..0736122 100644 --- a/media-video/kaffeine/kaffeine-.ebuild +++ b/media-video/kaffeine/kaffeine-.ebuild @@ -4,7 +4,6 @@ EAPI=6 -# TODO: desktop file has warnings inherit kde5 DESCRIPTION="Media player with digital TV support by KDE" @@ -40,6 +39,8 @@ RDEPEND="${DEPEND} DOCS=( Changelog NOTES README ) +PATCHES=( "${FILESDIR}/${PN}-2.0.1-desktop-file.patch" ) + src_configure() { # tools working on $HOME directory for a local git checkout local mycmakeargs=(
[gentoo-commits] proj/kde:master commit in: media-video/kaffeine/
commit: d36c20e6a536844feca49971cebf9e432c935c70 Author: Johannes Huber gentoo org> AuthorDate: Fri Jun 3 11:49:19 2016 + Commit: Johannes Huber gentoo org> CommitDate: Fri Jun 3 11:49:19 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=d36c20e6 media-video/kaffeine: Disable tools build option Scripts only working in $HOME directory with hardcoded paths. Package-Manager: portage-2.3.0_rc1 media-video/kaffeine/kaffeine-.ebuild | 9 + 1 file changed, 9 insertions(+) diff --git a/media-video/kaffeine/kaffeine-.ebuild b/media-video/kaffeine/kaffeine-.ebuild index 0494066..2e712c2 100644 --- a/media-video/kaffeine/kaffeine-.ebuild +++ b/media-video/kaffeine/kaffeine-.ebuild @@ -39,3 +39,12 @@ RDEPEND="${DEPEND} " DOCS=( Changelog NOTES README ) + +src_configure() { + # tools working on $HOME directory for a local git checkout + local mycmakeargs=( + -DBUILD_TOOLS=OFF + ) + + kde5_src_configure +}
[gentoo-commits] proj/kde:master commit in: media-video/kaffeine/
commit: 35f3f779341e29b6f6526ea45d445cba7afbe19f Author: Johannes Huber gentoo org> AuthorDate: Thu Jun 2 21:30:55 2016 + Commit: Johannes Huber gentoo org> CommitDate: Thu Jun 2 21:36:17 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=35f3f779 media-video/kaffeine: Version bump Upstream ported to KDE Frameworks. Package-Manager: portage-2.3.0_rc1 media-video/kaffeine/kaffeine-.ebuild | 41 +++ media-video/kaffeine/metadata.xml | 15 +++ 2 files changed, 56 insertions(+) diff --git a/media-video/kaffeine/kaffeine-.ebuild b/media-video/kaffeine/kaffeine-.ebuild new file mode 100644 index 000..0494066 --- /dev/null +++ b/media-video/kaffeine/kaffeine-.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +# TODO: desktop file has warnings +inherit kde5 + +DESCRIPTION="Media player with digital TV support by KDE" +HOMEPAGE="https://kaffeine.kde.org/; +LICENSE="GPL-2 FDL-1.2" +KEYWORDS="" +IUSE="" + +DEPEND=" + $(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 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 +" +RDEPEND="${DEPEND} + !media-video/kaffeine:4 +" + +DOCS=( Changelog NOTES README ) diff --git a/media-video/kaffeine/metadata.xml b/media-video/kaffeine/metadata.xml new file mode 100644 index 000..81fb67d --- /dev/null +++ b/media-video/kaffeine/metadata.xml @@ -0,0 +1,15 @@ + +http://www.gentoo.org/dtd/metadata.dtd;> + + + media-vi...@gentoo.org + Gentoo Video project + + + k...@gentoo.org + Gentoo KDE Project + + + kaffeine + +
[gentoo-commits] proj/kde:master commit in: media-video/kaffeine/
commit: 1ef92600e8f1507bb98ed37a693765edf0493487 Author: Johannes Huber gentoo org> AuthorDate: Thu Apr 28 06:57:12 2016 + Commit: Johannes Huber gentoo org> CommitDate: Thu Apr 28 06:57:12 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=1ef92600 media-video/kaffeine: Remove package No KDE Frameworks port available. Still uses deprecated kdelibs4. Stable and testing version in gentoo main tree available. media-video/kaffeine/kaffeine-.ebuild | 36 --- media-video/kaffeine/metadata.xml | 15 - 2 files changed, 51 deletions(-) diff --git a/media-video/kaffeine/kaffeine-.ebuild b/media-video/kaffeine/kaffeine-.ebuild deleted file mode 100644 index 48fdbbb..000 --- a/media-video/kaffeine/kaffeine-.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -KDE_LINGUAS="ar ast be bg ca ca@valencia cs da de el en_GB eo es et fi fr ga gl hr hu - it ja km ko ku lt mai nb nds nl nn pa pl pt pt_BR ro ru se sk sr@ijekavian - sr@ijekavianlatin sr@latin sv th tr uk zh_CN zh_TW" -inherit kde4-base - -DESCRIPTION="Media player with digital TV support" -HOMEPAGE="http://kaffeine.kde.org/; -SRC_URI="" - -LICENSE="GPL-2 FDL-1.2" -SLOT="4" -KEYWORDS="" -IUSE="debug" - -DEPEND=" - dev-qt/qtsql:4[sqlite] - >=media-video/vlc-1.2 - x11-libs/libXScrnSaver -" -RDEPEND="${DEPEND}" - -DOCS=( Changelog NOTES ) - -src_configure() { - local mycmakeargs=( - -DBUILD_DEBUG_MODULE=$(usex debug) - ) - - kde4-base_src_configure -} diff --git a/media-video/kaffeine/metadata.xml b/media-video/kaffeine/metadata.xml deleted file mode 100644 index 81fb67d..000 --- a/media-video/kaffeine/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ - -http://www.gentoo.org/dtd/metadata.dtd;> - - - media-vi...@gentoo.org - Gentoo Video project - - - k...@gentoo.org - Gentoo KDE Project - - - kaffeine - -
[gentoo-commits] proj/kde:master commit in: media-video/kaffeine/
commit: 6a9d2c26a2c0606a4c3d5f02f71fba219c40ee15 Author: Johannes Huber gentoo org> AuthorDate: Sat Mar 26 18:33:42 2016 + Commit: Johannes Huber gentoo org> CommitDate: Sat Mar 26 18:34:41 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=6a9d2c26 media-video/kaffeine: EAPI 6 Package-Manager: portage-2.2.28 media-video/kaffeine/kaffeine-.ebuild | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/media-video/kaffeine/kaffeine-.ebuild b/media-video/kaffeine/kaffeine-.ebuild index ccbf983..48fdbbb 100644 --- a/media-video/kaffeine/kaffeine-.ebuild +++ b/media-video/kaffeine/kaffeine-.ebuild @@ -2,14 +2,14 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 KDE_LINGUAS="ar ast be bg ca ca@valencia cs da de el en_GB eo es et fi fr ga gl hr hu it ja km ko ku lt mai nb nds nl nn pa pl pt pt_BR ro ru se sk sr@ijekavian sr@ijekavianlatin sr@latin sv th tr uk zh_CN zh_TW" inherit kde4-base -DESCRIPTION="A media player for KDE with digital TV support" +DESCRIPTION="Media player with digital TV support" HOMEPAGE="http://kaffeine.kde.org/; SRC_URI="" @@ -19,9 +19,9 @@ KEYWORDS="" IUSE="debug" DEPEND=" + dev-qt/qtsql:4[sqlite] >=media-video/vlc-1.2 x11-libs/libXScrnSaver - dev-qt/qtsql:4[sqlite] " RDEPEND="${DEPEND}" @@ -29,7 +29,7 @@ DOCS=( Changelog NOTES ) src_configure() { local mycmakeargs=( - $(cmake-utils_use_build debug DEBUG_MODULE) + -DBUILD_DEBUG_MODULE=$(usex debug) ) kde4-base_src_configure