diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2012-05-17 13:46:44 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2012-05-17 13:46:44 +0000 |
| commit | 199e8b1605b6f9246369b9654480c3370566dabd (patch) | |
| tree | f84e595c5de339a4d2ba6431e6517682f4aae144 /media-libs/libpostproc | |
| parent | keyword ~amd64-fbsd (diff) | |
| download | gentoo-2-199e8b1605b6f9246369b9654480c3370566dabd.tar.gz gentoo-2-199e8b1605b6f9246369b9654480c3370566dabd.tar.bz2 gentoo-2-199e8b1605b6f9246369b9654480c3370566dabd.zip | |
Avoid file colisions.
(Portage version: 2.2.0_alpha107/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/libpostproc')
| -rw-r--r-- | media-libs/libpostproc/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/libpostproc/libpostproc-0.8.0.20120217.ebuild | 7 | ||||
| -rw-r--r-- | media-libs/libpostproc/libpostproc-9999.ebuild | 7 |
3 files changed, 15 insertions, 5 deletions
diff --git a/media-libs/libpostproc/ChangeLog b/media-libs/libpostproc/ChangeLog index f99a3b5c4db5..2ed19683b425 100644 --- a/media-libs/libpostproc/ChangeLog +++ b/media-libs/libpostproc/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/libpostproc # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libpostproc/ChangeLog,v 1.2 2012/05/15 08:41:37 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libpostproc/ChangeLog,v 1.3 2012/05/17 13:46:44 scarabeus Exp $ + + 17 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> + libpostproc-0.8.0.20120217.ebuild, libpostproc-9999.ebuild: + Avoid file colisions. 15 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> libpostproc-0.8.0.20120217.ebuild, libpostproc-9999.ebuild: diff --git a/media-libs/libpostproc/libpostproc-0.8.0.20120217.ebuild b/media-libs/libpostproc/libpostproc-0.8.0.20120217.ebuild index f46116d28fff..50d18d5e7cb7 100644 --- a/media-libs/libpostproc/libpostproc-0.8.0.20120217.ebuild +++ b/media-libs/libpostproc/libpostproc-0.8.0.20120217.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/media-libs/libpostproc/libpostproc-0.8.0.20120217.ebuild,v 1.2 2012/05/15 08:41:37 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libpostproc/libpostproc-0.8.0.20120217.ebuild,v 1.3 2012/05/17 13:46:44 scarabeus Exp $ EAPI="4" @@ -37,7 +37,10 @@ for i in ${CPU_FEATURES}; do done DEPEND=">=media-video/libav-0.8.2-r2" -RDEPEND="${DEPEND}" +RDEPEND="${DEPEND} + !<media-video/libav-0.8.2-r2 + !media-video/ffmpeg +" src_configure() { local myconf="${EXTRA_LIBPOSTPROC_CONF}" diff --git a/media-libs/libpostproc/libpostproc-9999.ebuild b/media-libs/libpostproc/libpostproc-9999.ebuild index 3e56ffdf615e..4d02efad27de 100644 --- a/media-libs/libpostproc/libpostproc-9999.ebuild +++ b/media-libs/libpostproc/libpostproc-9999.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/media-libs/libpostproc/libpostproc-9999.ebuild,v 1.2 2012/05/15 08:41:37 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libpostproc/libpostproc-9999.ebuild,v 1.3 2012/05/17 13:46:44 scarabeus Exp $ EAPI="4" @@ -38,7 +38,10 @@ for i in ${CPU_FEATURES}; do done DEPEND=">=media-video/libav-0.8.2-r2" -RDEPEND="${DEPEND}" +RDEPEND="${DEPEND} + !<media-video/libav-0.8.2-r2 + !media-video/ffmpeg +" src_configure() { local myconf="${EXTRA_LIBPOSTPROC_CONF}" |