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

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

4 files changed, 19 insertions, 32 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/Manifest b/media-tv/linuxtv-dvb-headers/Manifest
index b818b3e225dc..defd2111910e 100644
--- a/media-tv/linuxtv-dvb-headers/Manifest
+++ b/media-tv/linuxtv-dvb-headers/Manifest
@@ -1,19 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-EBUILD linuxtv-dvb-headers-3.1.ebuild 503 RMD160 4da1c9f4d632c64ab3ecf3670a173d2b1eda41fa SHA1 38b454d6365e9dbddfedb161e28b8b070aff868b SHA256 9a166efdb98d9c994d2655b7072f8889bb8b6367966172704c0fd5949a467709
 EBUILD linuxtv-dvb-headers-5.3.ebuild 461 RMD160 c9ca46104dc349809813da9e3b92c774029649a4 SHA1 892be6465d202b40fccae3a12cfc5f3f83fd5e6e SHA256 70d0b3b4a8deaf2b21ed81bc7c4b8a6b8e3eaa76b02415c422129330e21fc1a1
-EBUILD linuxtv-dvb-headers-5.ebuild 479 RMD160 27eebcfb8501c3fb4de393633447578949a4f4fa SHA1 648e9d297229b096a8b36ecf198083c197bb3784 SHA256 562cd80813c2ed7effa90cb4a7ad3e7496c0a812dfc02d7ca59dc278f698a010
-MISC ChangeLog 3025 RMD160 6b5a87a11361cda1dc617012445bb7e6b335958e SHA1 f4823ebbf4725ef23bc3998a4fb7841da459e23a SHA256 7f798f6963366b480c4a4c992f2d01663e90b9f652f36f90c6e1e882a7240448
+EBUILD linuxtv-dvb-headers-5.ebuild 490 RMD160 5a6c71daac3e55135459c7f2b01fc1e01d0689ea SHA1 01905a2a16c0e7c82201ed6f058911601d324c88 SHA256 62a3af65ae0277a32a981e16b76e4de97c2a4482acb788a579407a67db0db522
+MISC ChangeLog 3234 RMD160 989ddabb9c252232a352ff4c2df2c4ade4f996d7 SHA1 028c146b920892c2615a380110d0a18cb7495af8 SHA256 061cc73ff59e36956efbdcb1721554eab4d003096b4a66b183703ed50c0335cd
 MISC metadata.xml 408 RMD160 839639137cc09a4bb271fd5bfbdf787fd3ea57b7 SHA1 d279790b41d5330a31816a2c17a9f0dcc501373b SHA256 01471187dcea3dd747c0641ce6afa9876a6a88906ed1595d5df1f804a5637dd7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBCAAGBQJPFH2UAAoJEMOx0zmdw4Z1d3cH/37+sH/lXIadTtf2FDzVW3RA
-jrPptNqbVd248lflsMynoczWunDuTPN3NCOuc3AnLYejL8iEH3IMHEPVQxqyCzN+
-wtLHRb8el4pOfgLzaXgk6fP6Pr+D1GJRMOQ/jYzJ/bb26y4OOBbPIUJ+njZyYSp3
-I/4UDKr1HjxTwRmbAr55TxUN26A7fhoLGTveh2MrVM42ZxCiRjLoXt9yj0PXqSzt
-+/0Jb8XJqX5G/wvfY5Y0UDpaKt6I3+qlk8ajlXv4riIcmBuhfefkvz2oRN+17VF4
-3pfn9YhRwvLUCV/4dyWJTvA3OLOTfUX6I9VEVOUf1opNYj2zssg55R35tidwGr4=
-=LzXg
+iQEcBAEBCAAGBQJPFcrvAAoJEMOx0zmdw4Z1IekIALxzWskzTmAAuXpTyIJHXRds
+wccXny0vTwP4z+gWADWEVhOKUd1zLfWKqTeUuN1s61+R4g8N95196zyAPb/ZRuZX
+GpidAy+iPjSD3HH9I9QGx/8Lm1RuPHnx1LdzfRPkxv4EEQDMd/IEm5w8KrBDmoUd
+axWvH4vXG/M7NpiQbSZFqjXWaEnisMryMOlELTqvmwYf0sFsGHXBxI3o6WOrXKzV
+1pO0N8zysKhltuMSVuBgDr3R4yicZz/NajUN/cwAcc/RPSTzmEMxqCvLCIaaqIgx
+MQMOz/pUhnhS5lgG3khMKHbLo0zjk4zZQtqptZ2OvsL3tupIJNkOFcP1Fi5yFlI=
+=UxjZ
 -----END PGP SIGNATURE-----
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"