[Documentation] Split kde-extras-live and koffice-live out from kde-live.keywords

As it never really made sense to have all the live ebuilds in one p.keywords
file, the non-kde-base packages now have their own .keywords files: one for
koffice, and one for everything else.  The regenerate-files script has been
updated to account for this.  You will need to add symlinks for the new files
in your /etc/portage/package.keywords/ directory.

6 files changed, 10 insertions, 72 deletions

diff --git a/Documentation/maintainers/regenerate-files b/Documentation/maintainers/regenerate-files
index 13be8b8770a..f8e6b8a9e12 100755
--- a/Documentation/maintainers/regenerate-files
+++ b/Documentation/maintainers/regenerate-files
@@ -56,15 +56,12 @@ if [[ -d kde-live.base ]]; then
 	cat kde-live.d/* >> kde-live.keywords
 fi
 
-# Uncomment the following to create separate .keywords files for
-# kde-extra-live and koffice-live:
-
-#for set in kde-extras-live koffice-live; do
-#	if [[ -e "../../sets/${set}" ]]; then
-#		echo -e "${HEADER}" > "${set}.keywords"
-#		sed '/^~.*[.-]9999$/s/$/ **/' "../../sets/${set}" >> "${set}.keywords"
-#	fi
-#done
+for set in kde-extras-live koffice-live; do
+	if [[ -e "../../sets/${set}" ]]; then
+		echo -e "${HEADER}" > "${set}.keywords"
+		sed '/^~.*[.-]9999$/s/$/ **/' "../../sets/${set}" >> "${set}.keywords"
+	fi
+done
 
 popd > /dev/null
 
diff --git a/Documentation/package.keywords/kde-live.d/kde-extras-live b/Documentation/package.keywords/kde-extras-live.keywords
index 1dc1a3ca752..87cf5296d25 100644
--- a/Documentation/package.keywords/kde-live.d/kde-extras-live
+++ b/Documentation/package.keywords/kde-extras-live.keywords
@@ -1,3 +1,5 @@
+# Jonathan Callen <en.ABCD@gmail.com> (23 Jul 2009)
+# Autogenerated by regenerate-files, DO NOT EDIT.
 ~app-cdr/k3b-9999 **
 ~app-cdr/k9copy-9999 **
 ~app-editors/kile-9999 **
diff --git a/Documentation/package.keywords/kde-live.base/kde-extras-live b/Documentation/package.keywords/kde-live.base/kde-extras-live
deleted file mode 120000
index 0c5b4ba0d65..00000000000
--- a/Documentation/package.keywords/kde-live.base/kde-extras-live
+++ /dev/null
@@ -1 +0,0 @@
-../../../sets/kde-extras-live
\ No newline at end of file
diff --git a/Documentation/package.keywords/kde-live.base/koffice-live b/Documentation/package.keywords/kde-live.base/koffice-live
deleted file mode 120000
index 5942b503da5..00000000000
--- a/Documentation/package.keywords/kde-live.base/koffice-live
+++ /dev/null
@@ -1 +0,0 @@
-../../../sets/koffice-live
\ No newline at end of file
diff --git a/Documentation/package.keywords/kde-live.keywords b/Documentation/package.keywords/kde-live.keywords
index adf01bcd002..1f33b5c99cd 100644
--- a/Documentation/package.keywords/kde-live.keywords
+++ b/Documentation/package.keywords/kde-live.keywords
@@ -4,58 +4,6 @@
 # Edit Documentation/package.keywords/kde-live.base/ files instead.
 ~kde-base/kdeplasma-addons-9999 **
 ~kde-base/kde-l10n-9999 **
-~app-cdr/k3b-9999 **
-~app-cdr/k9copy-9999 **
-~app-editors/kile-9999 **
-~app-office/skrooge-9999 **
-~dev-cpp/eigen-9999 **
-~dev-util/kdesvn-9999 **
-~dev-util/kdevelop-9999 **
-~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 **
-~kde-misc/kobby-9999 **
-~kde-misc/konq-plugins-9999 **
-~kde-misc/krusader-9999 **
-~kde-misc/webkit-kpart-9999 **
-~kde-misc/yakuake-9999 **
-~mail-client/mailody-9999 **
-~media-gfx/digikam-9999 **
-~media-gfx/kflickr-9999 **
-~media-libs/taglib-extras-9999 **
-~media-plugins/kipi-plugins-9999 **
-~media-sound/amarok-9999 **
-~media-sound/amarok-utils-9999 **
-~media-sound/kaudiocreator-9999 **
-~media-sound/kradio-9999 **
-~media-tv/kdetv-9999 **
-~media-video/kaffeine-9999 **
-~media-video/kmplayer-9999 **
-~media-video/kplayer-9999 **
-~media-video/subtitlecomposer-9999 **
-~net-ftp/kftpgrabber-9999 **
-~net-im/kmess-9999 **
-~net-im/synapse-9999 **
-~net-irc/aki-9999 **
-~net-irc/akiirc-9999 **
-~net-misc/smb4k-9999 **
-~net-libs/decibel-9999 **
-~net-libs/libqinfinity-9999 **
-~net-libs/telepathy-qt-9999 **
-#net-p2p/kmldonkey-9999
-~net-p2p/ktorrent-9999 **
-~net-voip/tapioca-qt-9999 **
-~net-wireless/kdebluetooth4-9999 **
-~sys-auth/policykit-qt-9999 **
-~sys-block/partitionmanager-9999 **
-~www-client/rekonq-9999 **
-~x11-libs/qtscriptgenerator-9999 **
-~x11-themes/gtk-engines-qt-9999 **
-~x11-themes/playground-plasma-themes-9999 **
 ~kde-base/kdeaccessibility-colorschemes-9999 **
 ~kde-base/kdeaccessibility-iconthemes-9999 **
 ~kde-base/kmag-9999 **
@@ -325,15 +273,6 @@
 ~kde-base/klinkstatus-9999 **
 ~kde-base/kommander-9999 **
 ~kde-base/kxsldbg-9999 **
-~app-office/kword-9999 **
-~app-office/kplato-9999 **
-~app-office/kpresenter-9999 **
-~app-office/kchart-9999 **
-~app-office/karbon-9999 **
-~app-office/krita-9999 **
-~app-office/koffice-data-9999 **
-~app-office/koffice-libs-9999 **
-~app-office/kspread-9999 **
 app-arch/libarchive
 app-text/ebook-tools
 >=dev-libs/libical-0.33-r1
diff --git a/Documentation/package.keywords/kde-live.d/koffice-live b/Documentation/package.keywords/koffice-live.keywords
index 75cea30721b..9be6eeed700 100644
--- a/Documentation/package.keywords/kde-live.d/koffice-live
+++ b/Documentation/package.keywords/koffice-live.keywords
@@ -1,3 +1,5 @@
+# Jonathan Callen <en.ABCD@gmail.com> (23 Jul 2009)
+# Autogenerated by regenerate-files, DO NOT EDIT.
 ~app-office/kword-9999 **
 ~app-office/kplato-9999 **
 ~app-office/kpresenter-9999 **