Adding || die to econf & emakes, as-needed patch fixing the linking order

Package-Manager: portage-2.1.2_rc1-r5

4 files changed, 91 insertions, 13 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++/Manifest b/media-libs/mlt++/Manifest
index b517a1619982..ddfcd8968aef 100644
--- a/media-libs/mlt++/Manifest
+++ b/media-libs/mlt++/Manifest
@@ -1,17 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX mlt++-20060601-as-needed.patch 1727 RMD160 cd66450ff430058115ea5cda58870072e14425c9 SHA1 05c843d5bc63da93b61a1d966ceda6b8c0d693dd SHA256 04634949c2e4e94441cdd7ab9950bfc36d9b3ce3d567680ed2f14378218f73d1
+MD5 4b82c684367bc72de15a8a89ba826c99 files/mlt++-20060601-as-needed.patch 1727
+RMD160 cd66450ff430058115ea5cda58870072e14425c9 files/mlt++-20060601-as-needed.patch 1727
+SHA256 04634949c2e4e94441cdd7ab9950bfc36d9b3ce3d567680ed2f14378218f73d1 files/mlt++-20060601-as-needed.patch 1727
 DIST mlt++-20051209.tar.bz2 29480 RMD160 2feefa598e4cf68af2d836ad3ef7398168754a8b SHA1 f47f39526affbe77b6baeb8a590868c77c97f8b5 SHA256 f6172b02cb76c83546d7d85720b8e60586b5ef6832738a4d83cf7af35b15c750
 DIST mlt++-20060601.tar.bz2 30789 RMD160 f693e829d0d40325801d0bfb64aa360d22eb949e SHA1 d373e38179608c50f81698fb5fce6746b2dcbd4c SHA256 042546daffffc97e71cd9f39e7db42ba9c121082dfc86f7431b7157eb2e465db
 EBUILD mlt++-20051209.ebuild 1165 RMD160 c0be13a9e9ef9b971847f4f47e3f56518966f508 SHA1 1914039dc017c5270a8cdd0aa797e270d8a23064 SHA256 d886ee8875463315a6304651a3ad64cd1f5b6b45507e18fc88687f9c43f14e25
 MD5 e674b5cece83724b08e0cefd9d318920 mlt++-20051209.ebuild 1165
 RMD160 c0be13a9e9ef9b971847f4f47e3f56518966f508 mlt++-20051209.ebuild 1165
 SHA256 d886ee8875463315a6304651a3ad64cd1f5b6b45507e18fc88687f9c43f14e25 mlt++-20051209.ebuild 1165
-EBUILD mlt++-20060601.ebuild 554 RMD160 a6eb86f5fd0ffd91a51a98652a3bee0b9a962570 SHA1 1062fdd489d0a256dc40be9348a3a3eb9a4be816 SHA256 b57f6438d2e4ee44338bb5643b8fe71ac5e57b980cc848e2893f3a8d6898f44c
-MD5 e7e5f770fecf64756c42fec9f4411c5f mlt++-20060601.ebuild 554
-RMD160 a6eb86f5fd0ffd91a51a98652a3bee0b9a962570 mlt++-20060601.ebuild 554
-SHA256 b57f6438d2e4ee44338bb5643b8fe71ac5e57b980cc848e2893f3a8d6898f44c mlt++-20060601.ebuild 554
-MISC ChangeLog 818 RMD160 2aa2f5a4dc44877a2a2534d0367144058e680764 SHA1 71f788ad4846f75c779c6dbe1c68894fa469cbd3 SHA256 8decaadc0cbe5ce98fcbc4e5dc8e3d44ca30dd1833e0367a8c7d8f1b616d105c
-MD5 53496f4c11c1dc27b43bad64df6d17c7 ChangeLog 818
-RMD160 2aa2f5a4dc44877a2a2534d0367144058e680764 ChangeLog 818
-SHA256 8decaadc0cbe5ce98fcbc4e5dc8e3d44ca30dd1833e0367a8c7d8f1b616d105c ChangeLog 818
+EBUILD mlt++-20060601.ebuild 730 RMD160 0688f2af8a8ae793de5546afc34a9c09c13fc76d SHA1 43156a035b2e9e679f3dc652a05a002a5912c4dc SHA256 1b16351119ceec0ac4a0731921841f8bb410b135e98a7b3d8401b7900957e7dc
+MD5 96593996f51826df8f278fdde6725f24 mlt++-20060601.ebuild 730
+RMD160 0688f2af8a8ae793de5546afc34a9c09c13fc76d mlt++-20060601.ebuild 730
+SHA256 1b16351119ceec0ac4a0731921841f8bb410b135e98a7b3d8401b7900957e7dc mlt++-20060601.ebuild 730
+MISC ChangeLog 1012 RMD160 7757cf14e6850fd0ac0a46ce4bb76ae9d2b4c94b SHA1 88834f388cb3a71260dc7652d68bc491c289849b SHA256 9e90271d6dde830a81bbc88c30c631f45742851310656460926d4c8e4a32985d
+MD5 2b0c9111c2201c5e4e11c8cb4850edad ChangeLog 1012
+RMD160 7757cf14e6850fd0ac0a46ce4bb76ae9d2b4c94b ChangeLog 1012
+SHA256 9e90271d6dde830a81bbc88c30c631f45742851310656460926d4c8e4a32985d ChangeLog 1012
 MISC metadata.xml 159 RMD160 b9decd768167ec0ed480f59c688f5134a3f49224 SHA1 379b6baddb33ec462e76cea084aa990b2fa9c4b8 SHA256 9e151e582f202c4f1a8cccb57f5078ac593e663a20f3b7cd454d3831e8fe09c4
 MD5 25473b6655fde2985f9e373862873020 metadata.xml 159
 RMD160 b9decd768167ec0ed480f59c688f5134a3f49224 metadata.xml 159
@@ -22,3 +29,10 @@ SHA256 55cfe263231a9c35b0c1216abdf1e24d3c8e7363a5895852b2922c9aef3e8f00 files/di
 MD5 98ac6080410198b72c7c0be2f3ba0ec7 files/digest-mlt++-20060601 244
 RMD160 7a6efcc208e0d8e8940a08b7ba8f94150b6fd055 files/digest-mlt++-20060601 244
 SHA256 3dfebc923044676631f2796b000ee6e7a2f85dcc1e0fce80dab5539e2d17b6b8 files/digest-mlt++-20060601 244
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFVfytvFcC4BYPU0oRAklaAJ4sXPqznOHnJ8H6e5jrsWhmj4cY5wCeKiZH
+N17ONzG82KrgCo48dlGlBcM=
+=VIuo
+-----END PGP SIGNATURE-----
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
 }