diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2010-01-02 14:49:46 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2010-01-02 14:49:46 +0000 |
| commit | e208d40a29abcc1b6f0928374cd22df527af914c (patch) | |
| tree | 1f91b30d6021716cffe7feedd3aee532ea9b9510 /app-emulation/emul-linux-x86-medialibs | |
| parent | Marking docbook2X-0.8.8-r2 ppc64 for bug 290161 (diff) | |
| download | gentoo-2-e208d40a29abcc1b6f0928374cd22df527af914c.tar.gz gentoo-2-e208d40a29abcc1b6f0928374cd22df527af914c.tar.bz2 gentoo-2-e208d40a29abcc1b6f0928374cd22df527af914c.zip | |
Fix collisions
(Portage version: 2.1.7.15/cvs/Linux x86_64)
Diffstat (limited to 'app-emulation/emul-linux-x86-medialibs')
| -rw-r--r-- | app-emulation/emul-linux-x86-medialibs/ChangeLog | 7 | ||||
| -rw-r--r-- | app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20091231.ebuild | 5 |
2 files changed, 9 insertions, 3 deletions
diff --git a/app-emulation/emul-linux-x86-medialibs/ChangeLog b/app-emulation/emul-linux-x86-medialibs/ChangeLog index 547dbd602655..1f5bd708a8f4 100644 --- a/app-emulation/emul-linux-x86-medialibs/ChangeLog +++ b/app-emulation/emul-linux-x86-medialibs/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-emulation/emul-linux-x86-medialibs # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/ChangeLog,v 1.31 2010/01/01 21:29:06 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/ChangeLog,v 1.32 2010/01/02 14:49:46 pacho Exp $ + + 02 Jan 2010; Pacho Ramos <pacho@gentoo.org> + emul-linux-x86-medialibs-20091231.ebuild: + Block old versions to prevent collisions. Thanks to Doug for reporting + them in bug 299309 01 Jan 2010; Pacho Ramos <pacho@gentoo.org> -emul-linux-x86-medialibs-1.2-r1.ebuild, diff --git a/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20091231.ebuild b/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20091231.ebuild index ce7bff7c5372..1326b38aa875 100644 --- a/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20091231.ebuild +++ b/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20091231.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $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 $ +# $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 $ inherit emul-linux-x86 @@ -14,4 +14,5 @@ RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV} ~app-emulation/emul-linux-x86-soundlibs-${PV} ~app-emulation/emul-linux-x86-xlibs-${PV} ~app-emulation/emul-linux-x86-sdl-${PV} + !<=app-emulation/emul-linux-x86-sdl-20081109 !<media-video/mplayer-bin-1.0_rc1-r2" |