Cleanups.

(Portage version: 2.1.1_pre3-r1)

2 files changed, 34 insertions, 32 deletions

diff --git a/media-libs/mlt/ChangeLog b/media-libs/mlt/ChangeLog
index 95f11a6ff18f..181775167d35 100644
--- a/media-libs/mlt/ChangeLog
+++ b/media-libs/mlt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/mlt
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/ChangeLog,v 1.6 2006/07/17 07:14:37 zypher Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/ChangeLog,v 1.7 2006/07/17 14:41:15 zypher Exp $
+
+  17 Jul 2006; Marc Hildebrand <zypher@gentoo.org> mlt-0.2.2.ebuild
+  Some cleanup and fixes. Thanks to Tiziano Müller for all his work on this.
+
+*mlt-0.2.2 (01 Jan 2006)
 
   17 Jul 2006; Marc Hildebrand <zypher@gentoo.org> mlt-0.2.2.ebuild
   Version bump. Thanks to Danny (kugelfang@gentoo.org) for the amd64-fix.
diff --git a/media-libs/mlt/mlt-0.2.2.ebuild b/media-libs/mlt/mlt-0.2.2.ebuild
index bed7a8b12c7c..ded0a68b1541 100644
--- a/media-libs/mlt/mlt-0.2.2.ebuild
+++ b/media-libs/mlt/mlt-0.2.2.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-libs/mlt/mlt-0.2.2.ebuild,v 1.1 2006/07/17 07:14:37 zypher Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/mlt-0.2.2.ebuild,v 1.2 2006/07/17 14:41:15 zypher Exp $
 
 inherit eutils
 
@@ -12,31 +12,31 @@ SRC_URI="mirror://sourceforge/mlt/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="dv xml jack gtk sdl vorbis sox quicktime mmx lame xine lame ogg \
-	theora doc xine"
+IUSE="dv xml jack gtk sdl vorbis sox quicktime mmx lame xine lame ogg theora xine"
 
 DEPEND="media-video/ffmpeg
-		dv?	( >=media-libs/libdv-0.104 )
-		xml?	( >=dev-libs/libxml2-2.5 )
-		ogg?	( >=media-libs/libogg-1.1.3 )
-		vorbis?	( >=media-libs/libvorbis-1.1.2 )
-		sdl?	( >=media-libs/libsdl-1.2.10
-			  >=media-libs/sdl-image-1.2.4 )
-		>=media-libs/libsamplerate-0.1.2
-		jack?	( media-sound/jack-audio-connection-kit
-				  >=dev-libs/libxml2-2.5 )
-		gtk?	( >=x11-libs/gtk+-2.0
-				  x11-libs/pango )
-		sox? 	( media-sound/sox )
-		quicktime? ( media-libs/libquicktime )
-		xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 )
-		lame? ( >=media-sound/lame-3.97_beta2 )
-		theora? ( >=media-libs/libtheora-1.0_alpha5 )"
+	dv?	( >=media-libs/libdv-0.104 )
+	xml?	( >=dev-libs/libxml2-2.5 )
+	ogg?	( >=media-libs/libogg-1.1.3 )
+	vorbis?	( >=media-libs/libvorbis-1.1.2 )
+	sdl?	( >=media-libs/libsdl-1.2.10
+		  >=media-libs/sdl-image-1.2.4 )
+	>=media-libs/libsamplerate-0.1.2
+	jack?	( media-sound/jack-audio-connection-kit
+		  >=dev-libs/libxml2-2.5 )
+	gtk?	( >=x11-libs/gtk+-2.0
+		  x11-libs/pango )
+	sox? 	( media-sound/sox )
+	quicktime? ( media-libs/libquicktime )
+	xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 )
+	lame? ( >=media-sound/lame-3.97_beta2 )
+	theora? ( >=media-libs/libtheora-1.0_alpha5 )"
+RDEPEND=${DEPEND}
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	( use amd64 ) && epatch ${FILESDIR}/mlt-0.2.2-motion-est-amd64.patch
+	cd "${S}"
+	( use amd64 ) && epatch "${FILESDIR}/mlt-0.2.2-motion-est-amd64.patch"
 }
 
 src_compile() {
@@ -45,7 +45,6 @@ src_compile() {
 			--enable-pp --enable-shared-pp
 			--enable-motion-est
 			$(use_enable dv)
-			$(use_enable dv)
 			$(use_enable mmx)
 			$(use_enable gtk gtk2)
 			$(use_enable vorbis)
@@ -59,19 +58,17 @@ src_compile() {
 
 	(use quicktime || use dv) ||  myconf="${myconf} --disable-kino"
 
-	econf $myconf
-	sed -e s/^OPT/#OPT/ -i ${S}/config.mak
-	emake || die
+	econf ${myconf} || die "econf failed"
+	sed -i -e s/^OPT/#OPT/ "${S}/config.mak"
+	emake || die "emake failed"
 }
 
 src_install() {
-	make DESTDIR="${D}" install
-	use doc && dodoc docs/*.txt
+	emake DESTDIR="${D}" install || die "emake install failed"
 
-	dodoc ChangeLog COPYING README docs/TODO
+	dodoc docs/*.txt ChangeLog README docs/TODO
 
-	dodir /usr/share/mlt
-	insinto /usr/share/mlt
+	dodir /usr/share/${PN}
+	insinto /usr/share/${PN}
 	doins -r demo
 }
-