From: Diego Elio Pettenò <flameeyes@gentoo.org>
Date: Sun, 9 Oct 2005 20:14:33 +0000 (+0000)
Subject: Re-fix the virtual/os-headers as per bug #108074, the security fixes were out-of... 
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c5876129f8119ce3f3554b4a057b1a8e34b6d438;p=gentoo.git

Re-fix the virtual/os-headers as per bug #108074, the security fixes were out-of-sync.
Package-Manager: portage-2.0.53_rc4
---

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index 9386798ec51b..14ec63476377 100644
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/xine-lib
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.262 2005/10/08 14:45:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.263 2005/10/09 20:14:33 flameeyes Exp $
+
+  09 Oct 2005; Diego Pettenò <flameeyes@gentoo.org>
+  xine-lib-1.0.1-r4.ebuild, xine-lib-1.1.0-r5.ebuild,
+  xine-lib-1.1.0-r6.ebuild:
+  Re-fix the virtual/os-headers as per bug #108074, the security fixes were
+  out-of-sync.
 
 *xine-lib-1.1.0-r6 (08 Oct 2005)
 *xine-lib-1.1.0-r5 (08 Oct 2005)
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index 63b00e8c8abf..24085584dd7a 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,4 +1,4 @@
-MD5 acd9e33ef7240f7305f92cc085c7a394 ChangeLog 15926
+MD5 a9fbbe762761cba146623089845af7ac ChangeLog 16153
 MD5 9678227c043f04d5e8561cb6ba80d3e6 files/digest-xine-lib-1.0.1-r4 137
 MD5 33da8deb9637be23cd464aba9c5c4ac4 files/digest-xine-lib-1.1.0 137
 MD5 3d6e1d0e96ea02e463d045cd83e2e32f files/digest-xine-lib-1.1.0-r5 138
@@ -6,8 +6,8 @@ MD5 3d6e1d0e96ea02e463d045cd83e2e32f files/digest-xine-lib-1.1.0-r6 138
 MD5 51e97df2f6ae538ab33a802eafb10457 files/digest-xine-lib-1_rc8-r2 138
 MD5 cd292167e0ca6e7910e1cf32091e3a27 files/xine-lib-formatstring.patch 315
 MD5 40462be9f1caff6326630fc3b93e7105 metadata.xml 330
-MD5 d961e8afbe56b1e1354ca9c6bfce3ae2 xine-lib-1.0.1-r4.ebuild 7513
-MD5 101d717f67dff2b574772630c8be45df xine-lib-1.1.0-r5.ebuild 6851
-MD5 be0541725f13aba3c5a7ffe8a211784d xine-lib-1.1.0-r6.ebuild 6952
+MD5 6b76f6f5129a29911fd681772ba92601 xine-lib-1.0.1-r4.ebuild 7507
+MD5 6d96166f223f8fbeecbdc2acaf32ccb3 xine-lib-1.1.0-r5.ebuild 6845
+MD5 1ac08397f8a7899848f1cf9d85da285e xine-lib-1.1.0-r6.ebuild 6946
 MD5 1a7fe2febb92bcbc715be3fcdb0d8361 xine-lib-1.1.0.ebuild 7277
 MD5 c87a2009ccb1471f8011d312a14602d2 xine-lib-1_rc8-r2.ebuild 5296
diff --git a/media-libs/xine-lib/xine-lib-1.0.1-r4.ebuild b/media-libs/xine-lib/xine-lib-1.0.1-r4.ebuild
index d1eb9b1087d2..dc33202b8d07 100644
--- a/media-libs/xine-lib/xine-lib-1.0.1-r4.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.0.1-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.0.1-r4.ebuild,v 1.1 2005/10/08 14:45:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.0.1-r4.ebuild,v 1.2 2005/10/09 20:14:33 flameeyes Exp $
 
 inherit eutils flag-o-matic toolchain-funcs libtool
 
@@ -49,7 +49,7 @@ RDEPEND="vorbis? ( media-libs/libvorbis )
 	!=media-libs/xine-lib-0.9.13*"
 
 DEPEND="${RDEPEND}
-	v4l? ( sys-kernel/linux-headers )
+	v4l? ( virtual/os-headers )
 	>=sys-devel/automake-1.7
 	>=sys-devel/autoconf-2.59
 	dev-util/pkgconfig
diff --git a/media-libs/xine-lib/xine-lib-1.1.0-r5.ebuild b/media-libs/xine-lib/xine-lib-1.1.0-r5.ebuild
index c413c5959335..bb477e41ade2 100644
--- a/media-libs/xine-lib/xine-lib-1.1.0-r5.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.1.0-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.1.0-r5.ebuild,v 1.1 2005/10/08 14:45:54 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.1.0-r5.ebuild,v 1.2 2005/10/09 20:14:33 flameeyes Exp $
 
 inherit eutils flag-o-matic toolchain-funcs libtool autotools
 
@@ -69,7 +69,7 @@ DEPEND="${RDEPEND}
 		virtual/x11 )
 		)
 	xinerama? ( || ( x11-proto/xineramaproto virtual/x11 ) )
-	v4l? ( sys-kernel/linux-headers )
+	v4l? ( virtual/os-headers )
 	dev-util/pkgconfig
 	>=sys-devel/automake-1.7
 	>=sys-devel/autoconf-2.59
diff --git a/media-libs/xine-lib/xine-lib-1.1.0-r6.ebuild b/media-libs/xine-lib/xine-lib-1.1.0-r6.ebuild
index 4b1e65c486b7..76a987260edc 100644
--- a/media-libs/xine-lib/xine-lib-1.1.0-r6.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.1.0-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.1.0-r6.ebuild,v 1.1 2005/10/08 14:45:54 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.1.0-r6.ebuild,v 1.2 2005/10/09 20:14:33 flameeyes Exp $
 
 inherit eutils flag-o-matic toolchain-funcs libtool autotools
 
@@ -70,7 +70,7 @@ DEPEND="${RDEPEND}
 		virtual/x11 )
 		)
 	xinerama? ( || ( x11-proto/xineramaproto virtual/x11 ) )
-	v4l? ( sys-kernel/linux-headers )
+	v4l? ( virtual/os-headers )
 	dev-util/pkgconfig
 	>=sys-devel/automake-1.7
 	>=sys-devel/autoconf-2.59