Fix build with USE=ruby, bug 351718

Package-Manager: portage-2.1.10.31/cvs/Linux x86_64

4 files changed, 42 insertions, 9 deletions

diff --git a/media-libs/mlt/ChangeLog b/media-libs/mlt/ChangeLog
index 6a8a2b707101..73548f1ff3aa 100644
--- a/media-libs/mlt/ChangeLog
+++ b/media-libs/mlt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/mlt
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/ChangeLog,v 1.72 2011/05/20 11:50:40 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/ChangeLog,v 1.73 2011/10/30 15:23:55 dilfridge Exp $
+
+  30 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> mlt-0.7.2.ebuild,
+  +files/mlt-0.7.2-ruby-link.patch:
+  Fix build with USE=ruby, bug 351718
 
   20 May 2011; Tomáš Chvátal <scarabeus@gentoo.org> mlt-0.7.2.ebuild:
   Bump dependency over swig. Fixes bug #351718.
diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest
index ca630f58f8c4..6148b580eea3 100644
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -1,17 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX mlt-0.5.4-asneeded.patch 338 RMD160 1fd1f17c6461fa518a621064a9d1f5a981e94059 SHA1 06784b1c39a9766e45c9b29e9c7a03916472e21e SHA256 9331f20822eb6cb0ed7e20952b0e37cb3e9a5df0203d1ab6361b4289a6c0cba8
+AUX mlt-0.7.2-ruby-link.patch 680 RMD160 f63b85806e58561e43ffad0162393ea77e01e728 SHA1 7bb51abe6dd716369f39272867eb242b1cb42e29 SHA256 fbcf41da78bc150afd2fcc5394eda2022d2c19d7b1cb788910b443b64d0cdd56
 DIST mlt-0.5.10.tar.gz 819471 RMD160 015053ddb98175adc905d2ccf29ae962f295a9bb SHA1 e0b3d8f77ad6d97d6495614e78dfbbb531e70f77 SHA256 106636540cdf44f670937b8df549ea2c988a27d05e14d4a8670f9b6af5a0d19e
 DIST mlt-0.7.2.tar.gz 901572 RMD160 50d4e7601338a94bf30eac78d0b39422bf4f522e SHA1 ada5bbe9c5d38ff2f42a5d89c0cdb5a56586a699 SHA256 4b6212b6ab137220af93333195ae5deee4bf7b294d680b43b1b074a4c63e0131
 EBUILD mlt-0.5.10.ebuild 4456 RMD160 d8caa63396701fbf34f00d1c3435b80c2e34a59e SHA1 05ff0316c1ca33a1a08b48239d693855334dfef2 SHA256 679a3206e4eb1efd3fe60e86f730fd2b85a6c1645ebcafcd4482c5d651d16b45
-EBUILD mlt-0.7.2.ebuild 4454 RMD160 5ca468c422d8efd3f63240234a1dbd3f2ad491a0 SHA1 fb94cbbffff0586dacee50a720b56689751e5cef SHA256 3f7db711f1d0976903f7992f5d2344739b47f0ee0d1a5f699248022ffe5e3491
-MISC ChangeLog 11313 RMD160 bd1523bdc67bc111a0c6b19eafc5fa4ff7bc4398 SHA1 7ea78ba7ce8bbedee9b856876d4ff787d61d120a SHA256 81f812882448c079c8810558aab2ae96162c2cd68f49c7c4949a1bb35773c3a8
+EBUILD mlt-0.7.2.ebuild 4455 RMD160 bfbc23069c4183f4d6a176a15d69663debd83b37 SHA1 c8435964f048bf9f012c91bd2c1e6abb565ebe4c SHA256 1191921ef3836e87f8f7af4f74e6fecd212745dde2b384ae452b8b29d4a042b6
+MISC ChangeLog 11463 RMD160 90f4b94a82d0c9862bab61dac321bff2f69b2498 SHA1 81de45ae9ad1ba90eaaee96ce3bb5d94094c7cdc SHA256 bcb4cd9d1ba184a57fbfba1220401203cd2af5465f552db049c2f6dbad6dcb5c
 MISC metadata.xml 902 RMD160 9cbaf3b801eeda6ba3733ffdc947eec947c9c905 SHA1 564c50101ea02bc5b3adc1c94a59962e8652e4f5 SHA256 42ad9c42cec4fbde252f7bfb7656012f7b452525679de4a644697bcbea73b7e6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3WVZYACgkQHB6c3gNBRYcs8QCfXv6jcM28Ub5Na+4Y/2YlvV28
-j6QAoL71fMHxUOZIt8TqnVIMDsqBHrwb
-=+MPn
+iQIcBAEBCgAGBQJOrWwbAAoJENwGBM22xffehxkP/0qI6gi2OE9UPf1d/euHLYM8
+nIY529L2bFjJHJxkJZ9VvjnooGf56PGSaD88DMhbVSgDANKGQgzhpW10sapNBu1W
+ETpQ2lRnO6lUXRkUd08dYIn8PkljcRABDsig3pwdki1Y8N3s9Y2ktia5/NanLMQA
+t8/nP7UPVba/EaQPivxguCqG8ej28sPZ3KcFvR+EyCACvwyfVi7CxIWc+2z47H5q
+h6mW2kIEx/qj/3I5AOcQxn4VDLVWsyU3G072LlGYpGtc47snYyAfnoTiqXajHzNm
+FlPmbgfO1zW/wkuzYYeCrRHqL/qlfv78UBV/YemagPQCDvVo4xyBthZtkgWQATw8
+MPiNpnKWM/iqmA58HMeG1DezTI5ujID+lNS4PyF6AcniYPyeUZZIlwwLJesLUwLF
+u1Uyb2yaXPYa59ybv9d8vtkwc8v18O9xL4NRR1Jy3OFPlqnJHH9Egt0QfuvrVsmP
+X1kViVDa6M2kQgMyDJd7bgBbS93D5g4W53a5F7wx9cyjMe1gnohqSY4N6D9kzfdH
+3vwOjxSdCMKTL34m8bb0W94eAsiVgHokUQNgakcuW6IJLLRjO93m+xMGGKKyXA3+
+MA8PNDVajgXBUSfzRCXL1gqBoDP6hRo4juGe8Vg7fA9dvwUddCbr0patIaQasXIM
+lG7qxyecI8f+T6RK+bMf
+=BWK0
 -----END PGP SIGNATURE-----
diff --git a/media-libs/mlt/files/mlt-0.7.2-ruby-link.patch b/media-libs/mlt/files/mlt-0.7.2-ruby-link.patch
new file mode 100644
index 000000000000..c0427c1a3df0
--- /dev/null
+++ b/media-libs/mlt/files/mlt-0.7.2-ruby-link.patch
@@ -0,0 +1,18 @@
+The build system tries to link to installed system libraries first, which 
+fails because the ABI has changed...
+
+diff -ruN mlt-0.7.2.orig/src/swig/ruby/build mlt-0.7.2/src/swig/ruby/build
+--- mlt-0.7.2.orig/src/swig/ruby/build	2011-05-02 07:59:12.000000000 +0200
++++ mlt-0.7.2/src/swig/ruby/build	2011-10-30 16:21:01.000000000 +0100
+@@ -5,8 +5,10 @@
+   exit 0
+ end
+ system( "ln -sf ../mlt.i" )
++system( "ln -sf ../../framework/libmlt.so" )
++system( "ln -sf ../../mlt++/libmlt++.so" )
+ system( "swig -c++ -ruby -I../../mlt++ -I../.. mlt.i" )
+ $CFLAGS += " -I../.."
+-$LDFLAGS += " -L../../mlt++ -lmlt++"
++$LIBS += " -lmlt++ -lmlt -lstdc++"
+ create_makefile('mlt')
+ system( "make" )
diff --git a/media-libs/mlt/mlt-0.7.2.ebuild b/media-libs/mlt/mlt-0.7.2.ebuild
index 56d4e3f50d0b..17db6aab7172 100644
--- a/media-libs/mlt/mlt-0.7.2.ebuild
+++ b/media-libs/mlt/mlt-0.7.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/mlt-0.7.2.ebuild,v 1.2 2011/05/20 11:50:40 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/mlt-0.7.2.ebuild,v 1.3 2011/10/30 15:23:55 dilfridge Exp $
 
 EAPI=3
 PYTHON_DEPEND="python? 2:2.6"
@@ -59,7 +59,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.5.4-asneeded.patch
+	epatch "${FILESDIR}"/${PN}-0.7.2-ruby-link.patch
 	# respect CFLAGS LDFLAGS when building shared libraries. Bug #308873
 	for x in python lua; do
 		sed -i "/mlt.so/s: -lmlt++ :& ${CFLAGS} ${LDFLAGS} :" src/swig/$x/build