commit: ddcd7a778226542377fdf3386b2eb2c58b095509 Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> AuthorDate: Sun Aug 30 12:31:33 2015 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sun Sep 27 23:41:25 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddcd7a77
kde-apps/kde-wallpapers: It is slot 5, so port it to kf5 Fixes https://bugs.gentoo.org/show_bug.cgi?id=559156 Package-Manager: portage-2.2.20.1 .../files/kde-wallpapers-15.08.0-kf5-port.patch | 15 +++++++++++++++ kde-apps/kde-wallpapers/kde-wallpapers-15.08.0.ebuild | 3 +++ kde-apps/kde-wallpapers/kde-wallpapers-15.08.1.ebuild | 3 +++ 3 files changed, 21 insertions(+) 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 new file mode 100644 index 0000000..502837c --- /dev/null +++ b/kde-apps/kde-wallpapers/files/kde-wallpapers-15.08.0-kf5-port.patch @@ -0,0 +1,15 @@ +--- a/CMakeLists.txt 2015-08-30 14:18:57.169314811 +0200 ++++ b/CMakeLists.txt 2015-08-30 14:17:34.534347890 +0200 +@@ -1,5 +1,10 @@ +-find_package(KDE4 REQUIRED) +-include(KDE4Defaults) ++cmake_minimum_required(VERSION 2.8.12) ++ ++find_package(ECM 0.0.9 REQUIRED NO_MODULE) ++set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) ++ ++include(KDEInstallDirs) ++include(KDECMakeSettings) + + install(DIRECTORY Ariya DESTINATION ${WALLPAPER_INSTALL_DIR} PATTERN .svn EXCLUDE) + diff --git a/kde-apps/kde-wallpapers/kde-wallpapers-15.08.0.ebuild b/kde-apps/kde-wallpapers/kde-wallpapers-15.08.0.ebuild index 8e2328c..96e4903 100644 --- a/kde-apps/kde-wallpapers/kde-wallpapers-15.08.0.ebuild +++ b/kde-apps/kde-wallpapers/kde-wallpapers-15.08.0.ebuild @@ -13,8 +13,11 @@ DESCRIPTION="KDE wallpapers" KEYWORDS="~amd64 ~x86" IUSE="" +DEPEND="$(add_frameworks_dep extra-cmake-modules)" RDEPEND="!kde-apps/kde-wallpapers:4" +PATCHES=( "${FILESDIR}/${PN}-15.08.0-kf5-port.patch" ) # bug 559156 + src_configure() { local mycmakeargs=( -DWALLPAPER_INSTALL_DIR="${EPREFIX}/usr/share/wallpapers" ) diff --git a/kde-apps/kde-wallpapers/kde-wallpapers-15.08.1.ebuild b/kde-apps/kde-wallpapers/kde-wallpapers-15.08.1.ebuild index 8e2328c..96e4903 100644 --- a/kde-apps/kde-wallpapers/kde-wallpapers-15.08.1.ebuild +++ b/kde-apps/kde-wallpapers/kde-wallpapers-15.08.1.ebuild @@ -13,8 +13,11 @@ DESCRIPTION="KDE wallpapers" KEYWORDS="~amd64 ~x86" IUSE="" +DEPEND="$(add_frameworks_dep extra-cmake-modules)" RDEPEND="!kde-apps/kde-wallpapers:4" +PATCHES=( "${FILESDIR}/${PN}-15.08.0-kf5-port.patch" ) # bug 559156 + src_configure() { local mycmakeargs=( -DWALLPAPER_INSTALL_DIR="${EPREFIX}/usr/share/wallpapers" )
