summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Reffett <creffett@gentoo.org>2012-11-24 00:57:56 +0000
committerChris Reffett <creffett@gentoo.org>2012-11-24 00:57:56 +0000
commit27bf4915ee07f595f675eb6599726a1c4eef327c (patch)
tree86ad0eb17533370da01b055ed3c2ba816b6cc375 /profiles
parentVersion bump (bug #444264). (diff)
downloadgentoo-2-27bf4915ee07f595f675eb6599726a1c4eef327c.tar.gz
gentoo-2-27bf4915ee07f595f675eb6599726a1c4eef327c.tar.bz2
gentoo-2-27bf4915ee07f595f675eb6599726a1c4eef327c.zip
Mask php USE flag for libkolab and libkolabxml
Diffstat (limited to 'profiles')
-rw-r--r--profiles/base/ChangeLog5
-rw-r--r--profiles/base/package.use.mask8
2 files changed, 11 insertions, 2 deletions
diff --git a/profiles/base/ChangeLog b/profiles/base/ChangeLog
index 4fbbf2dc42bb..2cf1871e9fdb 100644
--- a/profiles/base/ChangeLog
+++ b/profiles/base/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for Gentoo base-profile
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.462 2012/11/18 08:14:43 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.463 2012/11/24 00:57:56 creffett Exp $
+
+ 24 Nov 2012; <creffett@gentoo.org> package.use.mask:
+ Mask php USE flag for libkolab and libkolabxml
18 Nov 2012; <swift@gentoo.org> package.mask:
Preparing for selinux-makewhatis package
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 0ccad825f4af..7892d5e93509 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -1,10 +1,16 @@
# Copyright 1999-2012 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.409 2012/11/16 05:19:05 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.410 2012/11/24 00:57:56 creffett Exp $
# This file requires >=portage-2.1.1
# New entries go on top.
#
+# Chris Reffett <creffett@gentoo.org> (23 Nov 2012)
+# CMake's PHP module can't find our install location, so
+# libkolab(xml) fails with the php flag enabled.
+net-libs/libkolab php
+net-libs/libkolabxml php
+
# Pawel Hajdan jr <phajdan.jr@gentoo.org> (15 Nov 2012)
# Experimental, requires masked ffmpeg, no libav support yet.
www-client/chromium system-ffmpeg