summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOle Markus With <olemarkus@gentoo.org>2013-03-05 08:51:01 +0000
committerOle Markus With <olemarkus@gentoo.org>2013-03-05 08:51:01 +0000
commit8f62ebce072b20ee431b251ae4a027ee5ac0d8b2 (patch)
tree4d49eca1a8e596d8a1dfff5ff93d1447c54b1cd5 /profiles
parentClean up old revisions. (diff)
downloadhistorical-8f62ebce072b20ee431b251ae4a027ee5ac0d8b2.tar.gz
historical-8f62ebce072b20ee431b251ae4a027ee5ac0d8b2.tar.bz2
historical-8f62ebce072b20ee431b251ae4a027ee5ac0d8b2.zip
Masking dev-php/PEAR-PEAR_PackageFileManager_Cli
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask7
2 files changed, 10 insertions, 2 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index a2e7de8b4101..c3cbb5a8bb5e 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,14 @@
# ChangeLog for profile directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.7554 2013/03/04 19:17:23 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.7555 2013/03/05 08:51:01 olemarkus 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!
+ 05 Mar 2013; Ole Markus With <olemarkus@gentoo.org> package.mask:
+ Masking dev-php/PEAR-PEAR_PackageFileManager_Cli
+
04 Mar 2013; Robin H. Johnson <robbat2@gentoo.org> package.mask:
Update MySQL pmask.
diff --git a/profiles/package.mask b/profiles/package.mask
index ae5f71a8ec14..4d47f76a06cc 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14525 2013/03/04 19:17:23 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14526 2013/03/05 08:51:01 olemarkus 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,11 @@
#--- END OF EXAMPLES ---
+# Ole Markus With <olemarkus@gentoo.org> (05 Mar 2013)
+# Conflicts with app-misc/pfm (bug 460222). Upstream gone.
+# Masked for removal in 30 days.
+dev-php/PEAR-PEAR_PackageFileManager_Cli
+
# Robin H. Johnson <robbat2@gentoo.org> (04 Mar 2013)
# MySQL 5.6 is not yet GA.
>=dev-db/mariadb-5.6