[kde-misc/basket] - live ebuild moved from x11-misc/basket + slot change 0->4

12 files changed, 18 insertions, 12 deletions

diff --git a/Documentation/package.keywords/kde-3.5.keywords b/Documentation/package.keywords/kde-3.5.keywords
index 2ac674db84..90cba25546 100644
--- a/Documentation/package.keywords/kde-3.5.keywords
+++ b/Documentation/package.keywords/kde-3.5.keywords
@@ -1,4 +1,4 @@
-# Maciej Mrozowski (reavertm) <reavertm@poczta.fm> (30 May 2009)
+# Maciej Mrozowski (reavertm) <reavertm@poczta.fm> (01 Jun 2009)
 # Autogenerated by regenerate-files, DO NOT EDIT.
 # Combined KDE 3.5 package.keywords file.
 kde-base/ksayit:3.5
diff --git a/Documentation/package.keywords/kde-live.keywords b/Documentation/package.keywords/kde-live.keywords
index 84fbe6a0da..ccc7853969 100644
--- a/Documentation/package.keywords/kde-live.keywords
+++ b/Documentation/package.keywords/kde-live.keywords
@@ -287,6 +287,7 @@
 ~kde-base/systemsettings-9999 **
 ~kde-base/thumbnailers-9999 **
 ~kde-base/umbrello-9999 **
+~kde-misc/basket-9999 **
 ~kde-misc/filelight-9999 **
 ~kde-misc/kdiff3-9999 **
 ~kde-misc/kgrubeditor-9999 **
@@ -331,4 +332,3 @@
 ~x11-themes/gtk-engines-qt-9999 **
 ~kde-base/oxygen-icons-9999 **
 ~x11-themes/playground-plasma-themes-9999 **
-~x11-misc/basket-9999 **
diff --git a/Documentation/package.unmask/kde-4.2 b/Documentation/package.unmask/kde-4.2
index 138733b1cf..05388e240f 100644
--- a/Documentation/package.unmask/kde-4.2
+++ b/Documentation/package.unmask/kde-4.2
@@ -1,4 +1,4 @@
-# Maciej Mrozowski (reavertm) <reavertm@poczta.fm> (30 May 2009)
+# Maciej Mrozowski (reavertm) <reavertm@poczta.fm> (01 Jun 2009)
 # Autogenerated by regenerate-files, DO NOT EDIT.
 # You can use this file to mask/unmask KDE 4.2 release.
 # Edit Documentation/package.unmask/kde-4.2.d/ files instead."
diff --git a/Documentation/package.unmask/kde-4.3 b/Documentation/package.unmask/kde-4.3
index a554f777cb..02a19b0244 100644
--- a/Documentation/package.unmask/kde-4.3
+++ b/Documentation/package.unmask/kde-4.3
@@ -1,4 +1,4 @@
-# Maciej Mrozowski (reavertm) <reavertm@poczta.fm> (30 May 2009)
+# Maciej Mrozowski (reavertm) <reavertm@poczta.fm> (01 Jun 2009)
 # Autogenerated by regenerate-files, DO NOT EDIT.
 # You can use this file to mask/unmask KDE 4.3 release.
 # Edit Documentation/package.unmask/kde-4.3.d/ files instead."
diff --git a/Documentation/package.unmask/kde-live b/Documentation/package.unmask/kde-live
index 9096d86eed..cdaaa2ffef 100644
--- a/Documentation/package.unmask/kde-live
+++ b/Documentation/package.unmask/kde-live
@@ -1,4 +1,4 @@
-# Maciej Mrozowski (reavertm) <reavertm@poczta.fm> (30 May 2009)
+# Maciej Mrozowski (reavertm) <reavertm@poczta.fm> (01 Jun 2009)
 # Autogenerated by regenerate-files, DO NOT EDIT.
 # Live packages are masked by default.
 # Edit Documentation/package.unmask/kde-live.d/ files instead."
@@ -144,6 +144,7 @@ kde-base/step:live
 ~dev-util/kdevelop-plugins-9999
 ~dev-util/kdevplatform-9999
 ~dev-util/krazy2-9999
+~kde-misc/basket-9999
 ~kde-misc/filelight-9999
 ~kde-misc/kdiff3-9999
 ~kde-misc/kgrubeditor-9999
@@ -181,7 +182,6 @@ kde-base/step:live
 ~x11-libs/qtscriptgenerator-9999
 ~x11-themes/gtk-engines-qt-9999
 ~x11-themes/playground-plasma-themes-9999
-~x11-misc/basket-9999
 kde-base/bomber:live
 kde-base/bovo:live
 kde-base/kapman:live
diff --git a/x11-misc/basket/ChangeLog b/kde-misc/basket/ChangeLog
index 8caee82e24..8caee82e24 100644
--- a/x11-misc/basket/ChangeLog
+++ b/kde-misc/basket/ChangeLog
diff --git a/x11-misc/basket/Manifest b/kde-misc/basket/Manifest
index 2ae03bacb6..2ae03bacb6 100644
--- a/x11-misc/basket/Manifest
+++ b/kde-misc/basket/Manifest
diff --git a/x11-misc/basket/basket-9999.ebuild b/kde-misc/basket/basket-9999.ebuild
index 16b66e9c1f..9e702fafc6 100644
--- a/x11-misc/basket/basket-9999.ebuild
+++ b/kde-misc/basket/basket-9999.ebuild
@@ -12,9 +12,13 @@ EGIT_REPO_URI="git://github.com/kelvie/basket.git"
 
 LICENSE="GPL-2"
 KEYWORDS=""
-SLOT="0"
+SLOT="4"
 IUSE="debug"
 
 src_unpack() {
 	git_src_unpack
 }
+
+RDEPEND="
+	!x11-misc/basket:0
+"
diff --git a/x11-misc/basket/metadata.xml b/kde-misc/basket/metadata.xml
index 8d1e86a9ce..8d1e86a9ce 100644
--- a/x11-misc/basket/metadata.xml
+++ b/kde-misc/basket/metadata.xml
diff --git a/profiles/package.mask b/profiles/package.mask
index 1de8734294..3865835761 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,4 +1,4 @@
-# Maciej Mrozowski (reavertm) <reavertm@poczta.fm> (30 May 2009)
+# Maciej Mrozowski (reavertm) <reavertm@poczta.fm> (01 Jun 2009)
 # Autogenerated by regenerate-files, DO NOT EDIT.
 # Edit profiles/package.mask.d/ files instead.
 
@@ -255,7 +255,7 @@
 ~kde-base/kommander-4.2.4
 ~kde-base/kxsldbg-4.2.4
 
-# Maciej Mrozowski (reavertm) <reavertm@poczta.fm> (30 May 2009)
+# Maciej Mrozowski (reavertm) <reavertm@poczta.fm> (01 Jun 2009)
 # Autogenerated by regenerate-files, DO NOT EDIT.
 # You can use this file to mask/unmask KDE 4.3 release.
 # Edit Documentation/package.unmask/kde-4.3.d/ files instead."
@@ -524,7 +524,7 @@ kde-base/klinkstatus:4.3
 kde-base/kommander:4.3
 kde-base/kxsldbg:4.3
 
-# Maciej Mrozowski (reavertm) <reavertm@poczta.fm> (30 May 2009)
+# Maciej Mrozowski (reavertm) <reavertm@poczta.fm> (01 Jun 2009)
 # Autogenerated by regenerate-files, DO NOT EDIT.
 # Live packages are masked by default.
 # Edit Documentation/package.unmask/kde-live.d/ files instead."
@@ -670,6 +670,7 @@ kde-base/step:live
 ~dev-util/kdevelop-plugins-9999
 ~dev-util/kdevplatform-9999
 ~dev-util/krazy2-9999
+~kde-misc/basket-9999
 ~kde-misc/filelight-9999
 ~kde-misc/kdiff3-9999
 ~kde-misc/kgrubeditor-9999
@@ -707,7 +708,6 @@ kde-base/step:live
 ~x11-libs/qtscriptgenerator-9999
 ~x11-themes/gtk-engines-qt-9999
 ~x11-themes/playground-plasma-themes-9999
-~x11-misc/basket-9999
 kde-base/bomber:live
 kde-base/bovo:live
 kde-base/kapman:live
diff --git a/profiles/updates/2Q-2009 b/profiles/updates/2Q-2009
index c4cb072645..f76e565c45 100644
--- a/profiles/updates/2Q-2009
+++ b/profiles/updates/2Q-2009
@@ -1 +1,3 @@
 move kde-misc/guidance-power-manager sys-power/guidance-power-manager
+move x11-misc/basket kde-misc/basket
+slotmove =kde-misc/basket-9999 0 4
diff --git a/sets/kde-extras-live b/sets/kde-extras-live
index 8d680b661e..0f4ef1d792 100644
--- a/sets/kde-extras-live
+++ b/sets/kde-extras-live
@@ -8,6 +8,7 @@
 ~dev-util/kdevelop-plugins-9999
 ~dev-util/kdevplatform-9999
 ~dev-util/krazy2-9999
+~kde-misc/basket-9999
 ~kde-misc/filelight-9999
 ~kde-misc/kdiff3-9999
 ~kde-misc/kgrubeditor-9999
@@ -45,4 +46,3 @@
 ~x11-libs/qtscriptgenerator-9999
 ~x11-themes/gtk-engines-qt-9999
 ~x11-themes/playground-plasma-themes-9999
-~x11-misc/basket-9999