Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/kaffeine/, media-video/kaffeine/files/
Date: Sat, 02 Dec 2017 18:33:52
Message-Id: 1512239611.504ea2277422233c81902672298cab17b9b2333c.asturm@gentoo
1 commit: 504ea2277422233c81902672298cab17b9b2333c
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sat Dec 2 13:52:52 2017 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sat Dec 2 18:33:31 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=504ea227
7
8 media-video/kaffeine: Drop old
9
10 Package-Manager: Portage-2.3.16, Repoman-2.3.6
11
12 media-video/kaffeine/Manifest | 1 -
13 .../kaffeine/files/kaffeine-2.0.9-kf5.34.patch | 22 -------
14 media-video/kaffeine/kaffeine-2.0.9.ebuild | 68 ----------------------
15 3 files changed, 91 deletions(-)
16
17 diff --git a/media-video/kaffeine/Manifest b/media-video/kaffeine/Manifest
18 index f669893c53e..c73d4725052 100644
19 --- a/media-video/kaffeine/Manifest
20 +++ b/media-video/kaffeine/Manifest
21 @@ -1,2 +1 @@
22 DIST kaffeine-2.0.13.tar.xz 4374124 SHA256 1ac52ac811a9c9e88fcd466a7df13860fcd749cd125e7d533f589e6a6ee176fd SHA512 710d6c5b35f2b2f82094004e8d09edd33ec95c8e0afb64f6dcf2bc14f3e6619ae87712e2a5bd3cde23e886d1e9300510fb0b0c355c33386d4dd238aada2760f5 WHIRLPOOL 3748a8a01289b14a466d3d6651ade04c712350a78ae539811d01ce681b2b2afb96f0882503eccf3e4195ac474429394f874f08560300841f73bc9b9a6860273f
23 -DIST kaffeine-2.0.9.tar.xz 4398832 SHA256 ac53b697bba4fa97350706698c777908c21c464f7c567fe1a4ce9352e955754f SHA512 5adf86185aaafce4eadda4cfe40af2e0c867477f51b74a464bf813c018ecf035f9e13f47fffd21c0cd547289825441d2d80298ec7035e260f3cc0414c5fdd0d7 WHIRLPOOL 948eecec4957046c6ddee872747959661725f4d9f8408c735803d0dcc82c38dfcc7df6e9e92c46e8fda58e2f53a41ab6cf8c33da4b88f7d89542aa427a486223
24
25 diff --git a/media-video/kaffeine/files/kaffeine-2.0.9-kf5.34.patch b/media-video/kaffeine/files/kaffeine-2.0.9-kf5.34.patch
26 deleted file mode 100644
27 index 3fba1d22ba9..00000000000
28 --- a/media-video/kaffeine/files/kaffeine-2.0.9-kf5.34.patch
29 +++ /dev/null
30 @@ -1,22 +0,0 @@
31 -commit 657c11d76271f66fc3f40b60c5ba782061e8d895
32 -Author: Andreas Sturmlechner <andreas.sturmlechner@×××××.com>
33 -Date: Wed May 17 20:15:43 2017 +0200
34 -
35 - Remove duplicate call of ki18n_install
36 -
37 - Release script is adding this as well to tarball CMakeLists.txt.
38 - That has worked in the past, but is fatal in KDE Frameworks 5.34.
39 -
40 -diff --git a/CMakeLists.txt b/CMakeLists.txt
41 -index 9a88958..3c4601d 100644
42 ---- a/CMakeLists.txt
43 -+++ b/CMakeLists.txt
44 -@@ -95,8 +95,6 @@ add_subdirectory(src)
45 - if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po")
46 - if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/po/CMakeLists.txt" )
47 - add_subdirectory(po)
48 -- else()
49 -- ki18n_install(po)
50 - endif()
51 - endif()
52 -
53
54 diff --git a/media-video/kaffeine/kaffeine-2.0.9.ebuild b/media-video/kaffeine/kaffeine-2.0.9.ebuild
55 deleted file mode 100644
56 index 31cb79ae2e7..00000000000
57 --- a/media-video/kaffeine/kaffeine-2.0.9.ebuild
58 +++ /dev/null
59 @@ -1,68 +0,0 @@
60 -# Copyright 1999-2017 Gentoo Foundation
61 -# Distributed under the terms of the GNU General Public License v2
62 -
63 -EAPI=6
64 -
65 -KDE_HANDBOOK="optional"
66 -inherit kde5
67 -
68 -DESCRIPTION="Media player with digital TV support by KDE"
69 -HOMEPAGE="https://kaffeine.kde.org/"
70 -SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
71 -
72 -LICENSE="GPL-2+ handbook? ( FDL-1.3 )"
73 -KEYWORDS="amd64 x86"
74 -IUSE=""
75 -
76 -CDEPEND="
77 - $(add_frameworks_dep kconfig)
78 - $(add_frameworks_dep kconfigwidgets)
79 - $(add_frameworks_dep kcoreaddons)
80 - $(add_frameworks_dep kdbusaddons)
81 - $(add_frameworks_dep ki18n)
82 - $(add_frameworks_dep kio)
83 - $(add_frameworks_dep kwidgetsaddons)
84 - $(add_frameworks_dep kxmlgui)
85 - $(add_frameworks_dep solid)
86 - $(add_qt_dep qtdbus)
87 - $(add_qt_dep qtgui)
88 - $(add_qt_dep qtnetwork)
89 - $(add_qt_dep qtsql 'sqlite')
90 - $(add_qt_dep qtwidgets)
91 - $(add_qt_dep qtx11extras)
92 - $(add_qt_dep qtxml)
93 - media-libs/libv4l
94 - media-video/vlc[X]
95 - x11-libs/libXScrnSaver
96 -"
97 -DEPEND="${CDEPEND}
98 - sys-devel/gettext
99 - virtual/pkgconfig
100 -"
101 -RDEPEND="${CDEPEND}
102 - !media-video/kaffeine:4
103 -"
104 -
105 -DOCS=( Changelog NOTES README.md )
106 -
107 -PATCHES=( "${FILESDIR}/${P}-kf5.34.patch" )
108 -
109 -src_prepare() {
110 - kde5_src_prepare
111 -
112 - # unused dependencies incorrectly added during the release process
113 - # they do not appear in upstream git
114 - sed -i \
115 - -e "/find_package(KF5DocTools CONFIG REQUIRED)/d" \
116 - -e "/kdoctools_install(po)/d" \
117 - CMakeLists.txt || die
118 -}
119 -
120 -src_configure() {
121 - # tools working on $HOME directory for a local git checkout
122 - local mycmakeargs=(
123 - -DBUILD_TOOLS=OFF
124 - )
125 -
126 - kde5_src_configure
127 -}