summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabio Erculiani <lxnay@gentoo.org>2011-06-26 15:19:25 +0000
committerFabio Erculiani <lxnay@gentoo.org>2011-06-26 15:19:25 +0000
commit13978724778cd477f170f8310325b0fc0fe2ceee (patch)
treede3661da451122a9844d17deb7ebabda136144c2 /media-tv
parentDefined RDEPEND, bumped EAPI (diff)
downloadgentoo-2-13978724778cd477f170f8310325b0fc0fe2ceee.tar.gz
gentoo-2-13978724778cd477f170f8310325b0fc0fe2ceee.tar.bz2
gentoo-2-13978724778cd477f170f8310325b0fc0fe2ceee.zip
sys-kernel/linux-firmware blocks ivtv-firmware making impossible to have ivtv-utils installed. add or dependency, including sys-kernel/linux-firmware as alternative package to ivtv-firmware
(Portage version: 2.2.0_alpha37/cvs/Linux x86_64)
Diffstat (limited to 'media-tv')
-rw-r--r--media-tv/ivtv-utils/ChangeLog7
-rw-r--r--media-tv/ivtv-utils/ivtv-utils-1.4.0-r2.ebuild4
2 files changed, 8 insertions, 3 deletions
diff --git a/media-tv/ivtv-utils/ChangeLog b/media-tv/ivtv-utils/ChangeLog
index de625eea216a..1f76a3bac3c1 100644
--- a/media-tv/ivtv-utils/ChangeLog
+++ b/media-tv/ivtv-utils/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-tv/ivtv-utils
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv-utils/ChangeLog,v 1.14 2011/03/13 16:30:55 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv-utils/ChangeLog,v 1.15 2011/06/26 15:19:24 lxnay Exp $
+
+ 26 Jun 2011; Fabio Erculiani <lxnay@gentoo.org> ivtv-utils-1.4.0-r2.ebuild:
+ sys-kernel/linux-firmware blocks ivtv-firmware making impossible to have
+ ivtv-utils installed. add or dependency, including sys-kernel/linux-firmware
+ as alternative package to ivtv-firmware
13 Mar 2011; Kacper Kowalik <xarthisius@gentoo.org>
ivtv-utils-1.4.0-r2.ebuild:
diff --git a/media-tv/ivtv-utils/ivtv-utils-1.4.0-r2.ebuild b/media-tv/ivtv-utils/ivtv-utils-1.4.0-r2.ebuild
index ccb0f992c81c..c46ae0622dc1 100644
--- a/media-tv/ivtv-utils/ivtv-utils-1.4.0-r2.ebuild
+++ b/media-tv/ivtv-utils/ivtv-utils-1.4.0-r2.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/media-tv/ivtv-utils/ivtv-utils-1.4.0-r2.ebuild,v 1.5 2011/03/13 16:30:55 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv-utils/ivtv-utils-1.4.0-r2.ebuild,v 1.6 2011/06/26 15:19:25 lxnay Exp $
EAPI=2
@@ -17,7 +17,7 @@ RDEPEND=">=sys-fs/udev-103"
DEPEND="app-arch/unzip
>=sys-kernel/linux-headers-2.6.29
!media-tv/ivtv"
-PDEPEND=">=media-tv/ivtv-firmware-20070217
+PDEPEND="|| ( >=media-tv/ivtv-firmware-20070217 sys-kernel/linux-firmware )
perl? (
dev-perl/Video-Frequencies
dev-perl/Video-ivtv