DEPEND fix0rs

7 files changed, 30 insertions, 29 deletions

diff --git a/media-video/xawtv/ChangeLog b/media-video/xawtv/ChangeLog
index 42312cbd9860..369813c3c25d 100644
--- a/media-video/xawtv/ChangeLog
+++ b/media-video/xawtv/ChangeLog
@@ -1,9 +1,13 @@
 # ChangeLog for media-video/xawtv
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xawtv/ChangeLog,v 1.23 2003/03/28 07:12:21 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xawtv/ChangeLog,v 1.24 2003/04/01 23:38:49 seemant Exp $
 
 *xawtv-3.86 (21 Mar 2003)
 
+  01 Apr 2003; Seemant Kulleen <seemant@gentoo.org> xawtv-3.83.ebuild,
+  xawtv-3.85.ebuild, xawtv-3.86.ebuild:
+  removed xpm from DEPEND -- xfree86 provides it
+
   27 Mar 2003; Seemant Kulleen <seemant@gentoo.org> xawtv-3.86.ebuild:
   mark stable on x86
 
diff --git a/media-video/xawtv/files/digest-xawtv-3.83 b/media-video/xawtv/files/digest-xawtv-3.83
index e07b1e75fd34..54f134812417 100644
--- a/media-video/xawtv/files/digest-xawtv-3.83
+++ b/media-video/xawtv/files/digest-xawtv-3.83
@@ -1,3 +1,6 @@
+MD5 e4dcb4819e11ae2fb4fa72f4f8420bca /files/tv-fonts-1.0-gentoo.diff 426
+MD5 04a2ce4d8937cc7dfc255082396fa5fe /files/webcamrc 597
+MD5 9fa22baab35518b30a0cec40b11df7c6 /xawtv-3.83.ebuild 2521
 MD5 866acba0fa7994c966d5c69a4528fb5b xawtv_3.83.tar.gz 546241
 MD5 46c68df4976306e25a1526a762371770 tv-fonts-1.0.tar.bz2 140781
 MD5 13a6d70ce058f3576f1d047dd2c20364 xaw-deinterlace-3.76-0.1.0.diff 15039
diff --git a/media-video/xawtv/files/digest-xawtv-3.85 b/media-video/xawtv/files/digest-xawtv-3.85
index e72c6192252e..f0d285bd574d 100644
--- a/media-video/xawtv/files/digest-xawtv-3.85
+++ b/media-video/xawtv/files/digest-xawtv-3.85
@@ -1,3 +1,6 @@
+MD5 e4dcb4819e11ae2fb4fa72f4f8420bca /files/tv-fonts-1.0-gentoo.diff 426
+MD5 04a2ce4d8937cc7dfc255082396fa5fe /files/webcamrc 597
+MD5 596250842c842306266a59f3198b0f00 /xawtv-3.85.ebuild 2618
 MD5 7ef19068bbc27b3a8e0b92a3d7ab437f xawtv_3.85.tar.gz 687759
 MD5 46c68df4976306e25a1526a762371770 tv-fonts-1.0.tar.bz2 140781
 MD5 80a7a2779c4c521f5e9a28583d27c736 xaw-deinterlace-3.76-0.1.1.diff.bz2 3858
diff --git a/media-video/xawtv/files/digest-xawtv-3.86 b/media-video/xawtv/files/digest-xawtv-3.86
index 1f1594482bd5..28cf66a99f6f 100644
--- a/media-video/xawtv/files/digest-xawtv-3.86
+++ b/media-video/xawtv/files/digest-xawtv-3.86
@@ -1,3 +1,6 @@
+MD5 e4dcb4819e11ae2fb4fa72f4f8420bca /files/tv-fonts-1.0-gentoo.diff 426
+MD5 04a2ce4d8937cc7dfc255082396fa5fe /files/webcamrc 597
+MD5 3849962fa6747c3778be7fbfc25d386f /xawtv-3.86.ebuild 2366
 MD5 1a87beb0f7c9ccf06b54a6a5d0c003cc xawtv_3.86.tar.gz 549653
 MD5 46c68df4976306e25a1526a762371770 tv-fonts-1.0.tar.bz2 140781
 MD5 80a7a2779c4c521f5e9a28583d27c736 xaw-deinterlace-3.76-0.1.1.diff.bz2 3858
diff --git a/media-video/xawtv/xawtv-3.83.ebuild b/media-video/xawtv/xawtv-3.83.ebuild
index 72ab6d24ccd7..803b25f2cd4e 100644
--- a/media-video/xawtv/xawtv-3.83.ebuild
+++ b/media-video/xawtv/xawtv-3.83.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2 
-# $Header: /var/cvsroot/gentoo-x86/media-video/xawtv/xawtv-3.83.ebuild,v 1.5 2003/03/13 23:26:04 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xawtv/xawtv-3.83.ebuild,v 1.6 2003/04/01 23:38:49 seemant Exp $
 
 IUSE="aalib motif alsa opengl nls quicktime"
 
@@ -16,13 +16,13 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 ~ppc"
 
-DEPEND=">=sys-libs/ncurses-5.1
+DEPEND=">=sys-apps/portage-2.0.47-r10
+	>=sys-apps/sed-4.0.5
+	>=sys-libs/ncurses-5.1
 	>=media-libs/jpeg-6b
 	media-libs/libpng
-	media-libs/xpm
 	media-libs/zvbi
 	virtual/x11
-	sys-apps/supersed
 	alsa? ( media-libs/alsa-lib )
 	aalib? ( media-libs/aalib )
 	motif? ( virtual/motif
@@ -33,14 +33,14 @@ DEPEND=">=sys-libs/ncurses-5.1
 src_unpack() {
 	unpack ${PN}_${PV}.tar.gz
 	cd ${S}
-	patch -p1 < ${DISTDIR}/xaw-deinterlace-3.76-0.1.0.diff || die
+	epatch ${DISTDIR}/xaw-deinterlace-3.76-0.1.0.diff
 
 	use mmx || \
-		ssed -i "s:#define MMX::" libng/plugins/linear_blend.c
+		sed -i "s:#define MMX::" libng/plugins/linear_blend.c
 
 	unpack ${MY_FONT}.tar.bz2
 	cd ${S}/${MY_FONT}
-	patch -p0 < ${FILESDIR}/${MY_FONT}-gentoo.diff || die
+	epatch ${FILESDIR}/${MY_FONT}-gentoo.diff
 }
 
 src_compile() {
diff --git a/media-video/xawtv/xawtv-3.85.ebuild b/media-video/xawtv/xawtv-3.85.ebuild
index f3c3f93e7915..f390b4142912 100644
--- a/media-video/xawtv/xawtv-3.85.ebuild
+++ b/media-video/xawtv/xawtv-3.85.ebuild
@@ -1,8 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2 
-# $Header: /var/cvsroot/gentoo-x86/media-video/xawtv/xawtv-3.85.ebuild,v 1.3 2003/03/13 23:26:04 seemant Exp $
-
-inherit eutils
+# $Header: /var/cvsroot/gentoo-x86/media-video/xawtv/xawtv-3.85.ebuild,v 1.4 2003/04/01 23:38:49 seemant Exp $
 
 IUSE="aalib motif alsa opengl nls quicktime"
 
@@ -20,10 +18,11 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc"
 
-DEPEND=">=sys-libs/ncurses-5.1
+DEPEND=">=sys-apps/portage-2.0.47-r10
+	>=sys-apps/sed-4.0.5
+	>=sys-libs/ncurses-5.1
 	>=media-libs/jpeg-6b
 	media-libs/libpng
-	media-libs/xpm
 	media-libs/zvbi
 	virtual/x11
 	alsa? ( media-libs/alsa-lib )
@@ -39,7 +38,7 @@ src_unpack() {
 	epatch ${DISTDIR}/${MY_PATCH}
 
 	use mmx || \
-		ssed -i "s:#define MMX::" libng/plugins/linear_blend.c
+		sed -i "s:#define MMX::" libng/plugins/linear_blend.c
 
 	unpack ${MY_FONT}.tar.bz2
 	cd ${S}/${MY_FONT}
diff --git a/media-video/xawtv/xawtv-3.86.ebuild b/media-video/xawtv/xawtv-3.86.ebuild
index f49dfc6525c1..60248b3667ce 100644
--- a/media-video/xawtv/xawtv-3.86.ebuild
+++ b/media-video/xawtv/xawtv-3.86.ebuild
@@ -1,8 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2 
-# $Header: /var/cvsroot/gentoo-x86/media-video/xawtv/xawtv-3.86.ebuild,v 1.2 2003/03/28 07:12:21 seemant Exp $
-
-inherit eutils
+# $Header: /var/cvsroot/gentoo-x86/media-video/xawtv/xawtv-3.86.ebuild,v 1.3 2003/04/01 23:38:49 seemant Exp $
 
 IUSE="aalib motif alsa opengl nls quicktime"
 
@@ -23,7 +21,6 @@ DEPEND=">=sys-apps/sed-4.0.5
 	>=sys-libs/ncurses-5.1
 	>=media-libs/jpeg-6b
 	media-libs/libpng
-	media-libs/xpm
 	media-libs/zvbi
 	virtual/x11
 	alsa? ( media-libs/alsa-lib )
@@ -33,17 +30,6 @@ DEPEND=">=sys-apps/sed-4.0.5
 	opengl? ( virtual/opengl )
 	quicktime? ( media-libs/libquicktime )"
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# Patch breaks compilation -- needs investigation
-#	epatch ${WORKDIR}/${MY_PATCH}
-
-	use mmx || \
-		sed -i "s:#define MMX::" libng/plugins/linear_blend.c
-}
-
 src_compile() {
 	local myconf
 	use motif \
@@ -67,6 +53,9 @@ src_compile() {
 		&& myconf="${myconf} --enable-gl" \
 		|| myconf="${myconf} --disable-gl"
 
+	use mmx || \
+		sed -i "s:#define MMX::" libng/plugins/linear_blend.c
+
 	econf \
 		--with-x \
 		--enable-xfree-ext \