summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2013-07-31 06:28:05 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2013-07-31 06:28:05 +0000
commit3e30b1cca346e654253f15a1025736cceff9d39e (patch)
tree8fbfa067b41b7c5ab7ce3780c4b1abbdda1c34a7
parentVersion bump (diff)
downloadgentoo-2-3e30b1cca346e654253f15a1025736cceff9d39e.tar.gz
gentoo-2-3e30b1cca346e654253f15a1025736cceff9d39e.tar.bz2
gentoo-2-3e30b1cca346e654253f15a1025736cceff9d39e.zip
Temporarily mask new libjpeg-turbo revision with initial conversion to the new multilib format.
-rw-r--r--profiles/ChangeLog6
-rw-r--r--profiles/package.mask6
2 files changed, 8 insertions, 4 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 01dde6177360..998c61ba5923 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,15 @@
# ChangeLog for profile directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.8095 2013/07/31 00:43:54 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.8096 2013/07/31 06:28:05 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!
+ 31 Jul 2013; Samuli Suominen <ssuominen@gentoo.org> package.mask:
+ Temporarily mask new libjpeg-turbo revision with initial conversion to the
+ new multilib format.
+
31 Jul 2013; Jeroen Roovers <jer@gentoo.org> package.mask:
Mask net-analyzer/nmap-6.40 as it needs masked >=dev-lang/lua-5.2.
diff --git a/profiles/package.mask b/profiles/package.mask
index 041b3d364fc0..571d75b37b46 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,6 +1,6 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14967 2013/07/31 00:43:54 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14968 2013/07/31 06:28:05 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
@@ -466,8 +466,8 @@ media-tv/tvtime
app-text/cuneiform
# Samuli Suominen <ssuominen@gentoo.org> (16 Mar 2013)
-# Reasons to keep them masked:
-# - libv4l depends on emul-linux for jpeg
+# Missing some blockers, deps, revision bumped emul-
+>=media-libs/libjpeg-turbo-1.3.0-r1
>=media-libs/libv4l-0.9.5-r1
# Tom Wijsman <TomWij@gentoo.org> (12 Mar 2013)