Fix x11 dependencies, bug 157979

Package-Manager: portage-2.1.2.3

8 files changed, 40 insertions, 215 deletions

diff --git a/media-video/transcode/ChangeLog b/media-video/transcode/ChangeLog
index 9ee8a6630e96..8fe1a3600edf 100644
--- a/media-video/transcode/ChangeLog
+++ b/media-video/transcode/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/transcode
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.169 2007/03/25 11:27:44 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.170 2007/03/31 13:39:59 beandog Exp $
+
+  31 Mar 2007; Steve Dibb <beandog@gentoo.org> -transcode-1.0.2-r2.ebuild,
+  transcode-1.0.2-r3.ebuild, transcode-1.0.2-r4.ebuild,
+  transcode-1.0.3_rc2_p20070310-r1.ebuild,
+  transcode-1.1.0_pre20070315-r1.ebuild:
+  Fix x11 dependencies, bug 157979
 
   25 Mar 2007; Alexis Ballier <aballier@gentoo.org>
   +files/transcode-1.0.3_rc2_p20070310-libmpeg3.patch,
diff --git a/media-video/transcode/Manifest b/media-video/transcode/Manifest
index 9a4eb36859c2..fe82853b1eb7 100644
--- a/media-video/transcode/Manifest
+++ b/media-video/transcode/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX transcode-1.0.2-autoconf259d.patch 521 RMD160 e5387a540269bd2c10e67415b57b351c329d8521 SHA1 34a0d1b5394d6414cb9d46a672a993b107bbc1bd SHA256 b3e2d78d28cd4e90d9b1de8f249b73ab943f63d749fd8296ae780b72417ffdb5
 MD5 c9bb89a41ef717f36c8cf3f44df77aef files/transcode-1.0.2-autoconf259d.patch 521
 RMD160 e5387a540269bd2c10e67415b57b351c329d8521 files/transcode-1.0.2-autoconf259d.patch 521
@@ -33,37 +30,30 @@ DIST transcode-1.0.2.tar.gz 2347861 RMD160 5a07777093b3d395180396a662dc765c179cd
 DIST transcode-1.1.0_pre20070315.tar.bz2 1595454 RMD160 71c34011e8408fd56a7bdf0de8a9c0b6a8ee2374 SHA1 87c33cd973eceb5a6fe4cc85e105607e04f5235b SHA256 ea7732bd92f92e1fbd47788f91ca22ecbd0873fc0b271021e75b1f0ccaca35ce
 DIST transcode-20070310.tar.bz2 1608431 RMD160 0bd5d44cfe0e113f14617589465edc7f8adfa9ed SHA1 3e899c6daaeb32090adf899e883dbdd7e80168de SHA256 0db56bc4e2ab1aa8b85e9e8c4fe47dc1fb00cd86650cea4d30b67fc3f2c8cbab
 DIST transcode-types.patch.bz2 5021 RMD160 956ea116495a57e304ab71a20ccd45ffd7416544 SHA1 80df51dddca665cdb3723f56679091076c4717d3 SHA256 02bf6ac9a2e039336e103d43acbe7c86975bc3b587dc9dfa23992bd949fc2170
-EBUILD transcode-1.0.2-r2.ebuild 4024 RMD160 01edf4a13ed6d8d1c66677b0b5046f7171204ed6 SHA1 c9a5f2b7dbb4d5db508ba54fe8fd3f2c2e818208 SHA256 e67ffe3127f5c25a7aa4bf1d31e4ad56b93688c4de99636b668f1cc46ac2e7c4
-MD5 4b0d03afc4bc9d6a5e992e97229cc942 transcode-1.0.2-r2.ebuild 4024
-RMD160 01edf4a13ed6d8d1c66677b0b5046f7171204ed6 transcode-1.0.2-r2.ebuild 4024
-SHA256 e67ffe3127f5c25a7aa4bf1d31e4ad56b93688c4de99636b668f1cc46ac2e7c4 transcode-1.0.2-r2.ebuild 4024
-EBUILD transcode-1.0.2-r3.ebuild 4235 RMD160 8e75ea021c58e47ce07c04e9e493fee93f5ba3a6 SHA1 29456809285a1e825eae680d04054e6dc7003350 SHA256 63beb2cb406860aaf8bedff2201e255df9204d177483a669571bc50929e031fd
-MD5 116cc3c1e507b6fc8ed767f9c2aee5f2 transcode-1.0.2-r3.ebuild 4235
-RMD160 8e75ea021c58e47ce07c04e9e493fee93f5ba3a6 transcode-1.0.2-r3.ebuild 4235
-SHA256 63beb2cb406860aaf8bedff2201e255df9204d177483a669571bc50929e031fd transcode-1.0.2-r3.ebuild 4235
-EBUILD transcode-1.0.2-r4.ebuild 4292 RMD160 4624186cae52363f8096be83b7e284206ae3e8b1 SHA1 3914f0430891939faece08f3e1f8b5d3b842dd38 SHA256 b3393a19ab3cf38d2576668edb787515d6fb89a8319c1f6a8b34b0c61312ec0f
-MD5 81f9934e983e65eaacadb579d8cc5f29 transcode-1.0.2-r4.ebuild 4292
-RMD160 4624186cae52363f8096be83b7e284206ae3e8b1 transcode-1.0.2-r4.ebuild 4292
-SHA256 b3393a19ab3cf38d2576668edb787515d6fb89a8319c1f6a8b34b0c61312ec0f transcode-1.0.2-r4.ebuild 4292
-EBUILD transcode-1.0.3_rc2_p20070310-r1.ebuild 3838 RMD160 c3e2a16123527182a3358de5cdf391d5a48e680a SHA1 5f1a4aa26347c731eca3f2532cfe2ba27463b94d SHA256 18cbad48edb60a15e186b3c8feada97c32ca8d39ff7e0f41f9486751be890f91
-MD5 8bcd45a72e093c7899c5632e7ac3fa0a transcode-1.0.3_rc2_p20070310-r1.ebuild 3838
-RMD160 c3e2a16123527182a3358de5cdf391d5a48e680a transcode-1.0.3_rc2_p20070310-r1.ebuild 3838
-SHA256 18cbad48edb60a15e186b3c8feada97c32ca8d39ff7e0f41f9486751be890f91 transcode-1.0.3_rc2_p20070310-r1.ebuild 3838
-EBUILD transcode-1.1.0_pre20070315-r1.ebuild 3415 RMD160 f950ffcc67cf5753997c2e55d6d8ba518253faba SHA1 8311af86a1d02b83a156a99f41db553da0dd2533 SHA256 0c02bea04de6b7673cbd452ceedd67ac025ba3b42b8da6b2fdefe4fe03c7e24b
-MD5 c4ed83231c1a0d43c593823ff0c53dfd transcode-1.1.0_pre20070315-r1.ebuild 3415
-RMD160 f950ffcc67cf5753997c2e55d6d8ba518253faba transcode-1.1.0_pre20070315-r1.ebuild 3415
-SHA256 0c02bea04de6b7673cbd452ceedd67ac025ba3b42b8da6b2fdefe4fe03c7e24b transcode-1.1.0_pre20070315-r1.ebuild 3415
-MISC ChangeLog 30401 RMD160 fbdd0a8cfb868d7af385e711d1feeea4b66a52d2 SHA1 1e8a19c0d767b185fec58029678c6a02e094123b SHA256 198aa7dc5506d6798b6cb25ba6921152eb5d22f2bb08db70299f2b605f707b3c
-MD5 a408c756c08b73fe65caf84342999e6b ChangeLog 30401
-RMD160 fbdd0a8cfb868d7af385e711d1feeea4b66a52d2 ChangeLog 30401
-SHA256 198aa7dc5506d6798b6cb25ba6921152eb5d22f2bb08db70299f2b605f707b3c ChangeLog 30401
+EBUILD transcode-1.0.2-r3.ebuild 4011 RMD160 df7325fb73838192bae90cafa2aa42fc8f07c57d SHA1 39b9bdafbfb7d9042891e1a377933ccd505ffe7a SHA256 68a640d15d958cc3c342d3be5abed9b75e0e8d4490727976eff0f2ed7ef87c19
+MD5 a46751a7ff1627371346454f6a7f87dc transcode-1.0.2-r3.ebuild 4011
+RMD160 df7325fb73838192bae90cafa2aa42fc8f07c57d transcode-1.0.2-r3.ebuild 4011
+SHA256 68a640d15d958cc3c342d3be5abed9b75e0e8d4490727976eff0f2ed7ef87c19 transcode-1.0.2-r3.ebuild 4011
+EBUILD transcode-1.0.2-r4.ebuild 4068 RMD160 ed1bee947fd183bfeed799ffe91e7e307f90bf8a SHA1 af0e93ee56afb41ad5dbe84c8760b2f7ae624bc0 SHA256 a8bb1932240bba2424935b2df7aefee8cbf1e31e22fa82cb8e8bea78495142c5
+MD5 d6f0a2adf412f4dbe839b70e84878c80 transcode-1.0.2-r4.ebuild 4068
+RMD160 ed1bee947fd183bfeed799ffe91e7e307f90bf8a transcode-1.0.2-r4.ebuild 4068
+SHA256 a8bb1932240bba2424935b2df7aefee8cbf1e31e22fa82cb8e8bea78495142c5 transcode-1.0.2-r4.ebuild 4068
+EBUILD transcode-1.0.3_rc2_p20070310-r1.ebuild 3805 RMD160 755157f78722e67e2572198464d88664b3088cfd SHA1 19fa5d8e06889fab69ec7eaffc1d2c4e3c249add SHA256 9d8f334ade52514cc8d32a6c4ba09dab3746c25c31ab8e8f813618c17eb3b3ac
+MD5 1b17825fde3168c4c19e58c9d398b3fa transcode-1.0.3_rc2_p20070310-r1.ebuild 3805
+RMD160 755157f78722e67e2572198464d88664b3088cfd transcode-1.0.3_rc2_p20070310-r1.ebuild 3805
+SHA256 9d8f334ade52514cc8d32a6c4ba09dab3746c25c31ab8e8f813618c17eb3b3ac transcode-1.0.3_rc2_p20070310-r1.ebuild 3805
+EBUILD transcode-1.1.0_pre20070315-r1.ebuild 3382 RMD160 de2708243d18efa47f756420caf47e16acadb66b SHA1 81fe11d5f68819bc305b59fac8d757aa85d78ab7 SHA256 36ab2b31fcf2435716ce84be93731869dee654de3d56c440ceb05f13d42ecc63
+MD5 91234f926a18143093ee7fa4fb3ae26d transcode-1.1.0_pre20070315-r1.ebuild 3382
+RMD160 de2708243d18efa47f756420caf47e16acadb66b transcode-1.1.0_pre20070315-r1.ebuild 3382
+SHA256 36ab2b31fcf2435716ce84be93731869dee654de3d56c440ceb05f13d42ecc63 transcode-1.1.0_pre20070315-r1.ebuild 3382
+MISC ChangeLog 30651 RMD160 ecc1cc5fb22d4d6abfb6f8fccb458265a95a5126 SHA1 7845f86c5ca83e109a931e5d2d5a4b5c637ff469 SHA256 7a8cd5035fadd9ad556d5dc4f90a5705b9e3cf9c8f67fc2b298bf5d2a19432db
+MD5 1f53b9f109b7f0fd74887a86fcb688fa ChangeLog 30651
+RMD160 ecc1cc5fb22d4d6abfb6f8fccb458265a95a5126 ChangeLog 30651
+SHA256 7a8cd5035fadd9ad556d5dc4f90a5705b9e3cf9c8f67fc2b298bf5d2a19432db ChangeLog 30651
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
 MD5 0338bfb24d7bfb6450aac4dd025c0096 metadata.xml 223
 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 metadata.xml 223
 SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812 metadata.xml 223
-MD5 c448a2ffa8b3dbb74c19c6158c3b5236 files/digest-transcode-1.0.2-r2 500
-RMD160 6a87084baf3f95adfa72259f0e4ebdf9c5de10a8 files/digest-transcode-1.0.2-r2 500
-SHA256 69e0df2008dd3d72e0654cbb83818090a7ee9ef47dd21331e23864740620706f files/digest-transcode-1.0.2-r2 500
 MD5 c448a2ffa8b3dbb74c19c6158c3b5236 files/digest-transcode-1.0.2-r3 500
 RMD160 6a87084baf3f95adfa72259f0e4ebdf9c5de10a8 files/digest-transcode-1.0.2-r3 500
 SHA256 69e0df2008dd3d72e0654cbb83818090a7ee9ef47dd21331e23864740620706f files/digest-transcode-1.0.2-r3 500
@@ -76,10 +66,3 @@ SHA256 d965e2c26b3227f53ee87eb9bfa858be903724a268bddf3d880803dc8eac976a files/di
 MD5 a40ce0eaa07ca2f09368793e864d7088 files/digest-transcode-1.1.0_pre20070315-r1 289
 RMD160 a18de979d3ee42b4ac05fc083c4d2ecc054ca076 files/digest-transcode-1.1.0_pre20070315-r1 289
 SHA256 016357c6d7555c8f1a4c7d8b5b45d82d3131c84775a0531f19ce62cd69691f94 files/digest-transcode-1.1.0_pre20070315-r1 289
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFGBly2vFcC4BYPU0oRAlJbAKCsgwQlsg7ZLwYlgMobsyR7TY9aCgCgmwxC
-LKTV0QqNbJotPZ7JqUcjXUI=
-=aKGC
------END PGP SIGNATURE-----
diff --git a/media-video/transcode/files/digest-transcode-1.0.2-r2 b/media-video/transcode/files/digest-transcode-1.0.2-r2
deleted file mode 100644
index 2d26e8b234da..000000000000
--- a/media-video/transcode/files/digest-transcode-1.0.2-r2
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 e353c0ab7e927a8672528e05a9ae960b transcode-1.0.2.tar.gz 2347861
-RMD160 5a07777093b3d395180396a662dc765c179cd687 transcode-1.0.2.tar.gz 2347861
-SHA256 765936b908fb32ea2149f76246fb22c931549485959cea76ac40f10924c0c0da transcode-1.0.2.tar.gz 2347861
-MD5 ece32a8f6bce5bd9d06841bec8cc263e transcode-types.patch.bz2 5021
-RMD160 956ea116495a57e304ab71a20ccd45ffd7416544 transcode-types.patch.bz2 5021
-SHA256 02bf6ac9a2e039336e103d43acbe7c86975bc3b587dc9dfa23992bd949fc2170 transcode-types.patch.bz2 5021
diff --git a/media-video/transcode/transcode-1.0.2-r2.ebuild b/media-video/transcode/transcode-1.0.2-r2.ebuild
deleted file mode 100644
index a95f61cc0bd0..000000000000
--- a/media-video/transcode/transcode-1.0.2-r2.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2007 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.18 2007/02/17 01:05:58 flameeyes Exp $
-
-WANT_AUTOMAKE=latest
-WANT_AUTOCONF=latest
-
-inherit libtool flag-o-matic eutils multilib autotools
-
-MY_P="${P/_/}"
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="video stream processing tool"
-HOMEPAGE="http://www.transcoding.org/cgi-bin/transcode"
-SRC_URI="mirror://transcode/${MY_P}.tar.gz
-	mirror://gentoo/transcode-types.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
-IUSE="X 3dnow a52 altivec dv dvdread extrafilters mp3 fame truetype gtk imagemagick jpeg
-lzo mjpeg mpeg mmx network ogg vorbis quicktime sdl sse sse2 theora v4l2
-xvid xml"
-
-RDEPEND="a52? ( >=media-libs/a52dec-0.7.4 )
-	dv? ( >=media-libs/libdv-0.99 )
-	dvdread? ( >=media-libs/libdvdread-0.9.0 )
-	xvid? ( >=media-libs/xvid-1.0.2 )
-	mjpeg? ( >=media-video/mjpegtools-1.6.2-r3 )
-	lzo? ( >=dev-libs/lzo-2 )
-	fame? ( >=media-libs/libfame-0.9.1 )
-	imagemagick? ( >=media-gfx/imagemagick-5.5.6.0 )
-	media-libs/libexif
-	mpeg? ( media-libs/libmpeg3 )
-	mp3? ( >=media-sound/lame-3.93 )
-	sdl? ( media-libs/libsdl )
-	quicktime? ( >=media-libs/libquicktime-0.9.3 )
-	vorbis? ( media-libs/libvorbis )
-	ogg? ( media-libs/libogg )
-	theora? ( media-libs/libtheora )
-	jpeg? ( media-libs/jpeg )
-	gtk? ( =x11-libs/gtk+-1.2* )
-	truetype? ( >=media-libs/freetype-2 )
-	>=media-video/ffmpeg-0.4.9_p20050226-r3
-	|| ( sys-libs/glibc dev-libs/libiconv )
-	>=media-libs/libmpeg2-0.4.0b
-	xml? ( dev-libs/libxml2 )
-	X? ( || ( (
-			x11-libs/libXaw
-			x11-libs/libXv )
-		<virtual/x11-7 ) )"
-
-DEPEND="${RDEPEND}
-	v4l2? ( >=sys-kernel/linux-headers-2.6.11 )"
-# Make sure the assembler USE flags are unmasked on amd64
-# Remove this once default-linux/amd64/2006.1 is deprecated
-DEPEND="${DEPEND} amd64? ( >=sys-apps/portage-2.1.2 )"
-
-pkg_setup() {
-	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
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	sed -i -e "s:\$(datadir)/doc/transcode:\$(datadir)/doc/${PF}:" \
-		"${S}"/Makefile.am "${S}"/docs/Makefile.am "${S}"/docs/html/Makefile.am \
-		"${S}"/docs/release-notes/Makefile.am
-
-	epatch "${FILESDIR}/${P}-bigdir.patch"
-	epatch "${FILESDIR}/${P}-lzo2.patch"
-	epatch "${DISTDIR}/${PN}-types.patch.bz2"
-	epatch "${FILESDIR}/${P}-autoconf259d.patch"
-
-	eautoreconf
-}
-
-src_compile() {
-	filter-flags -maltivec -mabi=altivec -momit-leaf-frame-pointer
-	if use ppc || use ppc64 ; then
-		append-flags -U__ALTIVEC__
-	fi
-
-	use xvid \
-		&& myconf="${myconf} --with-default-xvid=xvid4"
-
-	myconf="${myconf} $(use_enable mmx) \
-			$(use_enable 3dnow) \
-			$(use_enable sse) \
-			$(use_enable sse2)"
-
-	append-flags -DDCT_YUV_PRECISION=1
-	econf \
-		$(use_enable altivec) \
-		$(use_enable network netstream) \
-		$(use_enable truetype freetype2) \
-		$(use_enable v4l2 v4l) \
-		$(use_enable mp3 lame) \
-		$(use_enable ogg) \
-		$(use_enable vorbis) \
-		$(use_enable theora) \
-		$(use_enable dvdread libdvdread) \
-		$(use_enable dv libdv) \
-		$(use_enable quicktime libquicktime) \
-		$(use_enable lzo) \
-		$(use_enable a52) \
-		$(use_enable mpeg libmpeg3) \
-		$(use_enable xml libxml2) \
-		$(use_enable mjpeg mjpegtools) \
-		$(use_enable sdl) \
-		$(use_enable gtk) \
-		$(use_enable fame libfame) \
-		$(use_enable imagemagick) \
-		$(use_enable jpeg libjpeg) \
-		--with-mod-path=/usr/$(get_libdir)/transcode \
-		$(use_with X x) \
-		${myconf} \
-		--with-libpostproc-builddir="/usr/$(get_libdir)" \
-		--with-lzo-includes=/usr/include/lzo \
-		--disable-avifile \
-		|| die
-
-	emake all || die
-}
-
-src_install () {
-	make DESTDIR="${D}" install || die
-
-	#do not install the filters that make dvdrip hang unless we ask for them
-	if ! use extrafilters ; then
-	rm "${D}"/usr/$(get_libdir)/transcode/filter_logo.*
-	rm "${D}"/usr/$(get_libdir)/transcode/filter_compare.*
-	fi
-
-	dodoc AUTHORS ChangeLog README TODO
-}
diff --git a/media-video/transcode/transcode-1.0.2-r3.ebuild b/media-video/transcode/transcode-1.0.2-r3.ebuild
index 8633cabd07cf..a0405bbae7e3 100644
--- a/media-video/transcode/transcode-1.0.2-r3.ebuild
+++ b/media-video/transcode/transcode-1.0.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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-r3.ebuild,v 1.13 2007/02/17 01:05:58 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-1.0.2-r3.ebuild,v 1.14 2007/03/31 13:39:59 beandog Exp $
 
 WANT_AUTOMAKE=latest
 WANT_AUTOCONF=latest
@@ -43,20 +43,12 @@ RDEPEND="a52? ( >=media-libs/a52dec-0.7.4 )
 	|| ( sys-libs/glibc dev-libs/libiconv )
 	>=media-libs/libmpeg2-0.4.0b
 	xml? ( dev-libs/libxml2 )
-	X? ( || ( (
-			x11-libs/libXaw
-			x11-libs/libXv )
-		<virtual/x11-7 ) )"
+	X? ( x11-libs/libXaw
+		x11-libs/libXv )"
 
 DEPEND="${RDEPEND}
 	v4l2? ( >=sys-kernel/linux-headers-2.6.11 )"
 
-pkg_setup() {
-	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
-}
-
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
diff --git a/media-video/transcode/transcode-1.0.2-r4.ebuild b/media-video/transcode/transcode-1.0.2-r4.ebuild
index 89d3cebc914f..3cf44d51f414 100644
--- a/media-video/transcode/transcode-1.0.2-r4.ebuild
+++ b/media-video/transcode/transcode-1.0.2-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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-r4.ebuild,v 1.3 2007/02/17 01:05:58 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-1.0.2-r4.ebuild,v 1.4 2007/03/31 13:39:59 beandog Exp $
 
 WANT_AUTOMAKE=latest
 WANT_AUTOCONF=latest
@@ -43,10 +43,8 @@ RDEPEND="a52? ( >=media-libs/a52dec-0.7.4 )
 	|| ( sys-libs/glibc dev-libs/libiconv )
 	>=media-libs/libmpeg2-0.4.0b
 	xml? ( dev-libs/libxml2 )
-	X? ( || ( (
-			x11-libs/libXaw
-			x11-libs/libXv )
-		<virtual/x11-7 ) )"
+	X? ( x11-libs/libXaw
+		x11-libs/libXv )"
 
 DEPEND="${RDEPEND}
 	v4l2? ( >=sys-kernel/linux-headers-2.6.11 )"
@@ -54,12 +52,6 @@ DEPEND="${RDEPEND}
 # Remove this once default-linux/amd64/2006.1 is deprecated
 DEPEND="${DEPEND} amd64? ( >=sys-apps/portage-2.1.2 )"
 
-pkg_setup() {
-	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
-}
-
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
diff --git a/media-video/transcode/transcode-1.0.3_rc2_p20070310-r1.ebuild b/media-video/transcode/transcode-1.0.3_rc2_p20070310-r1.ebuild
index bf6afb035fae..dcd4418f64e8 100644
--- a/media-video/transcode/transcode-1.0.3_rc2_p20070310-r1.ebuild
+++ b/media-video/transcode/transcode-1.0.3_rc2_p20070310-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-1.0.3_rc2_p20070310-r1.ebuild,v 1.2 2007/03/25 11:27:44 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-1.0.3_rc2_p20070310-r1.ebuild,v 1.3 2007/03/31 13:39:59 beandog Exp $
 
 WANT_AUTOMAKE=latest
 WANT_AUTOCONF=latest
@@ -40,10 +40,8 @@ RDEPEND="a52? ( >=media-libs/a52dec-0.7.4 )
 	|| ( sys-libs/glibc dev-libs/libiconv )
 	>=media-libs/libmpeg2-0.4.0b
 	xml? ( dev-libs/libxml2 )
-	X? ( || ( (
-			x11-libs/libXaw
-			x11-libs/libXv )
-		<virtual/x11-7 ) )"
+	X? ( x11-libs/libXaw
+		x11-libs/libXv )"
 
 DEPEND="${RDEPEND}
 	v4l2? ( >=sys-kernel/linux-headers-2.6.11 )"
diff --git a/media-video/transcode/transcode-1.1.0_pre20070315-r1.ebuild b/media-video/transcode/transcode-1.1.0_pre20070315-r1.ebuild
index e67cf29e4e78..c58a6e3e91f5 100644
--- a/media-video/transcode/transcode-1.1.0_pre20070315-r1.ebuild
+++ b/media-video/transcode/transcode-1.1.0_pre20070315-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-1.1.0_pre20070315-r1.ebuild,v 1.1 2007/03/24 14:55:11 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-1.1.0_pre20070315-r1.ebuild,v 1.2 2007/03/31 13:39:59 beandog Exp $
 
 WANT_AUTOMAKE=latest
 WANT_AUTOCONF=latest
@@ -37,11 +37,9 @@ RDEPEND="a52? ( media-libs/a52dec )
 	media-libs/libmpeg2
 	x264? ( media-libs/x264-svn )
 	xml? ( dev-libs/libxml2 )
-	X? ( || ( (
-			x11-libs/libXpm
-			x11-libs/libXaw
-			x11-libs/libXv )
-		<virtual/x11-7 ) )"
+	X? ( x11-libs/libXpm
+		x11-libs/libXaw
+		x11-libs/libXv )"
 
 DEPEND="${RDEPEND}
 	v4l2? ( >=sys-kernel/linux-headers-2.6.11 )"