Fix kde multilib library path, bug #391283.

Package-Manager: portage-2.2.0_alpha77/cvs/Linux x86_64

4 files changed, 27 insertions, 4 deletions

diff --git a/www-plugins/gnash/ChangeLog b/www-plugins/gnash/ChangeLog
index 08e90d58e011..bca9fd865f5d 100644
--- a/www-plugins/gnash/ChangeLog
+++ b/www-plugins/gnash/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-plugins/gnash
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.67 2011/11/21 21:30:22 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.68 2011/11/25 17:39:19 chithanh Exp $
+
+*gnash-0.8.9-r2 (25 Nov 2011)
+
+  25 Nov 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  -gnash-0.8.9-r1.ebuild, +gnash-0.8.9-r2.ebuild,
+  +files/gnash-0.8.9-kde4-libdir.patch:
+  Fix kde multilib library path, bug #391283.
 
 *gnash-0.8.9-r1 (21 Nov 2011)
 
diff --git a/www-plugins/gnash/Manifest b/www-plugins/gnash/Manifest
index 3c7d13bf0caf..e3762c386d29 100644
--- a/www-plugins/gnash/Manifest
+++ b/www-plugins/gnash/Manifest
@@ -11,6 +11,7 @@ AUX gnash-0.8.9-documentation-paths.patch 623 RMD160 cdf0bb4cc4626bd50ab32c5a191
 AUX gnash-0.8.9-external-dejagnu.patch 700 RMD160 b24901796187f5b9ee2a27b60c0232884302af69 SHA1 5dc178479f5ad2aa1eb0d5314df0bec505708890 SHA256 b838af0304d41165557dff2538031edf8d14d5a221375aff4b9e404ef1cb261d
 AUX gnash-0.8.9-ffmpeg-detection.patch 780 RMD160 a7b02c2472b3bf2b8618e5d6d4203e8f30cc8aea SHA1 e6cfed32780546bc68acce66fb5da5fc64627585 SHA256 09bcb58f61d05a582206c82f789484471565f955e8daa6e852c62bca87624353
 AUX gnash-0.8.9-find-openvg.patch 465 RMD160 774f6ab0a42df1172c17f089d9c72502db6cb0bf SHA1 de8bb98460c0b37a75389c35b3e06500c4e10e15 SHA256 27d0cffa642c4eccaf894bcea590473db24462b6cd792827bdccc52653207b8b
+AUX gnash-0.8.9-kde4-libdir.patch 498 RMD160 5e09d4adc1953b6149e2deffeeb74e3860adf19e SHA1 30f32d37e713b2dd1ffc88df99ff54f608ceb61a SHA256 43a74367b0f7452bed23577ddda2bde692b6ce4d2bd1d56e480c4d37380af80d
 AUX gnash-0.8.9-klash.patch 471 RMD160 578a467c276884179a9110a18f381f46b2874157 SHA1 c480de3a87f409cbc1c1af499a304b020303fe83 SHA256 779f4be4eb25f654010b380fea4d6b092310d1f850acb040a203a7b8caf02bb8
 AUX gnash-0.8.9-libavcodec-version.patch 3181 RMD160 21473691da492c6da4c92718d7397cb7541d4747 SHA1 8cdfa8389ff0d4c84c92777f50c432cdecff4ad8 SHA256 8ec3d55aaa6fc1806b858387b9ccd5364e8bf4e21283a1156801c6c2d03e8daf
 AUX gnash-0.8.9-look-harder-for-version_h.patch 554 RMD160 6cb606cc740961433e69016f7dc8be41ab578d14 SHA1 d39135a9d6aa15a63b1b695d7eccfdb175880e39 SHA256 2e6436c021e7c2ebfe03935c8f18a10cc64810c5a5b55f0e05ef20935157f93f
@@ -22,7 +23,7 @@ AUX gnash-0.8.9-no-deprecated-avformat-metadata.patch 1299 RMD160 a88e744b8886ad
 DIST gnash-0.8.8.tar.bz2 3850383 RMD160 621afbd14180ce770f60a6e158f9fda0b4d5ec02 SHA1 d349e0321e7fe9abcd265d63ce282cd2a7ce59d3 SHA256 dcac4b81f81ecd6cc7c5422d7c731fc5c2a7be7fb18b5570a7e6f8fb5fc6e220
 DIST gnash-0.8.9.tar.bz2 3777140 RMD160 34bb51cfe5b8593dc14bc2c21c0085277dbb23f1 SHA1 585c320c98b3304fcbba230f2c4b1fdf2a52aee0 SHA256 f90dbdc6f03d787b239b9edacbea077b46d69ae9d85f08af23f256af389c48bd
 EBUILD gnash-0.8.8.ebuild 9006 RMD160 cd9a10d9b7b121b638bac179c97de26771e66542 SHA1 f6b0ae7862286aabbbd34e99a318021136ae33bc SHA256 594842337ae216fa7a89112298f00e2a1c74609af4a4b48f3e39b4b2dc82b380
-EBUILD gnash-0.8.9-r1.ebuild 8916 RMD160 8f2081fcfbcbe6ea561b63098568ec6fdedad7e6 SHA1 c63eec17ef3431952e13786bfaf79383b07701f4 SHA256 dfb35f6260eeab8cb28092b31385963020a5f1e75ff43235825a379033421979
+EBUILD gnash-0.8.9-r2.ebuild 9015 RMD160 1cf36f01e3b3772b8e31b090c0e69430185d81e5 SHA1 c13b75f4bbabda3410db9b845adae4eafbd6b741 SHA256 847e31d3afd8d07b788993a8fd5f59e1904744cef5c030e08ad505b1b786b2ab
 EBUILD gnash-0.8.9.ebuild 8830 RMD160 b3e6ab1a6a6ce84c502af1647e4e58b65e110809 SHA1 f6fd90d100132b8658428cf3cafc8cbe6bec1c8d SHA256 8a3c33a3a82619f22863e32fb83e264193cfe94132491535fb919a9ed863478a
-MISC ChangeLog 25149 RMD160 1c2a9e61436d241ba7411f2122ece7d74a9f47c1 SHA1 919683de340058a48d8de86ea417714d869f46d9 SHA256 0323711b0d327d16a2efe8f995036c5b8bc39dbd3f8a2f17a59f233de9912c90
+MISC ChangeLog 25386 RMD160 1926178629d8069a833f128b8e74452c4233ae24 SHA1 8818e665256c31bd4a830b939c2f9abf74011cf1 SHA256 448597ef4f5d5b05c35a43e111b6dab6ba9e0814183f186e504705a4e2b3bf0b
 MISC metadata.xml 876 RMD160 c66baf8ded1d751eda1c55992f39a189931f1a9f SHA1 bc490cb83a3ed47c561f2975c61400c8bc867be4 SHA256 b087a4196095d60ce0949b9374c4077322aca887bd6e0019c5dc34762d199152
diff --git a/www-plugins/gnash/files/gnash-0.8.9-kde4-libdir.patch b/www-plugins/gnash/files/gnash-0.8.9-kde4-libdir.patch
new file mode 100644
index 000000000000..b3279441d2f0
--- /dev/null
+++ b/www-plugins/gnash/files/gnash-0.8.9-kde4-libdir.patch
@@ -0,0 +1,12 @@
+diff -ur a/macros/kde4.m4 b/macros/kde4.m4
+--- a/macros/kde4.m4	2011-02-26 19:11:08.000000000 +0100
++++ b/macros/kde4.m4	2011-11-25 18:09:25.000000000 +0100
+@@ -198,7 +198,7 @@
+       if test -d ${KDE4_PREFIX}/lib64 -a -f /etc/redhat-release; then
+         KDE4_PLUGINDIR="${KDE4_PREFIX}/lib64/kde4"
+       else
+-        KDE4_PLUGINDIR="${KDE4_PREFIX}/lib/kde4"
++        KDE4_PLUGINDIR="${KDE4_PREFIX}/${acl_libdirstem}/kde4"
+       fi
+     fi
+     if test x"${with_kde4_servicesdir}" != x ; then 
diff --git a/www-plugins/gnash/gnash-0.8.9-r1.ebuild b/www-plugins/gnash/gnash-0.8.9-r2.ebuild
index 2ad7855b3c97..e0cb2a913916 100644
--- a/www-plugins/gnash/gnash-0.8.9-r1.ebuild
+++ b/www-plugins/gnash/gnash-0.8.9-r2.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/www-plugins/gnash/gnash-0.8.9-r1.ebuild,v 1.1 2011/11/21 21:30:22 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.9-r2.ebuild,v 1.1 2011/11/25 17:39:19 chithanh Exp $
 
 EAPI=3
 CMAKE_REQUIRED="never"
@@ -171,6 +171,9 @@ src_prepare() {
 	# Fix building on ppc64, bug #342535
 	use ppc64 && append-flags -mminimal-toc
 
+	# Fix kde multilib library path, bug #391283
+	epatch "${FILESDIR}"/${PN}-0.8.9-kde4-libdir.patch
+
 	# Fix security bug #391283
 	epatch "${FILESDIR}"/${PN}-0.8.9-cve-2011-4328.patch