Added patch from Fedora to avoid collision with libquicktime, bug #324217, thanks ssuominen

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 34 insertions, 7 deletions

diff --git a/sci-mathematics/qtoctave/ChangeLog b/sci-mathematics/qtoctave/ChangeLog
index 3e188da4a2e5..04d014ada941 100644
--- a/sci-mathematics/qtoctave/ChangeLog
+++ b/sci-mathematics/qtoctave/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-mathematics/qtoctave
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/qtoctave/ChangeLog,v 1.8 2010/06/16 05:56:39 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/qtoctave/ChangeLog,v 1.9 2010/06/16 15:30:24 bicatali Exp $
+
+  16 Jun 2010; Sébastien Fabbro <bicatali@gentoo.org>
+  qtoctave-0.9.1.ebuild, +files/qtoctave-0.9.1-qtinfo.patch:
+  Added patch from Fedora to avoid collision with libquicktime, bug #324217,
+  thanks ssuominen
 
 *qtoctave-0.9.1 (16 Jun 2010)
 
diff --git a/sci-mathematics/qtoctave/Manifest b/sci-mathematics/qtoctave/Manifest
index 3f642ed6142e..327e2e48eaee 100644
--- a/sci-mathematics/qtoctave/Manifest
+++ b/sci-mathematics/qtoctave/Manifest
@@ -4,18 +4,19 @@ Hash: SHA1
 AUX qtoctave-0.8.1-gcc4.4.patch 410 RMD160 971ffd6ea7641b129a681d0011e73de0cd217c8e SHA1 6f2a693a59a963d92b788211065eb492027efce5 SHA256 c6e8ad6fa19758bc3de11430f124fe86214fcef9cb76b5c2f328f7838bd680e5
 AUX qtoctave-0.9.1-doc-path.patch 999 RMD160 80de26d5be7404b36886f309c23847c30c09a08e SHA1 ca3ca1c6fe91b9c6a58b0fa022ea32a131338501 SHA256 a6d2026fb2bf5a633cba73ec68ae91f4cbe42be75c1def17f3c3104bcf2de50b
 AUX qtoctave-0.9.1-qt-version.patch 730 RMD160 5138ec093731f0284c0d3a6a026444ca6ce2d3ec SHA1 8d51a0d5f831999989f710878f840f50d3f9eea3 SHA256 50ab3eebbe994ee042094ef928938405a4094f2805916c1ced12a825f2a267b2
+AUX qtoctave-0.9.1-qtinfo.patch 791 RMD160 b8600f6775492038110209089ab179fb4263b9d0 SHA1 cd65605c27d100f19f4585bf0488a3795cfa0851 SHA256 b67a05e0f1b6f3bd999c9c29a515c137f3e445e562892702f3e48298f26abba7
 DIST qtoctave-0.8.1.tar.gz 1707919 RMD160 41bb670f630ce08ce5b440b2c8dbe16fdbe282b0 SHA1 e7cb555eed318c0e62b2de974e5904e40579d2c4 SHA256 d5654f5aaa2ea86b473accb49cea4a85c2899d2822fe4c3d980f0260bbe87498
 DIST qtoctave-0.8.2.tar.gz 4554545 RMD160 18cedfecea53d4c86b46ebc8474a6e2b6ebee313 SHA1 d2aed8be03fb77d0f37cc72b7cd74ff7c73934dd SHA256 f7c42f0c215209e3f3faf98bed366afa49969a66a01a5733d83ce38118a0f1a3
 DIST qtoctave-0.9.1.tar.bz2 3335725 RMD160 9e4725cc2a52cfe9b7ec1e1b74becba8146b74f0 SHA1 1d18058c7549a3f25cd648183db3d99ef755257e SHA256 dd54c1dda166811e1ab32043211e37b803135b01d5f7d9101e85300ea9cfc986
 EBUILD qtoctave-0.8.1.ebuild 891 RMD160 06331169ffbe1d060761bcc2e557e72e12b6d582 SHA1 6350b6816d197f967ad3d4767d806cace098a265 SHA256 8ac66aeff417bded48c07ce9f53b36264822a6c74e3b89f7d185207804ec7c14
 EBUILD qtoctave-0.8.2.ebuild 875 RMD160 a3a07a030b862d2c72b607d0221498c38885bc00 SHA1 8863ae3714939fab42be529168a938145a8261b1 SHA256 0e4ff25095270e85a16c99b0d9dad0faf790338eb946eaa1d5d7f41a59325292
-EBUILD qtoctave-0.9.1.ebuild 958 RMD160 197508e50c07f53fd81dee0253dd82281e904e74 SHA1 20889b52a9026512583daea81862188b4820acba SHA256 072220969e6e3a371a0f88c5152508c4df95c68475850d7b2fae705d72c1a3b5
-MISC ChangeLog 1465 RMD160 177b65f2d02bf284568f209907c803a0bb11d167 SHA1 76d68271216e9ce75e33e595425f2ce8b1229eff SHA256 96924886647689a0f9a783fc5f8ef8552d894803a65f82f2aa56932a343ab67b
+EBUILD qtoctave-0.9.1.ebuild 1005 RMD160 2472b560bbd7012f270dd34ee9f652d442ca2416 SHA1 4fe18961b5c68d7a29942add733051cd1b887d89 SHA256 c4f61a1cd86898c408746b714f19e87125158814944aa52d21ab570eab66176b
+MISC ChangeLog 1678 RMD160 d7d5cd2c4220d19f47899e28f4870c224d3fe7bc SHA1 4257670bfc8d031886f504b62437b973af82253a SHA256 fb14ff7618be9a90237e47eae43a7e1ee1669f82914712b5db84536569b1224e
 MISC metadata.xml 168 RMD160 d98790cf055dc0f820c63d65f485b9dcfa8950f4 SHA1 95c9e4f7368f82053d631bbcd469612c92ca13cb SHA256 c0cc8d6ab9385750af753ddc504299ed90a70b5c4c655f6c77d865917a8829c9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwYZ6AACgkQ1ycZbhPLE2BVPwCfSZoCXQKPjMmeIvoqqUNJ4n20
-JEAAmgLEXUxX2BfJlCH9KPW7S97qcGqV
-=lOiO
+iEYEARECAAYFAkwY7hkACgkQ1ycZbhPLE2CKYACglY4uVQepOSWmyDyOGEblgJoF
+6k0AnRj2Y89uND4RoWl5pwCRtdW/ywtT
+=i4LJ
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/qtoctave/files/qtoctave-0.9.1-qtinfo.patch b/sci-mathematics/qtoctave/files/qtoctave-0.9.1-qtinfo.patch
new file mode 100644
index 000000000000..e6c632edd163
--- /dev/null
+++ b/sci-mathematics/qtoctave/files/qtoctave-0.9.1-qtinfo.patch
@@ -0,0 +1,20 @@
+--- qtoctave-0.9.1/qtinfo/CMakeLists.txt	2010-01-25 15:19:51.000000000 +0200
++++ qtoctave-0.9.1/qtinfo/CMakeLists.txt	2010-05-09 16:02:41.000000000 +0300
+@@ -33,6 +33,7 @@
+ 	PROPERTIES INSTALL_RPATH ":usr/lib"
+ 	BUILD_WITH_INSTALL_RPATH true
+ 	INSTALL_RPATH_USE_LINK_PATH true
++	OUTPUT_NAME qtoctave-info
+ )
+ 
+ TARGET_LINK_LIBRARIES(qtinfo 
+--- qtoctave-0.9.1/qtoctave/src/scripts_octave/qtinfo.m	2010-01-25 15:19:50.000000000 +0200
++++ qtoctave-0.9.1/qtoctave/src/scripts_octave/qtinfo.m	2010-05-09 16:02:19.000000000 +0300
+@@ -1,5 +1,5 @@
+ function qtinfo()
+-	command=sprintf("qtinfo %s > /dev/null", info_file);
++	command=sprintf("qtoctave-info %s > /dev/null", info_file);
+ 	printf("Starting info: %s\n", command);
+ 	system(command, 1, "async");
+ endfunction
+\ No newline at end of file
diff --git a/sci-mathematics/qtoctave/qtoctave-0.9.1.ebuild b/sci-mathematics/qtoctave/qtoctave-0.9.1.ebuild
index a684b7ac5950..1256fc25cf18 100644
--- a/sci-mathematics/qtoctave/qtoctave-0.9.1.ebuild
+++ b/sci-mathematics/qtoctave/qtoctave-0.9.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/qtoctave/qtoctave-0.9.1.ebuild,v 1.1 2010/06/16 05:56:39 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/qtoctave/qtoctave-0.9.1.ebuild,v 1.2 2010/06/16 15:30:24 bicatali Exp $
 
 EAPI="2"
 
@@ -28,6 +28,7 @@ S="${WORKDIR}/${P}"
 DOCS="readme.txt leeme.txt"
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.9.1-qtinfo.patch
 	epatch "${FILESDIR}"/${PN}-0.9.1-qt-version.patch
 	epatch "${FILESDIR}"/${PN}-0.9.1-doc-path.patch
 	epatch "${FILESDIR}"/${PN}-0.8.1-gcc4.4.patch