Merge branch 'master' of http://git.overlays.gentoo.org/gitroot/proj/kde

97 files changed, 94 insertions, 1135 deletions

diff --git a/Documentation/maintainers/regenerate-files b/Documentation/maintainers/regenerate-files
index 32d9446da21..464e169de54 100755
--- a/Documentation/maintainers/regenerate-files
+++ b/Documentation/maintainers/regenerate-files
@@ -13,7 +13,7 @@ HEADER="# Autogenerated by ${SCRIPT}, DO NOT EDIT."
 
 # regenerate keywords
 pushd ../package.keywords/ > /dev/null
-for release in 4.6 4.7 4.8; do
+for release in 4.7 4.8; do
 	echo -e "${HEADER}" > "kde-${release}.keywords"
 	if [[ -d ".kde-${release}" ]]; then
 		cat ".kde-${release}/"* | sed '/^~.*[.-]9999$/s/$/ **/' >> "kde-${release}.keywords"
@@ -56,7 +56,7 @@ popd > /dev/null
 
 # regenerate unmask entries (base for package mask)
 pushd ../package.unmask/ > /dev/null
-for release in 4.6 4.7 4.8 live; do
+for release in 4.7 4.8 live; do
 	echo -e "${HEADER}" > "kde-${release}"
 	if [[ -d ".kde-${release}" ]]; then
 		cat ".kde-${release}/"* >> "kde-${release}"
diff --git a/Documentation/package.keywords/.kde-4.6/_HEADER_ b/Documentation/package.keywords/.kde-4.6/_HEADER_
deleted file mode 100644
index 328e4b34d52..00000000000
--- a/Documentation/package.keywords/.kde-4.6/_HEADER_
+++ /dev/null
@@ -1,2 +0,0 @@
-# You can use this file to keyword/unkeyword the KDE SC 4.6 release.
-# Edit Documentation/package.keywords/.kde-4.6/ files instead.
diff --git a/Documentation/package.keywords/.kde-4.6/kde-addons-4.6 b/Documentation/package.keywords/.kde-4.6/kde-addons-4.6
deleted file mode 120000
index 263828538de..00000000000
--- a/Documentation/package.keywords/.kde-4.6/kde-addons-4.6
+++ /dev/null
@@ -1 +0,0 @@
-../../package.unmask/.kde-4.6/kde-addons-4.6
\ No newline at end of file
diff --git a/Documentation/package.keywords/.kde-4.6/kdeaccessibility-4.6 b/Documentation/package.keywords/.kde-4.6/kdeaccessibility-4.6
deleted file mode 120000
index 6049178bbeb..00000000000
--- a/Documentation/package.keywords/.kde-4.6/kdeaccessibility-4.6
+++ /dev/null
@@ -1 +0,0 @@
-../../../sets/kdeaccessibility-4.6
\ No newline at end of file
diff --git a/Documentation/package.keywords/.kde-4.6/kdeadmin-4.6 b/Documentation/package.keywords/.kde-4.6/kdeadmin-4.6
deleted file mode 120000
index 83d5c669489..00000000000
--- a/Documentation/package.keywords/.kde-4.6/kdeadmin-4.6
+++ /dev/null
@@ -1 +0,0 @@
-../../../sets/kdeadmin-4.6
\ No newline at end of file
diff --git a/Documentation/package.keywords/.kde-4.6/kdeartwork-4.6 b/Documentation/package.keywords/.kde-4.6/kdeartwork-4.6
deleted file mode 120000
index 5b825b7512f..00000000000
--- a/Documentation/package.keywords/.kde-4.6/kdeartwork-4.6
+++ /dev/null
@@ -1 +0,0 @@
-../../../sets/kdeartwork-4.6
\ No newline at end of file
diff --git a/Documentation/package.keywords/.kde-4.6/kdebase-apps-4.6 b/Documentation/package.keywords/.kde-4.6/kdebase-apps-4.6
deleted file mode 120000
index ae21590573e..00000000000
--- a/Documentation/package.keywords/.kde-4.6/kdebase-apps-4.6
+++ /dev/null
@@ -1 +0,0 @@
-../../../sets/kdebase-apps-4.6
\ No newline at end of file
diff --git a/Documentation/package.keywords/.kde-4.6/kdebase-runtime-4.6 b/Documentation/package.keywords/.kde-4.6/kdebase-runtime-4.6
deleted file mode 120000
index 9512ace9b65..00000000000
--- a/Documentation/package.keywords/.kde-4.6/kdebase-runtime-4.6
+++ /dev/null
@@ -1 +0,0 @@
-../../../sets/kdebase-runtime-4.6
\ No newline at end of file
diff --git a/Documentation/package.keywords/.kde-4.6/kdebase-workspace-4.6 b/Documentation/package.keywords/.kde-4.6/kdebase-workspace-4.6
deleted file mode 120000
index bd83b3c2611..00000000000
--- a/Documentation/package.keywords/.kde-4.6/kdebase-workspace-4.6
+++ /dev/null
@@ -1 +0,0 @@
-../../../sets/kdebase-workspace-4.6
\ No newline at end of file
diff --git a/Documentation/package.keywords/.kde-4.6/kdebindings-4.6 b/Documentation/package.keywords/.kde-4.6/kdebindings-4.6
deleted file mode 120000
index a423e07cd9a..00000000000
--- a/Documentation/package.keywords/.kde-4.6/kdebindings-4.6
+++ /dev/null
@@ -1 +0,0 @@
-../../../sets/kdebindings-4.6
\ No newline at end of file
diff --git a/Documentation/package.keywords/.kde-4.6/kdeedu-4.6 b/Documentation/package.keywords/.kde-4.6/kdeedu-4.6
deleted file mode 120000
index 551b2617c73..00000000000
--- a/Documentation/package.keywords/.kde-4.6/kdeedu-4.6
+++ /dev/null
@@ -1 +0,0 @@
-../../../sets/kdeedu-4.6
\ No newline at end of file
diff --git a/Documentation/package.keywords/.kde-4.6/kdegames-4.6 b/Documentation/package.keywords/.kde-4.6/kdegames-4.6
deleted file mode 120000
index 6d5f9bc3873..00000000000
--- a/Documentation/package.keywords/.kde-4.6/kdegames-4.6
+++ /dev/null
@@ -1 +0,0 @@
-../../../sets/kdegames-4.6
\ No newline at end of file
diff --git a/Documentation/package.keywords/.kde-4.6/kdegraphics-4.6 b/Documentation/package.keywords/.kde-4.6/kdegraphics-4.6
deleted file mode 120000
index 6cbd78aeaef..00000000000
--- a/Documentation/package.keywords/.kde-4.6/kdegraphics-4.6
+++ /dev/null
@@ -1 +0,0 @@
-../../../sets/kdegraphics-4.6
\ No newline at end of file
diff --git a/Documentation/package.keywords/.kde-4.6/kdelibs-4.6 b/Documentation/package.keywords/.kde-4.6/kdelibs-4.6
deleted file mode 120000
index 700957c4dbd..00000000000
--- a/Documentation/package.keywords/.kde-4.6/kdelibs-4.6
+++ /dev/null
@@ -1 +0,0 @@
-../../../sets/kdelibs-4.6
\ No newline at end of file
diff --git a/Documentation/package.keywords/.kde-4.6/kdemultimedia-4.6 b/Documentation/package.keywords/.kde-4.6/kdemultimedia-4.6
deleted file mode 120000
index 3b8b4bba53f..00000000000
--- a/Documentation/package.keywords/.kde-4.6/kdemultimedia-4.6
+++ /dev/null
@@ -1 +0,0 @@
-../../../sets/kdemultimedia-4.6
\ No newline at end of file
diff --git a/Documentation/package.keywords/.kde-4.6/kdenetwork-4.6 b/Documentation/package.keywords/.kde-4.6/kdenetwork-4.6
deleted file mode 120000
index 39684c6b48b..00000000000
--- a/Documentation/package.keywords/.kde-4.6/kdenetwork-4.6
+++ /dev/null
@@ -1 +0,0 @@
-../../../sets/kdenetwork-4.6
\ No newline at end of file
diff --git a/Documentation/package.keywords/.kde-4.6/kdeoptional-4.6 b/Documentation/package.keywords/.kde-4.6/kdeoptional-4.6
deleted file mode 120000
index b372ac97332..00000000000
--- a/Documentation/package.keywords/.kde-4.6/kdeoptional-4.6
+++ /dev/null
@@ -1 +0,0 @@
-../../../sets/kdeoptional-4.6
\ No newline at end of file
diff --git a/Documentation/package.keywords/.kde-4.6/kdepim-4.4 b/Documentation/package.keywords/.kde-4.6/kdepim-4.4
deleted file mode 100644
index 3e49620d7af..00000000000
--- a/Documentation/package.keywords/.kde-4.6/kdepim-4.4
+++ /dev/null
@@ -1,30 +0,0 @@
-
-#
-# kdepim-4.4.11.1 contains some fixes that make life with kde-4.6 easier
-#
-~kde-base/akonadi-4.4.11.1
-~kde-base/akregator-4.4.11.1
-~kde-base/blogilo-4.4.11.1
-~kde-base/kabcclient-4.4.11.1
-~kde-base/kaddressbook-4.4.11.1
-~kde-base/kalarm-4.4.11.1
-~kde-base/kdepim-icons-4.4.11.1
-~kde-base/kdepim-kresources-4.4.11.1
-~kde-base/kdepim-meta-4.4.11.1
-~kde-base/kdepim-strigi-analyzer-4.4.11.1
-~kde-base/kdepim-runtime-4.4.11.1
-~kde-base/kdepim-wizards-4.4.11.1
-~kde-base/kjots-4.4.11.1
-~kde-base/kleopatra-4.4.11.1
-~kde-base/kmail-4.4.11.1
-~kde-base/knode-4.4.11.1
-~kde-base/knotes-4.4.11.1
-~kde-base/konsolekalendar-4.4.11.1
-~kde-base/kontact-4.4.11.1
-~kde-base/korganizer-4.4.11.1
-~kde-base/ktimetracker-4.4.11.1
-~kde-base/libkdepim-4.4.11.1
-~kde-base/libkleo-4.4.11.1
-~kde-base/libkpgp-4.4.11.1
-~kde-base/kdepim-l10n-4.4.11.1
-
diff --git a/Documentation/package.keywords/.kde-4.6/kdepim-4.6 b/Documentation/package.keywords/.kde-4.6/kdepim-4.6
deleted file mode 120000
index 87c12b650ce..00000000000
--- a/Documentation/package.keywords/.kde-4.6/kdepim-4.6
+++ /dev/null
@@ -1 +0,0 @@
-../../../sets/kdepim-4.6
\ No newline at end of file
diff --git a/Documentation/package.keywords/.kde-4.6/kdesdk-4.6 b/Documentation/package.keywords/.kde-4.6/kdesdk-4.6
deleted file mode 120000
index a46ec9f63c9..00000000000
--- a/Documentation/package.keywords/.kde-4.6/kdesdk-4.6
+++ /dev/null
@@ -1 +0,0 @@
-../../../sets/kdesdk-4.6
\ No newline at end of file
diff --git a/Documentation/package.keywords/.kde-4.6/kdetoys-4.6 b/Documentation/package.keywords/.kde-4.6/kdetoys-4.6
deleted file mode 120000
index 1d4383bb3a4..00000000000
--- a/Documentation/package.keywords/.kde-4.6/kdetoys-4.6
+++ /dev/null
@@ -1 +0,0 @@
-../../../sets/kdetoys-4.6
\ No newline at end of file
diff --git a/Documentation/package.keywords/.kde-4.6/kdeutils-4.6 b/Documentation/package.keywords/.kde-4.6/kdeutils-4.6
deleted file mode 120000
index 9a0947d3ecc..00000000000
--- a/Documentation/package.keywords/.kde-4.6/kdeutils-4.6
+++ /dev/null
@@ -1 +0,0 @@
-../../../sets/kdeutils-4.6
\ No newline at end of file
diff --git a/Documentation/package.keywords/.kde-4.6/kdewebdev-4.6 b/Documentation/package.keywords/.kde-4.6/kdewebdev-4.6
deleted file mode 120000
index 91a20679be0..00000000000
--- a/Documentation/package.keywords/.kde-4.6/kdewebdev-4.6
+++ /dev/null
@@ -1 +0,0 @@
-../../../sets/kdewebdev-4.6
\ No newline at end of file
diff --git a/Documentation/package.keywords/.kde-4.6/metapackages b/Documentation/package.keywords/.kde-4.6/metapackages
deleted file mode 120000
index 6ad62038825..00000000000
--- a/