summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOle Markus With <olemarkus@gentoo.org>2014-08-29 12:12:46 +0000
committerOle Markus With <olemarkus@gentoo.org>2014-08-29 12:12:46 +0000
commit43b1eb192f2ad243cc812b32a9c50edb369be9f1 (patch)
treebd7f30c3f839ea410e717fa2b57e5c637f5608fe /profiles
parentStable for amd64 wrt bug #518270 (diff)
downloadhistorical-43b1eb192f2ad243cc812b32a9c50edb369be9f1.tar.gz
historical-43b1eb192f2ad243cc812b32a9c50edb369be9f1.tar.bz2
historical-43b1eb192f2ad243cc812b32a9c50edb369be9f1.zip
Remove mask of php 5.6
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog6
-rw-r--r--profiles/base/use.mask3
-rw-r--r--profiles/package.mask6
3 files changed, 8 insertions, 7 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index f762c0fda95e..a7a89939910a 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +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.9329 2014/08/28 16:29:19 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9330 2014/08/29 12:12:45 olemarkus 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!
+ 29 Aug 2014; Ole Markus With <olemarkus@gentoo.org> base/use.mask,
+ package.mask:
+ Remove mask of php 5.6
+
28 Aug 2014; Samuli Suominen <ssuominen@gentoo.org> package.mask:
Remove mask for removed version of the libopenraw git snapshot.
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index 78b2e525c23d..fe25bc511706 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/use.mask,v 1.204 2014/08/29 11:52:06 jauhien Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/use.mask,v 1.205 2014/08/29 12:12:46 olemarkus Exp $
# Mask use-flag firebird and package dev-db/firebird for bug 460780
firebird
@@ -33,6 +33,7 @@ vdpau
infiniband
# PHP 5.6 still has no stable version
+php_targets_php5-3
php_targets_php5-6
# Its deps are not mature enough yet
diff --git a/profiles/package.mask b/profiles/package.mask
index 57be7ad404fc..c75e617d2000 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15995 2014/08/28 16:29:19 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15996 2014/08/29 12:12:45 olemarkus 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
@@ -542,10 +542,6 @@ lxde-base/lxpolkit
# Mask development releases
=media-sound/lilypond-2.19*
-# Ole Markus With <olemarkus@gentoo.org> (28 Jan 2014)
-# PHP 5.6 still in early development
->=dev-lang/php-5.6
-
# Christian Ruppert <idl0r@gentoo.org> (19 Jan 2014)
# Experimental, for now
=dev-vcs/gitolite-gentoo-3*