From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8C30113832E for ; Fri, 29 Jul 2016 20:23:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5D564E0804; Fri, 29 Jul 2016 20:23:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E388EE0804 for ; Fri, 29 Jul 2016 20:23:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7D335340CF6 for ; Fri, 29 Jul 2016 20:23:20 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 27A9C7CD for ; Fri, 29 Jul 2016 20:23:15 +0000 (UTC) From: "Johannes Huber" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Johannes Huber" Message-ID: <1469823789.05ad3d2305a2879f392eb697187c629bccabfc96.johu@gentoo> Subject: [gentoo-commits] proj/kde-sunset:master commit in: kde-apps/kde-wallpapers/files/, kde-apps/kde-wallpapers/ X-VCS-Repository: proj/kde-sunset X-VCS-Files: kde-apps/kde-wallpapers/files/kde-wallpapers-15.08.0-kf5-port.patch kde-apps/kde-wallpapers/kde-wallpapers-15.08.3-r2.ebuild kde-apps/kde-wallpapers/kde-wallpapers-15.08.3.ebuild X-VCS-Directories: kde-apps/kde-wallpapers/files/ kde-apps/kde-wallpapers/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: 05ad3d2305a2879f392eb697187c629bccabfc96 X-VCS-Branch: master Date: Fri, 29 Jul 2016 20:23:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: db4ca628-e137-4ef4-8500-d0f642c20324 X-Archives-Hash: 10e0993416a644211e6fccfa5254ec69 commit: 05ad3d2305a2879f392eb697187c629bccabfc96 Author: Johannes Huber gentoo org> AuthorDate: Fri Jul 29 20:23:09 2016 +0000 Commit: Johannes Huber gentoo org> CommitDate: Fri Jul 29 20:23:09 2016 +0000 URL: https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=05ad3d23 kde-apps/kde-wallpapers: Import latest from gentoo main tree Package-Manager: portage-2.3.0 .../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 +++++++++++++++++++++ 3 files changed, 68 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.3-r2.ebuild b/kde-apps/kde-wallpapers/kde-wallpapers-15.08.3-r2.ebuild new file mode 100644 index 0000000..d392afc --- /dev/null +++ b/kde-apps/kde-wallpapers/kde-wallpapers-15.08.3-r2.ebuild @@ -0,0 +1,27 @@ +# 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 new file mode 100644 index 0000000..1ca8243 --- /dev/null +++ b/kde-apps/kde-wallpapers/kde-wallpapers-15.08.3.ebuild @@ -0,0 +1,26 @@ +# 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 +}