Configure couldn't complete if gtk isn't installed, so added =x11-libs/gtk-1.2* to DEPEND. Other cleanups.

3 files changed, 22 insertions, 26 deletions

diff --git a/media-libs/libdv/ChangeLog b/media-libs/libdv/ChangeLog
index d0c011a74438..2b685ef3afda 100644
--- a/media-libs/libdv/ChangeLog
+++ b/media-libs/libdv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libdv
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdv/ChangeLog,v 1.15 2003/07/11 18:00:32 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdv/ChangeLog,v 1.16 2003/08/18 17:36:05 max Exp $
+
+  18 Aug 2003; Max Kalika <max@gentoo.org> libdv-0.99.ebuild:
+  Configure couldn't complete if gtk isn't installed, so added
+  =x11-libs/gtk-1.2* to DEPEND. Other cleanups.
 
   11 Jul 2003; Martin Holzer <mholzer@gentoo.org> libdv-0.99.ebuild:
   Marked stable on x86.
diff --git a/media-libs/libdv/Manifest b/media-libs/libdv/Manifest
index 7f66e26730eb..772bdae418a6 100644
--- a/media-libs/libdv/Manifest
+++ b/media-libs/libdv/Manifest
@@ -1,7 +1,7 @@
 MD5 55706adc4e35f4c4402d2b93bbe1379f libdv-0.9.5-r1.ebuild 805
-MD5 b3c3e84d12853868614d9b464b23d534 libdv-0.99.ebuild 1068
+MD5 d007c88d554ddc43791b174155f90069 libdv-0.99.ebuild 923
 MD5 5e11191017e9473641ac1a378b2afb96 libdv-0.98.ebuild 1049
-MD5 9e83a55c259e99efe7509cb73f710a3c ChangeLog 1976
+MD5 ae5b8e1524ea0ea12c50111364f75ecc ChangeLog 2146
 MD5 a880f41dce1a820076b48ca914ac5e8b files/digest-libdv-0.9.5-r1 63
 MD5 d79d611e171b21dfe5e1f5d1534576e5 files/digest-libdv-0.98 62
 MD5 108d55b61056533255db29dbed106beb files/digest-libdv-0.99 123
diff --git a/media-libs/libdv/libdv-0.99.ebuild b/media-libs/libdv/libdv-0.99.ebuild
index 03ab7a68d6ef..f13a1097f43a 100644
--- a/media-libs/libdv/libdv-0.99.ebuild
+++ b/media-libs/libdv/libdv-0.99.ebuild
@@ -1,43 +1,35 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdv/libdv-0.99.ebuild,v 1.3 2003/07/18 21:55:44 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdv/libdv-0.99.ebuild,v 1.4 2003/08/18 17:36:05 max Exp $
 
-IUSE="sdl gtk xv"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="software codec for dv-format video (camcorders etc)"
+DESCRIPTION="Software codec for dv-format video (camcorders etc)."
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://libdv.sourceforge.net/"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ~ppc ~sparc ~alpha amd64"
+IUSE="sdl xv"
 
-DEPEND=" dev-libs/popt
-	gtk? ( =x11-libs/gtk+-1.2* )
-	gtk? ( =dev-libs/glib-1.2* )
-	xv? ( x11-base/xfree )
+DEPEND="dev-libs/popt
 	dev-util/pkgconfig
-	sdl? ( >=media-libs/libsdl-1.2.4.20020601 )"
+	=x11-libs/gtk+-1.2*
+	sdl? ( >=media-libs/libsdl-1.2.4.20020601 )
+	xv? ( virtual/x11 )"
 	
 src_compile() {
-	myconf="--without-debug"
-	
-	use gtk \
-		|| myconf="$myconf --disable-gtk"
-	use sdl \
-		&& myconf="$myconf --enable-sdl" \
-		|| myconf="$myconf --disable-sdl"
-	use xv \
-		|| myconf="$mycong --disable-xv"
+	local myconf
+	myconf="${myconf} `use_with debug`"
+	myconf="${myconf} `use_enable sdl`"
+	myconf="${myconf} `use_enable xv`"
 
 	unset CFLAGS CXXFLAGS
 
-	econf ${myconf} || die
-	make || die
+	econf ${myconf}
+	make || die "compile problem."
 }
 
 src_install () {
-	make DESTDIR=${D} install || die
+	einstall DESTDIR="${D}"
 	dodoc AUTHORS COPYING COPYRIGHT ChangeLog INSTALL NEWS README* TODO
 }