diff options
| author |   Tom Wijsman <tomwij@gentoo.org> | 2013-07-16 23:58:32 +0000 |
|---|---|---|
| committer | Tom Wijsman <tomwij@gentoo.org> | 2013-07-16 23:58:32 +0000 |
| commit | 28b7380d23391c5ef31ce542998eb2260ff5316b (patch) | |
| tree | 2e14b61c8b151635d4689fdfd4c095cc1593c4c4 /media-libs | |
| parent | Version bump (bug #466094). (diff) | |
| download | gentoo-2-28b7380d23391c5ef31ce542998eb2260ff5316b.tar.gz gentoo-2-28b7380d23391c5ef31ce542998eb2260ff5316b.tar.bz2 gentoo-2-28b7380d23391c5ef31ce542998eb2260ff5316b.zip | |
Slotted the blocker to allow versions of other slots to be installed.
(Portage version: 2.1.12.13/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)
Diffstat (limited to 'media-libs')
5 files changed, 14 insertions, 9 deletions
diff --git a/media-libs/avidemux-core/ChangeLog b/media-libs/avidemux-core/ChangeLog index 87400ede2011..3fe655f91d5a 100644 --- a/media-libs/avidemux-core/ChangeLog +++ b/media-libs/avidemux-core/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-libs/avidemux-core # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-core/ChangeLog,v 1.10 2013/07/16 19:41:10 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-core/ChangeLog,v 1.11 2013/07/16 23:58:32 tomwij Exp $ + + 16 Jul 2013; Tom Wijsman <TomWij@gentoo.org> avidemux-core-2.6.2-r1.ebuild, + avidemux-core-2.6.3.ebuild, avidemux-core-2.6.4.ebuild, + avidemux-core-9999.ebuild: + Slotted the blocker to allow versions of other slots to be installed. *avidemux-core-9999 (16 Jul 2013) diff --git a/media-libs/avidemux-core/avidemux-core-2.6.2-r1.ebuild b/media-libs/avidemux-core/avidemux-core-2.6.2-r1.ebuild index 2ff20ab05500..1a5e2ff23bca 100644 --- a/media-libs/avidemux-core/avidemux-core-2.6.2-r1.ebuild +++ b/media-libs/avidemux-core/avidemux-core-2.6.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-core/avidemux-core-2.6.2-r1.ebuild,v 1.3 2013/07/07 13:09:29 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-core/avidemux-core-2.6.2-r1.ebuild,v 1.4 2013/07/16 23:58:32 tomwij Exp $ EAPI="5" @@ -21,7 +21,7 @@ KEYWORDS="~amd64 ~x86" IUSE="aften a52 alsa amr debug dts fontconfig jack lame libsamplerate mmx oss nls sdl -system-ffmpeg vorbis truetype xvid x264 xv" RDEPEND=" - !<media-video/avidemux-2.6.2-r1 + !<media-video/avidemux-2.6.2-r1:${SLOT} >=dev-lang/spidermonkey-1.5-r2 dev-libs/libxml2 media-libs/libpng diff --git a/media-libs/avidemux-core/avidemux-core-2.6.3.ebuild b/media-libs/avidemux-core/avidemux-core-2.6.3.ebuild index 85f3a2a53b68..55bde4a7c42e 100644 --- a/media-libs/avidemux-core/avidemux-core-2.6.3.ebuild +++ b/media-libs/avidemux-core/avidemux-core-2.6.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-core/avidemux-core-2.6.3.ebuild,v 1.3 2013/05/16 07:00:59 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-core/avidemux-core-2.6.3.ebuild,v 1.4 2013/07/16 23:58:32 tomwij Exp $ EAPI="5" @@ -21,7 +21,7 @@ KEYWORDS="~amd64 ~x86" IUSE="debug nls sdl system-ffmpeg vdpau xv" DEPEND=" - !<media-video/avidemux-${PV} + !<media-video/avidemux-${PV}:${SLOT} dev-db/sqlite nls? ( sys-devel/gettext ) sdl? ( media-libs/libsdl ) diff --git a/media-libs/avidemux-core/avidemux-core-2.6.4.ebuild b/media-libs/avidemux-core/avidemux-core-2.6.4.ebuild index 20645e0f837a..e997fa96859c 100644 --- a/media-libs/avidemux-core/avidemux-core-2.6.4.ebuild +++ b/media-libs/avidemux-core/avidemux-core-2.6.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-core/avidemux-core-2.6.4.ebuild,v 1.2 2013/07/12 22:58:35 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-core/avidemux-core-2.6.4.ebuild,v 1.3 2013/07/16 23:58:32 tomwij Exp $ EAPI="5" @@ -21,7 +21,7 @@ KEYWORDS="~amd64 ~x86" IUSE="debug nls sdl system-ffmpeg vdpau xv" DEPEND=" - !<media-video/avidemux-${PV} + !<media-video/avidemux-${PV}:${SLOT} dev-db/sqlite nls? ( sys-devel/gettext ) sdl? ( media-libs/libsdl ) diff --git a/media-libs/avidemux-core/avidemux-core-9999.ebuild b/media-libs/avidemux-core/avidemux-core-9999.ebuild index 9804264154fc..aca9dbe1bce9 100644 --- a/media-libs/avidemux-core/avidemux-core-9999.ebuild +++ b/media-libs/avidemux-core/avidemux-core-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-core/avidemux-core-9999.ebuild,v 1.1 2013/07/16 19:41:10 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-core/avidemux-core-9999.ebuild,v 1.2 2013/07/16 23:58:32 tomwij Exp $ EAPI="5" @@ -29,7 +29,7 @@ fi # Trying to use virtual; ffmpeg misses aac,cpudetection USE flags now though, are they needed? DEPEND=" - !<media-video/avidemux-${PV} + !<media-video/avidemux-${PV}:${SLOT} dev-db/sqlite:3 nls? ( sys-devel/gettext:0 ) sdl? ( media-libs/libsdl:0 ) |