summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2006-01-31 13:59:32 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2006-01-31 13:59:32 +0000
commit01220901e6ce3e7d65556dbf88b5d9cf8a03f069 (patch)
tree44969321650485c2c67ce29fc645abc202198a11 /media-video/transcode
parentVersion bump. Fixed bug #119683, and may be bug reported in #119379 comment 1. (diff)
downloadgentoo-2-01220901e6ce3e7d65556dbf88b5d9cf8a03f069.tar.gz
gentoo-2-01220901e6ce3e7d65556dbf88b5d9cf8a03f069.tar.bz2
gentoo-2-01220901e6ce3e7d65556dbf88b5d9cf8a03f069.zip
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.
(Portage version: 2.1_pre4-r1)
Diffstat (limited to 'media-video/transcode')
-rw-r--r--media-video/transcode/ChangeLog9
-rw-r--r--media-video/transcode/transcode-1.0.2-r2.ebuild14
2 files changed, 11 insertions, 12 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/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() {