summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gentoo.org>2014-10-10 19:47:28 +0000
committerTim Harder <radhermit@gentoo.org>2014-10-10 19:47:28 +0000
commit4bc67d8368e5b132eafe0436c50995368047d672 (patch)
tree219a2fb92f46e156a35bc4828e6e106cd1d0b390 /profiles/base
parentUpdate git repo location (bug #520068). (diff)
downloadgentoo-2-4bc67d8368e5b132eafe0436c50995368047d672.tar.gz
gentoo-2-4bc67d8368e5b132eafe0436c50995368047d672.tar.bz2
gentoo-2-4bc67d8368e5b132eafe0436c50995368047d672.zip
Move net-im/bitlbee skype use flag mask to package.use.stable.mask (bug #523708).
Diffstat (limited to 'profiles/base')
-rw-r--r--profiles/base/ChangeLog7
-rw-r--r--profiles/base/package.use.mask6
-rw-r--r--profiles/base/package.use.stable.mask6
3 files changed, 12 insertions, 7 deletions
diff --git a/profiles/base/ChangeLog b/profiles/base/ChangeLog
index a9de7a8c8f7d..7d7115bdd225 100644
--- a/profiles/base/ChangeLog
+++ b/profiles/base/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for Gentoo base-profile
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.731 2014/10/09 12:26:08 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.732 2014/10/10 19:47:28 radhermit Exp $
+
+ 10 Oct 2014; Tim Harder <radhermit@gentoo.org> package.use.mask,
+ package.use.stable.mask:
+ Move net-im/bitlbee skype use flag mask to package.use.stable.mask (bug
+ #523708).
09 Oct 2014; Michael Palimaka <kensington@gentoo.org> package.use.stable.mask:
Move kde-base/kopete[otr] from regular mask to stable mask.
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 1fbb59c914e3..dd9f0d6a1073 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.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/package.use.mask,v 1.612 2014/10/09 12:26:08 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.613 2014/10/10 19:47:28 radhermit Exp $
# This file requires >=portage-2.1.1
# New entries go on top.
@@ -507,10 +507,6 @@ media-sound/pulseaudio webrtc-aec xen
<dev-cpp/gtkmm-3.7 wayland
<x11-libs/gtk+-3.7 egl wayland
-# Tim Harder <radhermit@gentoo.org> (22 Mar 2012)
-# Masked since skype isn't stable
-net-im/bitlbee skype
-
# Samuli Suominen <ssuominen@gentoo.org> (20 Mar 2012)
# This is for udev-acl. Unmasked in default/linux/package.use.mask.
sys-auth/consolekit acl
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index 29ee91416738..68d170482695 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -1,10 +1,14 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.stable.mask,v 1.25 2014/10/09 12:26:08 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.stable.mask,v 1.26 2014/10/10 19:47:28 radhermit Exp $
# This file requires eapi 5 or later. New entries go on top.
# Please use the same syntax as in package.use.mask
+# Tim Harder <radhermit@gentoo.org> (10 Oct 2014)
+# Masked since skype isn't stable
+net-im/bitlbee skype
+
# Michael Palimaka <kensington@gentoo.org> (09 Oct 2014)
# Requires net-libs/libotr-4.0.0 which just came out of
# hard mask.