Make dependency on wallpapers configurable

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64

9 files changed, 33 insertions, 12 deletions

diff --git a/kde-base/kdebase-data/ChangeLog b/kde-base/kdebase-data/ChangeLog
index 89f8a95f513f..0ccaaa0b6a7e 100644
--- a/kde-base/kdebase-data/ChangeLog
+++ b/kde-base/kdebase-data/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdebase-data
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-data/ChangeLog,v 1.195 2011/08/15 19:38:56 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-data/ChangeLog,v 1.196 2011/08/22 22:00:52 dilfridge Exp $
+
+  22 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  kdebase-data-4.7.0.ebuild, metadata.xml:
+  Make dependency on wallpapers configurable
 
   15 Aug 2011; Markus Meier <maekke@gentoo.org> kdebase-data-4.6.5.ebuild:
   x86 stable, bug #377465
diff --git a/kde-base/kdebase-data/kdebase-data-4.7.0.ebuild b/kde-base/kdebase-data/kdebase-data-4.7.0.ebuild
index 7d824130c48f..d5c03e352031 100644
--- a/kde-base/kdebase-data/kdebase-data-4.7.0.ebuild
+++ b/kde-base/kdebase-data/kdebase-data-4.7.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-data/kdebase-data-4.7.0.ebuild,v 1.1 2011/07/27 14:04:51 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-data/kdebase-data-4.7.0.ebuild,v 1.2 2011/08/22 22:00:52 dilfridge Exp $
 
 EAPI=4
 
@@ -9,11 +9,11 @@ KMNOMODULE="true"
 inherit kde4-meta
 
 DESCRIPTION="Icons, localization data and various .desktop files from kdebase."
-IUSE=""
+IUSE="+wallpapers"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
 RDEPEND="
-	$(add_kdebase_dep kde-wallpapers)
+	wallpapers? ( $(add_kdebase_dep kde-wallpapers) )
 	$(add_kdebase_dep oxygen-icons)
 	x11-themes/hicolor-icon-theme
 "
diff --git a/kde-base/kdebase-data/metadata.xml b/kde-base/kdebase-data/metadata.xml
index 8d1e86a9cefb..8028a443f9c9 100644
--- a/kde-base/kdebase-data/metadata.xml
+++ b/kde-base/kdebase-data/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>kde</herd>
+  <use>
+    <flag name="wallpapers">Install the KDE wallpapers</flag>
+  </use>
 </pkgmetadata>
diff --git a/kde-base/kdebase-meta/ChangeLog b/kde-base/kdebase-meta/ChangeLog
index 75b31684765d..0ce8fb23b2d9 100644
--- a/kde-base/kdebase-meta/ChangeLog
+++ b/kde-base/kdebase-meta/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdebase-meta
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-meta/ChangeLog,v 1.199 2011/08/15 22:00:06 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-meta/ChangeLog,v 1.200 2011/08/22 22:03:41 dilfridge Exp $
+
+  22 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  kdebase-meta-4.7.0.ebuild, metadata.xml:
+  Make dependency on wallpapers configurable
 
   15 Aug 2011; Markus Meier <maekke@gentoo.org> kdebase-meta-4.6.5.ebuild:
   x86 stable, bug #377465
diff --git a/kde-base/kdebase-meta/kdebase-meta-4.7.0.ebuild b/kde-base/kdebase-meta/kdebase-meta-4.7.0.ebuild
index bdb42749fa56..f03a5aab7c18 100644
--- a/kde-base/kdebase-meta/kdebase-meta-4.7.0.ebuild
+++ b/kde-base/kdebase-meta/kdebase-meta-4.7.0.ebuild
@@ -1,20 +1,20 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-meta/kdebase-meta-4.7.0.ebuild,v 1.1 2011/07/27 14:04:36 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-meta/kdebase-meta-4.7.0.ebuild,v 1.2 2011/08/22 22:03:41 dilfridge Exp $
 
 EAPI=4
 inherit kde4-meta-pkg
 
 DESCRIPTION="Merge this to pull in all kdebase-derived packages"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
+IUSE="+wallpapers"
 
 RDEPEND="
 	$(add_kdebase_dep dolphin)
 	$(add_kdebase_dep freespacenotifier)
 	$(add_kdebase_dep kcheckpass)
 	$(add_kdebase_dep kcminit)
-	$(add_kdebase_dep kde-wallpapers)
+	wallpapers? ( $(add_kdebase_dep kde-wallpapers) )
 	$(add_kdebase_dep kdebase-cursors)
 	$(add_kdebase_dep kdebase-runtime-meta)
 	$(add_kdebase_dep kdebase-startkde)
diff --git a/kde-base/kdebase-meta/metadata.xml b/kde-base/kdebase-meta/metadata.xml
index 8d1e86a9cefb..8028a443f9c9 100644
--- a/kde-base/kdebase-meta/metadata.xml
+++ b/kde-base/kdebase-meta/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>kde</herd>
+  <use>
+    <flag name="wallpapers">Install the KDE wallpapers</flag>
+  </use>
 </pkgmetadata>
diff --git a/kde-base/kdebase-startkde/ChangeLog b/kde-base/kdebase-startkde/ChangeLog
index 30075fb33309..23ee445c990f 100644
--- a/kde-base/kdebase-startkde/ChangeLog
+++ b/kde-base/kdebase-startkde/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdebase-startkde
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.245 2011/08/15 21:58:21 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.246 2011/08/22 22:05:15 dilfridge Exp $
+
+  22 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  kdebase-startkde-4.7.0.ebuild, metadata.xml:
+  Make dependency on wallpapers configurable
 
   15 Aug 2011; Markus Meier <maekke@gentoo.org> kdebase-startkde-4.6.5.ebuild:
   x86 stable, bug #377465
diff --git a/kde-base/kdebase-startkde/kdebase-startkde-4.7.0.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-4.7.0.ebuild
index 1506fa6f9bf1..c1186e2920fc 100644
--- a/kde-base/kdebase-startkde/kdebase-startkde-4.7.0.ebuild
+++ b/kde-base/kdebase-startkde/kdebase-startkde-4.7.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/kdebase-startkde-4.7.0.ebuild,v 1.1 2011/07/27 14:04:49 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/kdebase-startkde-4.7.0.ebuild,v 1.2 2011/08/22 22:05:15 dilfridge Exp $
 
 EAPI=4
 
@@ -10,14 +10,14 @@ inherit kde4-meta multilib prefix
 
 DESCRIPTION="Startkde script, which starts a complete KDE session, and associated scripts"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
+IUSE="+wallpapers"
 
 # The KDE apps called from the startkde script.
 # These provide the most minimal KDE desktop.
 RDEPEND="
 	$(add_kdebase_dep kcminit)
 	$(add_kdebase_dep kdebase-runtime-meta)
-	$(add_kdebase_dep kde-wallpapers)
+	wallpapers? ( $(add_kdebase_dep kde-wallpapers) )
 	$(add_kdebase_dep kfmclient)
 	$(add_kdebase_dep knotify)
 	$(add_kdebase_dep kreadconfig)
diff --git a/kde-base/kdebase-startkde/metadata.xml b/kde-base/kdebase-startkde/metadata.xml
index 8d1e86a9cefb..8028a443f9c9 100644
--- a/kde-base/kdebase-startkde/metadata.xml
+++ b/kde-base/kdebase-startkde/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>kde</herd>
+  <use>
+    <flag name="wallpapers">Install the KDE wallpapers</flag>
+  </use>
 </pkgmetadata>