changed X dependency to virtual/x11. fixes bug #78046.

5 files changed, 38 insertions, 44 deletions

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index 3ac8e96a0843..af876ebcfd4c 100644
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -1,6 +1,10 @@
 # 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.190 2005/01/06 20:36:45 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.191 2005/01/15 10:53:01 luckyduck Exp $
+
+  15 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> xine-lib-1.0.ebuild,
+  xine-lib-1_rc6-r1.ebuild, xine-lib-1_rc8-r1.ebuild:
+  changed X dependency to virtual/x11. fixes bug #78046.
 
 *xine-lib-1_rc8-r1 (07 Jan 2005)
 
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index 8b294e6ee893..f4f6058177bd 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,49 +1,39 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 c9e0884056502ba91f7009fec57350fa ChangeLog 1243
+MD5 fbd4525d9421d40399c70cda51d45b86 xine-lib-1.0.ebuild 8034
+MD5 7e888d6f30d2dc30447d7dd55b05f518 xine-lib-1_rc8-r1.ebuild 5711
+MD5 cd42faa7fb6cf1a2d0d049ae33467ab6 xine-lib-1_rc6-r1.ebuild 5679
+MD5 b278a4ec6727697020a4a19f7f901fde ChangeLog 1427
 MD5 af08cabbae4b191018ca153392a86bea metadata.xml 304
-MD5 424d1fa88b2c772b3d393db78232fb65 xine-lib-1.0.ebuild 8073
-MD5 7967d53ed184e69355e1d9e5a27cb8b7 xine-lib-1_rc6-r1.ebuild 5712
-MD5 7c6058d5fb9d29157744592280f2d3d7 xine-lib-1_rc8-r1.ebuild 5751
 MD5 bcd5f2b8999f92c2f7215009f5ae1490 files/configure-64bit-define.patch 221
-MD5 1780c88522c9a26856effa70a0e27b50 files/digest-xine-lib-1.0 65
-MD5 082b3ed1c96543704d604199047b1dee files/digest-xine-lib-1_rc6-r1 68
-MD5 98bc17778384589bba027ff136956fec files/digest-xine-lib-1_rc8-r1 67
-MD5 54088d42a9e9980285a96b7e2cce19cf files/djb_demux_aiff.patch 559
+MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc5-configure-sparc.patch 587
+MD5 ddf48f1eb00a6985b6fba5fff9386ad0 files/xine-lib-hardened-mmx.patch 2558
+MD5 5d3bbb085af2a8dcaa429c1376a52c50 files/xine-lib-1-rc4-sparc_missing_include.patch 464
 MD5 5e99bec89f5cc4f0d00bcd61430d67cb files/protect-CFLAGS.patch-1_rc2 597
 MD5 060bcd1d4a4ffa427139a7f188272e01 files/protect-CFLAGS.patch-1_rc3 597
 MD5 060bcd1d4a4ffa427139a7f188272e01 files/protect-CFLAGS.patch-1_rc4 597
-MD5 e35c6e1b7a7cd3f4e268b1fb876cbeb5 files/protect-CFLAGS.patch-1_rc5-r1 316
 MD5 e35c6e1b7a7cd3f4e268b1fb876cbeb5 files/protect-CFLAGS.patch-1_rc6 316
-MD5 beea8b4dacbd153e4c6b06e57ee711d2 files/xine-lib-0.9.12-r2-directfb.patch 746
-MD5 279ee4d06acc78adef09fe7ae4a64980 files/xine-lib-0.9.13-kxine.patch 9041
-MD5 5d3bbb085af2a8dcaa429c1376a52c50 files/xine-lib-1-rc4-sparc_missing_include.patch 464
-MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc5-configure-sparc.patch 587
-MD5 ff56a363d07445735a05afe1dc7f6f56 files/xine-lib-1_rc5-vcd_overflow.patch 1754
-MD5 a52bac7d568413597e0c7932b164e58c files/xine-lib-1_rc6-2.6.patch 594
-MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc6-configure-sparc.patch 587
-MD5 a11a93cf97cecb7c1c2b24e11a5419ae files/xine-lib-1_rc6-ffmpeg.patch 1279
+MD5 5ddf5d90566965b047828407dcc0f5d1 files/xine-lib-1rc4-libtool1.5.6.shrext_cmds.patch 331
+MD5 aa54582a91933533008c1211dcbcfb35 files/xine-lib-disable-directfb.patch 4169
 MD5 b3b75486422c6ccab706f2ff4cf7c4eb files/xine-lib-1_rc6-mmx.patch 391
-MD5 bf2bb27a1f0433ea77571175f2b59885 files/xine-lib-1_rc6-pic.patch 2655
-MD5 a52bac7d568413597e0c7932b164e58c files/xine-lib-1_rc7-2.6.patch 594
+MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc6-configure-sparc.patch 587
+MD5 e35c6e1b7a7cd3f4e268b1fb876cbeb5 files/protect-CFLAGS.patch-1_rc5-r1 316
+MD5 a52bac7d568413597e0c7932b164e58c files/xine-lib-2.6.patch 594
 MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc7-configure-sparc.patch 587
-MD5 b3b75486422c6ccab706f2ff4cf7c4eb files/xine-lib-1_rc7-mmx.patch 391
 MD5 bf2bb27a1f0433ea77571175f2b59885 files/xine-lib-1_rc7-pic.patch 2655
-MD5 5ddf5d90566965b047828407dcc0f5d1 files/xine-lib-1rc4-libtool1.5.6.shrext_cmds.patch 331
-MD5 a52bac7d568413597e0c7932b164e58c files/xine-lib-2.6.patch 594
+MD5 dcb0c79c0bb106397aad42f6d936627d files/xineconfig.patch-0.9.13 601
+MD5 279ee4d06acc78adef09fe7ae4a64980 files/xine-lib-0.9.13-kxine.patch 9041
+MD5 082b3ed1c96543704d604199047b1dee files/digest-xine-lib-1_rc6-r1 68
+MD5 98bc17778384589bba027ff136956fec files/digest-xine-lib-1_rc8-r1 67
 MD5 0cf698a9ff87a3595140d92df7b900b6 files/xine-lib-configure.patch 342
-MD5 aa54582a91933533008c1211dcbcfb35 files/xine-lib-disable-directfb.patch 4169
-MD5 3cbdef8aa211184b96474addb4f7c5d6 files/xine-lib-gcc34.patch 423
+MD5 a52bac7d568413597e0c7932b164e58c files/xine-lib-1_rc7-2.6.patch 594
+MD5 ff56a363d07445735a05afe1dc7f6f56 files/xine-lib-1_rc5-vcd_overflow.patch 1754
+MD5 bf2bb27a1f0433ea77571175f2b59885 files/xine-lib-1_rc6-pic.patch 2655
 MD5 5d2c3c00bf3ae9a89dfcaa8b5c5b17a2 files/xine-lib-x11.patch 703
-MD5 dcb0c79c0bb106397aad42f6d936627d files/xineconfig.patch-0.9.13 601
-MD5 ddf48f1eb00a6985b6fba5fff9386ad0 files/xine-lib-hardened-mmx.patch 2558
-MD5 d8f3138ae2260f7c98bf46ae7159be11 files/xine-lib-configure.ac.patch 926
+MD5 beea8b4dacbd153e4c6b06e57ee711d2 files/xine-lib-0.9.12-r2-directfb.patch 746
+MD5 a52bac7d568413597e0c7932b164e58c files/xine-lib-1_rc6-2.6.patch 594
+MD5 54088d42a9e9980285a96b7e2cce19cf files/djb_demux_aiff.patch 559
+MD5 a11a93cf97cecb7c1c2b24e11a5419ae files/xine-lib-1_rc6-ffmpeg.patch 1279
 MD5 3704271d4339b919569b4ea416a4c34e files/xine-lib-1_rc8-configure.ac.patch 2825
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFB3aBQFdQwWVoAgN4RApv7AJ99ztaIPtudTOBJQ4AQ4r2xZGut8gCffern
-0RT6NjYzfzAO+5NdfZf+Pa0=
-=sGrt
------END PGP SIGNATURE-----
+MD5 d8f3138ae2260f7c98bf46ae7159be11 files/xine-lib-configure.ac.patch 926
+MD5 3cbdef8aa211184b96474addb4f7c5d6 files/xine-lib-gcc34.patch 423
+MD5 b3b75486422c6ccab706f2ff4cf7c4eb files/xine-lib-1_rc7-mmx.patch 391
+MD5 1780c88522c9a26856effa70a0e27b50 files/digest-xine-lib-1.0 65
diff --git a/media-libs/xine-lib/xine-lib-1.0.ebuild b/media-libs/xine-lib/xine-lib-1.0.ebuild
index 5be040a06dca..931421c2d0d5 100644
--- a/media-libs/xine-lib/xine-lib-1.0.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.0.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.ebuild,v 1.14 2005/01/05 11:35:37 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.0.ebuild,v 1.15 2005/01/15 10:53:01 luckyduck Exp $
 
 inherit eutils flag-o-matic gcc libtool
 
@@ -20,7 +20,7 @@ IUSE="arts esd avi nls dvd X directfb oggvorbis alsa gnome sdl speex
 
 RDEPEND="oggvorbis? ( media-libs/libvorbis )
 	!amd64? ( X? ( virtual/x11 ) )
-	amd64? ( X? ( || ( x11-base/xorg-x11 >=x11-base/xfree-4.3.0-r6 ) ) )
+	amd64? ( X? ( virtual/x11  ) )
 	avi? ( x86? ( >=media-libs/win32codecs-0.50 ) )
 	esd? ( media-sound/esound )
 	dvd? ( >=media-libs/libdvdcss-1.2.7 )
diff --git a/media-libs/xine-lib/xine-lib-1_rc6-r1.ebuild b/media-libs/xine-lib/xine-lib-1_rc6-r1.ebuild
index 9feaed781704..45fa272921ce 100644
--- a/media-libs/xine-lib/xine-lib-1_rc6-r1.ebuild
+++ b/media-libs/xine-lib/xine-lib-1_rc6-r1.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_rc6-r1.ebuild,v 1.2 2005/01/06 00:54:11 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_rc6-r1.ebuild,v 1.3 2005/01/15 10:53:01 luckyduck Exp $
 
 inherit eutils flag-o-matic gcc libtool
 
@@ -18,7 +18,7 @@ IUSE="arts esd avi nls dvd aalib X directfb oggvorbis alsa gnome sdl speex theor
 
 RDEPEND="oggvorbis? ( media-libs/libvorbis )
 	!amd64? ( X? ( virtual/x11 ) )
-	amd64? ( X? ( || ( x11-base/xorg-x11 >=x11-base/xfree-4.3.0-r6 ) ) )
+	amd64? ( X? ( || ( virtual/x11 ) ) )
 	avi? ( x86? ( >=media-libs/win32codecs-0.50 ) )
 	esd? ( media-sound/esound )
 	dvd? ( >=media-libs/libdvdcss-1.2.7 )
diff --git a/media-libs/xine-lib/xine-lib-1_rc8-r1.ebuild b/media-libs/xine-lib/xine-lib-1_rc8-r1.ebuild
index 9d7826e7792e..a9e68e9f4dab 100644
--- a/media-libs/xine-lib/xine-lib-1_rc8-r1.ebuild
+++ b/media-libs/xine-lib/xine-lib-1_rc8-r1.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_rc8-r1.ebuild,v 1.17 2005/01/06 20:36:45 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_rc8-r1.ebuild,v 1.18 2005/01/15 10:53:01 luckyduck Exp $
 
 inherit eutils flag-o-matic gcc libtool
 
@@ -18,7 +18,7 @@ IUSE="arts esd avi nls dvd aalib X directfb oggvorbis alsa gnome sdl speex theor
 
 RDEPEND="oggvorbis? ( media-libs/libvorbis )
 	!amd64? ( X? ( virtual/x11 ) )
-	amd64? ( X? ( || ( x11-base/xorg-x11 >=x11-base/xfree-4.3.0-r6 ) ) )
+	amd64? ( X? ( virtual/x11 ) )
 	avi? ( x86? ( >=media-libs/win32codecs-0.50 ) )
 	esd? ( media-sound/esound )
 	dvd? ( >=media-libs/libdvdcss-1.2.7 )