summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2015-03-25 21:05:40 +0000
committerMike Frysinger <vapier@gentoo.org>2015-03-25 21:05:40 +0000
commit185f947d96f7cb026cfb702493bb6f1c52598211 (patch)
treee94a0c3a89120628e6223aec265a349b9767a0c6 /profiles/base
parentUpdate to the version merged upstream that also fixes USE=-ssl behavior. (diff)
downloadhistorical-185f947d96f7cb026cfb702493bb6f1c52598211.tar.gz
historical-185f947d96f7cb026cfb702493bb6f1c52598211.tar.bz2
historical-185f947d96f7cb026cfb702493bb6f1c52598211.zip
Revert openssh[hpn] masking #544254.
Diffstat (limited to 'profiles/base')
-rw-r--r--profiles/base/ChangeLog5
-rw-r--r--profiles/base/package.use.mask6
2 files changed, 5 insertions, 6 deletions
diff --git a/profiles/base/ChangeLog b/profiles/base/ChangeLog
index b8f3d08ea1fe..9efe579a1480 100644
--- a/profiles/base/ChangeLog
+++ b/profiles/base/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for Gentoo base-profile
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.783 2015/03/24 07:07:56 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.784 2015/03/25 21:05:40 vapier Exp $
+
+ 25 Mar 2015; Mike Frysinger <vapier@gentoo.org> package.use.mask:
+ Revert openssh[hpn] masking #544254.
24 Mar 2015; Patrick Lauer <patrick@gentoo.org> package.use.mask:
Mask hpn useflag for openssh #544254
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index d529b6058d58..8f152710d5ba 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -1,10 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.663 2015/03/24 07:07:56 patrick Exp $
-
-# Patrick Lauer <patrick@gentoo.org> (24 Mar 2015)
-# hpn patchset breaks things badly #544254
-=net-misc/openssh-6.8_p1-r2 hpn
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.664 2015/03/25 21:05:40 vapier Exp $
# Lars Wendler <polynomial-c@gentoo.org> (19 Mar 2015)
# >=games-strategy/freeciv-2.5.0 requires >=dev-lang/lua-5.2