diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2014-05-05 03:39:56 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2014-05-05 03:39:56 +0000 |
| commit | 54d2a6abc1a8c66c1f2e5fd5aea97490a707909a (patch) | |
| tree | 18085361a65d3e34e6c7ee9af5b1821909c2cb2e /media-libs | |
| parent | Fix ChangeLog entry (diff) | |
| download | gentoo-2-54d2a6abc1a8c66c1f2e5fd5aea97490a707909a.tar.gz gentoo-2-54d2a6abc1a8c66c1f2e5fd5aea97490a707909a.tar.bz2 gentoo-2-54d2a6abc1a8c66c1f2e5fd5aea97490a707909a.zip | |
collision avoidance for sdl2-mixer[playtools] (bug #509448)
(Portage version: 2.2.8-r1/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/sdl-mixer/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/sdl-mixer/sdl-mixer-1.2.12-r3.ebuild | 7 |
2 files changed, 9 insertions, 4 deletions
diff --git a/media-libs/sdl-mixer/ChangeLog b/media-libs/sdl-mixer/ChangeLog index 4e100922ee23..2d91834f8516 100644 --- a/media-libs/sdl-mixer/ChangeLog +++ b/media-libs/sdl-mixer/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/sdl-mixer # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/ChangeLog,v 1.125 2014/05/03 10:34:42 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/ChangeLog,v 1.126 2014/05/05 03:39:56 mr_bones_ Exp $ + + 05 May 2014; Michael Sterrett <mr_bones_@gentoo.org> + sdl-mixer-1.2.12-r3.ebuild: + collision avoidance for sdl2-mixer[playtools] (bug #509448) *sdl-mixer-1.2.12-r4 (03 May 2014) diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r3.ebuild b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r3.ebuild index beb9502147b6..cb0055ba6f2d 100644 --- a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r3.ebuild +++ b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/sdl-mixer-1.2.12-r3.ebuild,v 1.11 2013/02/24 18:04:28 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/sdl-mixer-1.2.12-r3.ebuild,v 1.12 2014/05/05 03:39:56 mr_bones_ Exp $ EAPI=4 inherit eutils @@ -41,7 +41,8 @@ DEPEND=">=media-libs/libsdl-1.2.10 mikmod? ( >=media-libs/libmikmod-3.1.10 ) ) vorbis? ( >=media-libs/libvorbis-1.0_beta4 media-libs/libogg )" -RDEPEND=${DEPEND} +RDEPEND="${DEPEND} + playtools? ( !media-libs/sdl2-mixer[playtools] )" S=${WORKDIR}/${MY_P} |