summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2014-06-08 12:53:55 +0000
committerMichał Górny <mgorny@gentoo.org>2014-06-08 12:53:55 +0000
commit762ee151ea27bc70a24aa3934ca40637cc5b20d3 (patch)
tree5135c2a7b451baef7b837149ee5e88fca570363d /profiles
parentAdd ~arm keyword. Tested with radxa rock (armv7). (diff)
downloadgentoo-2-762ee151ea27bc70a24aa3934ca40637cc5b20d3.tar.gz
gentoo-2-762ee151ea27bc70a24aa3934ca40637cc5b20d3.tar.bz2
gentoo-2-762ee151ea27bc70a24aa3934ca40637cc5b20d3.zip
Mask multilib libsoup & neon.
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask5
2 files changed, 8 insertions, 2 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index dc32126ea2ec..7fe96e955c0f 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,12 +1,15 @@
# ChangeLog for profile directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9054 2014/06/08 10:35:06 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9055 2014/06/08 12:53:55 mgorny 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 Jun 2014; Michał Górny <mgorny@gentoo.org> package.mask:
+ Mask multilib libsoup & neon.
+
+ 08 Jun 2014; Michał Górny <mgorny@gentoo.org> package.mask:
Unmask the previous set of multilib conversions.
07 Jun 2014; Manuel Rüger <mrueg@gentoo.org> package.mask:
diff --git a/profiles/package.mask b/profiles/package.mask
index cd6b25512331..315257458d05 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15770 2014/06/08 10:35:06 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15771 2014/06/08 12:53:55 mgorny 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
@@ -87,6 +87,9 @@ dev-java/ibm-jdk-bin:1.5
>=virtual/ffmpeg-9-r1
>=media-libs/libpostproc-10.20140517-r1
>=app-emulation/emul-linux-x86-medialibs-20140508-r4
+>=net-libs/libsoup-2.46.0-r1
+>=net-libs/neon-0.30.0-r1
+>=app-emulation/emul-linux-x86-baselibs-20140508-r9
# Vladimir Smirnov <civil@gentoo.org> (27 May 2014)
# Masked for testing, will defenitely cause major breakage