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 | f90957a452b1b0b171e21389f83b9865c7d7fae1 (patch) | |
| tree | 6ceb4b1cfbcd635a6e179a0471d4b3bac53cf649 /app-emulation | |
| parent | Marking docbook2X-0.8.8-r2 ppc64 for bug 290161 (diff) | |
| download | historical-f90957a452b1b0b171e21389f83b9865c7d7fae1.tar.gz historical-f90957a452b1b0b171e21389f83b9865c7d7fae1.tar.bz2 historical-f90957a452b1b0b171e21389f83b9865c7d7fae1.zip | |
Fix collisions
Package-Manager: portage-2.1.7.15/cvs/Linux x86_64
Diffstat (limited to 'app-emulation')
3 files changed, 14 insertions, 8 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/Manifest b/app-emulation/emul-linux-x86-medialibs/Manifest index d3b5fe802f2e..2dc803df73a2 100644 --- a/app-emulation/emul-linux-x86-medialibs/Manifest +++ b/app-emulation/emul-linux-x86-medialibs/Manifest @@ -4,13 +4,13 @@ Hash: SHA1 DIST emul-linux-x86-medialibs-20081109.tar.bz2 1904169 RMD160 fb83929618fbdb28e014677a89eda61dfcceb98d SHA1 eb572fa9a12d1fcf0e43956ba756c707d705667b SHA256 a4c33997653a7f180d4e2e87ea64566da5a3cbceda1009a00875d8e6c11c7f7d DIST emul-linux-x86-medialibs-20091231.tar.bz2 7180454 RMD160 1f27324dba654a3e6510d308005be399c18a1575 SHA1 d39dea94bedb1ed665c37ce424fca6016ac773e4 SHA256 79465c8e912ecf9e8bc63132b4f24e80d74904148caad00aceeb086ed7df616f EBUILD emul-linux-x86-medialibs-20081109.ebuild 588 RMD160 2f8e6e6fb957182fd6a84c5388b05615c6150051 SHA1 726a0974b5b1d0a7593cedf9768f54f6ad02356e SHA256 3b2703c2d8b4f0a10c802ede58c956ec9801c30517204be0c9875586d4d44640 -EBUILD emul-linux-x86-medialibs-20091231.ebuild 579 RMD160 c231ab2adbdaf6e433250f13237d6e92bcb97928 SHA1 1cf32ceae53a6b6572c076880c753ce139b95c8c SHA256 037e786bd59040699aa3d794fb262e522c8bb62a3d2afd55c7a323abfb022c66 -MISC ChangeLog 5902 RMD160 05feaee6eed719d901e17af1e8f8d0b9e321c418 SHA1 ae6456b472c91dfc04686bda1592b717d711523e SHA256 116d96828fdbc971ef1027e6c573a0cc2b271364e4ae4add3ed3eaaf6c30317e +EBUILD emul-linux-x86-medialibs-20091231.ebuild 625 RMD160 43787f2483291e1d3d1b957f071081c760d223b4 SHA1 5220540020b909dd0ab64a7f32c145c4d469eb10 SHA256 6454730e7d08afdbaf8f591dac9d86ab28496a6b057674729c7b41584fc4ad6c +MISC ChangeLog 6087 RMD160 b2bdfd601f77cf23a41d63aaa34e087c17821952 SHA1 2d5f9230dd5c39a67cf5721441342ac882ba9f09 SHA256 64be570d5a5440917473a4133d4f0648530d4f2ea0544c01ffef94d2f13f935b MISC metadata.xml 218 RMD160 cbc93b26738b5e98e127744c5a949cf2f0920778 SHA1 e6c4a3379b1d26bd7a87fe3a64f4b8185bf208d4 SHA256 0522168dc16d1a5fe22d19e63237544b3bdbb06dcefb1df3d4fe8c54975a6d3b -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.11 (GNU/Linux) -iEYEARECAAYFAks+aSgACgkQCaWpQKGI+9T2WQCfVjpS23SNnauGEasQmQV7bTZi -ANYAn0I+0qxRWS2otdwQW1AZCRahu5vt -=1O06 +iEYEARECAAYFAks/XRQACgkQCaWpQKGI+9SVPACfaPvGEJTHhljDPgPw8bUOnisQ +27sAn14n2lcb3zOSe6Y/unTi8FCxnnI8 +=HdZK -----END PGP SIGNATURE----- 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" |