* [gentoo-commits] repo/gentoo:master commit in: kde-apps/kde-wallpapers/files/, kde-apps/kde-wallpapers/
@ 2015-10-04 15:12 Michał Górny
0 siblings, 0 replies; 2+ messages in thread
From: Michał Górny @ 2015-10-04 15:12 UTC (permalink / raw
To: gentoo-commits
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" )
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/kde-wallpapers/files/, kde-apps/kde-wallpapers/
@ 2016-08-28 16:18 Johannes Huber
0 siblings, 0 replies; 2+ messages in thread
From: Johannes Huber @ 2016-08-28 16:18 UTC (permalink / raw
To: gentoo-commits
commit: 2ffcd3a66fa16f22972ef1574996d56c0913391c
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 28 16:16:48 2016 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Aug 28 16:16:48 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ffcd3a6
kde-apps/kde-wallpapers: Remove last-rited pkg
kde-apps/kde-wallpapers/Manifest | 1 -
.../files/kde-wallpapers-15.08.0-kf5-port.patch | 15 ------------
.../kde-wallpapers-15.08.3-r2.ebuild | 27 ----------------------
.../kde-wallpapers/kde-wallpapers-15.08.3.ebuild | 26 ---------------------
kde-apps/kde-wallpapers/metadata.xml | 8 -------
5 files changed, 77 deletions(-)
diff --git a/kde-apps/kde-wallpapers/Manifest b/kde-apps/kde-wallpapers/Manifest
deleted file mode 100644
index e3b4644..00000000
--- a/kde-apps/kde-wallpapers/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST kde-wallpapers-15.08.3.tar.xz 90373308 SHA256 4dae4b2fcb58ac259435d46a560000b0dc7d0c79ea3f7e2fb0a431cbbd009593 SHA512 7fe81eb4f4256a67e817356f15f7a5daa36ac08b61ee1a462dd471c6fbec6d33586d2f74a7a3e22e68a2263c06cfd1ebe5245d4cfef8409de1657e6c3de7eeff WHIRLPOOL a03829efa6e1a7ec98949bc0e7bd4860bd1c207a7e579979ce467332ff7f5267ae3e4a33616db4a5217c95250fadf983e65d50b28cc137d5553b24e3c606d4b1
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
deleted file mode 100644
index 502837c..00000000
--- a/kde-apps/kde-wallpapers/files/kde-wallpapers-15.08.0-kf5-port.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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.3-r2.ebuild b/kde-apps/kde-wallpapers/kde-wallpapers-15.08.3-r2.ebuild
deleted file mode 100644
index 4930f5b..00000000
--- a/kde-apps/kde-wallpapers/kde-wallpapers-15.08.3-r2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KMNAME="kde-wallpapers"
-KDE_AUTODEPS="false"
-KDE_DEBUG="false"
-inherit kde5
-
-DESCRIPTION="KDE wallpapers"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
- $(add_frameworks_dep extra-cmake-modules)
- $(add_qt_dep qtcore)
-"
-RDEPEND="!kde-apps/kde-wallpapers:4"
-
-PATCHES=( "${FILESDIR}/${PN}-15.08.0-kf5-port.patch" ) # bug 559156
-
-src_install() {
- kde5_src_install
- rm -r "${ED}"usr/share/wallpapers/Autumn || die
-}
diff --git a/kde-apps/kde-wallpapers/kde-wallpapers-15.08.3.ebuild b/kde-apps/kde-wallpapers/kde-wallpapers-15.08.3.ebuild
deleted file mode 100644
index c806161..00000000
--- a/kde-apps/kde-wallpapers/kde-wallpapers-15.08.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KMNAME="kde-wallpapers"
-inherit kde4-base
-
-DESCRIPTION="KDE wallpapers"
-KEYWORDS="amd64 ~arm x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="+minimal"
-
-src_configure() {
- local mycmakeargs=( -DWALLPAPER_INSTALL_DIR="${EPREFIX}/usr/share/wallpapers" )
-
- kde4-base_src_configure
-}
-
-src_install() {
- kde4-base_src_install
-
- if use minimal ; then
- rm -r "${ED}"usr/share/wallpapers/Autumn || die
- fi
-}
diff --git a/kde-apps/kde-wallpapers/metadata.xml b/kde-apps/kde-wallpapers/metadata.xml
deleted file mode 100644
index 2fdbf33..00000000
--- a/kde-apps/kde-wallpapers/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>kde@gentoo.org</email>
- <name>Gentoo KDE Project</name>
- </maintainer>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-08-28 16:18 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-04 15:12 [gentoo-commits] repo/gentoo:master commit in: kde-apps/kde-wallpapers/files/, kde-apps/kde-wallpapers/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2016-08-28 16:18 Johannes Huber
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox