[kde-misc/filelight] Moved to kdeutils since 4.6

8 files changed, 12 insertions, 9 deletions

diff --git a/Documentation/package.keywords/.kde-live/kdeutils-live b/Documentation/package.keywords/.kde-live/kdeutils-live
index 41c1d0f026c..c52fd7bff73 100644
--- a/Documentation/package.keywords/.kde-live/kdeutils-live
+++ b/Documentation/package.keywords/.kde-live/kdeutils-live
@@ -1,4 +1,5 @@
 ~kde-base/ark-9999 **
+~kde-base/filelight-9999 **
 ~kde-base/kcalc-9999 **
 ~kde-base/kcharselect-9999 **
 ~kde-base/kdeutils-meta-9999 **
diff --git a/Documentation/package.keywords/kde-live.keywords b/Documentation/package.keywords/kde-live.keywords
index c4a139ef43e..89a9a80b517 100644
--- a/Documentation/package.keywords/kde-live.keywords
+++ b/Documentation/package.keywords/kde-live.keywords
@@ -279,6 +279,7 @@
 ~kde-base/kteatime-9999 **
 ~kde-base/ktux-9999 **
 ~kde-base/ark-9999 **
+~kde-base/filelight-9999 **
 ~kde-base/kcalc-9999 **
 ~kde-base/kcharselect-9999 **
 ~kde-base/kdeutils-meta-9999 **
diff --git a/Documentation/package.unmask/kde-live b/Documentation/package.unmask/kde-live
index 52eed16cbf9..454d870fec3 100644
--- a/Documentation/package.unmask/kde-live
+++ b/Documentation/package.unmask/kde-live
@@ -279,6 +279,7 @@ kde-base/kdetoys-meta:live
 kde-base/kteatime:live
 kde-base/ktux:live
 kde-base/ark:live
+kde-base/filelight:live
 kde-base/kcalc:live
 kde-base/kcharselect:live
 kde-base/kdeutils-meta:live
diff --git a/kde-base/filelight/Manifest b/kde-base/filelight/Manifest
new file mode 100644
index 00000000000..3473b11e8b9
--- /dev/null
+++ b/kde-base/filelight/Manifest
@@ -0,0 +1,2 @@
+EBUILD filelight-9999.ebuild 417 RMD160 50afb64645170af85f9e4e58621aa403a90d98b4 SHA1 82059c6a8595a1d66ec5c1f7ca476760531853c6 SHA256 0724427c78101262e49196eb8db80ebb8e8aee0e7c5212e9c0e78d8df01724a9
+MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-misc/filelight/filelight-9999.ebuild b/kde-base/filelight/filelight-9999.ebuild
index e1d00adc4bb..252d1a3512b 100644
--- a/kde-misc/filelight/filelight-9999.ebuild
+++ b/kde-base/filelight/filelight-9999.ebuild
@@ -2,20 +2,19 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI="3"
 
-KMNAME="playground/utils"
-inherit kde4-base
+KDE_HANDBOOK="optional"
+KMNAME="kdeutils"
+inherit kde4-meta
 
 DESCRIPTION="Filelight creates an interactive map of concentric, segmented rings that help visualise disk usage."
-HOMEPAGE="http://kde-apps.org/content/show.php/filelight?content=99561"
 
-LICENSE="GPL-2"
+LICENSE="GPL-3"
 KEYWORDS=""
-SLOT="4"
 IUSE="debug"
 
 RDEPEND="
-	!kde-misc/filelight:0
+	!kdeprefix? ( !kde-misc/filelight )
 	x11-apps/xdpyinfo
 "
diff --git a/kde-misc/filelight/metadata.xml b/kde-base/filelight/metadata.xml
index 8d1e86a9cef..8d1e86a9cef 100644
--- a/kde-misc/filelight/metadata.xml
+++ b/kde-base/filelight/metadata.xml
diff --git a/kde-misc/filelight/Manifest b/kde-misc/filelight/Manifest
deleted file mode 100644
index dcf8718767c..00000000000
--- a/kde-misc/filelight/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD filelight-9999.ebuild 468 RMD160 c6f81ad61e23863fa10b1f3dc706b6b49d056ae3 SHA1 204801a27416e3b77d44c64ab0279749de20c6a5 SHA256 c07c05a8ed37e02d70ef419d599be4fac91d864b33fb7e8424dce1d4c484710c
-MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/sets/kdeutils-live b/sets/kdeutils-live
index cd68ac4869a..6225bbdc803 100644
--- a/sets/kdeutils-live
+++ b/sets/kdeutils-live
@@ -1,4 +1,5 @@
 kde-base/ark:live
+kde-base/filelight:live
 kde-base/kcalc:live
 kde-base/kcharselect:live
 kde-base/kdeutils-meta:live