summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOle Markus With <olemarkus@gentoo.org>2011-06-28 18:54:25 +0000
committerOle Markus With <olemarkus@gentoo.org>2011-06-28 18:54:25 +0000
commit72b5042ab4bdfa8fd7bd462e8146ae0f9b4adf82 (patch)
tree08cc2703ebdce364b7e9d3ac54085db3a276944b
parentVersion bump. (diff)
downloadgentoo-2-72b5042ab4bdfa8fd7bd462e8146ae0f9b4adf82.tar.gz
gentoo-2-72b5042ab4bdfa8fd7bd462e8146ae0f9b4adf82.tar.bz2
gentoo-2-72b5042ab4bdfa8fd7bd462e8146ae0f9b4adf82.zip
Mask php 5.4 alpha versions and above
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask4
2 files changed, 6 insertions, 3 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 8bb1ec40294d..549fd33aac05 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,14 @@
# ChangeLog for profile directory
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5483 2011/06/28 10:32:27 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5484 2011/06/28 18:54:25 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!
+ 28 Jun 2011; Ole Markus With <olemarkus@gentoo.org> package.mask:
+ Mask php 5.4 alpha versions and above
+
28 Jun 2011; Tony Vroon <chainsaw@gentoo.org> package.mask:
The replacement package is net-misc/gogoc, not net-misc/gogo6. As pointed out
by Evesong on #gentoo.
diff --git a/profiles/package.mask b/profiles/package.mask
index 2265cc4b0a0a..79e28e5b162f 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.12868 2011/06/28 10:32:27 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.12869 2011/06/28 18:54:25 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
@@ -318,7 +318,7 @@ app-crypt/scsign
=dev-lang/php-5.3.7_rc1
=dev-lang/php-5.3.7_rc2
=dev-lang/php-5.3.7_rc3
->=dev-lang/php-5.4.0_pre1
+>=dev-lang/php-5.4.0_alpha1
# Nirbheek Chauhan <nirbheek@gentoo.org> (30 Apr 2011)
# GTK3 version of notification-daemon, added for testing