summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2012-11-25 23:20:51 +0000
committerPacho Ramos <pacho@gentoo.org>2012-11-25 23:20:51 +0000
commitd213a5e44ee8acdc15cd5a074a2f090396f8a6e4 (patch)
treebcf4c267a4b72af9d332036d746452e4b8dc9fdd /profiles
parentBuild static libs when tests are enabled and drop REQUIRED_USE. (diff)
downloadgentoo-2-d213a5e44ee8acdc15cd5a074a2f090396f8a6e4.tar.gz
gentoo-2-d213a5e44ee8acdc15cd5a074a2f090396f8a6e4.tar.bz2
gentoo-2-d213a5e44ee8acdc15cd5a074a2f090396f8a6e4.zip
Previous scilab mask entry also masks overlay versions by error
Diffstat (limited to 'profiles')
-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 df1c5a9aee9a..3d8b5ad0efa1 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,14 @@
# ChangeLog for profile directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.7190 2012/11/25 19:34:52 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.7191 2012/11/25 23:20:51 pacho 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!
+ 25 Nov 2012; Pacho Ramos <pacho@gentoo.org> package.mask:
+ Previous scilab mask entry also masks overlay versions by error
+
25 Nov 2012; Ulrich Müller <ulm@gentoo.org> license_groups:
Add Sleepycat to GPL-COMPATIBLE and OSI-APPROVED license groups, bug 300426.
This replaces DB and OracleDB, remove them from both license groups.
diff --git a/profiles/package.mask b/profiles/package.mask
index e32ad9d2712e..e51b3646ed0f 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14253 2012/11/25 13:53:02 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14254 2012/11/25 23:20:51 pacho 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
@@ -144,7 +144,7 @@ app-laptop/macbook-backlight
# Pacho Ramos <pacho@gentoo.org> (24 Nov 2012)
# Lots of bug report, use version from science overlay as pointed
# in bug #339364#c3 . Removal in a month
-sci-mathematics/scilab
+<sci-mathematics/scilab-5
# Pacho Ramos <pacho@gentoo.org> (24 Nov 2012)
# Upstream dead for more than 2 years and replaced by nmcli