Fix bug #284073, Use pkgconfig to determine XPCOM_IDL_DIR instead of non-portable construct which fix building against xulrunner-1.9.0, many thanks to Chi-Thanh Christopher Nguyen <chithanh@cs.tu-berlin.de>, Add >=sys-devel/libtool-2 in RDEPEND (not portable to libtool-1)

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

4 files changed, 36 insertions, 5 deletions

diff --git a/www-plugins/gnash/ChangeLog b/www-plugins/gnash/ChangeLog
index 00c11fe3c004..9762d0826851 100644
--- a/www-plugins/gnash/ChangeLog
+++ b/www-plugins/gnash/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-plugins/gnash
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.8 2009/09/09 10:17:48 mrpouet Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.9 2009/09/09 10:35:30 mrpouet Exp $
+
+  09 Sep 2009; Romain Perier <mrpouet@gentoo.org>
+  gnash-0.8.5.ebuild, +files/gnash-0.8.5-xpcom-idldir.patch:
+  Fix bug #284073, Use pkgconfig to determine XPCOM_IDL_DIR instead of
+  non-portable construct which fix building against xulrunner-1.9.0, many
+  thanks to Chi-Thanh Christopher Nguyen <chithanh@cs.tu-berlin.de>, Add
+  >=sys-devel/libtool-2 in RDEPEND (not portable to libtool-1).
 
   09 Sep 2009; Romain Perier <mrpouet@gentoo.org>
   gnash-0.8.5.ebuild:
diff --git a/www-plugins/gnash/Manifest b/www-plugins/gnash/Manifest
index c706d64d912a..4468d3f922c7 100644
--- a/www-plugins/gnash/Manifest
+++ b/www-plugins/gnash/Manifest
@@ -1,10 +1,11 @@
 AUX gnash-0.8.3-boost-dynamic-link.patch 1474 RMD160 0ce418d9e7a0f4d5b3bc724c65dedc3c675b69ef SHA1 df6ae427a0efda13da822ca65700aebcb25ef504 SHA256 d3ada2ca33083b0b233051f66041eb57c402783b2cc177b126e4dccab2e32b76
 AUX gnash-0.8.5-klash.patch 4219 RMD160 f7d49ca32cf18d3d160ce8f0653fd12e5a278511 SHA1 fc44e119975ecc49d2d64450e0eeb92f6a84f893 SHA256 e1ad6b241bc28892ff9758d55851439b2b61b496dc2e73d96d9a13fdd44a4a08
 AUX gnash-0.8.5-moc-qt4.patch 622 RMD160 7143ab1170f536ed35b618740723ff823859e2bd SHA1 24ee33fa3aaed598e48ed6dcdadf94dcdeace588 SHA256 a10cce240d2b241f90523042cd464b81cda0b4e00fd4408f7b421e9a12e18702
+AUX gnash-0.8.5-xpcom-idldir.patch 740 RMD160 2e01374e5ae5a69218160fb3abbbceff67f2445b SHA1 b6b357d66eb0fb554a0b2933eac79e2a1a43f42e SHA256 d7d8919681cda058bccbd165f652b06a70681ed424a43b347e1a13f59172f460
 AUX gnash-0.8.5-xpidl-sdkdir.patch 1014 RMD160 21b49bccc13af7159d3b81a72b3c82f0daf98eb8 SHA1 c9092cde8baff0c184c961d3b2434740c1dc0a7d SHA256 d7682af2cc466e571fc9d59d0fbd305f087d8e4676f489977ca17c2ad306d6b3
 DIST gnash-0.8.4.tar.bz2 2887666 RMD160 0557eee847f6dd625714d6659058ff7e6c4cec56 SHA1 342d7776d06d11b964546b2b4ebec1864ee717d8 SHA256 6ffe4bdbc22de712e59205a27b46aa93a5372c67829c7f02d6b1c1778e9f9224
 DIST gnash-0.8.5.tar.bz2 3335797 RMD160 8ef599237c3162f9f28459855e4729d400bd4304 SHA1 26304322728d10dda1a0da2951946d981a507ca6 SHA256 16f272214eed2ab50bcd9507d6299b82ed7d20e7e8eb253ab160e594eeb210b3
 EBUILD gnash-0.8.4.ebuild 6134 RMD160 a81e3d22fcbc393e48d6dd3d87c488b7ce8d2e77 SHA1 558c58a7a05a29a4bbdd2aaa883f85ce8f1097b9 SHA256 8ed92a7606fc2bdb651e192c59e1d7f77b86d214d5e68c97ab3a779fb79096df
-EBUILD gnash-0.8.5.ebuild 6397 RMD160 ed38074993f14eac74a80a3137538c800fdf1b66 SHA1 084c5b1902dfb5abbed61b9be3f804f2e11da957 SHA256 5694cb74dd3a8f64fda210fa8f705a7a1726a29aee474cbaae2846987275fdcc
-MISC ChangeLog 13648 RMD160 a7524c9960838ea514043a7bdc377428f73b5a14 SHA1 77940175861150dedc6de60bbdf0922e9bdd45fb SHA256 df94fe8298296e62acad2f903fc5229eab11f62791fd8cfc7dcb6d3dd49c4e93
+EBUILD gnash-0.8.5.ebuild 6604 RMD160 1061fbfdd65ba9f5893028c03f2113a58d2db0b4 SHA1 6820fddca81ac4e2d3d85aadc7544e798bca9c40 SHA256 1732d6f5978c2d00c0a2c8d9549b9fb676ddbe71008f31372441ca910071ca36
+MISC ChangeLog 14042 RMD160 9cae602dcdac42a784e28a514609d17450401f1d SHA1 257d4f8b87e5fdafe954516ab247ad4e748be233 SHA256 479a14d08a905118018b2852c84179165ad11108a78974168f2dbc653db47042
 MISC metadata.xml 433 RMD160 b9b12038d73201f5cec72a81881d3be95b7c40a2 SHA1 8f6ed8f430d3077c2ece0e360e8134fff37ae44c SHA256 f2d11f160b69884291221f4c12016396b16f5e80602407e6048c34a6305983e2
diff --git a/www-plugins/gnash/files/gnash-0.8.5-xpcom-idldir.patch b/www-plugins/gnash/files/gnash-0.8.5-xpcom-idldir.patch
new file mode 100644
index 000000000000..cdea85df2570
--- /dev/null
+++ b/www-plugins/gnash/files/gnash-0.8.5-xpcom-idldir.patch
@@ -0,0 +1,18 @@
+Author: Chi-Thanh Christopher Nguyen <chithanh@cs.tu-berlin.de>
+Subject: Use pkg-config to determine XPCOM_IDL_DIR instead of non-portable construct.
+Bug: #284073
+
+---
+
+diff -ur a/macros/xpcom.m4 b/macros/xpcom.m4
+--- a/macros/xpcom.m4	2009-03-02 16:29:48.000000000 +0100
++++ b/macros/xpcom.m4	2009-09-08 22:02:21.548228034 +0200
+@@ -102,7 +102,7 @@
+ 
+   if test x"${ac_cv_path_xpcom_incl}" != x; then
+     XPCOM_CFLAGS="${ac_cv_path_xpcom_incl}"
+-    XPCOM_IDL_CFLAGS=`echo $XPCOM_CFLAGS | sed -e 's:include:share/idl:'`
++    XPCOM_IDL_CFLAGS="-I`$PKG_CONFIG --variable=idldir libxul`/unstable"
+     XPIDL=$(pkg-config libxul --variable=sdkdir)
+     XPIDL="${XPIDL}xpidl"
+     AC_DEFINE([HAVE_XPCOM], [1], [Use XPCOM in the NPAPI plugin])
diff --git a/www-plugins/gnash/gnash-0.8.5.ebuild b/www-plugins/gnash/gnash-0.8.5.ebuild
index d35248afbdeb..e5f31cfa86c3 100644
--- a/www-plugins/gnash/gnash-0.8.5.ebuild
+++ b/www-plugins/gnash/gnash-0.8.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.5.ebuild,v 1.4 2009/09/09 10:17:48 mrpouet Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.5.ebuild,v 1.5 2009/09/09 10:35:30 mrpouet Exp $
 
 EAPI="2"
 KDE_REQUIRED="optional"
@@ -56,7 +56,8 @@ RDEPEND=">=dev-libs/boost-1.35.0
 	sdl? ( media-libs/libsdl[X] )
 	nsplugin? ( net-libs/xulrunner:1.9 )
 	speex? ( media-libs/speex[ogg] )
-	zlib? ( sys-libs/zlib )"
+	zlib? ( sys-libs/zlib )
+	>=sys-devel/libtool-2.2"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	nls? ( sys-devel/gettext )
@@ -98,6 +99,10 @@ src_prepare() {
 	# Defines $(XPIDL) correctly using sdkdir variable from libxul.pc
 	epatch "${FILESDIR}"/${P}-xpidl-sdkdir.patch
 
+	# Use pkgconfig to determine XPCOM_IDL_DIR instead of non-portable construct.
+	# Fixes building against xulrunner-1.9.0, bug #284073.
+	epatch "${FILESDIR}"/${P}-xpcom-idldir.patch
+
 	# Resurect patch from bug #230287
 	epatch "${FILESDIR}"/${PN}-0.8.3-boost-dynamic-link.patch