Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-apps/kde-wallpapers/files/, kde-apps/kde-wallpapers/
Date: Sun, 04 Oct 2015 15:12:10
Message-Id: 1443397285.ddcd7a778226542377fdf3386b2eb2c58b095509.mgorny@gentoo
1 commit: ddcd7a778226542377fdf3386b2eb2c58b095509
2 Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
3 AuthorDate: Sun Aug 30 12:31:33 2015 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Sep 27 23:41:25 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddcd7a77
7
8 kde-apps/kde-wallpapers: It is slot 5, so port it to kf5
9
10 Fixes https://bugs.gentoo.org/show_bug.cgi?id=559156
11
12 Package-Manager: portage-2.2.20.1
13
14 .../files/kde-wallpapers-15.08.0-kf5-port.patch | 15 +++++++++++++++
15 kde-apps/kde-wallpapers/kde-wallpapers-15.08.0.ebuild | 3 +++
16 kde-apps/kde-wallpapers/kde-wallpapers-15.08.1.ebuild | 3 +++
17 3 files changed, 21 insertions(+)
18
19 diff --git a/kde-apps/kde-wallpapers/files/kde-wallpapers-15.08.0-kf5-port.patch b/kde-apps/kde-wallpapers/files/kde-wallpapers-15.08.0-kf5-port.patch
20 new file mode 100644
21 index 0000000..502837c
22 --- /dev/null
23 +++ b/kde-apps/kde-wallpapers/files/kde-wallpapers-15.08.0-kf5-port.patch
24 @@ -0,0 +1,15 @@
25 +--- a/CMakeLists.txt 2015-08-30 14:18:57.169314811 +0200
26 ++++ b/CMakeLists.txt 2015-08-30 14:17:34.534347890 +0200
27 +@@ -1,5 +1,10 @@
28 +-find_package(KDE4 REQUIRED)
29 +-include(KDE4Defaults)
30 ++cmake_minimum_required(VERSION 2.8.12)
31 ++
32 ++find_package(ECM 0.0.9 REQUIRED NO_MODULE)
33 ++set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
34 ++
35 ++include(KDEInstallDirs)
36 ++include(KDECMakeSettings)
37 +
38 + install(DIRECTORY Ariya DESTINATION ${WALLPAPER_INSTALL_DIR} PATTERN .svn EXCLUDE)
39 +
40
41 diff --git a/kde-apps/kde-wallpapers/kde-wallpapers-15.08.0.ebuild b/kde-apps/kde-wallpapers/kde-wallpapers-15.08.0.ebuild
42 index 8e2328c..96e4903 100644
43 --- a/kde-apps/kde-wallpapers/kde-wallpapers-15.08.0.ebuild
44 +++ b/kde-apps/kde-wallpapers/kde-wallpapers-15.08.0.ebuild
45 @@ -13,8 +13,11 @@ DESCRIPTION="KDE wallpapers"
46 KEYWORDS="~amd64 ~x86"
47 IUSE=""
48
49 +DEPEND="$(add_frameworks_dep extra-cmake-modules)"
50 RDEPEND="!kde-apps/kde-wallpapers:4"
51
52 +PATCHES=( "${FILESDIR}/${PN}-15.08.0-kf5-port.patch" ) # bug 559156
53 +
54 src_configure() {
55 local mycmakeargs=( -DWALLPAPER_INSTALL_DIR="${EPREFIX}/usr/share/wallpapers" )
56
57
58 diff --git a/kde-apps/kde-wallpapers/kde-wallpapers-15.08.1.ebuild b/kde-apps/kde-wallpapers/kde-wallpapers-15.08.1.ebuild
59 index 8e2328c..96e4903 100644
60 --- a/kde-apps/kde-wallpapers/kde-wallpapers-15.08.1.ebuild
61 +++ b/kde-apps/kde-wallpapers/kde-wallpapers-15.08.1.ebuild
62 @@ -13,8 +13,11 @@ DESCRIPTION="KDE wallpapers"
63 KEYWORDS="~amd64 ~x86"
64 IUSE=""
65
66 +DEPEND="$(add_frameworks_dep extra-cmake-modules)"
67 RDEPEND="!kde-apps/kde-wallpapers:4"
68
69 +PATCHES=( "${FILESDIR}/${PN}-15.08.0-kf5-port.patch" ) # bug 559156
70 +
71 src_configure() {
72 local mycmakeargs=( -DWALLPAPER_INSTALL_DIR="${EPREFIX}/usr/share/wallpapers" )