summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'media-tv')
-rw-r--r--media-tv/ivtv-utils/ChangeLog7
-rw-r--r--media-tv/ivtv-utils/Manifest16
-rw-r--r--media-tv/ivtv-utils/ivtv-utils-1.4.0-r2.ebuild4
3 files changed, 10 insertions, 17 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/Manifest b/media-tv/ivtv-utils/Manifest
index d3bf30e7fb23..1e499c4f0b6c 100644
--- a/media-tv/ivtv-utils/Manifest
+++ b/media-tv/ivtv-utils/Manifest
@@ -1,17 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
AUX ivtv-utils-1.4.0-gentoo.patch 2488 RMD160 67b82c7384da279c215598714fc9e5b5734762ac SHA1 24b4c7e701dbcbe03cb88a59c5d42fd04cf48d87 SHA256 2e0801ca1724c6b1feb1335321ffb05bde8402335fb13a06eb878bb6825cbf82
DIST ivtv-utils-1.4.0.tar.gz 192733 RMD160 841b46c64dc57e04e603a1a074a55be1d6ea5ea3 SHA1 ea046eec2511ad00395e9de5ba693c069190d2c4 SHA256 702c365da723ce419bd49f25f88eb3a028f0594699f9c9710c713eba022ac911
-EBUILD ivtv-utils-1.4.0-r2.ebuild 3027 RMD160 2abd73dc209af384e1f064a9aac5b2e0b41ea829 SHA1 4ae6da2fc112eb2106688585aa10a68b1bab14d9 SHA256 1a2d2dde7285257d2a914260b9975392d990dd1c267cbe9b023446c56646a17a
-MISC ChangeLog 2655 RMD160 e271e6da2cad7bb67a60bc36eae24024e5a88de6 SHA1 0b46c44e34a8db1d6b305dd9446e944d6baea3bb SHA256 08bf84c22a447d78294af4628580fc025602d901776912c2127359c2eed9e3ef
+EBUILD ivtv-utils-1.4.0-r2.ebuild 3055 RMD160 44c3915f04008c7a44dd686c5129afbd34f52482 SHA1 22bdcba70633a4777ed64a80b8a3f4d8c46b2a40 SHA256 1f5805c58e3dc851541e84267b5bfde9e3942c52a627571636b6f736ce555d24
+MISC ChangeLog 2925 RMD160 b516813e8b3379db2944b54ce28841c9f205d221 SHA1 b98891dc5bf9185010a47df13eee261c668b4ec0 SHA256 ae5c2a37ef611b2bafe341ea45f794e8f5609d3840028dd81cf2fce7002a964d
MISC metadata.xml 494 RMD160 a8c45c9e2ad783198d04b68c755398d915270499 SHA1 1a04f1e7b3be80d5a875559fddbc5b681ba9254b SHA256 99e7a214b2abd11188552236eb67309ccde04d0a66209ed0fd48589eed258bb4
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iJwEAQECAAYFAk188UgACgkQIiMqcbOVdxQCdQQAkS8gZesdH+DoyGfA/I/c4yTQ
-cUT6HypB4XMWx5st1/glKHi70seNWHFbyU3MBTNUDFjev9Sqsqi4ghQUP0of/36F
-b7YD+bhoPfgYm/SgsN/0B5JLkDVJTfZNEYhipJ24UcwXNxPY499ai60Yhl5nbp5L
-9bn4KcMBaLl/b+OEaaI=
-=SLje
------END PGP SIGNATURE-----
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