Remove 3.1. Adjust sys-kernel/linux-headers dependency. Remove useless eutils inherit.

(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

3 files changed, 10 insertions, 22 deletions

diff --git a/media-tv/linuxtv-dvb-headers/ChangeLog b/media-tv/linuxtv-dvb-headers/ChangeLog
index 06d2fb3a4a57..8e699b4ac3e5 100644
--- a/media-tv/linuxtv-dvb-headers/ChangeLog
+++ b/media-tv/linuxtv-dvb-headers/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-tv/linuxtv-dvb-headers
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb-headers/ChangeLog,v 1.22 2012/01/16 19:42:04 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb-headers/ChangeLog,v 1.23 2012/01/17 19:24:25 idl0r Exp $
+
+  17 Jan 2012; Christian Ruppert <idl0r@gentoo.org>
+  -linuxtv-dvb-headers-3.1.ebuild, linuxtv-dvb-headers-5.ebuild:
+  Remove 3.1. Adjust sys-kernel/linux-headers dependency. Remove useless eutils
+  inherit.
 
 *linuxtv-dvb-headers-5.3 (16 Jan 2012)
 
diff --git a/media-tv/linuxtv-dvb-headers/linuxtv-dvb-headers-3.1.ebuild b/media-tv/linuxtv-dvb-headers/linuxtv-dvb-headers-3.1.ebuild
deleted file mode 100644
index 4211e29df0dd..000000000000
--- a/media-tv/linuxtv-dvb-headers/linuxtv-dvb-headers-3.1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb-headers/linuxtv-dvb-headers-3.1.ebuild,v 1.14 2011/03/20 11:24:31 armin76 Exp $
-
-inherit eutils
-
-DESCRIPTION="Virtual Package installing the Header files for DVB"
-HOMEPAGE="http://www.linuxtv.org"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ppc x86"
-IUSE=""
-RDEPEND="|| (
-		>=sys-kernel/linux-headers-2.6.11-r2
-		media-tv/linuxtv-dvb
-	)"
diff --git a/media-tv/linuxtv-dvb-headers/linuxtv-dvb-headers-5.ebuild b/media-tv/linuxtv-dvb-headers/linuxtv-dvb-headers-5.ebuild
index fe231da4c6df..5f84448dbb30 100644
--- a/media-tv/linuxtv-dvb-headers/linuxtv-dvb-headers-5.ebuild
+++ b/media-tv/linuxtv-dvb-headers/linuxtv-dvb-headers-5.ebuild
@@ -1,8 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb-headers/linuxtv-dvb-headers-5.ebuild,v 1.7 2011/10/22 17:47:51 hd_brummy Exp $
-
-inherit eutils
+# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb-headers/linuxtv-dvb-headers-5.ebuild,v 1.8 2012/01/17 19:24:25 idl0r Exp $
 
 DESCRIPTION="Virtual Package installing the Header files for DVB"
 HOMEPAGE="http://www.linuxtv.org"
@@ -10,4 +8,5 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~arm amd64 ~hppa ~ppc ppc64 x86"
 IUSE=""
-RDEPEND=">=sys-kernel/linux-headers-2.6.29"
+RDEPEND=">=sys-kernel/linux-headers-2.6.28
+	<sys-kernel/linux-headers-3.0"