summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2011-08-25 09:44:27 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2011-08-25 09:44:27 +0000
commitb5de8f38412417df4559238fbd4df00918fa5f26 (patch)
tree7ed5010b4cff568071eaf80b013ed7a800193d98 /profiles
parentCommit the license for zpaq. (diff)
downloadhistorical-b5de8f38412417df4559238fbd4df00918fa5f26.tar.gz
historical-b5de8f38412417df4559238fbd4df00918fa5f26.tar.bz2
historical-b5de8f38412417df4559238fbd4df00918fa5f26.zip
Punt my old pmask entries.
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask19
2 files changed, 5 insertions, 19 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 18331cc097fb..25558fdf9aea 100644
--- 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.5648 2011/08/23 19:23:40 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5649 2011/08/25 09:44:27 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!
+ 25 Aug 2011; Tomáš Chvátal <scarabeus@gentoo.org> package.mask:
+ Punt my old pmask entries.
+
23 Aug 2011; Anthony G. Basile <blueness@gentoo.org>
hardened/linux/amd64/no-multilib/package.mask:
Fix masking on hardened/linux/amd64/no-multilib, should be opencv, not ipp
diff --git a/profiles/package.mask b/profiles/package.mask
index da9ebdbaa707..727783c4a4ba 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13003 2011/08/22 18:20:55 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13004 2011/08/25 09:44:27 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
@@ -259,15 +259,6 @@ net-misc/dhcdbd
=dev-db/mariadb-5.3*
=virtual/mysql-5.3*
-# 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
@@ -278,14 +269,6 @@ app-text/wpd2sxw
# still needing old libsigc++:1.0. Removal in 30 days. (#358589)
net-libs/libicq2000
-# Tomáš Chvátal <scarabeus@gentoo.org> (24 Jul 2011)
-# Mask for removal packages that are obsoleted.
-# To be removed in 30 days.
-# tangogps -> foxtrotgps
-# qlandkare -> qlandkartegt
-sci-geosciences/tangogps
-sci-geosciences/qlandkarte
-
# Gilles Dartiguelongue <eva@gentoo.org> (24 Jul 2011)
# Mask development release
=dev-libs/json-glib-0.13*