Mask openoffice{,-bin} and wpd2sxw for removal. Substitutes are in main tree.

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 7d484d9f4ed3d1aa71ad2968bec6c7d06440c4b2..b20aa08536bfc97ddc264d88894bb34b29eebdd0 100644 (file)
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,14 @@
 # ChangeLog for profile directory
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5576 2011/07/25 23:03:28 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5577 2011/07/27 10:52:11 scarabeus 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!
 
+  27 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org> package.mask:
+  Mask openoffice{,-bin} and wpd2sxw for removal. Substitutes are in main tree.
+
   25 Jul 2011; Anthony G. Basile <blueness@gentoo.org> base/package.mask,
   features/selinux/package.mask, selinux/package.mask:
   Added maskings and unmaskings for sec-policy/selinux-nginx

diff --git a/profiles/package.mask b/profiles/package.mask
index 3a19278c554c15a7348d4602c28be98046420312..09772959b34de7c3f1dd3a32ab03071ebae1a417 100644 (file)
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
 ####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.12940 2011/07/25 11:42:49 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.12941 2011/07/27 10:52:11 scarabeus 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,15 @@
 
 #--- END OF EXAMPLES ---
 
+# Tomáš Chvátal <scarabeus@gentoo.org> (27 Jul 2011)
+# Old replaced packages. Will be removed in 30 days.
+# app-office/openoffice -> app-office/libreoffice
+# app-office/openoffice-bin -> app-office/libreoffice-bin
+# app-text/wpd2sxw -> app-text/wpd2odt
+app-office/openoffice
+app-office/openoffice-bin
+app-text/wpd2sxw
+
 # Pacho Ramos <pacho@gentoo.org> (25 Jul 2011)
 # Old and unmaintained for a long time, bug #358587.
 # Removal in 30 days