Gentoo Archives: gentoo-commits

From: Johannes Huber <johu@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/kaffeine/files/, media-video/kaffeine/
Date: Tue, 07 Mar 2017 18:07:08
Message-Id: 1488910020.a1cf2cea618f7cc48102add51140d4e1c19d95ab.johu@gentoo
1 commit: a1cf2cea618f7cc48102add51140d4e1c19d95ab
2 Author: Johannes Huber <johu <AT> gentoo <DOT> org>
3 AuthorDate: Tue Mar 7 18:06:49 2017 +0000
4 Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
5 CommitDate: Tue Mar 7 18:07:00 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1cf2cea
7
8 media-video/kaffeine: Version bump 2.0.8
9
10 Package-Manager: Portage-2.3.4, Repoman-2.3.2
11
12 media-video/kaffeine/Manifest | 1 +
13 .../kaffeine/files/kaffeine-2.0.8-build.patch | 38 ++++++++++++
14 media-video/kaffeine/kaffeine-2.0.8.ebuild | 68 ++++++++++++++++++++++
15 3 files changed, 107 insertions(+)
16
17 diff --git a/media-video/kaffeine/Manifest b/media-video/kaffeine/Manifest
18 index 84d894772e1..385d5a88dc1 100644
19 --- a/media-video/kaffeine/Manifest
20 +++ b/media-video/kaffeine/Manifest
21 @@ -1,2 +1,3 @@
22 DIST kaffeine-2.0.5.tar.xz 2284712 SHA256 e1610931e9475e8b86f9c75331f51fbeea22fab0c5fc6a1085325ab2ef055a8c SHA512 2e0562debba616a1b5e3c8c635735e27473cea4ac9b21ab56b8babe5cfffd6f43bce82ecbdcb1d01c08722c08622110fd1b0d00aae779e9007ea82c5068680c2 WHIRLPOOL df3d8bc26077bbd15199a426d77ca0725342c22c0c0c29915479a74f41c37b95579d202cd718e271b2ef7bc0fb6dfc1c921f14395f56040a6727d4830421f840
23 DIST kaffeine-2.0.6.tar.xz 2295280 SHA256 70cd8423a23717edc7c8f127bd41e5e98aa93cc5866615ed25a8da3e148464e6 SHA512 ca2f036b629e750703536054dd6e28bc9b8191c3851a745f07548b756799243b3739cba9c7ec031be6eab64c18aa5f2eb96d37bcd0b11456e65eb67b016d1bc2 WHIRLPOOL 0d67538dc45f50cced9ab2c0b1adf1bf2367d823270118bf268ed2126c7bb1a653333b09fabb51e2b60400fcf073de6fe917a4887d54edc3c13204433538d146
24 +DIST kaffeine-2.0.8.tar.xz 4400524 SHA256 0277e5d3f55e4ac002788fc6954d4ab5c6aa994f63d7c6b9136d3227818facbd SHA512 9ee7b156d5195caef61cdbdf12deaa2493c6acc31724e839e1773dc5d7ee06f0d87cd7f21df74cf67dcb32fa5a347b72f5953f4568eb8476cb337a59121c609f WHIRLPOOL 4ae48e7e2f615428730f02d0b6b08406f6b3e805518da3fad9cb041ec5f1f9623541f521b3c065e94ed75f3f076d6651d5acc9d2fd306bc545527b05d550c01e
25
26 diff --git a/media-video/kaffeine/files/kaffeine-2.0.8-build.patch b/media-video/kaffeine/files/kaffeine-2.0.8-build.patch
27 new file mode 100644
28 index 00000000000..1507f46da21
29 --- /dev/null
30 +++ b/media-video/kaffeine/files/kaffeine-2.0.8-build.patch
31 @@ -0,0 +1,38 @@
32 +commit 2dbc752d644440f963bad172cf3ec83dc681ec7f
33 +Author: Mauro Carvalho Chehab <mchehab@××××××××××××.com>
34 +Date: Tue Mar 7 06:54:39 2017 -0300
35 +
36 + CMakeLists.txt: fix it to allow building from tarball
37 +
38 + Kaffeine has a script at tools/update_l10n.sh that allows one to
39 + download and test all translations locally, with is useful during
40 + Kaffeine development. Such script creates a file at po/CMakeLists.txt.
41 +
42 + However, normal users will use the Kaffeine tarball, downloaded from
43 + kde.org.
44 +
45 + The translations at the po/ directory on the tarballs don't
46 + have a CMakeLists.txt, as this file is created only if the
47 + tools/update_l10n.sh is called.
48 +
49 + So, change the main CMakeLists.txt to cope with both ways.
50 +
51 + Signed-off-by: Mauro Carvalho Chehab <mchehab@××××××××××××.com>
52 +
53 +diff --git a/CMakeLists.txt b/CMakeLists.txt
54 +index 3215e94..d24e848 100644
55 +--- a/CMakeLists.txt
56 ++++ b/CMakeLists.txt
57 +@@ -93,7 +93,11 @@ add_subdirectory(icons)
58 + add_subdirectory(profiles)
59 + add_subdirectory(src)
60 + if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po")
61 +- add_subdirectory(po)
62 ++ if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/po/CMakeLists.txt" )
63 ++ add_subdirectory(po)
64 ++ else()
65 ++ ki18n_install(po)
66 ++ endif()
67 + endif()
68 +
69 + if(KF5DocTools_VERSION)
70
71 diff --git a/media-video/kaffeine/kaffeine-2.0.8.ebuild b/media-video/kaffeine/kaffeine-2.0.8.ebuild
72 new file mode 100644
73 index 00000000000..202f5a50eca
74 --- /dev/null
75 +++ b/media-video/kaffeine/kaffeine-2.0.8.ebuild
76 @@ -0,0 +1,68 @@
77 +# Copyright 1999-2017 Gentoo Foundation
78 +# Distributed under the terms of the GNU General Public License v2
79 +
80 +EAPI=6
81 +
82 +KDE_HANDBOOK="optional"
83 +inherit kde5
84 +
85 +DESCRIPTION="Media player with digital TV support by KDE"
86 +HOMEPAGE="https://kaffeine.kde.org/"
87 +SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
88 +
89 +LICENSE="GPL-2+ handbook? ( FDL-1.3 )"
90 +KEYWORDS="~amd64 ~x86"
91 +IUSE=""
92 +
93 +CDEPEND="
94 + $(add_frameworks_dep kconfig)
95 + $(add_frameworks_dep kconfigwidgets)
96 + $(add_frameworks_dep kcoreaddons)
97 + $(add_frameworks_dep kdbusaddons)
98 + $(add_frameworks_dep ki18n)
99 + $(add_frameworks_dep kio)
100 + $(add_frameworks_dep kwidgetsaddons)
101 + $(add_frameworks_dep kxmlgui)
102 + $(add_frameworks_dep solid)
103 + $(add_qt_dep qtdbus)
104 + $(add_qt_dep qtgui)
105 + $(add_qt_dep qtnetwork)
106 + $(add_qt_dep qtsql 'sqlite')
107 + $(add_qt_dep qtwidgets)
108 + $(add_qt_dep qtx11extras)
109 + $(add_qt_dep qtxml)
110 + media-libs/libv4l
111 + media-video/vlc[X]
112 + x11-libs/libXScrnSaver
113 +"
114 +DEPEND="${CDEPEND}
115 + sys-devel/gettext
116 + virtual/pkgconfig
117 +"
118 +RDEPEND="${CDEPEND}
119 + !media-video/kaffeine:4
120 +"
121 +
122 +DOCS=( Changelog NOTES README.md )
123 +
124 +PATCHES=( "${FILESDIR}/${P}-build.patch" )
125 +
126 +src_prepare() {
127 + kde5_src_prepare
128 +
129 + # unused dependencies incorrectly added during the release process
130 + # they do not appear in upstream git
131 + sed -i \
132 + -e "/find_package(KF5DocTools CONFIG REQUIRED)/d" \
133 + -e "/kdoctools_install(po)/d" \
134 + CMakeLists.txt || die
135 +}
136 +
137 +src_configure() {
138 + # tools working on $HOME directory for a local git checkout
139 + local mycmakeargs=(
140 + -DBUILD_TOOLS=OFF
141 + )
142 +
143 + kde5_src_configure
144 +}