public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/kde:master commit in: Documentation/package.unmask/, kde-base/kdebase-meta/, ...
@ 2011-02-15 12:22 Steffen Stramm
  0 siblings, 0 replies; 2+ messages in thread
From: Steffen Stramm @ 2011-02-15 12:22 UTC (permalink / raw
  To: gentoo-commits

commit:     5cb8f53eae6b4e3ff428ea50c80bb2933126b812
Author:     Steffen Stramm <krytzz <AT> soylent <DOT> eu>
AuthorDate: Tue Feb 15 12:20:55 2011 +0000
Commit:     Steffen Stramm <krytzz <AT> soylent <DOT> eu>
CommitDate: Tue Feb 15 12:20:55 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=5cb8f53e

[kde-base/kdebase-wallpapers] vanished from kde git, no new location
found

---
 .../.kde-live/kdebase-workspace-live               |    1 -
 Documentation/package.keywords/kde-live.keywords   |    1 -
 Documentation/package.unmask/kde-live              |    1 -
 kde-base/kdebase-meta/kdebase-meta-9999.ebuild     |    1 -
 .../kdebase-startkde/kdebase-startkde-9999.ebuild  |    1 -
 .../kdebase-wallpapers-9999.ebuild                 |   15 ---------------
 sets/kdebase-workspace-live                        |    1 -
 7 files changed, 0 insertions(+), 21 deletions(-)

diff --git a/Documentation/package.keywords/.kde-live/kdebase-workspace-live b/Documentation/package.keywords/.kde-live/kdebase-workspace-live
index 1906875..34580b2 100644
--- a/Documentation/package.keywords/.kde-live/kdebase-workspace-live
+++ b/Documentation/package.keywords/.kde-live/kdebase-workspace-live
@@ -3,7 +3,6 @@
 ~kde-base/kcminit-9999 **
 ~kde-base/kdebase-cursors-9999 **
 ~kde-base/kdebase-startkde-9999 **
-~kde-base/kdebase-wallpapers-9999 **
 ~kde-base/kdm-9999 **
 ~kde-base/kephal-9999 **
 ~kde-base/khotkeys-9999 **

diff --git a/Documentation/package.keywords/kde-live.keywords b/Documentation/package.keywords/kde-live.keywords
index 80ea9f4..9b8aea0 100644
--- a/Documentation/package.keywords/kde-live.keywords
+++ b/Documentation/package.keywords/kde-live.keywords
@@ -81,7 +81,6 @@
 ~kde-base/kcminit-9999 **
 ~kde-base/kdebase-cursors-9999 **
 ~kde-base/kdebase-startkde-9999 **
-~kde-base/kdebase-wallpapers-9999 **
 ~kde-base/kdm-9999 **
 ~kde-base/kephal-9999 **
 ~kde-base/khotkeys-9999 **

diff --git a/Documentation/package.unmask/kde-live b/Documentation/package.unmask/kde-live
index ea233aa..bbd43cf 100644
--- a/Documentation/package.unmask/kde-live
+++ b/Documentation/package.unmask/kde-live
@@ -81,7 +81,6 @@ kde-base/kcheckpass:live
 kde-base/kcminit:live
 kde-base/kdebase-cursors:live
 kde-base/kdebase-startkde:live
-kde-base/kdebase-wallpapers:live
 kde-base/kdm:live
 kde-base/kephal:live
 kde-base/khotkeys:live

diff --git a/kde-base/kdebase-meta/kdebase-meta-9999.ebuild b/kde-base/kdebase-meta/kdebase-meta-9999.ebuild
index 47e1e8b..86a45fc 100644
--- a/kde-base/kdebase-meta/kdebase-meta-9999.ebuild
+++ b/kde-base/kdebase-meta/kdebase-meta-9999.ebuild
@@ -21,7 +21,6 @@ RDEPEND="
 	$(add_kdebase_dep kdebase-cursors)
 	$(add_kdebase_dep kdebase-runtime-meta)
 	$(add_kdebase_dep kdebase-startkde)
-	$(add_kdebase_dep kdebase-wallpapers)
 	$(add_kdebase_dep kdepasswd)
 	$(add_kdebase_dep kdialog)
 	$(add_kdebase_dep keditbookmarks)

diff --git a/kde-base/kdebase-startkde/kdebase-startkde-9999.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-9999.ebuild
index a013174..9440d8e 100644
--- a/kde-base/kdebase-startkde/kdebase-startkde-9999.ebuild
+++ b/kde-base/kdebase-startkde/kdebase-startkde-9999.ebuild
@@ -17,7 +17,6 @@ IUSE=""
 RDEPEND="
 	$(add_kdebase_dep kcminit)
 	$(add_kdebase_dep kdebase-runtime-meta)
-	$(add_kdebase_dep kdebase-wallpapers)
 	$(add_kdebase_dep kfmclient)
 	$(add_kdebase_dep knotify)
 	$(add_kdebase_dep kreadconfig)

diff --git a/kde-base/kdebase-wallpapers/kdebase-wallpapers-9999.ebuild b/kde-base/kdebase-wallpapers/kdebase-wallpapers-9999.ebuild
deleted file mode 100644
index ed62f92..0000000
--- a/kde-base/kdebase-wallpapers/kdebase-wallpapers-9999.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-KMNAME="kdebase-workspace"
-KMMODULE="wallpapers"
-inherit kde4-meta
-
-DESCRIPTION="KDE wallpapers"
-KEYWORDS=""
-IUSE=""
-
-add_blocker kde-wallpapers

diff --git a/sets/kdebase-workspace-live b/sets/kdebase-workspace-live
index ef9a28f..413de11 100644
--- a/sets/kdebase-workspace-live
+++ b/sets/kdebase-workspace-live
@@ -3,7 +3,6 @@ kde-base/kcheckpass:live
 kde-base/kcminit:live
 kde-base/kdebase-cursors:live
 kde-base/kdebase-startkde:live
-kde-base/kdebase-wallpapers:live
 kde-base/kdm:live
 kde-base/kephal:live
 kde-base/khotkeys:live



^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] proj/kde:master commit in: Documentation/package.unmask/, kde-base/kdebase-meta/, ...
@ 2011-02-22 15:49 Manuel Nickschas
  0 siblings, 0 replies; 2+ messages in thread
From: Manuel Nickschas @ 2011-02-22 15:49 UTC (permalink / raw
  To: gentoo-commits

commit:     5390a8cfee1fc01a1c8fe7bdca7bc0a3c1208bd2
Author:     Manuel Nickschas <sputnick <AT> quassel-irc <DOT> org>
AuthorDate: Tue Feb 22 15:47:36 2011 +0000
Commit:     Manuel Nickschas <sputnick <AT> quassel-irc <DOT> org>
CommitDate: Tue Feb 22 15:49:08 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=5390a8cf

[kde-wallpapers:live] Found the missing wallpapers

The default wallpapers moved from the kdebase-workspace module to a standalone
svn repo named kde-wallpapers. Upstream intends to keep those as a separate module/tarball
in the future.

We pull it in as part of kdebase-data (like oxygen-icons).

---
 .../.kde-live/kdebase-workspace-live               |    1 +
 Documentation/package.keywords/kde-live.keywords   |    1 +
 Documentation/package.unmask/kde-live              |    1 +
 kde-base/kde-wallpapers/kde-wallpapers-9999.ebuild |   22 ++++++++++++++++++++
 kde-base/kde-wallpapers/metadata.xml               |    5 ++++
 kde-base/kdebase-data/kdebase-data-9999.ebuild     |    1 +
 kde-base/kdebase-meta/kdebase-meta-9999.ebuild     |    1 +
 sets/kdebase-workspace-live                        |    1 +
 8 files changed, 33 insertions(+), 0 deletions(-)

diff --git a/Documentation/package.keywords/.kde-live/kdebase-workspace-live b/Documentation/package.keywords/.kde-live/kdebase-workspace-live
index 34580b2..fc88407 100644
--- a/Documentation/package.keywords/.kde-live/kdebase-workspace-live
+++ b/Documentation/package.keywords/.kde-live/kdebase-workspace-live
@@ -3,6 +3,7 @@
 ~kde-base/kcminit-9999 **
 ~kde-base/kdebase-cursors-9999 **
 ~kde-base/kdebase-startkde-9999 **
+~kde-base/kde-wallpapers-9999 **
 ~kde-base/kdm-9999 **
 ~kde-base/kephal-9999 **
 ~kde-base/khotkeys-9999 **

diff --git a/Documentation/package.keywords/kde-live.keywords b/Documentation/package.keywords/kde-live.keywords
index 5aa0958..b778422 100644
--- a/Documentation/package.keywords/kde-live.keywords
+++ b/Documentation/package.keywords/kde-live.keywords
@@ -82,6 +82,7 @@
 ~kde-base/kcminit-9999 **
 ~kde-base/kdebase-cursors-9999 **
 ~kde-base/kdebase-startkde-9999 **
+~kde-base/kde-wallpapers-9999 **
 ~kde-base/kdm-9999 **
 ~kde-base/kephal-9999 **
 ~kde-base/khotkeys-9999 **

diff --git a/Documentation/package.unmask/kde-live b/Documentation/package.unmask/kde-live
index 574434e..2713ff4 100644
--- a/Documentation/package.unmask/kde-live
+++ b/Documentation/package.unmask/kde-live
@@ -82,6 +82,7 @@ kde-base/kcheckpass:live
 kde-base/kcminit:live
 kde-base/kdebase-cursors:live
 kde-base/kdebase-startkde:live
+kde-base/kde-wallpapers:live
 kde-base/kdm:live
 kde-base/kephal:live
 kde-base/khotkeys:live

diff --git a/kde-base/kde-wallpapers/kde-wallpapers-9999.ebuild b/kde-base/kde-wallpapers/kde-wallpapers-9999.ebuild
new file mode 100644
index 0000000..a000716
--- /dev/null
+++ b/kde-base/kde-wallpapers/kde-wallpapers-9999.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=3
+
+KMNAME="kde-wallpapers"
+KDE_SCM="svn"
+KDE_REQUIRED="never"
+inherit kde4-base
+
+DESCRIPTION="KDE wallpapers"
+KEYWORDS=""
+IUSE=""
+
+add_blocker kdebase-wallpapers
+
+src_configure() {
+	mycmakeargs=( -DWALLPAPER_INSTALL_DIR=${EKDEDIR}/share/wallpapers )
+
+	kde4-base_src_configure
+}

diff --git a/kde-base/kde-wallpapers/metadata.xml b/kde-base/kde-wallpapers/metadata.xml
new file mode 100644
index 0000000..8d1e86a
--- /dev/null
+++ b/kde-base/kde-wallpapers/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>kde</herd>
+</pkgmetadata>

diff --git a/kde-base/kdebase-data/kdebase-data-9999.ebuild b/kde-base/kdebase-data/kdebase-data-9999.ebuild
index bd45488..7f8746e 100644
--- a/kde-base/kdebase-data/kdebase-data-9999.ebuild
+++ b/kde-base/kdebase-data/kdebase-data-9999.ebuild
@@ -13,6 +13,7 @@ IUSE=""
 KEYWORDS=""
 
 RDEPEND="
+	$(add_kdebase_dep kde-wallpapers)
 	$(add_kdebase_dep oxygen-icons)
 	x11-themes/hicolor-icon-theme
 "

diff --git a/kde-base/kdebase-meta/kdebase-meta-9999.ebuild b/kde-base/kdebase-meta/kdebase-meta-9999.ebuild
index 86a45fc..a29ca6d 100644
--- a/kde-base/kdebase-meta/kdebase-meta-9999.ebuild
+++ b/kde-base/kdebase-meta/kdebase-meta-9999.ebuild
@@ -18,6 +18,7 @@ RDEPEND="
 	$(add_kdebase_dep freespacenotifier)
 	$(add_kdebase_dep kcheckpass)
 	$(add_kdebase_dep kcminit)
+	$(add_kdebase_dep kde-wallpapers)
 	$(add_kdebase_dep kdebase-cursors)
 	$(add_kdebase_dep kdebase-runtime-meta)
 	$(add_kdebase_dep kdebase-startkde)

diff --git a/sets/kdebase-workspace-live b/sets/kdebase-workspace-live
index 413de11..3af33e2 100644
--- a/sets/kdebase-workspace-live
+++ b/sets/kdebase-workspace-live
@@ -3,6 +3,7 @@ kde-base/kcheckpass:live
 kde-base/kcminit:live
 kde-base/kdebase-cursors:live
 kde-base/kdebase-startkde:live
+kde-base/kde-wallpapers:live
 kde-base/kdm:live
 kde-base/kephal:live
 kde-base/khotkeys:live



^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2011-02-22 15:49 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-22 15:49 [gentoo-commits] proj/kde:master commit in: Documentation/package.unmask/, kde-base/kdebase-meta/, Manuel Nickschas
  -- strict thread matches above, loose matches on Subject: below --
2011-02-15 12:22 Steffen Stramm

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox