Gentoo Archives: gentoo-commits

From: "Pacho Ramos (pacho)" <pacho@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-emulation/emul-linux-x86-medialibs: emul-linux-x86-medialibs-20091231.ebuild ChangeLog
Date: Sat, 02 Jan 2010 14:49:51
Message-Id: E1NR5IY-0005S8-H2@stork.gentoo.org
1 pacho 10/01/02 14:49:46
2
3 Modified: emul-linux-x86-medialibs-20091231.ebuild ChangeLog
4 Log:
5 Fix collisions
6 (Portage version: 2.1.7.15/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.2 app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20091231.ebuild
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20091231.ebuild?rev=1.2&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20091231.ebuild?rev=1.2&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20091231.ebuild?r1=1.1&r2=1.2
14
15 Index: emul-linux-x86-medialibs-20091231.ebuild
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20091231.ebuild,v
18 retrieving revision 1.1
19 retrieving revision 1.2
20 diff -u -r1.1 -r1.2
21 --- emul-linux-x86-medialibs-20091231.ebuild 31 Dec 2009 12:04:48 -0000 1.1
22 +++ emul-linux-x86-medialibs-20091231.ebuild 2 Jan 2010 14:49:46 -0000 1.2
23 @@ -1,6 +1,6 @@
24 -# Copyright 1999-2009 Gentoo Foundation
25 +# Copyright 1999-2010 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20091231.ebuild,v 1.1 2009/12/31 12:04:48 pacho Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20091231.ebuild,v 1.2 2010/01/02 14:49:46 pacho Exp $
29
30 inherit emul-linux-x86
31
32 @@ -14,4 +14,5 @@
33 ~app-emulation/emul-linux-x86-soundlibs-${PV}
34 ~app-emulation/emul-linux-x86-xlibs-${PV}
35 ~app-emulation/emul-linux-x86-sdl-${PV}
36 + !<=app-emulation/emul-linux-x86-sdl-20081109
37 !<media-video/mplayer-bin-1.0_rc1-r2"
38
39
40
41 1.32 app-emulation/emul-linux-x86-medialibs/ChangeLog
42
43 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/emul-linux-x86-medialibs/ChangeLog?rev=1.32&view=markup
44 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/emul-linux-x86-medialibs/ChangeLog?rev=1.32&content-type=text/plain
45 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/emul-linux-x86-medialibs/ChangeLog?r1=1.31&r2=1.32
46
47 Index: ChangeLog
48 ===================================================================
49 RCS file: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/ChangeLog,v
50 retrieving revision 1.31
51 retrieving revision 1.32
52 diff -u -r1.31 -r1.32
53 --- ChangeLog 1 Jan 2010 21:29:06 -0000 1.31
54 +++ ChangeLog 2 Jan 2010 14:49:46 -0000 1.32
55 @@ -1,6 +1,11 @@
56 # ChangeLog for app-emulation/emul-linux-x86-medialibs
57 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
58 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/ChangeLog,v 1.31 2010/01/01 21:29:06 pacho Exp $
59 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/ChangeLog,v 1.32 2010/01/02 14:49:46 pacho Exp $
60 +
61 + 02 Jan 2010; Pacho Ramos <pacho@g.o>
62 + emul-linux-x86-medialibs-20091231.ebuild:
63 + Block old versions to prevent collisions. Thanks to Doug for reporting
64 + them in bug 299309
65
66 01 Jan 2010; Pacho Ramos <pacho@g.o>
67 -emul-linux-x86-medialibs-1.2-r1.ebuild,