summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2013-07-31 09:48:34 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2013-07-31 09:48:34 +0000
commit414f70a62e7014a09b67181ac571f6356d7e41f1 (patch)
treef75df88639f25933684aed337c302385cfe1cab3 /profiles
parentMake build & install simpler. Since we're calling 'install' for non-native AB... (diff)
downloadgentoo-2-414f70a62e7014a09b67181ac571f6356d7e41f1.tar.gz
gentoo-2-414f70a62e7014a09b67181ac571f6356d7e41f1.tar.bz2
gentoo-2-414f70a62e7014a09b67181ac571f6356d7e41f1.zip
temp mask libpng12 multilib
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog6
-rw-r--r--profiles/package.mask7
2 files changed, 8 insertions, 5 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 998c61ba5923..f4a67129e7d1 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,14 +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.8096 2013/07/31 06:28:05 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.8097 2013/07/31 09:48:34 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.
+ Temporarily mask new libjpeg-turbo revision and libpng12 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 571d75b37b46..9d5f29e09bf5 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,6 +1,6 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14968 2013/07/31 06:28:05 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14969 2013/07/31 09:48:34 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,9 +466,12 @@ media-tv/tvtime
app-text/cuneiform
# Samuli Suominen <ssuominen@gentoo.org> (16 Mar 2013)
-# Missing some blockers, deps, revision bumped emul-
+# libjpeg-turbo: missing blockers to emul-, missing virtual/jpeg revbump
+# libv4l: missing dep on virtual/jpeg, missing blockers to emul-
+# libpng12: missing blockers to emul-
>=media-libs/libjpeg-turbo-1.3.0-r1
>=media-libs/libv4l-0.9.5-r1
+=media-libs/libpng-1.2.50-r1
# Tom Wijsman <TomWij@gentoo.org> (12 Mar 2013)
# 2.5.* has known security and other issues due to an affected