[>=kde-base/kappfinder:4.5] Moved to extragear, so in kde-misc

13 files changed, 21 insertions, 10 deletions

diff --git a/Documentation/package.keywords/kde-4.5.keywords b/Documentation/package.keywords/kde-4.5.keywords
index ce99abc2f93..d2b0dc54521 100644
--- a/Documentation/package.keywords/kde-4.5.keywords
+++ b/Documentation/package.keywords/kde-4.5.keywords
@@ -25,7 +25,6 @@ kde-base/kdeartwork-styles:4.5
 kde-base/kdeartwork-wallpapers:4.5
 kde-base/kdeartwork-weatherwallpapers:4.5
 kde-base/dolphin:4.5
-kde-base/kappfinder:4.5
 kde-base/kdepasswd:4.5
 kde-base/kdialog:4.5
 kde-base/keditbookmarks:4.5
diff --git a/Documentation/package.keywords/kde-live.d/kdebase-apps-live b/Documentation/package.keywords/kde-live.d/kdebase-apps-live
index 5042e059282..d82d685d758 100644
--- a/Documentation/package.keywords/kde-live.d/kdebase-apps-live
+++ b/Documentation/package.keywords/kde-live.d/kdebase-apps-live
@@ -1,5 +1,4 @@
 ~kde-base/dolphin-9999 **
-~kde-base/kappfinder-9999 **
 ~kde-base/kdepasswd-9999 **
 ~kde-base/kdialog-9999 **
 ~kde-base/keditbookmarks-9999 **
diff --git a/Documentation/package.keywords/kde-live.keywords b/Documentation/package.keywords/kde-live.keywords
index 073d080c5c8..3f175c9148b 100644
--- a/Documentation/package.keywords/kde-live.keywords
+++ b/Documentation/package.keywords/kde-live.keywords
@@ -25,7 +25,6 @@
 ~kde-base/kdeartwork-wallpapers-9999 **
 ~kde-base/kdeartwork-weatherwallpapers-9999 **
 ~kde-base/dolphin-9999 **
-~kde-base/kappfinder-9999 **
 ~kde-base/kdepasswd-9999 **
 ~kde-base/kdialog-9999 **
 ~kde-base/keditbookmarks-9999 **
diff --git a/Documentation/package.unmask/kde-4.5 b/Documentation/package.unmask/kde-4.5
index 35878119185..71ee1d5fe8a 100644
--- a/Documentation/package.unmask/kde-4.5
+++ b/Documentation/package.unmask/kde-4.5
@@ -25,7 +25,6 @@ kde-base/kdeartwork-styles:4.5
 kde-base/kdeartwork-wallpapers:4.5
 kde-base/kdeartwork-weatherwallpapers:4.5
 kde-base/dolphin:4.5
-kde-base/kappfinder:4.5
 kde-base/kdepasswd:4.5
 kde-base/kdialog:4.5
 kde-base/keditbookmarks:4.5
diff --git a/Documentation/package.unmask/kde-live b/Documentation/package.unmask/kde-live
index d4f44483642..2561ea7861c 100644
--- a/Documentation/package.unmask/kde-live
+++ b/Documentation/package.unmask/kde-live
@@ -94,7 +94,6 @@ kde-base/kdeartwork-styles:live
 kde-base/kdeartwork-wallpapers:live
 kde-base/kdeartwork-weatherwallpapers:live
 kde-base/dolphin:live
-kde-base/kappfinder:live
 kde-base/kdepasswd:live
 kde-base/kdialog:live
 kde-base/keditbookmarks:live
diff --git a/kde-base/kappfinder/Manifest b/kde-base/kappfinder/Manifest
index ac1fc28c686..7cc135968ae 100644
--- a/kde-base/kappfinder/Manifest
+++ b/kde-base/kappfinder/Manifest
@@ -1,3 +1,2 @@
-EBUILD kappfinder-4.4.9999.ebuild 319 RMD160 91b560f59f0cde379797395e2d99b4d3a04c68ea SHA1 752ce11fcee8a8515b5d6a3954d8a866c21b9186 SHA256 600fcde1e5f35b76587212a551d897dc6c61f8609a379b778a38587312b51fba
-EBUILD kappfinder-9999.ebuild 321 RMD160 ba7cd579bacfe830d1f9319592868a0d83280e3d SHA1 1bd2a1b15b231d3575ae34b2c0ecbfe9561d27a4 SHA256 8ac5012c7240fd1a5301a40e58b9021cbff7f443f5c72b05a554a9899230b62e
+EBUILD kappfinder-4.4.9999.ebuild 412 RMD160 c9c4d903adcb88be541f1e5fc215169f622bd663 SHA1 3e2fef416b110a87b68c90395cd6e7af95cfd9b2 SHA256 8bc78ef3d97dad8d1b318cb95b0b40e2f300d900cdf22ce02acec43fa38236c9
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/kappfinder/kappfinder-4.4.9999.ebuild b/kde-base/kappfinder/kappfinder-4.4.9999.ebuild
index 175345b75b4..4c61bb6be87 100644
--- a/kde-base/kappfinder/kappfinder-4.4.9999.ebuild
+++ b/kde-base/kappfinder/kappfinder-4.4.9999.ebuild
@@ -10,3 +10,8 @@ inherit kde4-meta
 DESCRIPTION="KDE tool that looks for well-known apps in your path and creates entries for them in the KDE menu"
 KEYWORDS=""
 IUSE="debug +handbook"
+
+# Moved away to extragear around 4.4.70
+RDEPEND="
+	!kdeprefix? ( !kde-misc/kappfinder:4 )
+"
diff --git a/kde-misc/kappfinder/Manifest b/kde-misc/kappfinder/Manifest
new file mode 100644
index 00000000000..55511a56aba
--- /dev/null
+++ b/kde-misc/kappfinder/Manifest
@@ -0,0 +1,2 @@
+EBUILD kappfinder-9999.ebuild 432 RMD160 9c28869b6e7b14786f41c4644b0bf5da24b53e4f SHA1 bebc61bae3e1ede838374cadc9a8152f02ee97a1 SHA256 fb81110c6ec4a14c6d870d1923349c875142a047a3a6f4561b9e5c7936cf4d0e
+MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/kappfinder/kappfinder-9999.ebuild b/kde-misc/kappfinder/kappfinder-9999.ebuild
index dcc00fa8ec4..d58e0b4ed9b 100644
--- a/kde-base/kappfinder/kappfinder-9999.ebuild
+++ b/kde-misc/kappfinder/kappfinder-9999.ebuild
@@ -8,5 +8,13 @@ KMNAME="extragear/base"
 inherit kde4-meta
 
 DESCRIPTION="KDE tool that looks for well-known apps in your path and creates entries for them in the KDE menu"
+HOMEPAGE="http://kde.org"
+
+LICENSE="GPL-2"
 KEYWORDS=""
+SLOT="4"
 IUSE="debug +handbook"
+
+RDEPEND="
+	!kdeprefix? ( !>=kde-base/kappfinder-4.0.0 )
+"
diff --git a/kde-misc/kappfinder/metadata.xml b/kde-misc/kappfinder/metadata.xml
new file mode 100644
index 00000000000..8d1e86a9cef
--- /dev/null
+++ b/kde-misc/kappfinder/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/profiles/package.mask b/profiles/package.mask
index b84ce9b8b54..85521aef5a7 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -32,7 +32,6 @@ kde-base/kdeartwork-styles:4.5
 kde-base/kdeartwork-wallpapers:4.5
 kde-base/kdeartwork-weatherwallpapers:4.5
 kde-base/dolphin:4.5
-kde-base/kappfinder:4.5
 kde-base/kdepasswd:4.5
 kde-base/kdialog:4.5
 kde-base/keditbookmarks:4.5
diff --git a/sets/kdebase-apps-4.5 b/sets/kdebase-apps-4.5
index d9bcb240328..c1434b6798f 100644
--- a/sets/kdebase-apps-4.5
+++ b/sets/kdebase-apps-4.5
@@ -1,5 +1,4 @@
 kde-base/dolphin:4.5
-kde-base/kappfinder:4.5
 kde-base/kdepasswd:4.5
 kde-base/kdialog:4.5
 kde-base/keditbookmarks:4.5
diff --git a/sets/kdebase-apps-live b/sets/kdebase-apps-live
index 4f5a7bf4ba3..fc2810f85b1 100644
--- a/sets/kdebase-apps-live
+++ b/sets/kdebase-apps-live
@@ -1,5 +1,4 @@
 kde-base/dolphin:live
-kde-base/kappfinder:live
 kde-base/kdepasswd:live
 kde-base/kdialog:live
 kde-base/keditbookmarks:live