summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2013-08-07 15:46:22 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2013-08-07 15:46:22 +0000
commitc75d43689a8a9586ebd8af09628c5957ebcf475f (patch)
treebab54e39d465df3e70c363b4eafc90d01efab5fb /profiles
parentadd media-libs/libsdl dep (diff)
downloadgentoo-2-c75d43689a8a9586ebd8af09628c5957ebcf475f.tar.gz
gentoo-2-c75d43689a8a9586ebd8af09628c5957ebcf475f.tar.bz2
gentoo-2-c75d43689a8a9586ebd8af09628c5957ebcf475f.zip
Temporarily mask multilib copies of libusb, libusbx and libusb-compat.
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask9
2 files changed, 12 insertions, 2 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 3a6830c450d0..7d17d4394870 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.8122 2013/08/07 13:23:37 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.8123 2013/08/07 15:46:22 ssuominen 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!
+ 07 Aug 2013; Samuli Suominen <ssuominen@gentoo.org> package.mask:
+ Temporarily mask multilib copies of libusb, libusbx and libusb-compat.
+
07 Aug 2013; Alexis Ballier <aballier@gentoo.org> package.mask:
unmask multilib expat
diff --git a/profiles/package.mask b/profiles/package.mask
index 05eb42765086..f62bd4be8aea 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,6 +1,6 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14988 2013/08/07 13:23:37 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14989 2013/08/07 15:46:22 ssuominen 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
@@ -32,6 +32,13 @@
#--- END OF EXAMPLES ---
+# Samuli Suominen <ssuominen@gentoo.org> (07 Aug 2013)
+# Temporarily mask the new multilib versions, remove
+# the mask once blockers and emul- have been set
+>=dev-libs/libusbx-1.0.16-r3
+>=dev-libs/libusb-1.0.9-r2
+>=dev-libs/libusb-compat-0.1.5-r2
+
# Christian Faulhammer <fauli@gentoo.org> (06 Aug 2013)
# Masked for removal, dead upstream, bug #474518
dev-vcs/bzr-svn