3 files changed, 69 insertions, 5 deletions
diff --git a/media-libs/mlt++/ChangeLog b/media-libs/mlt++/ChangeLog
index 4998bf8de7c4..cbf9ea931741 100644
--- a/media-libs/mlt++/ChangeLog
+++ b/media-libs/mlt++/ChangeLog
@@ -1,6 +1,10 @@
 # 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.5 2006/09/08 19:28:08 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt++/ChangeLog,v 1.6 2006/11/11 16:39:06 aballier Exp $
+
+  11 Nov 2006; Alexis Ballier <aballier@gentoo.org>
+  +files/mlt++-20060601-as-needed.patch, mlt++-20060601.ebuild:
+  Adding || die to econf & emakes, as-needed patch fixing the linking order
 
   08 Sep 2006; Markus Rothe <corsair@gentoo.org> mlt++-20060601.ebuild:
   Added ~ppc64; bug #146851
diff --git a/media-libs/mlt++/files/mlt++-20060601-as-needed.patch b/media-libs/mlt++/files/mlt++-20060601-as-needed.patch
new file mode 100644
index 000000000000..2480956745f0
--- /dev/null
+++ b/media-libs/mlt++/files/mlt++-20060601-as-needed.patch
@@ -0,0 +1,51 @@
+--- mlt++-20060601/configure.old	2006-11-11 17:16:13.000000000 +0100
++++ mlt++-20060601/configure	2006-11-11 17:16:30.000000000 +0100
+@@ -37,13 +37,13 @@
+ 		echo LIBSUF=.dylib
+         echo "CXXFLAGS+=-D__DARWIN__ -Wall -fPIC `mlt-config --cflags`"
+ 		echo "LIBFLAGS=-dynamiclib -single_module"
+-        echo "LDFLAGS+=`mlt-config --libs` `mlt-config miracle --libs` `mlt-config valerie --libs`"
++        echo "OURLDFLAGS=`mlt-config --libs` `mlt-config miracle --libs` `mlt-config valerie --libs`"
+ 		;;
+ 	Linux)
+ 		echo LIBSUF=.so
+         echo "CXXFLAGS+=-pthread -Wall -fPIC `mlt-config --cflags`"
+ 		echo "LIBFLAGS=-shared"
+-        echo "LDFLAGS+=`mlt-config --libs` `mlt-config miracle --libs`"
++        echo "OURLDFLAGS=`mlt-config --libs` `mlt-config miracle --libs`"
+ 		;;
+ esac >> config.mak
+ 
+--- mlt++-20060601/src/Makefile.old	2006-11-11 17:22:39.000000000 +0100
++++ mlt++-20060601/src/Makefile	2006-11-11 17:23:10.000000000 +0100
+@@ -39,7 +39,7 @@
+ all:		$(TARGET)
+ 
+ $(TARGET):	$(OBJS)
+-	$(CXX) $(LIBFLAGS) -o $@ $(OBJS) $(LDFLAGS)
++	$(CXX) $(LIBFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(OURLDFLAGS)
+ 	ln -sf $(TARGET) $(NAME)
+ 
+ clean:
+--- mlt++-20060601/test/Makefile.old	2006-11-11 17:24:47.000000000 +0100
++++ mlt++-20060601/test/Makefile	2006-11-11 17:25:30.000000000 +0100
+@@ -1,16 +1,18 @@
+ include ../config.mak
+ 
+ CXXFLAGS+=-Wall -g `mlt-config --cflags` -I ../src
+-LDFLAGS+=-L../src -lmlt++ -lmiracle -lvalerie `mlt-config --libs`
++OURLDFLAGS+=-L../src -lmlt++ -lmiracle -lvalerie `mlt-config --libs`
+ CC=c++
+ 
+ all:		play server
+ 
+ play:		play.o
++	$(CC) $(LDFLAGS) -o $@ play.o $(OURLDFLAGS)
+ 
+ play.o:		play.cpp
+ 
+ server:		server.o
++	$(CC) $(LDFLAGS) -o $@ server.o $(OURLDFLAGS)
+ 
+ server.o:	server.cpp
+ 
diff --git a/media-libs/mlt++/mlt++-20060601.ebuild b/media-libs/mlt++/mlt++-20060601.ebuild
index c09cb30140e4..653d118961f7 100644
--- a/media-libs/mlt++/mlt++-20060601.ebuild
+++ b/media-libs/mlt++/mlt++-20060601.ebuild
@@ -1,6 +1,8 @@
 # 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++-20060601.ebuild,v 1.2 2006/09/08 19:28:08 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt++/mlt++-20060601.ebuild,v 1.3 2006/11/11 16:39:06 aballier Exp $
+
+inherit eutils
 
 DESCRIPTION="Various bindings for mlt"
 HOMEPAGE="http://mlt.sourceforge.net/"
@@ -13,13 +15,20 @@ IUSE=""
 
 DEPEND=">=media-libs/mlt-0.2.2"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-as-needed.patch"
+}
+
 src_compile() {
-	econf
-	emake
+	econf || die "econf failed"
+	emake || die "emake failed"
 }
 
 src_install() {
-	make DESTDIR=${D} install
+	make DESTDIR=${D} install || die "make install failed"
 
 	dodoc README CUSTOMISING HOWTO
 }