diff options
| author |   Christian Ruppert <idl0r@gentoo.org> | 2011-04-06 17:29:09 +0000 |
|---|---|---|
| committer | Christian Ruppert <idl0r@gentoo.org> | 2011-04-06 17:29:09 +0000 |
| commit | 0e4856a425bea7b8fe18a8c5b60ea266dc7a2f6b (patch) | |
| tree | 09e6eba06ee81a8c74d7bd9ba03aceadd690d839 /media-plugins/vdr-softdevice | |
| parent | Fix deprecation warning. (diff) | |
| download | gentoo-2-0e4856a425bea7b8fe18a8c5b60ea266dc7a2f6b.tar.gz gentoo-2-0e4856a425bea7b8fe18a8c5b60ea266dc7a2f6b.tar.bz2 gentoo-2-0e4856a425bea7b8fe18a8c5b60ea266dc7a2f6b.zip | |
Use the new ffmpeg virtual, bug 362105. QA Fix: use has_version instead of built_with_use.
(Portage version: 2.2.0_alpha29/cvs/Linux x86_64)
Diffstat (limited to 'media-plugins/vdr-softdevice')
4 files changed, 20 insertions, 14 deletions
diff --git a/media-plugins/vdr-softdevice/ChangeLog b/media-plugins/vdr-softdevice/ChangeLog index 5c291f36d80a..df72b181b361 100644 --- a/media-plugins/vdr-softdevice/ChangeLog +++ b/media-plugins/vdr-softdevice/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-plugins/vdr-softdevice -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/ChangeLog,v 1.66 2009/11/21 19:42:25 maekke Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/ChangeLog,v 1.67 2011/04/06 17:29:09 idl0r Exp $ + + 06 Apr 2011; Christian Ruppert <idl0r@gentoo.org> + vdr-softdevice-0.5.0.20080922.ebuild, vdr-softdevice-0.5.0.20090218.ebuild, + vdr-softdevice-0.5.0.20090630.ebuild: + Use the new ffmpeg virtual, bug 362105. QA Fix: use has_version instead of + built_with_use. 21 Nov 2009; Markus Meier <maekke@gentoo.org> vdr-softdevice-0.5.0.20090630.ebuild: diff --git a/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20080922.ebuild b/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20080922.ebuild index 4bea868641de..4dc0a3338c8a 100644 --- a/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20080922.ebuild +++ b/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20080922.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20080922.ebuild,v 1.4 2009/01/13 20:41:28 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20080922.ebuild,v 1.5 2011/04/06 17:29:09 idl0r Exp $ EAPI=1 @@ -25,7 +25,7 @@ KEYWORDS="~amd64 x86" IUSE="+xv fbcon directfb mmx mmxext xinerama" RDEPEND=">=media-video/vdr-1.3.36 - >=media-video/ffmpeg-0.4.9_pre1 + >=virtual/ffmpeg-0.4.9_pre1 directfb? ( dev-libs/DirectFB dev-libs/DFB++ @@ -78,7 +78,7 @@ pkg_setup() { # Check for ffmpeg relying on libtheora without pkg-config-file # Bug #142250 - if built_with_use media-video/ffmpeg theora && \ + if has_version virtual/ffmpeg[theora] && \ has_version "<media-libs/libtheora-1.0_alpha4"; then eerror "This package will not work when using ffmpeg with" diff --git a/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20090218.ebuild b/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20090218.ebuild index 7fd20b3f7927..36cd6bd40d43 100644 --- a/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20090218.ebuild +++ b/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20090218.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20090218.ebuild,v 1.3 2009/03/03 11:56:11 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20090218.ebuild,v 1.4 2011/04/06 17:29:09 idl0r Exp $ EAPI=1 @@ -25,7 +25,7 @@ KEYWORDS="~amd64 x86" IUSE="+xv fbcon directfb mmx mmxext xinerama" RDEPEND=">=media-video/vdr-1.3.36 - >=media-video/ffmpeg-0.4.9_pre1 + >=virtual/ffmpeg-0.4.9_pre1 directfb? ( dev-libs/DirectFB dev-libs/DFB++ @@ -77,7 +77,7 @@ pkg_setup() { # Check for ffmpeg relying on libtheora without pkg-config-file # Bug #142250 - if built_with_use media-video/ffmpeg theora && \ + if has_version virtual/ffmpeg[theora] && \ has_version "<media-libs/libtheora-1.0_alpha4"; then eerror "This package will not work when using ffmpeg with" diff --git a/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20090630.ebuild b/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20090630.ebuild index 3d42f6a694a3..149f4d0e5e96 100644 --- a/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20090630.ebuild +++ b/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20090630.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20090630.ebuild,v 1.3 2009/11/21 19:42:25 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20090630.ebuild,v 1.4 2011/04/06 17:29:09 idl0r Exp $ EAPI="2" @@ -29,9 +29,9 @@ IUSE="+xv fbcon directfb mmx mmxext xinerama" # Bug #142250 RDEPEND=">=media-video/vdr-1.3.36 || ( - >=media-video/ffmpeg-0.4.9_pre1[-theora] + >=virtual/ffmpeg-0.4.9_pre1[-theora] ( - >=media-video/ffmpeg-0.4.9_pre1[theora] + >=virtual/ffmpeg-0.4.9_pre1[theora] >=media-libs/libtheora-1.0_alpha4 ) ) |