summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOle Markus With <olemarkus@gentoo.org>2013-04-08 12:21:36 +0000
committerOle Markus With <olemarkus@gentoo.org>2013-04-08 12:21:36 +0000
commit038a791a984ffe6d6ff5ac4f057b074429b29581 (patch)
treebfe8453d925f380c88261e21827a0641d1ee3ca2 /profiles
parentRemove old. (diff)
downloadgentoo-2-038a791a984ffe6d6ff5ac4f057b074429b29581.tar.gz
gentoo-2-038a791a984ffe6d6ff5ac4f057b074429b29581.tar.bz2
gentoo-2-038a791a984ffe6d6ff5ac4f057b074429b29581.zip
PEAR-PEAR_PackageFileManager_Cli removed from tree
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask7
2 files changed, 5 insertions, 7 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index c813272b9fe5..ec4ffbd11ef5 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.7702 2013/04/07 20:01:11 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.7703 2013/04/08 12:21:35 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!
+ 08 Apr 2013; Ole Markus With <olemarkus@gentoo.org> package.mask:
+ PEAR-PEAR_PackageFileManager_Cli removed from tree
+
07 Apr 2013; Mike Gilbert <floppym@gentoo.org> package.mask:
Mask new python versions.
diff --git a/profiles/package.mask b/profiles/package.mask
index 25e7cd3d1eb3..a194c227a59a 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14639 2013/04/07 20:01:11 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14640 2013/04/08 12:21:36 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
@@ -406,11 +406,6 @@ sys-apps/module-init-tools
# Masked temporarily until fixed
=media-libs/libcaca-0.99_beta18
-# 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