Add modular X dependencies to 0.6. Remove some redundant deps on 1.0. Some differences in 1.0: apparently doesn't link against libXi.

Package-Manager: portage-2.0.53

4 files changed, 19 insertions, 26 deletions

diff --git a/media-video/transcode/ChangeLog b/media-video/transcode/ChangeLog
index f00c92fd39a6..d830ad4de113 100644
--- a/media-video/transcode/ChangeLog
+++ b/media-video/transcode/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/transcode
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.122 2005/12/10 16:06:44 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.123 2005/12/14 05:15:53 spyderous Exp $
+
+  14 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  transcode-0.6.14-r3.ebuild, transcode-1.0.2-r1.ebuild:
+  Add modular X dependencies to 0.6. Remove some redundant deps on 1.0. Some
+  differences in 1.0: apparently doesn't link against libXi.
 
 *transcode-1.0.2-r1 (10 Dec 2005)
 
diff --git a/media-video/transcode/Manifest b/media-video/transcode/Manifest
index 3198b267ab4c..9447a9bc1a53 100644
--- a/media-video/transcode/Manifest
+++ b/media-video/transcode/Manifest
@@ -1,7 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 edf3288971ffbd8bf4d1ebe574fe53e1 ChangeLog 23138
+MD5 f0c94ce3573c876725ee1637ec59abdd ChangeLog 23389
 MD5 8e1251c76b508dfdfe0e4f0c0b166540 files/digest-transcode-0.6.14-r2 144
 MD5 03b7d892f34025e0c5854e0977b5fb49 files/digest-transcode-0.6.14-r3 144
 MD5 2ee1936ab9b228cc4350881352426bd8 files/digest-transcode-1.0.2-r1 68
@@ -9,12 +6,5 @@ MD5 09d908064da685a17f52adb57e0c8075 files/transcode-1.0.2-bigdir.patch 10634
 MD5 07f7315638c5e4058ed39d914aed0d0f files/transcode-1.0.2-lzo2.patch 2922
 MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
 MD5 4c8fb6591a1611204df2915302b515f2 transcode-0.6.14-r2.ebuild 4055
-MD5 57eb8aa402eee3e3e839e6a3d59c66af transcode-0.6.14-r3.ebuild 3922
-MD5 eb4c1ae86bc74b096e398bcf9a7b4499 transcode-1.0.2-r1.ebuild 4386
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDmv0mAiZjviIA2XgRAsfnAKDyZSi6yNM1XnPpwKsLEMVa3DFFCACfbPjm
-ipv+f9IltRfJNO5UuOfy9Qc=
-=mVeq
------END PGP SIGNATURE-----
+MD5 d30085d1ee4daa7cf2cd3f966e57a767 transcode-0.6.14-r3.ebuild 4043
+MD5 39db7415d4995eb01c59ef4499f0d6b8 transcode-1.0.2-r1.ebuild 4216
diff --git a/media-video/transcode/transcode-0.6.14-r3.ebuild b/media-video/transcode/transcode-0.6.14-r3.ebuild
index e837bf9b3a5e..88814bae8f21 100644
--- a/media-video/transcode/transcode-0.6.14-r3.ebuild
+++ b/media-video/transcode/transcode-0.6.14-r3.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-video/transcode/transcode-0.6.14-r3.ebuild,v 1.2 2005/11/03 12:08:29 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-0.6.14-r3.ebuild,v 1.3 2005/12/14 05:15:53 spyderous Exp $
 
 inherit libtool flag-o-matic eutils multilib autotools
 
@@ -33,7 +33,13 @@ RDEPEND="a52? ( >=media-libs/a52dec-0.7.4 )
 	imagemagick? ( >=media-gfx/imagemagick-5.5.6.0 )
 	media-libs/netpbm
 	media-libs/libexif
-	X? ( virtual/x11 )
+	X? ( || ( ( x11-libs/libXaw
+				x11-libs/libXi
+				x11-libs/libXv
+			)
+			virtual/x11
+		)
+	)
 	mpeg? ( media-libs/libmpeg3 )
 	encode? ( >=media-sound/lame-3.93 )
 	sdl? ( media-libs/libsdl )
@@ -47,6 +53,7 @@ RDEPEND="a52? ( >=media-libs/a52dec-0.7.4 )
 	pvm? ( >=sys-cluster/pvm-3.4 )"
 
 DEPEND="${RDEPEND}
+	X? ( || ( x11-proto/xextproto virtual/x11 ) )
 	x86? ( >=dev-lang/nasm-0.98.36 )
 	=sys-devel/gcc-3*"
 
diff --git a/media-video/transcode/transcode-1.0.2-r1.ebuild b/media-video/transcode/transcode-1.0.2-r1.ebuild
index 1c0c29affb6e..4c19d5365dbe 100644
--- a/media-video/transcode/transcode-1.0.2-r1.ebuild
+++ b/media-video/transcode/transcode-1.0.2-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-video/transcode/transcode-1.0.2-r1.ebuild,v 1.1 2005/12/10 16:06:44 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-1.0.2-r1.ebuild,v 1.2 2005/12/14 05:15:53 spyderous Exp $
 
 inherit libtool flag-o-matic eutils multilib autotools
 
@@ -43,12 +43,6 @@ RDEPEND="a52? ( >=media-libs/a52dec-0.7.4 )
 	>=media-libs/libmpeg2-0.4.0b
 	xml2? ( dev-libs/libxml2 )
 	X? ( || ( (
-			x11-libs/libX11
-			x11-libs/libXext
-			x11-libs/libXpm
-			x11-libs/libXt
-			x11-libs/libICE
-			x11-libs/libSM
 			x11-libs/libXaw
 			x11-libs/libXv )
 		virtual/x11 ) )
@@ -57,11 +51,8 @@ RDEPEND="a52? ( >=media-libs/a52dec-0.7.4 )
 DEPEND="${RDEPEND}
 	v4l? ( >=sys-kernel/linux-headers-2.6.11 )
 	X? ( || ( ( x11-base/xorg-server
-			x11-libs/libX11
-			x11-libs/libXt
 			x11-libs/libXaw
 			x11-libs/libXv
-			x11-proto/xproto
 			x11-proto/xextproto )
 		virtual/x11 ) )
 	sys-devel/autoconf