diff options
| author |   Matthias Schwarzott <zzam@gentoo.org> | 2005-07-13 21:45:05 +0000 |
|---|---|---|
| committer | Matthias Schwarzott <zzam@gentoo.org> | 2005-07-13 21:45:05 +0000 |
| commit | 9815b63ca801ad1b5c49fe085bc8679104837ee2 (patch) | |
| tree | 24f24287d45367471e771ecde2bda32412f5faf6 /media-tv/xdtv | |
| parent | Fix for bug #98883. (diff) | |
| download | gentoo-2-9815b63ca801ad1b5c49fe085bc8679104837ee2.tar.gz gentoo-2-9815b63ca801ad1b5c49fe085bc8679104837ee2.tar.bz2 gentoo-2-9815b63ca801ad1b5c49fe085bc8679104837ee2.zip | |
Change dependency on dvb according to Bug #98672
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'media-tv/xdtv')
| -rw-r--r-- | media-tv/xdtv/Manifest | 14 | ||||
| -rw-r--r-- | media-tv/xdtv/xdtv-2.2.0.ebuild | 13 |
2 files changed, 8 insertions, 19 deletions
diff --git a/media-tv/xdtv/Manifest b/media-tv/xdtv/Manifest index 36931f457a8b..b3c39fb76835 100644 --- a/media-tv/xdtv/Manifest +++ b/media-tv/xdtv/Manifest @@ -1,14 +1,4 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 0dfc4d0a0cad3dc6b761593f69ac917b metadata.xml 252 +MD5 e9047465e2b67a384cb2da840d0af0d4 xdtv-2.2.0.ebuild 6043 MD5 f0da8181ee47c0b8340bd6351efa3785 ChangeLog 956 -MD5 4b6e19063360aa0c3af0da9ac8004b5a xdtv-2.2.0.ebuild 6184 +MD5 0dfc4d0a0cad3dc6b761593f69ac917b metadata.xml 252 MD5 1a76927ad3fc30c72aa7648bfd77f065 files/digest-xdtv-2.2.0 1252 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1 (GNU/Linux) - -iD8DBQFC0SCEj5H05b2HAEkRAlBpAJ41b5V33bDm1TR83x0rUaqqFVfsWgCfaQCW -XorId9CHUSBbrx7R8Rm9tdo= -=2w/P ------END PGP SIGNATURE----- diff --git a/media-tv/xdtv/xdtv-2.2.0.ebuild b/media-tv/xdtv/xdtv-2.2.0.ebuild index 79d65d655077..9a5dfa319bfe 100644 --- a/media-tv/xdtv/xdtv-2.2.0.ebuild +++ b/media-tv/xdtv/xdtv-2.2.0.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-tv/xdtv/xdtv-2.2.0.ebuild,v 1.5 2005/07/10 13:19:40 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-tv/xdtv/xdtv-2.2.0.ebuild,v 1.6 2005/07/13 21:45:05 zzam Exp $ -inherit font multilib flag-o-matic +inherit font multilib IUSE="alsa jpeg encode ffmpeg xvid lirc xinerama divx4linux neXt Xaw3d mmx zvbi aqua_theme xv debug dvb" @@ -75,7 +75,10 @@ RDEPEND="virtual/x11 alsa? ( >=media-libs/alsa-lib-0.9 )" DEPEND="${RDEPEND} - dvb? ( =media-tv/linuxtv-dvb-headers-3* )" + dvb? ( ||( + >=sys-kernel/linux-headers-2.6.11-r2 + media-tv/linuxtv-dvb + ) )" FONT_S="${S}/font" FONT_SUFFIX="pcf.gz" @@ -136,9 +139,6 @@ src_compile() { ( use mmx || use amd64 ) && myconf="${myconf} --enable-mmx" || \ myconf="${myconf} --disable-mmx" - # linux-dvb headers are installed in /usr/include/dvb to avoid collision-protect - use dvb && CPPFLAGS="${CPPFLAGS} -I/usr/include/dvb" - econf ${xawconf} \ $(use_enable divx4linux) \ $(use_enable alsa) \ @@ -155,7 +155,6 @@ src_compile() { --enable-pixmaps \ --disable-cpu-detection \ ${myconf} \ - CPPFLAGS="${CPPFLAGS}" \ || die "Configuration failed." emake OPT="${CFLAGS}" PERF_FLAGS="${CFLAGS}" || die "Compilation failed." |