summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2011-03-27 09:49:00 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2011-03-27 09:49:00 +0000
commitdc2463386844a9223494c456a7c8eaf3e1d87472 (patch)
tree976dfda96008764bbe30b12e525c6c62828f0d12 /virtual/ffmpeg
parentstable x86, bug 358907 (diff)
downloadhistorical-dc2463386844a9223494c456a7c8eaf3e1d87472.tar.gz
historical-dc2463386844a9223494c456a7c8eaf3e1d87472.tar.bz2
historical-dc2463386844a9223494c456a7c8eaf3e1d87472.zip
Do not set DEPEND. Per bug #360711.
Package-Manager: portage-2.2.0_alpha28/cvs/Linux x86_64
Diffstat (limited to 'virtual/ffmpeg')
-rw-r--r--virtual/ffmpeg/ChangeLog5
-rw-r--r--virtual/ffmpeg/Manifest4
-rw-r--r--virtual/ffmpeg/ffmpeg-0.ebuild6
3 files changed, 9 insertions, 6 deletions
diff --git a/virtual/ffmpeg/ChangeLog b/virtual/ffmpeg/ChangeLog
index 07e487876cfb..26adc7836b03 100644
--- a/virtual/ffmpeg/ChangeLog
+++ b/virtual/ffmpeg/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for virtual/ffmpeg
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ChangeLog,v 1.3 2011/03/26 14:29:54 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ChangeLog,v 1.4 2011/03/27 09:49:00 scarabeus Exp $
+
+ 27 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org> ffmpeg-0.ebuild:
+ Do not set DEPEND. Per bug #360711.
*ffmpeg-0 (26 Mar 2011)
diff --git a/virtual/ffmpeg/Manifest b/virtual/ffmpeg/Manifest
index 653a50e95a5d..677cf195adbd 100644
--- a/virtual/ffmpeg/Manifest
+++ b/virtual/ffmpeg/Manifest
@@ -1,3 +1,3 @@
-EBUILD ffmpeg-0.ebuild 627 RMD160 ff4854ae3135a96dc262487ec71d8b3af2c1a99e SHA1 5a754d0014e1bc2920eb172e9ccbb3b3abd27c94 SHA256 2de9272b423c85332fbfad058fdd50ed3d20e6f783eb2d9dd60c8fe1e07ca137
-MISC ChangeLog 1064 RMD160 7c4ef0a98e83f27127344ce02fa447851ab15917 SHA1 ebd7b08386b2fa11f0591d67b408083a48b49b75 SHA256 62e57d2f1dd99876c79b5cf696ae7a12a6ae0d91ca8a224b9cfeed9d5b7c673c
+EBUILD ffmpeg-0.ebuild 618 RMD160 f4199b5ae4e66882c280b277dfb0bafd340432e2 SHA1 b4f815a9144f5ebecc523d476842e87bdac8aa78 SHA256 fbb3d300b67011bb562cb3f5399883906e43e04a6bf53c22ca02d434b58c1859
+MISC ChangeLog 1175 RMD160 1dc469e1e99fd852e616b1597901d86169062301 SHA1 f8c852f22ce8b485e410b321df50999f4389ada6 SHA256 05a188c0ebea4b2d15e7ec54cd4afa0bb86894bbf5c1c1812cd6eb4b674d9e52
MISC metadata.xml 356 RMD160 f49a377695011eebee33635e86aa774012cc6b50 SHA1 fae2f8e5355912f11839c5229172d39e4e0c9f13 SHA256 17f805ca0c5d5243d0b3403c3959d84271a6c86c70c1dbbf26847ed3f83160b6
diff --git a/virtual/ffmpeg/ffmpeg-0.ebuild b/virtual/ffmpeg/ffmpeg-0.ebuild
index 10ec1f17c5c5..7e479d6449c2 100644
--- a/virtual/ffmpeg/ffmpeg-0.ebuild
+++ b/virtual/ffmpeg/ffmpeg-0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ffmpeg-0.ebuild,v 1.1 2011/03/26 14:29:54 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ffmpeg-0.ebuild,v 1.2 2011/03/27 09:49:00 scarabeus Exp $
EAPI=4
@@ -13,10 +13,10 @@ SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
IUSE="X encode mp3 sdl theora threads vdpau x264"
-DEPEND="
+RDEPEND="
|| (
media-video/libav[X=,encode=,mp3=,sdl=,theora=,threads=,vdpau=,x264=]
media-video/ffmpeg[X=,encode=,mp3=,sdl=,theora=,threads=,vdpau=,x264=]
)
"
-RDEPEND="${DEPEND}"
+DEPEND=""