[sets] Fix duplication between @kdedeps-live and @kdelibs-live in favor of @kdelibs-live, run regenerate-files

13 files changed, 14 insertions, 39 deletions

diff --git a/Documentation/package.keywords/kde-3.5.keywords b/Documentation/package.keywords/kde-3.5.keywords
index a11ca09f433..50f8915b540 100644
--- a/Documentation/package.keywords/kde-3.5.keywords
+++ b/Documentation/package.keywords/kde-3.5.keywords
@@ -1,4 +1,4 @@
-# Jonathan Callen <en.ABCD@gmail.com> (22 Jul 2009)
+# Jonathan Callen <en.ABCD@gmail.com> (23 Jul 2009)
 # Autogenerated by regenerate-files, DO NOT EDIT.
 # Combined KDE 3.5 package.keywords file.
 kde-base/kde-meta:3.5
diff --git a/Documentation/package.keywords/kde-4.2.keywords b/Documentation/package.keywords/kde-4.2.keywords
index c2ce4cec0b0..80665aa4ae7 100644
--- a/Documentation/package.keywords/kde-4.2.keywords
+++ b/Documentation/package.keywords/kde-4.2.keywords
@@ -1,4 +1,4 @@
-# Jonathan Callen <en.ABCD@gmail.com> (22 Jul 2009)
+# Jonathan Callen <en.ABCD@gmail.com> (23 Jul 2009)
 # Autogenerated by regenerate-files, DO NOT EDIT.
 # You can use this file to keywork/unkeyword KDE 4.2 release.
 # Edit Documentation/package.keywords/kde-4.2.d/ files instead.
diff --git a/Documentation/package.keywords/kde-4.3.9999.keywords b/Documentation/package.keywords/kde-4.3.9999.keywords
index eb8d926706c..9566be84c80 100644
--- a/Documentation/package.keywords/kde-4.3.9999.keywords
+++ b/Documentation/package.keywords/kde-4.3.9999.keywords
@@ -1,4 +1,4 @@
-# Jonathan Callen <en.ABCD@gmail.com> (22 Jul 2009)
+# Jonathan Callen <en.ABCD@gmail.com> (23 Jul 2009)
 # Autogenerated by regenerate-files, DO NOT EDIT.
 # You can use this file to keywork/unkeyword KDE 4.3 release.
 # Edit Documentation/package.keywords/kde-4.3.d/ files instead.
diff --git a/Documentation/package.keywords/kde-4.3.keywords b/Documentation/package.keywords/kde-4.3.keywords
index 7b5b3fe4fd7..f48386af9cb 100644
--- a/Documentation/package.keywords/kde-4.3.keywords
+++ b/Documentation/package.keywords/kde-4.3.keywords
@@ -1,4 +1,4 @@
-# Jonathan Callen <en.ABCD@gmail.com> (22 Jul 2009)
+# Jonathan Callen <en.ABCD@gmail.com> (23 Jul 2009)
 # Autogenerated by regenerate-files, DO NOT EDIT.
 # You can use this file to keywork/unkeyword KDE 4.3 release.
 # Edit Documentation/package.keywords/kde-4.3.d/ files instead.
diff --git a/Documentation/package.keywords/kde-4.4.keywords b/Documentation/package.keywords/kde-4.4.keywords
index a7a7ac92f08..44ca81c4e3a 100644
--- a/Documentation/package.keywords/kde-4.4.keywords
+++ b/Documentation/package.keywords/kde-4.4.keywords
@@ -1,4 +1,4 @@
-# Jonathan Callen <en.ABCD@gmail.com> (22 Jul 2009)
+# Jonathan Callen <en.ABCD@gmail.com> (23 Jul 2009)
 # Autogenerated by regenerate-files, DO NOT EDIT.
 # You can use this file to keywork/unkeyword KDE 4.4 release.
 # Edit Documentation/package.keywords/kde-4.4.d/ files instead.
diff --git a/Documentation/package.keywords/kde-live.d/kdedeps-live b/Documentation/package.keywords/kde-live.d/kdedeps-live
index 2f399889361..3b751b39792 100644
--- a/Documentation/package.keywords/kde-live.d/kdedeps-live
+++ b/Documentation/package.keywords/kde-live.d/kdedeps-live
@@ -3,8 +3,3 @@
 ~app-misc/strigi-9999 **
 ~kde-base/automoc-9999 **
 ~media-sound/phonon-9999 **
-~kde-base/kde-env-9999 **
-~kde-base/kdelibs-9999 **
-~kde-base/kdepimlibs-9999 **
-~kde-base/libknotificationitem-9999 **
-~kde-base/oxygen-icons-9999 **
diff --git a/Documentation/package.keywords/kde-live.keywords b/Documentation/package.keywords/kde-live.keywords
index 95ea3e1a703..adf01bcd002 100644
--- a/Documentation/package.keywords/kde-live.keywords
+++ b/Documentation/package.keywords/kde-live.keywords
@@ -1,4 +1,4 @@
-# Jonathan Callen <en.ABCD@gmail.com> (22 Jul 2009)
+# Jonathan Callen <en.ABCD@gmail.com> (23 Jul 2009)
 # Autogenerated by regenerate-files, DO NOT EDIT.
 # You can use this file to keywork/unkeyword KDE live release.
 # Edit Documentation/package.keywords/kde-live.base/ files instead.
@@ -165,11 +165,6 @@
 ~app-misc/strigi-9999 **
 ~kde-base/automoc-9999 **
 ~media-sound/phonon-9999 **
-~kde-base/kde-env-9999 **
-~kde-base/kdelibs-9999 **
-~kde-base/kdepimlibs-9999 **
-~kde-base/libknotificationitem-9999 **
-~kde-base/oxygen-icons-9999 **
 ~kde-base/blinken-9999 **
 ~kde-base/kalgebra-9999 **
 ~kde-base/kalzium-9999 **
diff --git a/Documentation/package.unmask/kde-4.2 b/Documentation/package.unmask/kde-4.2
index 3defeba6c96..0d803daf51e 100644
--- a/Documentation/package.unmask/kde-4.2
+++ b/Documentation/package.unmask/kde-4.2
@@ -1,4 +1,4 @@
-# Jonathan Callen <en.ABCD@gmail.com> (22 Jul 2009)
+# Jonathan Callen <en.ABCD@gmail.com> (23 Jul 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 d16527e0ae8..ca0cee75ca4 100644
--- a/Documentation/package.unmask/kde-4.3
+++ b/Documentation/package.unmask/kde-4.3
@@ -1,4 +1,4 @@
-# Jonathan Callen <en.ABCD@gmail.com> (22 Jul 2009)
+# Jonathan Callen <en.ABCD@gmail.com> (23 Jul 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-4.4 b/Documentation/package.unmask/kde-4.4
index 2a2594503de..532b8ff5680 100644
--- a/Documentation/package.unmask/kde-4.4
+++ b/Documentation/package.unmask/kde-4.4
@@ -1,4 +1,4 @@
-# Jonathan Callen <en.ABCD@gmail.com> (22 Jul 2009)
+# Jonathan Callen <en.ABCD@gmail.com> (23 Jul 2009)
 # Autogenerated by regenerate-files, DO NOT EDIT.
 # You can use this file to mask/unmask KDE 4.4 release.
 # Edit Documentation/package.unmask/kde-4.4.d/ files instead.
diff --git a/Documentation/package.unmask/kde-live b/Documentation/package.unmask/kde-live
index 5361b07028c..be1f045cdbc 100644
--- a/Documentation/package.unmask/kde-live
+++ b/Documentation/package.unmask/kde-live
@@ -1,4 +1,4 @@
-# Jonathan Callen <en.ABCD@gmail.com> (22 Jul 2009)
+# Jonathan Callen <en.ABCD@gmail.com> (23 Jul 2009)
 # Autogenerated by regenerate-files, DO NOT EDIT.
 # Live packages are masked by default.
 # Edit Documentation/package.unmask/kde-live.d/ files instead.
@@ -165,11 +165,6 @@ kde-base/smoke:live
 ~app-misc/strigi-9999
 ~kde-base/automoc-9999
 ~media-sound/phonon-9999
-kde-base/kde-env:live
-kde-base/kdelibs:live
-kde-base/kdepimlibs:live
-kde-base/libknotificationitem:live
-kde-base/oxygen-icons:live
 kde-base/blinken:live
 kde-base/kalgebra:live
 kde-base/kalzium:live
diff --git a/profiles/package.mask b/profiles/package.mask
index e46c6dd0b46..08eab93b2a2 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,4 +1,4 @@
-# Jonathan Callen <en.ABCD@gmail.com> (22 Jul 2009)
+# Jonathan Callen <en.ABCD@gmail.com> (23 Jul 2009)
 # Autogenerated by regenerate-files, DO NOT EDIT.
 # Edit profiles/package.mask.d/ files instead.
 
@@ -6,7 +6,7 @@
 # Name changed to plasma-applet-daisy.
 kde-misc/daisy
 
-# Jonathan Callen <en.ABCD@gmail.com> (22 Jul 2009)
+# Jonathan Callen <en.ABCD@gmail.com> (23 Jul 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.
@@ -277,7 +277,7 @@ kde-base/klinkstatus:4.3
 kde-base/kommander:4.3
 kde-base/kxsldbg:4.3
 
-# Jonathan Callen <en.ABCD@gmail.com> (22 Jul 2009)
+# Jonathan Callen <en.ABCD@gmail.com> (23 Jul 2009)
 # Autogenerated by regenerate-files, DO NOT EDIT.
 # You can use this file to mask/unmask KDE 4.4 release.
 # Edit Documentation/package.unmask/kde-4.4.d/ files instead.
@@ -552,7 +552,7 @@ kde-base/klinkstatus:4.4
 kde-base/kommander:4.4
 kde-base/kxsldbg:4.4
 
-# Jonathan Callen <en.ABCD@gmail.com> (22 Jul 2009)
+# Jonathan Callen <en.ABCD@gmail.com> (23 Jul 2009)
 # Autogenerated by regenerate-files, DO NOT EDIT.
 # Live packages are masked by default.
 # Edit Documentation/package.unmask/kde-live.d/ files instead.
@@ -719,11 +719,6 @@ kde-base/smoke:live
 ~app-misc/strigi-9999
 ~kde-base/automoc-9999
 ~media-sound/phonon-9999
-kde-base/kde-env:live
-kde-base/kdelibs:live
-kde-base/kdepimlibs:live
-kde-base/libknotificationitem:live
-kde-base/oxygen-icons:live
 kde-base/blinken:live
 kde-base/kalgebra:live
 kde-base/kalzium:live
diff --git a/sets/kdedeps-live b/sets/kdedeps-live
index 2c18d2edd0e..188e216755b 100644
--- a/sets/kdedeps-live
+++ b/sets/kdedeps-live
@@ -3,8 +3,3 @@
 ~app-misc/strigi-9999
 ~kde-base/automoc-9999
 ~media-sound/phonon-9999
-kde-base/kde-env:live
-kde-base/kdelibs:live
-kde-base/kdepimlibs:live
-kde-base/libknotificationitem:live
-kde-base/oxygen-icons:live