[gentoo-commits] proj/kde:master commit in: Documentation/package.keywords/.kde-4.6/, ...

["Andreas Hüttel" <dilfridge@gentoo.org>]

commit:     b41f5c8e2cb670eb17c1ca1c32c680ad8a6576c7
Author:     Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Sun Jun 19 14:30:28 2011 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Jun 19 14:30:59 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=b41f5c8e

[keywords] Cleanup

---
 .../package.keywords/.kde-4.6.9999/digikam         |   10 ---
 .../package.keywords/.kde-4.6.9999/koffice         |   16 ----
 .../package.keywords/.kde-4.6.9999/more-deps       |   53 -------------
 Documentation/package.keywords/.kde-4.6/digikam    |   10 ---
 Documentation/package.keywords/.kde-4.6/koffice    |   16 ----
 Documentation/package.keywords/.kde-4.6/more-deps  |   53 -------------
 .../package.keywords/kde-4.6.9999.keywords         |   79 --------------------
 Documentation/package.keywords/kde-4.6.keywords    |   79 --------------------
 8 files changed, 0 insertions(+), 316 deletions(-)

diff --git a/Documentation/package.keywords/.kde-4.6.9999/digikam b/Documentation/package.keywords/.kde-4.6.9999/digikam
deleted file mode 100644
index 37ef289..0000000
--- a/Documentation/package.keywords/.kde-4.6.9999/digikam
+++ /dev/null
@@ -1,10 +0,0 @@
-
-# digikam-1.2 and kipi-plugins-1.2 wont build anymore with kde-4.6, so we 
-# keyword 1.8 plus dependencies here to provide a smooth upgrade
-#
-~media-gfx/digikam-1.9.0
-~media-plugins/kipi-plugins-1.9.0
-~media-libs/lensfun-0.2.5
-~sci-libs/clapack-3.2.1
-~dev-libs/libf2c-20090407
-

diff --git a/Documentation/package.keywords/.kde-4.6.9999/koffice b/Documentation/package.keywords/.kde-4.6.9999/koffice
deleted file mode 100644
index 48df9b4..0000000
--- a/Documentation/package.keywords/.kde-4.6.9999/koffice
+++ /dev/null
@@ -1,16 +0,0 @@
-
-# koffice-2.2.2 wont build anymore with kde-4.6, so we 
-# keyword 2.3.3 plus dependencies (?) here to provide a smooth upgrade
-#
-~app-office/karbon-2.3.3
-~app-office/kexi-2.3.3
-~app-office/koffice-data-2.3.3
-~app-office/koffice-l10n-2.3.3
-~app-office/koffice-libs-2.3.3
-~app-office/koffice-meta-2.3.3
-~app-office/kplato-2.3.3
-~app-office/kpresenter-2.3.3
-~app-office/krita-2.3.3
-~app-office/kspread-2.3.3
-~app-office/kword-2.3.3
-

diff --git a/Documentation/package.keywords/.kde-4.6.9999/more-deps b/Documentation/package.keywords/.kde-4.6.9999/more-deps
index ad473b9..1e423ef 100644
--- a/Documentation/package.keywords/.kde-4.6.9999/more-deps
+++ b/Documentation/package.keywords/.kde-4.6.9999/more-deps
@@ -11,58 +11,5 @@ app-admin/system-config-printer-gnome
 net-print/cups
 dev-python/pycups
 
-# Bindings etc
->=dev-python/PyQt4-4.8.3
->=dev-python/sip-4.12.1
-
-# Polkit and friends
->=kde-misc/polkit-kde-kcmodules-0.98_pre
-~sys-auth/polkit-kde-agent-0.99.0
-~sys-auth/polkit-qt-0.99.0
-~gnome-extra/polkit-gnome-0.99
-
-# Phonon (have to decide on a version)
-media-libs/phonon
-media-libs/phonon-gstreamer
-media-libs/phonon-vlc
-media-libs/phonon-xine
-
-# Unrelated
-x11-misc/google-gadgets
-
-# Qt 4.7
-~x11-libs/qt-script-4.7.2
-~x11-libs/qt-core-4.7.2
-~x11-libs/qt-gui-4.7.2
-~x11-libs/qt-dbus-4.7.2
-~x11-libs/qt-qt3support-4.7.2
-~x11-libs/qt-sql-4.7.2
-~x11-libs/qt-test-4.7.2
-~x11-libs/qt-svg-4.7.2
-~x11-libs/qt-declarative-4.7.2
-~x11-libs/qt-opengl-4.7.2
-~x11-libs/qt-xmlpatterns-4.7.2
-~x11-libs/qt-multimedia-4.7.2
-~x11-libs/qt-webkit-4.7.2
-~x11-libs/qt-assistant-4.7.2
-~x11-libs/qt-demo-4.7.2
-
-# The new bluetooth stack
-net-libs/libbluedevil
-net-wireless/bluedevil
-
-# Need newer akonadi-server for 4.6
-app-office/akonadi-server
-
-# For those with useflag webkit
-kde-misc/kwebkitpart
-
-# kdevelop
-~dev-util/kdevelop-4.2.2
-~dev-util/kdevplatform-1.2.2
-
-# old plugins have file collisions
-~kde-misc/konq-plugins-4.6.1
-
 # Needed by libkexiv2
 >=media-gfx/exiv2-0.20

diff --git a/Documentation/package.keywords/.kde-4.6/digikam b/Documentation/package.keywords/.kde-4.6/digikam
deleted file mode 100644
index 37ef289..0000000
--- a/Documentation/package.keywords/.kde-4.6/digikam
+++ /dev/null
@@ -1,10 +0,0 @@
-
-# digikam-1.2 and kipi-plugins-1.2 wont build anymore with kde-4.6, so we 
-# keyword 1.8 plus dependencies here to provide a smooth upgrade
-#
-~media-gfx/digikam-1.9.0
-~media-plugins/kipi-plugins-1.9.0
-~media-libs/lensfun-0.2.5
-~sci-libs/clapack-3.2.1
-~dev-libs/libf2c-20090407
-

diff --git a/Documentation/package.keywords/.kde-4.6/koffice b/Documentation/package.keywords/.kde-4.6/koffice
deleted file mode 100644
index 48df9b4..0000000
--- a/Documentation/package.keywords/.kde-4.6/koffice
+++ /dev/null
@@ -1,16 +0,0 @@
-
-# koffice-2.2.2 wont build anymore with kde-4.6, so we 
-# keyword 2.3.3 plus dependencies (?) here to provide a smooth upgrade
-#
-~app-office/karbon-2.3.3
-~app-office/kexi-2.3.3
-~app-office/koffice-data-2.3.3
-~app-office/koffice-l10n-2.3.3
-~app-office/koffice-libs-2.3.3
-~app-office/koffice-meta-2.3.3
-~app-office/kplato-2.3.3
-~app-office/kpresenter-2.3.3
-~app-office/krita-2.3.3
-~app-office/kspread-2.3.3
-~app-office/kword-2.3.3
-

diff --git a/Documentation/package.keywords/.kde-4.6/more-deps b/Documentation/package.keywords/.kde-4.6/more-deps
index ad473b9..1e423ef 100644
--- a/Documentation/package.keywords/.kde-4.6/more-deps
+++ b/Documentation/package.keywords/.kde-4.6/more-deps
@@ -11,58 +11,5 @@ app-admin/system-config-printer-gnome
 net-print/cups
 dev-python/pycups
 
-# Bindings etc
->=dev-python/PyQt4-4.8.3
->=dev-python/sip-4.12.1
-
-# Polkit and friends
->=kde-misc/polkit-kde-kcmodules-0.98_pre
-~sys-auth/polkit-kde-agent-0.99.0
-~sys-auth/polkit-qt-0.99.0
-~gnome-extra/polkit-gnome-0.99
-
-# Phonon (have to decide on a version)
-media-libs/phonon
-media-libs/phonon-gstreamer
-media-libs/phonon-vlc
-media-libs/phonon-xine
-
-# Unrelated
-x11-misc/google-gadgets
-
-# Qt 4.7
-~x11-libs/qt-script-4.7.2
-~x11-libs/qt-core-4.7.2
-~x11-libs/qt-gui-4.7.2
-~x11-libs/qt-dbus-4.7.2
-~x11-libs/qt-qt3support-4.7.2
-~x11-libs/qt-sql-4.7.2
-~x11-libs/qt-test-4.7.2
-~x11-libs/qt-svg-4.7.2
-~x11-libs/qt-declarative-4.7.2
-~x11-libs/qt-opengl-4.7.2
-~x11-libs/qt-xmlpatterns-4.7.2
-~x11-libs/qt-multimedia-4.7.2
-~x11-libs/qt-webkit-4.7.2
-~x11-libs/qt-assistant-4.7.2
-~x11-libs/qt-demo-4.7.2
-
-# The new bluetooth stack
-net-libs/libbluedevil
-net-wireless/bluedevil
-
-# Need newer akonadi-server for 4.6
-app-office/akonadi-server
-
-# For those with useflag webkit
-kde-misc/kwebkitpart
-
-# kdevelop
-~dev-util/kdevelop-4.2.2
-~dev-util/kdevplatform-1.2.2
-
-# old plugins have file collisions
-~kde-misc/konq-plugins-4.6.1
-
 # Needed by libkexiv2
 >=media-gfx/exiv2-0.20

diff --git a/Documentation/package.keywords/kde-4.6.9999.keywords b/Documentation/package.keywords/kde-4.6.9999.keywords
index 8454010..13f3227 100644
--- a/Documentation/package.keywords/kde-4.6.9999.keywords
+++ b/Documentation/package.keywords/kde-4.6.9999.keywords
@@ -1,16 +1,6 @@
 # Autogenerated by regenerate-files, DO NOT EDIT.
 # You can use this file to keyword/unkeyword the KDE SC 4.6 release.
 # Edit Documentation/package.keywords/.kde-4.6/ files instead.
-
-# digikam-1.2 and kipi-plugins-1.2 wont build anymore with kde-4.6, so we 
-# keyword 1.8 plus dependencies here to provide a smooth upgrade
-#
-~media-gfx/digikam-1.9.0
-~media-plugins/kipi-plugins-1.9.0
-~media-libs/lensfun-0.2.5
-~sci-libs/clapack-3.2.1
-~dev-libs/libf2c-20090407
-
 ~kde-base/kdeplasma-addons-4.6.49.9999 **
 ~kde-base/kde-l10n-4.6.49.9999 **
 ~kde-base/jovie-4.6.49.9999 **
@@ -320,22 +310,6 @@
 ~kde-base/kimagemapeditor-4.6.49.9999 **
 ~kde-base/klinkstatus-4.6.49.9999 **
 ~kde-base/kommander-4.6.49.9999 **
-
-# koffice-2.2.2 wont build anymore with kde-4.6, so we 
-# keyword 2.3.3 plus dependencies (?) here to provide a smooth upgrade
-#
-~app-office/karbon-2.3.3
-~app-office/kexi-2.3.3
-~app-office/koffice-data-2.3.3
-~app-office/koffice-l10n-2.3.3
-~app-office/koffice-libs-2.3.3
-~app-office/koffice-meta-2.3.3
-~app-office/kplato-2.3.3
-~app-office/kpresenter-2.3.3
-~app-office/krita-2.3.3
-~app-office/kspread-2.3.3
-~app-office/kword-2.3.3
-
 ~kde-base/kdebase-meta-4.6.49.9999 **
 ~kde-base/kde-meta-4.6.49.9999 **
 # Version is unrelated, KDE printing won't be stabilized
@@ -351,58 +325,5 @@ app-admin/system-config-printer-gnome
 net-print/cups
 dev-python/pycups
 
-# Bindings etc
->=dev-python/PyQt4-4.8.3
->=dev-python/sip-4.12.1
-
-# Polkit and friends
->=kde-misc/polkit-kde-kcmodules-0.98_pre
-~sys-auth/polkit-kde-agent-0.99.0
-~sys-auth/polkit-qt-0.99.0
-~gnome-extra/polkit-gnome-0.99
-
-# Phonon (have to decide on a version)
-media-libs/phonon
-media-libs/phonon-gstreamer
-media-libs/phonon-vlc
-media-libs/phonon-xine
-
-# Unrelated
-x11-misc/google-gadgets
-
-# Qt 4.7
-~x11-libs/qt-script-4.7.2
-~x11-libs/qt-core-4.7.2
-~x11-libs/qt-gui-4.7.2
-~x11-libs/qt-dbus-4.7.2
-~x11-libs/qt-qt3support-4.7.2
-~x11-libs/qt-sql-4.7.2
-~x11-libs/qt-test-4.7.2
-~x11-libs/qt-svg-4.7.2
-~x11-libs/qt-declarative-4.7.2
-~x11-libs/qt-opengl-4.7.2
-~x11-libs/qt-xmlpatterns-4.7.2
-~x11-libs/qt-multimedia-4.7.2
-~x11-libs/qt-webkit-4.7.2
-~x11-libs/qt-assistant-4.7.2
-~x11-libs/qt-demo-4.7.2
-
-# The new bluetooth stack
-net-libs/libbluedevil
-net-wireless/bluedevil
-
-# Need newer akonadi-server for 4.6
-app-office/akonadi-server
-
-# For those with useflag webkit
-kde-misc/kwebkitpart
-
-# kdevelop
-~dev-util/kdevelop-4.2.2
-~dev-util/kdevplatform-1.2.2
-
-# old plugins have file collisions
-~kde-misc/konq-plugins-4.6.1
-
 # Needed by libkexiv2
 >=media-gfx/exiv2-0.20

diff --git a/Documentation/package.keywords/kde-4.6.keywords b/Documentation/package.keywords/kde-4.6.keywords
index 54d5379..8df0715 100644
--- a/Documentation/package.keywords/kde-4.6.keywords
+++ b/Documentation/package.keywords/kde-4.6.keywords
@@ -1,16 +1,6 @@
 # Autogenerated by regenerate-files, DO NOT EDIT.
 # You can use this file to keyword/unkeyword the KDE SC 4.6 release.
 # Edit Documentation/package.keywords/.kde-4.6/ files instead.
-
-# digikam-1.2 and kipi-plugins-1.2 wont build anymore with kde-4.6, so we 
-# keyword 1.8 plus dependencies here to provide a smooth upgrade
-#
-~media-gfx/digikam-1.9.0
-~media-plugins/kipi-plugins-1.9.0
-~media-libs/lensfun-0.2.5
-~sci-libs/clapack-3.2.1
-~dev-libs/libf2c-20090407
-
 >=kde-base/kdeplasma-addons-4.5.50
 >=kde-base/kde-l10n-4.5.50
 >=kde-base/jovie-4.5.50
@@ -320,22 +310,6 @@
 >=kde-base/kimagemapeditor-4.5.50
 >=kde-base/klinkstatus-4.5.50
 >=kde-base/kommander-4.5.50
-
-# koffice-2.2.2 wont build anymore with kde-4.6, so we 
-# keyword 2.3.3 plus dependencies (?) here to provide a smooth upgrade
-#
-~app-office/karbon-2.3.3
-~app-office/kexi-2.3.3
-~app-office/koffice-data-2.3.3
-~app-office/koffice-l10n-2.3.3
-~app-office/koffice-libs-2.3.3
-~app-office/koffice-meta-2.3.3
-~app-office/kplato-2.3.3
-~app-office/kpresenter-2.3.3
-~app-office/krita-2.3.3
-~app-office/kspread-2.3.3
-~app-office/kword-2.3.3
-
 >=kde-base/kdebase-meta-4.5.50
 >=kde-base/kde-meta-4.5.50
 # Version is unrelated, KDE printing won't be stabilized
@@ -351,58 +325,5 @@ app-admin/system-config-printer-gnome
 net-print/cups
 dev-python/pycups
 
-# Bindings etc
->=dev-python/PyQt4-4.8.3
->=dev-python/sip-4.12.1
-
-# Polkit and friends
->=kde-misc/polkit-kde-kcmodules-0.98_pre
-~sys-auth/polkit-kde-agent-0.99.0
-~sys-auth/polkit-qt-0.99.0
-~gnome-extra/polkit-gnome-0.99
-
-# Phonon (have to decide on a version)
-media-libs/phonon
-media-libs/phonon-gstreamer
-media-libs/phonon-vlc
-media-libs/phonon-xine
-
-# Unrelated
-x11-misc/google-gadgets
-
-# Qt 4.7
-~x11-libs/qt-script-4.7.2
-~x11-libs/qt-core-4.7.2
-~x11-libs/qt-gui-4.7.2
-~x11-libs/qt-dbus-4.7.2
-~x11-libs/qt-qt3support-4.7.2
-~x11-libs/qt-sql-4.7.2
-~x11-libs/qt-test-4.7.2
-~x11-libs/qt-svg-4.7.2
-~x11-libs/qt-declarative-4.7.2
-~x11-libs/qt-opengl-4.7.2
-~x11-libs/qt-xmlpatterns-4.7.2
-~x11-libs/qt-multimedia-4.7.2
-~x11-libs/qt-webkit-4.7.2
-~x11-libs/qt-assistant-4.7.2
-~x11-libs/qt-demo-4.7.2
-
-# The new bluetooth stack
-net-libs/libbluedevil
-net-wireless/bluedevil
-
-# Need newer akonadi-server for 4.6
-app-office/akonadi-server
-
-# For those with useflag webkit
-kde-misc/kwebkitpart
-
-# kdevelop
-~dev-util/kdevelop-4.2.2
-~dev-util/kdevplatform-1.2.2
-
-# old plugins have file collisions
-~kde-misc/konq-plugins-4.6.1
-
 # Needed by libkexiv2
 >=media-gfx/exiv2-0.20