diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2012-03-14 09:51:28 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2012-03-14 09:51:28 +0000 |
| commit | 9974ef8f2db1c19d2475cd70d02d89937ce42666 (patch) | |
| tree | d8cd2b08f310d348d60e601208321537ddb529d5 /app-emulation | |
| parent | Fix net-snmp DEPEND - bug #408043 (diff) | |
| download | gentoo-2-9974ef8f2db1c19d2475cd70d02d89937ce42666.tar.gz gentoo-2-9974ef8f2db1c19d2475cd70d02d89937ce42666.tar.bz2 gentoo-2-9974ef8f2db1c19d2475cd70d02d89937ce42666.zip | |
Block old version of app-emulation/emul-linux-x86-soundlibs for file collision with liboil-0.3.* wrt #408137 by Martin Mokrejš
(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)
Diffstat (limited to 'app-emulation')
3 files changed, 14 insertions, 6 deletions
diff --git a/app-emulation/emul-linux-x86-medialibs/ChangeLog b/app-emulation/emul-linux-x86-medialibs/ChangeLog index b9f8b3ed142f..1a304b8d2bba 100644 --- a/app-emulation/emul-linux-x86-medialibs/ChangeLog +++ b/app-emulation/emul-linux-x86-medialibs/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-emulation/emul-linux-x86-medialibs # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/ChangeLog,v 1.56 2012/03/09 14:53:31 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/ChangeLog,v 1.57 2012/03/14 09:51:28 ssuominen Exp $ + + 14 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> + emul-linux-x86-medialibs-20110928.ebuild, + emul-linux-x86-medialibs-20120127.ebuild: + Block old version of app-emulation/emul-linux-x86-soundlibs for file + collision with liboil-0.3.* wrt #408137 by Martin Mokrejš 09 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> emul-linux-x86-medialibs-20120127.ebuild: diff --git a/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20110928.ebuild b/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20110928.ebuild index a882049a2bb6..d96745c4f586 100644 --- a/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20110928.ebuild +++ b/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20110928.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 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-20110928.ebuild,v 1.5 2011/10/16 12:10:43 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20110928.ebuild,v 1.6 2012/03/14 09:51:28 ssuominen Exp $ EAPI="4" @@ -12,7 +12,8 @@ KEYWORDS="-* amd64" DEPEND="" RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV} ~app-emulation/emul-linux-x86-xlibs-${PV} - !<=app-emulation/emul-linux-x86-sdl-20081109" + !<=app-emulation/emul-linux-x86-sdl-20081109 + !<=app-emulation/emul-linux-x86-soundlibs-20110101" PDEPEND="~app-emulation/emul-linux-x86-soundlibs-${PV} ~app-emulation/emul-linux-x86-sdl-${PV}" # sdl pdep should be dropped once bug #299324 is solved diff --git a/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20120127.ebuild b/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20120127.ebuild index 2edb595f53b7..9c9696b74bf5 100644 --- a/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20120127.ebuild +++ b/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20120127.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 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-20120127.ebuild,v 1.2 2012/03/09 14:53:31 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20120127.ebuild,v 1.3 2012/03/14 09:51:28 ssuominen Exp $ EAPI="4" @@ -13,7 +13,8 @@ DEPEND="" RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV} ~app-emulation/emul-linux-x86-xlibs-${PV} ~app-emulation/emul-linux-x86-db-${PV} - !<=app-emulation/emul-linux-x86-sdl-20081109" + !<=app-emulation/emul-linux-x86-sdl-20081109 + !<=app-emulation/emul-linux-x86-soundlibs-20110101" PDEPEND="~app-emulation/emul-linux-x86-soundlibs-${PV} ~app-emulation/emul-linux-x86-sdl-${PV}" # sdl pdep should be dropped once bug #299324 is solved |