[gentoo-commits] proj/kde:master commit in: kde-apps/kde-wallpapers/

[gentoo-commits] proj/kde:master commit in: kde-apps/kde-wallpapers/

[Johannes Huber]

commit:     a50597173b6f088c05862e1a69ee9a26831918fa
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 26 08:48:50 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Aug 26 08:48:50 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a5059717

kde-apps/kde-wallpapers: Remove old

Moved to gentoo main repo.

Package-Manager: portage-2.2.20.1

 .../kde-wallpapers/kde-wallpapers-15.04.3.ebuild   | 19 -------------------
 .../kde-wallpapers/kde-wallpapers-15.08.0.ebuild   | 22 ----------------------
 2 files changed, 41 deletions(-)

diff --git a/kde-apps/kde-wallpapers/kde-wallpapers-15.04.3.ebuild b/kde-apps/kde-wallpapers/kde-wallpapers-15.04.3.ebuild
deleted file mode 100644
index 941b0dd..0000000
--- a/kde-apps/kde-wallpapers/kde-wallpapers-15.04.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KMNAME="kde-wallpapers"
-KDE_SCM="svn"
-inherit kde4-base
-
-DESCRIPTION="KDE wallpapers"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-src_configure() {
-	local mycmakeargs=( -DWALLPAPER_INSTALL_DIR="${EPREFIX}/usr/share/wallpapers" )
-
-	kde4-base_src_configure
-}

diff --git a/kde-apps/kde-wallpapers/kde-wallpapers-15.08.0.ebuild b/kde-apps/kde-wallpapers/kde-wallpapers-15.08.0.ebuild
deleted file mode 100644
index 8e2328c..0000000
--- a/kde-apps/kde-wallpapers/kde-wallpapers-15.08.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KMNAME="kde-wallpapers"
-KDE_AUTODEPS="false"
-KDE_SCM="svn"
-inherit kde5
-
-DESCRIPTION="KDE wallpapers"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="!kde-apps/kde-wallpapers:4"
-
-src_configure() {
-	local mycmakeargs=( -DWALLPAPER_INSTALL_DIR="${EPREFIX}/usr/share/wallpapers" )
-
-	kde5_src_configure
-}

[gentoo-commits] proj/kde:master commit in: kde-apps/kde-wallpapers/

[Michael Palimaka]

commit:     53193b0a855171cbfa7d5416a9b2c3a4b369a710
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Wed Nov 18 00:05:49 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Nov 18 07:59:21 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=53193b0a

kde-apps/kde-wallpapers: Add USE=+minimal to remove file collisions

...with >=kde-plasma/plasma-workspace-wallpapers-5.4.50, default on because
it's just wallpapers after all (avoids blocker for most people).

Package-Manager: portage-2.2.24

 ...lpapers-15.08.3.ebuild => kde-wallpapers-15.08.3-r1.ebuild} | 10 +++++++++-
 kde-apps/kde-wallpapers/metadata.xml                           |  3 +++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/kde-apps/kde-wallpapers/kde-wallpapers-15.08.3.ebuild b/kde-apps/kde-wallpapers/kde-wallpapers-15.08.3-r1.ebuild
similarity index 80%
rename from kde-apps/kde-wallpapers/kde-wallpapers-15.08.3.ebuild
rename to kde-apps/kde-wallpapers/kde-wallpapers-15.08.3-r1.ebuild
index 96e4903..80d90a8 100644
--- a/kde-apps/kde-wallpapers/kde-wallpapers-15.08.3.ebuild
+++ b/kde-apps/kde-wallpapers/kde-wallpapers-15.08.3-r1.ebuild
@@ -11,7 +11,7 @@ inherit kde5
 
 DESCRIPTION="KDE wallpapers"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="+minimal"
 
 DEPEND="$(add_frameworks_dep extra-cmake-modules)"
 RDEPEND="!kde-apps/kde-wallpapers:4"
@@ -23,3 +23,11 @@ src_configure() {
 
 	kde5_src_configure
 }
+
+src_install() {
+	kde5_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
index a23f444..a4694e9 100644
--- a/kde-apps/kde-wallpapers/metadata.xml
+++ b/kde-apps/kde-wallpapers/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>kde</herd>
+	<use>
+		<flag name="minimal">Remove file collisions with <pkg>kde-plasma/plasma-workspace-wallpapers</pkg></flag>
+	</use>
 </pkgmetadata>