Add check if X is required before checking if it has been built with xv support (bug #121035). Drop DEPEND on autotools (provided by autotools eclass instead), and fix modular X deps. elibtoolize is already run by eautoreconf now.

Package-Manager: portage-2.1_pre4-r1

3 files changed, 20 insertions, 21 deletions

diff --git a/media-video/transcode/ChangeLog b/media-video/transcode/ChangeLog
index c3f189a89597..7712f57282d3 100644
--- a/media-video/transcode/ChangeLog
+++ b/media-video/transcode/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/transcode
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.137 2006/01/30 22:56:05 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.138 2006/01/31 13:59:32 flameeyes Exp $
+
+  31 Jan 2006; Diego Pettenò <flameeyes@gentoo.org>
+  transcode-1.0.2-r2.ebuild:
+  Add check if X is required before checking if it has been built with xv
+  support (bug #121035). Drop DEPEND on autotools (provided by autotools
+  eclass instead), and fix modular X deps. elibtoolize is already run by
+  eautoreconf now.
 
   30 Jan 2006; Joshua Jackson <tsunam@gentoo.org> transcode-1.0.2-r2.ebuild:
   Added ~x86 for bug #93797
diff --git a/media-video/transcode/Manifest b/media-video/transcode/Manifest
index 7bbd8ecb1f61..117aa99bfe9b 100644
--- a/media-video/transcode/Manifest
+++ b/media-video/transcode/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 bd60b2856957a1356bda87b3809261e5 ChangeLog 25384
-RMD160 e9d872db8a65d05281f8925d1ab1f9931ce1e6be ChangeLog 25384
-SHA256 191fd94b2da306ed26555e74b9a6552f4ff22aeeac4cc580533ac4cd03459478 ChangeLog 25384
+MD5 0afb5b3811e25d0b6b647ab63e591d98 ChangeLog 25709
+RMD160 42a230298df81be917b000605313e18594f9ae16 ChangeLog 25709
+SHA256 6f9fbe2e9c78842783c6ad6edbcb3e4f39186074d08f1ba11ecaa1dc05d1100e ChangeLog 25709
 MD5 8e1251c76b508dfdfe0e4f0c0b166540 files/digest-transcode-0.6.14-r2 144
 RMD160 8f8d40b9c1343a02f9002185540bd6c455750940 files/digest-transcode-0.6.14-r2 144
 SHA256 007a460fcd8420b02d0c87b58f2fd999a592307ba37d9579571e6fa1a9e0d0d0 files/digest-transcode-0.6.14-r2 144
@@ -34,13 +34,13 @@ SHA256 e9847e2552592fabbd7481726aa5b7f3164189864651035b92c09b2eb0df41be transcod
 MD5 b15cb6b73f828461bd418ff5faf8194c transcode-1.0.2-r1.ebuild 3789
 RMD160 e1094b4825fa82976c2fb8b2264eaad4db8a65ab transcode-1.0.2-r1.ebuild 3789
 SHA256 c8a42864ca7c34b5b4ab79028221717da1e921e305dd50010efa17503ce37731 transcode-1.0.2-r1.ebuild 3789
-MD5 b950acea835759a878f4e28b1afb6918 transcode-1.0.2-r2.ebuild 4126
-RMD160 ac5b446d98a3834dc3ff82b05187017cdef2e738 transcode-1.0.2-r2.ebuild 4126
-SHA256 6820664caa3db32a6771016d17569d2a870625fa824332c18a4fd18e5f468e3f transcode-1.0.2-r2.ebuild 4126
+MD5 40c12e16e165a5b321fcc389f1f8cf98 transcode-1.0.2-r2.ebuild 3999
+RMD160 bddeda2c0893333e8237768dbbe6ac07c0fd0e63 transcode-1.0.2-r2.ebuild 3999
+SHA256 f84883436a222529e6ba72be8d2be6168840a62733d68b66d7c2768a902d4ffc transcode-1.0.2-r2.ebuild 3999
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFD3ppkSENan+PfizARAipJAKCWokMinikJ5fQQPJLPLIaV9zcsigCbBHen
-0nFEYF+RHymwH26rWokITxA=
-=pKzK
+iD8DBQFD321XAiZjviIA2XgRArfWAKDraEsu4fz5JlNdRlkKSLzvEP5ydQCggu8z
+gZtiBwtwROr2lW7ivXUSo/Q=
+=dvM8
 -----END PGP SIGNATURE-----
diff --git a/media-video/transcode/transcode-1.0.2-r2.ebuild b/media-video/transcode/transcode-1.0.2-r2.ebuild
index c06316f6ac0f..10e07954d87e 100644
--- a/media-video/transcode/transcode-1.0.2-r2.ebuild
+++ b/media-video/transcode/transcode-1.0.2-r2.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-video/transcode/transcode-1.0.2-r2.ebuild,v 1.4 2006/01/30 22:56:05 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-1.0.2-r2.ebuild,v 1.5 2006/01/31 13:59:32 flameeyes Exp $
 
 inherit libtool flag-o-matic eutils multilib autotools
 
@@ -49,17 +49,10 @@ RDEPEND="a52? ( >=media-libs/a52dec-0.7.4 )
 
 DEPEND="${RDEPEND}
 	v4l2? ( >=sys-kernel/linux-headers-2.6.11 )
-	X? ( || ( ( x11-base/xorg-server
-			x11-libs/libXaw
-			x11-libs/libXv
-			x11-proto/xextproto )
-		virtual/x11 ) )
-	sys-devel/autoconf
-	sys-devel/automake
-	sys-devel/libtool"
+	X? ( || ( x11-proto/xextproto virtual/x11 ) )"
 
 pkg_setup() {
-	if has_version '<x11-base/xorg-x11-7.0' && ! built_with_use x11-base/xorg-x11 xv; then
+	if use X && has_version '<x11-base/xorg-x11-7.0' && ! built_with_use x11-base/xorg-x11 xv; then
 		die "You need xorg-x11 emerged with xv support to compile transcode."
 	fi
 }
@@ -77,7 +70,6 @@ src_unpack() {
 	epatch "${DISTDIR}/${PN}-types.patch.bz2"
 
 	eautoreconf
-	elibtoolize
 }
 
 src_compile() {