Change KDE 3.5.10, KOffice 1.6.3 mask into a single placeholder.

2 files changed, 12 insertions, 69 deletions

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 0e39095745d5..620ec7c9e56f 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,14 @@
 # ChangeLog for profile directory
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.3758 2010/01/09 10:37:42 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.3759 2010/01/09 10:53:35 ssuominen Exp $
 #
 # This ChangeLog should include records for all changes in profiles directory.
 # Only typo fixes which don't affect portage/repoman behaviour could be avoided
 # here. If in doubt put a record here!
 
+  09 Jan 2010; Samuli Suominen <ssuominen@gentoo.org> package.mask:
+  Change KDE 3.5.10, KOffice 1.6.3 mask into a single placeholder.
+
   09 Jan 2010; Hanno Boeck <hanno@gentoo.org> license_groups:
   Creating two more metasets of licenses, FREE-SOFTWARE and FREE, also
   removing W3C-document from GPL-compatible.
diff --git a/profiles/package.mask b/profiles/package.mask
index 3824abcbb953..481e0d48ee57 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
 ####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.11080 2010/01/08 22:55:38 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.11081 2010/01/09 10:53:35 ssuominen Exp $
 #
 # When you add an entry to the top of this file, add your name, the date, and
 # an explanation of why something is getting masked. Please be extremely
@@ -31,6 +31,13 @@
 
 #--- END OF EXAMPLES ---
 
+# Samuli Suominen <ssuominen@gentoo.org> (09 Jan 2009)
+# KDE 3.5.10 has been removed from Portage. You can find it in layman, kde-sunset overlay.
+#
+# http://linuxized.blogspot.com/2008/10/how-to-unmerge-kde-3-packages-if-their.html
+#
+<kde-base/kdelibs-4
+
 # Michał Januszewski <spock@gentoo.org> (08 Jan 2010)
 # Masked until CUDA 3.0 is officially released in a non-beta version.
 =dev-util/nvidia-cuda-toolkit-3*
@@ -227,61 +234,6 @@ net-misc/ghamachi
 # 2 and half years, last release 6 years ago, bug #183103
 dev-db/mysqlnavigator
 
-# Samuli Suominen <ssuominen@gentoo.org> (31 Dec 2009)
-# Doesn't compile anymore with Autoconf >= 2.64, wv2 >= 0.4.0,
-# several open security bugs, ...
-#
-# Replaced by app-office/koffice-meta-2.1.0
-#
-# See bugs 274566, 274918, 279027, 279482, 283429, 285018, 294676,
-# 287276, 292791, ...
-#
-# kamikaze, hearts, six, slibo, kvisualboyadvance, xpertmud,
-# kfreeflight and boson will be removed with kdelibs-3.
-#
-# Masked for removal in 30 days
-#
-app-i18n/koffice-i18n
-=app-office/karbon-1.6*
-=app-office/kchart-1.6*
-=app-office/kexi-1.6*
-=app-office/kformula-1.6*
-=app-office/kivio-1.6*
-=app-office/koffice-data-1.6*
-=app-office/koffice-libs-1.6*
-=app-office/koffice-meta-1.6*
-=app-office/koshell-1.6*
-=app-office/kplato-1.6*
-=app-office/kpresenter-1.6*
-=app-office/krita-1.6*
-=app-office/kspread-1.6*
-=app-office/kugar-1.6*
-=app-office/kword-1.6*
-games-arcade/kamikaze
-games-board/hearts
-games-board/six
-games-board/slibo
-games-emulation/kvisualboyadvance
-games-mud/xpertmud
-games-simulation/kfreeflight
-games-strategy/boson
-=kde-base/kcminit-3.5*
-=kde-base/kcontrol-3.5*
-=kde-base/kde-i18n-3.5*
-=kde-base/kdebase-data-3.5*
-=kde-base/kdelibs-3.5*
-=kde-base/kdepasswd-3.5*
-=kde-base/kdesu-3.5*
-=kde-base/kdialog-3.5*
-=kde-base/kdnssd-3.5*
-=kde-base/kghostview-3.5*
-=kde-base/khotkeys-3.5*
-=kde-base/kicker-3.5*
-=kde-base/kmenuedit-3.5*
-=kde-base/libkonq-3.5*
-kde-misc/kdnssd-avahi
-~media-plugins/mythbrowser-0.21_p17105
-
 # Michael Sterrett <mr_bones_@gentoo.org> (30 Dec 2009)
 # Masked for testing prior to 1.8 appearing.
 >=games-strategy/wesnoth-1.7
@@ -301,13 +253,6 @@ games-emulation/mupen64-blight-uhleaudio
 games-emulation/mupen64-glide64
 games-emulation/mupen64-riceplugin
 
-# Samuli Suominen <ssuominen@gentoo.org> (29 Dec 2009)
-# Is using cmake without cmake-utils.eclass (#287583)
-# kdelibs-3 deps (#292791)
-#
-# Removed in 30 days.
-=media-sound/rosegarden-1.5*
-
 # Diego E. Pettenò <flameeyes@gentoo.org> (29 Dec 2009)
 #  on behalf of QA team
 #
@@ -377,11 +322,6 @@ x11-themes/gtk-engines-qt
 x11-libs/kylixlibs3-borqt
 
 # Samuli Suominen <ssuominen@gentoo.org> (27 Dec 2009)
-# Use k4guitune for KDE4 replacement. Or qpitch for Qt4 one.
-# Masked for removal in 30 days.
-media-sound/k3guitune
-
-# Samuli Suominen <ssuominen@gentoo.org> (27 Dec 2009)
 # Doesn't compile (#298452). Orphaned library, was
 # used by KDE3 applications. Masked for removal.
 media-libs/akode