backport modular X updates

Package-Manager: portage-2.1_pre5-r4

6 files changed, 32 insertions, 23 deletions

diff --git a/media-libs/libdv/Manifest b/media-libs/libdv/Manifest
index 3da93f3ac96b..f32ca8d46752 100644
--- a/media-libs/libdv/Manifest
+++ b/media-libs/libdv/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 304d121e8c864dca9fdda9e0d4ebbf1c ChangeLog 6699
 RMD160 eb3924894f6a9677a84450738898ae808feaafb3 ChangeLog 6699
 SHA256 243a09b37d242472069645ad09b01e73de07c3011e0ab964575ec8047932eaa3 ChangeLog 6699
@@ -49,3 +52,10 @@ SHA256 f84918b65f6e0dc4b6baf146cc46d3d33a271874a3876f947fd5079ffc758751 libdv-0.
 MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
 RMD160 d91ff64b3e5f86657b8b6ba02c41a26247a2fac7 metadata.xml 158
 SHA256 f9dd4fb4a7f368e776ea0d7d394dad8f3a674e67f6103d6fb58a8a98971eeee4 metadata.xml 158
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.1 (GNU/Linux)
+
+iD8DBQFEC8BI2+ySkm8kpY0RAoxIAJ9ahB6uJ3pZvgq+aSe+dkp9OkcBUACePAzu
+sHUh6KePm9Duv+arvk85iW8=
+=VBrG
+-----END PGP SIGNATURE-----
diff --git a/media-libs/libdv/libdv-0.101.ebuild b/media-libs/libdv/libdv-0.101.ebuild
index 221f985d0a1f..f06922aa0537 100644
--- a/media-libs/libdv/libdv-0.101.ebuild
+++ b/media-libs/libdv/libdv-0.101.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdv/libdv-0.101.ebuild,v 1.8 2005/05/07 10:18:41 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdv/libdv-0.101.ebuild,v 1.9 2006/03/06 04:52:16 vapier Exp $
 
 inherit eutils
 
@@ -16,9 +16,10 @@ IUSE="debug gtk sdl xv"
 RDEPEND="dev-libs/popt
 	gtk? ( =x11-libs/gtk+-1.2* )
 	sdl? ( >=media-libs/libsdl-1.2.4.20020601 )
-	xv? ( virtual/x11 )"
+	xv? ( || ( x11-libs/libXv virtual/x11 ) )"
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
+	dev-util/pkgconfig
+	gtk? ( || ( ( x11-proto/xextproto x11-libs/libXt ) virtual/x11 ) )"
 
 src_unpack() {
 	unpack ${A} && cd "${S}"
diff --git a/media-libs/libdv/libdv-0.102.ebuild b/media-libs/libdv/libdv-0.102.ebuild
index c816291fbee5..2197c22e597e 100644
--- a/media-libs/libdv/libdv-0.102.ebuild
+++ b/media-libs/libdv/libdv-0.102.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdv/libdv-0.102.ebuild,v 1.13 2005/12/24 16:54:19 killerfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdv/libdv-0.102.ebuild,v 1.14 2006/03/06 04:52:16 vapier Exp $
 
 inherit eutils
 
@@ -16,9 +16,10 @@ IUSE="debug gtk sdl xv"
 RDEPEND="dev-libs/popt
 	gtk? ( =x11-libs/gtk+-1.2* )
 	sdl? ( >=media-libs/libsdl-1.2.4.20020601 )
-	xv? ( virtual/x11 )"
+	xv? ( || ( x11-libs/libXv virtual/x11 ) )"
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
+	dev-util/pkgconfig
+	gtk? ( || ( ( x11-proto/xextproto x11-libs/libXt ) virtual/x11 ) )"
 
 src_unpack() {
 	unpack ${A} && cd "${S}"
diff --git a/media-libs/libdv/libdv-0.104-r1.ebuild b/media-libs/libdv/libdv-0.104-r1.ebuild
index d6c3867eb8e3..64fc429994fc 100644
--- a/media-libs/libdv/libdv-0.104-r1.ebuild
+++ b/media-libs/libdv/libdv-0.104-r1.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-libs/libdv/libdv-0.104-r1.ebuild,v 1.5 2006/02/07 18:06:11 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdv/libdv-0.104-r1.ebuild,v 1.6 2006/03/06 04:52:16 vapier Exp $
 
 inherit eutils flag-o-matic
 
@@ -19,12 +19,7 @@ RDEPEND="dev-libs/popt
 	xv? ( || ( x11-libs/libXv virtual/x11 ) )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
-	gtk? ( || ( ( x11-proto/xextproto
-				x11-libs/libXt
-			)
-			virtual/x11
-		)
-	)"
+	gtk? ( || ( ( x11-proto/xextproto x11-libs/libXt ) virtual/x11 ) )"
 
 src_unpack() {
 	unpack ${A}
diff --git a/media-libs/libdv/libdv-0.104.ebuild b/media-libs/libdv/libdv-0.104.ebuild
index bf9a3ad66a1d..e45f99d55626 100644
--- a/media-libs/libdv/libdv-0.104.ebuild
+++ b/media-libs/libdv/libdv-0.104.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdv/libdv-0.104.ebuild,v 1.6 2005/10/05 01:15:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdv/libdv-0.104.ebuild,v 1.7 2006/03/06 04:52:16 vapier Exp $
 
 inherit eutils flag-o-matic
 
@@ -16,9 +16,10 @@ IUSE="debug gtk sdl xv"
 RDEPEND="dev-libs/popt
 	gtk? ( =x11-libs/gtk+-1.2* )
 	sdl? ( >=media-libs/libsdl-1.2.5 )
-	xv? ( virtual/x11 )"
+	xv? ( || ( x11-libs/libXv virtual/x11 ) )"
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
+	dev-util/pkgconfig
+	gtk? ( || ( ( x11-proto/xextproto x11-libs/libXt ) virtual/x11 ) )"
 
 src_unpack() {
 	unpack ${A}
diff --git a/media-libs/libdv/libdv-0.99-r1.ebuild b/media-libs/libdv/libdv-0.99-r1.ebuild
index 3399c2825bb1..0f66eb7cf507 100644
--- a/media-libs/libdv/libdv-0.99-r1.ebuild
+++ b/media-libs/libdv/libdv-0.99-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdv/libdv-0.99-r1.ebuild,v 1.14 2005/01/11 02:44:46 malc Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdv/libdv-0.99-r1.ebuild,v 1.15 2006/03/06 04:52:16 vapier Exp $
 
 inherit eutils
 
@@ -16,9 +16,10 @@ IUSE="debug gtk sdl xv"
 RDEPEND="dev-libs/popt
 	gtk? ( =x11-libs/gtk+-1.2* )
 	sdl? ( >=media-libs/libsdl-1.2.4.20020601 )
-	xv? ( virtual/x11 )"
+	xv? ( || ( x11-libs/libXv virtual/x11 ) )"
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
+	dev-util/pkgconfig
+	gtk? ( || ( ( x11-proto/xextproto x11-libs/libXt ) virtual/x11 ) )"
 
 src_unpack() {
 	unpack ${A} && cd "${S}"