relink test programs with libmlt++ that has just been build, not the one on the system, fixes bug #176126

Package-Manager: portage-2.1.2.4

4 files changed, 37 insertions, 15 deletions

diff --git a/media-libs/mlt++/ChangeLog b/media-libs/mlt++/ChangeLog
index e2e3cd1a3dbc..107d745ca498 100644
--- a/media-libs/mlt++/ChangeLog
+++ b/media-libs/mlt++/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/mlt++
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt++/ChangeLog,v 1.7 2007/01/10 21:23:47 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt++/ChangeLog,v 1.8 2007/04/26 21:05:40 aballier Exp $
+
+  26 Apr 2007; Alexis Ballier <aballier@gentoo.org>
+  +files/mlt++-20060601-relink.patch, mlt++-20060601.ebuild:
+  relink test programs with libmlt++ that has just been build, not the one on
+  the system, fixes bug #176126
 
   10 Jan 2007; Diego Pettenò <flameeyes@gentoo.org> metadata.xml:
   Add missing email address for herd with name != alias.
diff --git a/media-libs/mlt++/Manifest b/media-libs/mlt++/Manifest
index e48846ec472d..e8121181483c 100644
--- a/media-libs/mlt++/Manifest
+++ b/media-libs/mlt++/Manifest
@@ -5,20 +5,24 @@ AUX mlt++-20060601-as-needed.patch 1727 RMD160 cd66450ff430058115ea5cda58870072e
 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
+AUX mlt++-20060601-relink.patch 385 RMD160 b3496a38988c49ec289bcb0351ce33730872e017 SHA1 c04235dc1a1f39ed8ca80ac4f5afd52b01c132b3 SHA256 b1825c3b8a959ca9c13ba169db046f1fe72f6ebceef28c022b02104c331747c8
+MD5 c80deab40c7ee68e7fc3b092a38da047 files/mlt++-20060601-relink.patch 385
+RMD160 b3496a38988c49ec289bcb0351ce33730872e017 files/mlt++-20060601-relink.patch 385
+SHA256 b1825c3b8a959ca9c13ba169db046f1fe72f6ebceef28c022b02104c331747c8 files/mlt++-20060601-relink.patch 385
 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 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 1138 RMD160 9ce9a66e6db740f385b710448f5486b0a015e7ef SHA1 6044a0a1c2f66159cad5ff24d238142946a62974 SHA256 5f47a4dead409b694d3ee9523b67cb16f1a5fe7699c8c107f56c74474b788d7e
-MD5 04426c1c6e0e9e8d84c84ad29a7ff855 ChangeLog 1138
-RMD160 9ce9a66e6db740f385b710448f5486b0a015e7ef ChangeLog 1138
-SHA256 5f47a4dead409b694d3ee9523b67cb16f1a5fe7699c8c107f56c74474b788d7e ChangeLog 1138
+EBUILD mlt++-20060601.ebuild 770 RMD160 37135aaea725ed597615566f9cdc5172a5296771 SHA1 20280b7ab637b85ba39f175b687819b3384e7b6e SHA256 a617f4cb6f4d465240434340c9900a6bb47a8e77c4212936f8cc93c5722dba66
+MD5 20b10fd442a9883451cd5e3b17ead425 mlt++-20060601.ebuild 770
+RMD160 37135aaea725ed597615566f9cdc5172a5296771 mlt++-20060601.ebuild 770
+SHA256 a617f4cb6f4d465240434340c9900a6bb47a8e77c4212936f8cc93c5722dba66 mlt++-20060601.ebuild 770
+MISC ChangeLog 1361 RMD160 cead5b850f6518aa170625317f7fa0229fc75a92 SHA1 cfb8084cc268fe1db27ff103294cd9f4d05abf85 SHA256 029df9e4495f8a19f7ebd4fcf769ca2c8bfd093715aa30f2118029dc2f37299f
+MD5 68f557fbd91449fa4f05afacae2c3106 ChangeLog 1361
+RMD160 cead5b850f6518aa170625317f7fa0229fc75a92 ChangeLog 1361
+SHA256 029df9e4495f8a19f7ebd4fcf769ca2c8bfd093715aa30f2118029dc2f37299f ChangeLog 1361
 MISC metadata.xml 226 RMD160 9acecdf92471eb50a25bc1aaf0d5179959d6d211 SHA1 f66369c7e7900801781a598bf5a7e6e49803a801 SHA256 b159adc5c7076105f4bc05f02d3c1e12bcad82faedf5df5ba4888077732ebf64
 MD5 29bc3f4b41337cb51a64ea89a3957657 metadata.xml 226
 RMD160 9acecdf92471eb50a25bc1aaf0d5179959d6d211 metadata.xml 226
@@ -30,9 +34,9 @@ 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 v2.0.1 (GNU/Linux)
+Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFFpVlpAiZjviIA2XgRAq6hAJ42m0bAH2vahOUiuLZedID6WcEmZwCgliTV
-niHPP5UwfAQctmZDK2HnFQI=
-=naRr
+iD8DBQFGMRPyvFcC4BYPU0oRAmiYAJ9mvFK0On/HY/PsFz8Ifq27F5ioAACgqg6f
+V+62mqB9qsGEZ9SiOZItGGo=
+=B22a
 -----END PGP SIGNATURE-----
diff --git a/media-libs/mlt++/files/mlt++-20060601-relink.patch b/media-libs/mlt++/files/mlt++-20060601-relink.patch
new file mode 100644
index 000000000000..28e2c7bfd056
--- /dev/null
+++ b/media-libs/mlt++/files/mlt++-20060601-relink.patch
@@ -0,0 +1,12 @@
+Index: mlt++-20060601/test/Makefile
+===================================================================
+--- mlt++-20060601.orig/test/Makefile
++++ mlt++-20060601/test/Makefile
+@@ -2,6 +2,7 @@ include ../config.mak
+ 
+ CXXFLAGS+=-Wall -g `mlt-config --cflags` -I ../src
+ OURLDFLAGS+=-L../src -lmlt++ -lmiracle -lvalerie `mlt-config --libs`
++LDFLAGS+=-L../src
+ CC=c++
+ 
+ all:		play server
diff --git a/media-libs/mlt++/mlt++-20060601.ebuild b/media-libs/mlt++/mlt++-20060601.ebuild
index 653d118961f7..e0de762f2f6e 100644
--- a/media-libs/mlt++/mlt++-20060601.ebuild
+++ b/media-libs/mlt++/mlt++-20060601.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 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.3 2006/11/11 16:39:06 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt++/mlt++-20060601.ebuild,v 1.4 2007/04/26 21:05:40 aballier Exp $
 
 inherit eutils
 
@@ -20,6 +20,7 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${FILESDIR}/${P}-as-needed.patch"
+	epatch "${FILESDIR}/${P}-relink.patch"
 }
 
 src_compile() {