diff options
| author |   Matthias Schwarzott <zzam@gentoo.org> | 2006-10-11 20:53:40 +0000 |
|---|---|---|
| committer | Matthias Schwarzott <zzam@gentoo.org> | 2006-10-11 20:53:40 +0000 |
| commit | d859537b5cdea7b8c62ac06dd88887948d4e527c (patch) | |
| tree | 69bbab9d9e769da8b2a8bc0706af99f4019bf85f /media-plugins/vdr-pvrinput | |
| parent | remove the bogus built_with_use check on virtual/x11, to fix bug #144909 (diff) | |
| download | gentoo-2-d859537b5cdea7b8c62ac06dd88887948d4e527c.tar.gz gentoo-2-d859537b5cdea7b8c62ac06dd88887948d4e527c.tar.bz2 gentoo-2-d859537b5cdea7b8c62ac06dd88887948d4e527c.zip | |
Apply include-order patch only conditional - ivtv-headers is a strange topic.
(Portage version: 2.1.2_pre2-r8)
Diffstat (limited to 'media-plugins/vdr-pvrinput')
| -rw-r--r-- | media-plugins/vdr-pvrinput/ChangeLog | 6 | ||||
| -rw-r--r-- | media-plugins/vdr-pvrinput/vdr-pvrinput-0.1.1.ebuild | 14 | ||||
| -rw-r--r-- | media-plugins/vdr-pvrinput/vdr-pvrinput-0.1.1_pre1.ebuild | 14 |
3 files changed, 29 insertions, 5 deletions
diff --git a/media-plugins/vdr-pvrinput/ChangeLog b/media-plugins/vdr-pvrinput/ChangeLog index 63fcc0081b43..f03d7e7ae1f5 100644 --- a/media-plugins/vdr-pvrinput/ChangeLog +++ b/media-plugins/vdr-pvrinput/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-plugins/vdr-pvrinput # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-pvrinput/ChangeLog,v 1.7 2006/08/15 10:13:42 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-pvrinput/ChangeLog,v 1.8 2006/10/11 20:53:40 zzam Exp $ + + 11 Oct 2006; Matthias Schwarzott <zzam@gentoo.org> + vdr-pvrinput-0.1.1_pre1.ebuild, vdr-pvrinput-0.1.1.ebuild: + Apply include-order patch only conditional - ivtv-headers is a strange topic. 15 Aug 2006; Matthias Schwarzott <zzam@gentoo.org> metadata.xml: Assigned to Gentoo VDR Project. diff --git a/media-plugins/vdr-pvrinput/vdr-pvrinput-0.1.1.ebuild b/media-plugins/vdr-pvrinput/vdr-pvrinput-0.1.1.ebuild index 1dc17a422d70..af460e5ca246 100644 --- a/media-plugins/vdr-pvrinput/vdr-pvrinput-0.1.1.ebuild +++ b/media-plugins/vdr-pvrinput/vdr-pvrinput-0.1.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-pvrinput/vdr-pvrinput-0.1.1.ebuild,v 1.3 2006/05/16 21:21:11 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-pvrinput/vdr-pvrinput-0.1.1.ebuild,v 1.4 2006/10/11 20:53:40 zzam Exp $ inherit vdr-plugin @@ -18,7 +18,17 @@ DEPEND=">=media-video/vdr-1.2.6" RDEPEND="${DEPEND} >=media-tv/ivtv-0.4.0" -PATCHES="${FILESDIR}/${P}-include-order.patch" +src_unpack() { + vdr-plugin_src_unpack + + cd ${S} + if has_version "<sys-kernel/linux-headers-2.6.17-r1"; then + epatch "${FILESDIR}/${P}-include-order.patch" + else + # magically works without action + : + fi +} src_install() { vdr-plugin_src_install diff --git a/media-plugins/vdr-pvrinput/vdr-pvrinput-0.1.1_pre1.ebuild b/media-plugins/vdr-pvrinput/vdr-pvrinput-0.1.1_pre1.ebuild index 21d2de2e26fe..23dcefe757d3 100644 --- a/media-plugins/vdr-pvrinput/vdr-pvrinput-0.1.1_pre1.ebuild +++ b/media-plugins/vdr-pvrinput/vdr-pvrinput-0.1.1_pre1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-pvrinput/vdr-pvrinput-0.1.1_pre1.ebuild,v 1.4 2006/05/16 21:21:11 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-pvrinput/vdr-pvrinput-0.1.1_pre1.ebuild,v 1.5 2006/10/11 20:53:40 zzam Exp $ inherit vdr-plugin IUSE="" @@ -21,7 +21,17 @@ RDEPEND="${DEPEND} S=${WORKDIR}/${MY_P#vdr-} -PATCHES="${FILESDIR}/${P}-include-order.patch" +src_unpack() { + vdr-plugin_src_unpack + + cd ${S} + if has_version "<sys-kernel/linux-headers-2.6.17-r1"; then + epatch "${FILESDIR}/${P}-include-order.patch" + else + # magically works without action + : + fi +} src_install() { vdr-plugin_src_install |