summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Palimaka <kensington@gentoo.org>2012-07-15 15:10:25 +0000
committerMichael Palimaka <kensington@gentoo.org>2012-07-15 15:10:25 +0000
commit7530103e1fe651d9bffcc0f47fe14f205eb61c97 (patch)
tree37017795c9f32519827394bf1c6dd963a3462180 /profiles
parentMigrate to EAPI 4. Add missing dependencies. Avoid building useless tests. (diff)
downloadgentoo-2-7530103e1fe651d9bffcc0f47fe14f205eb61c97.tar.gz
gentoo-2-7530103e1fe651d9bffcc0f47fe14f205eb61c97.tar.bz2
gentoo-2-7530103e1fe651d9bffcc0f47fe14f205eb61c97.zip
Mask net-misc/ssh-installkeys for removal wrt bug #315843.
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask8
2 files changed, 11 insertions, 2 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index ec4de5dcf7d4..f1a4564354d0 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,14 @@
# ChangeLog for profile directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6783 2012/07/15 14:18:30 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6784 2012/07/15 15:10:25 kensington 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!
+ 15 Jul 2012; Michael Palimaka <kensington@gentoo.org> package.mask:
+ Mask net-misc/ssh-installkeys for removal wrt bug #315843.
+
15 Jul 2012; Johannes Huber <johu@gentoo.org> updates/3Q-2012:
Move kde-misc/eventlist from SLOT 0 to 4.
diff --git a/profiles/package.mask b/profiles/package.mask
index 27e584ee0a1d..601d99930e90 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13965 2012/07/14 20:03:02 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13966 2012/07/15 15:10:25 kensington 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,12 @@
#--- END OF EXAMPLES ---
+# Michael Palimaka <kensington@gentoo.org> (15 Jul 2012)
+# Bundles dev-python/pexpect (bug #315843)
+# Replaced by ssh-copy-id from net-misc/openssh.
+# Removal in 30 days.
+net-misc/ssh-installkeys
+
# Markos Chandras <hwoarang@gentoo.org> (14 Jul 2012)
# Mask rc releases
=x11-libs/libfm-1.0_rc*