[gentoo-commits] proj/kde:master commit in: kde-misc/milou/, sets/, kde-base/milou/

[Michael Palimaka]

commit:     dad516907e3ccce98b72de99cc206a4cc97aec20
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri May 23 08:29:52 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri May 23 08:30:49 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=dad51690

[kde-misc/milou] Move to kde-base.

Upstream moved the proect from extragear to workspace.

---
 kde-base/milou/metadata.xml                      |  5 +++++
 {kde-misc => kde-base}/milou/milou-4.96.0.ebuild |  9 ++-------
 {kde-misc => kde-base}/milou/milou-9999.ebuild   |  9 ++-------
 sets/kde-applications                            |  4 ++++
 sets/kde-applications-5.0                        |  1 -
 sets/kde-applications-live                       |  1 -
 sets/kde-workspaces                              | 18 ++++++++++++++++++
 sets/kde-workspaces-5.0                          |  1 +
 sets/kde-workspaces-live                         |  1 +
 9 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/kde-base/milou/metadata.xml b/kde-base/milou/metadata.xml
new file mode 100644
index 0000000..a23f444
--- /dev/null
+++ b/kde-base/milou/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-misc/milou/milou-4.96.0.ebuild b/kde-base/milou/milou-4.96.0.ebuild
similarity index 73%
rename from kde-misc/milou/milou-4.96.0.ebuild
rename to kde-base/milou/milou-4.96.0.ebuild
index e5d5cd1..052ba5f 100644
--- a/kde-misc/milou/milou-4.96.0.ebuild
+++ b/kde-base/milou/milou-4.96.0.ebuild
@@ -4,16 +4,11 @@
 
 EAPI=5
 
-if [[ $PV = *9999* ]]; then
-	EGIT_BRANCH="frameworks"
-	KEYWORDS=""
-else
-	SRC_URI="mirror://kde/unstable/plasma/${PV}/src/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
+EGIT_BRANCH="frameworks"
 inherit kde5
 
 DESCRIPTION="Dedicated search application built on top of Baloo"
+KEYWORDS=""
 HOMEPAGE="https://projects.kde.org/projects/extragear/base/milou"
 
 LICENSE="GPL-2 LGPL-2.1"

diff --git a/kde-misc/milou/milou-9999.ebuild b/kde-base/milou/milou-9999.ebuild
similarity index 73%
rename from kde-misc/milou/milou-9999.ebuild
rename to kde-base/milou/milou-9999.ebuild
index e5d5cd1..834cd49 100644
--- a/kde-misc/milou/milou-9999.ebuild
+++ b/kde-base/milou/milou-9999.ebuild
@@ -4,16 +4,11 @@
 
 EAPI=5
 
-if [[ $PV = *9999* ]]; then
-	EGIT_BRANCH="frameworks"
-	KEYWORDS=""
-else
-	SRC_URI="mirror://kde/unstable/plasma/${PV}/src/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
+EGIT_BRANCH="frameworks"
 inherit kde5
 
 DESCRIPTION="Dedicated search application built on top of Baloo"
+KEYWORDS="~amd64 ~x86"
 HOMEPAGE="https://projects.kde.org/projects/extragear/base/milou"
 
 LICENSE="GPL-2 LGPL-2.1"

diff --git a/sets/kde-applications b/sets/kde-applications
new file mode 100644
index 0000000..afff2a3
--- /dev/null
+++ b/sets/kde-applications
@@ -0,0 +1,4 @@
+# Autogenerated by regenerate-files, DO NOT EDIT.
+# sort them later to the appropriate sets
+kde-misc/powerdevil-5.0.50
+x11-libs/libkscreen2

diff --git a/sets/kde-applications-5.0 b/sets/kde-applications-5.0
index 337026a..a81bc51 100644
--- a/sets/kde-applications-5.0
+++ b/sets/kde-applications-5.0
@@ -1,4 +1,3 @@
 # sort them later to the appropriate sets
-<kde-misc/milou-5.0.50
 <kde-misc/powerdevil-5.0.50
 x11-libs/libkscreen2

diff --git a/sets/kde-applications-live b/sets/kde-applications-live
index 2a9e204..ecd48c6 100644
--- a/sets/kde-applications-live
+++ b/sets/kde-applications-live
@@ -1,7 +1,6 @@
 # sort them later to the appropriate sets
 ~kde-base/konsole-9999
 ~kde-misc/plasma-nm-9999
-~kde-misc/milou-9999
 ~kde-misc/powerdevil-9999
 ~net-libs/libmm-qt-9999
 ~net-libs/libnm-qt-9999

diff --git a/sets/kde-workspaces b/sets/kde-workspaces
new file mode 100644
index 0000000..eb2ec39
--- /dev/null
+++ b/sets/kde-workspaces
@@ -0,0 +1,18 @@
+# Autogenerated by regenerate-files, DO NOT EDIT.
+kde-base/baloo-5.0.50
+kde-base/breeze-5.0.50
+kde-base/kde-cli-tools-5.0.50
+kde-base/khelpcenter-5.0.50
+kde-base/khotkeys-5.0.50
+kde-base/kinfocenter-5.0.50
+kde-base/kio-extras-5.0.50
+kde-base/kmenuedit-5.0.50
+kde-base/ksysguard-5.0.50
+kde-base/kwin-5.0.50
+kde-base/kwrited-5.0.50
+kde-base/libksysguard-5.0.50
+kde-base/milou-5.0.50
+kde-base/oxygen-5.0.50
+kde-base/plasma-desktop-5.0.50
+kde-base/plasma-workspace-5.0.50
+kde-base/systemsettings-5.0.50

diff --git a/sets/kde-workspaces-5.0 b/sets/kde-workspaces-5.0
index 67d2700..fd2c455 100644
--- a/sets/kde-workspaces-5.0
+++ b/sets/kde-workspaces-5.0
@@ -10,6 +10,7 @@
 <kde-base/kwin-5.0.50
 <kde-base/kwrited-5.0.50
 <kde-base/libksysguard-5.0.50
+<kde-base/milou-5.0.50
 <kde-base/oxygen-5.0.50
 <kde-base/plasma-desktop-5.0.50
 <kde-base/plasma-workspace-5.0.50

diff --git a/sets/kde-workspaces-live b/sets/kde-workspaces-live
index d5cd96b..2415898 100644
--- a/sets/kde-workspaces-live
+++ b/sets/kde-workspaces-live
@@ -10,6 +10,7 @@
 ~kde-base/kwin-9999
 ~kde-base/kwrited-9999
 ~kde-base/libksysguard-9999
+~kde-base/milou-9999
 ~kde-base/oxygen-9999
 ~kde-base/plasma-desktop-9999
 ~kde-base/plasma-workspace-9999