Gentoo Archives: gentoo-commits

From: "Nirbheek Chauhan (nirbheek)" <nirbheek@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in profiles: ChangeLog package.mask
Date: Sun, 27 Sep 2009 15:59:14
Message-Id: E1Mrw9X-0000Ig-Ld@stork.gentoo.org
1 nirbheek 09/09/27 15:59:11
2
3 Modified: ChangeLog package.mask
4 Log:
5 Mask net-wireless/bluez-hciemu since it's provided by net-wireless/bluez[test-programs] and by net-wireless/bluez-utils[test-programs], and hence has a file collision -- bug 257826
6
7 Revision Changes Path
8 1.3318 profiles/ChangeLog
9
10 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/profiles/ChangeLog?rev=1.3318&view=markup
11 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/profiles/ChangeLog?rev=1.3318&content-type=text/plain
12 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/profiles/ChangeLog?r1=1.3317&r2=1.3318
13
14 Index: ChangeLog
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v
17 retrieving revision 1.3317
18 retrieving revision 1.3318
19 diff -u -r1.3317 -r1.3318
20 --- ChangeLog 27 Sep 2009 12:37:09 -0000 1.3317
21 +++ ChangeLog 27 Sep 2009 15:59:10 -0000 1.3318
22 @@ -1,11 +1,17 @@
23 # ChangeLog for profile directory
24 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
25 -# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.3317 2009/09/27 12:37:09 ssuominen Exp $
26 +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.3318 2009/09/27 15:59:10 nirbheek Exp $
27 #
28 # This ChangeLog should include records for all changes in profiles directory.
29 # Only typo fixes which don't affect portage/repoman behaviour could be avoided
30 # here. If in doubt put a record here!
31
32 + 27 Sep 2009; Nirbheek Chauhan <nirbheek@g.o> package.mask:
33 + Mask net-wireless/bluez-hciemu since it's provided by
34 + net-wireless/bluez[test-programs] and by
35 + net-wireless/bluez-utils[test-programs], and hence has a file collision --
36 + bug 257826
37 +
38 27 Sep 2009; Samuli Suominen <ssuominen@g.o> package.mask:
39 Unmask media-plugins/gmpc-lyricwiki because >= 0.19.0 is working.
40
41
42
43
44 1.10507 profiles/package.mask
45
46 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/profiles/package.mask?rev=1.10507&view=markup
47 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/profiles/package.mask?rev=1.10507&content-type=text/plain
48 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/profiles/package.mask?r1=1.10506&r2=1.10507
49
50 Index: package.mask
51 ===================================================================
52 RCS file: /var/cvsroot/gentoo-x86/profiles/package.mask,v
53 retrieving revision 1.10506
54 retrieving revision 1.10507
55 diff -u -r1.10506 -r1.10507
56 --- package.mask 27 Sep 2009 12:37:09 -0000 1.10506
57 +++ package.mask 27 Sep 2009 15:59:10 -0000 1.10507
58 @@ -1,5 +1,5 @@
59 ####################################################################
60 -# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.10506 2009/09/27 12:37:09 ssuominen Exp $
61 +# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.10507 2009/09/27 15:59:10 nirbheek Exp $
62 #
63 # When you add an entry to the top of this file, add your name, the date, and
64 # an explanation of why something is getting masked. Please be extremely
65 @@ -31,6 +31,12 @@
66
67 #--- END OF EXAMPLES ---
68
69 +# Nirbheek Chauhan <nirbheek@g.o> (27 Sep 2009)
70 +# File collision with bluez-utils[test-programs] -- bug 257826
71 +# Also blocks bluez-4 stabilization
72 +# Replacements: net-wireless/bluez{,-utils}[test-programs]
73 +net-wireless/bluez-hciemu
74 +
75 # Ryan Hill <dirtyepic@g.o> (26 Sep 2008)
76 # Mask net-p2p/nicotine for removal on 20091026. (bug #286607)
77 # Superseded by net-p2p/nicotine+, no activity since 2005.