Ship a copy of custom libxul.pc in order to use Firefox 6.0 headers.

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

diff --git a/www-plugins/gecko-mediaplayer/ChangeLog b/www-plugins/gecko-mediaplayer/ChangeLog
index b9902f2da49812294b04ffb5c06994e1072a5fdd..3beb6827783c9612bc383948358d31b67b8b98ca 100644 (file)
--- a/www-plugins/gecko-mediaplayer/ChangeLog
+++ b/www-plugins/gecko-mediaplayer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-plugins/gecko-mediaplayer
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gecko-mediaplayer/ChangeLog,v 1.51 2011/07/12 15:02:00 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gecko-mediaplayer/ChangeLog,v 1.52 2011/09/13 14:05:38 ssuominen Exp $
+
+  13 Sep 2011; Samuli Suominen <ssuominen@gentoo.org>
+  gecko-mediaplayer-1.0.4.ebuild, +files/libxul.pc:
+  Ship a copy of custom libxul.pc in order to use Firefox 6.0 headers.
 
   12 Jul 2011; Thomas Kahle <tomka@gentoo.org>
   gecko-mediaplayer-1.0.3-r1.ebuild:

diff --git a/www-plugins/gecko-mediaplayer/Manifest b/www-plugins/gecko-mediaplayer/Manifest
index c413d36ecf212460caa4ada470f9deffc158c283..f96405d9adcbdce39c6e11b21fd2a83bbdbdb7f8 100644 (file)
--- a/www-plugins/gecko-mediaplayer/Manifest
+++ b/www-plugins/gecko-mediaplayer/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX libxul.pc 140 RMD160 56c10d614aecace08c9a30eb05b7da4ef61c0da7 SHA1 e6f231aab8c89111f5429546be90776e61895cf5 SHA256 46832fa41d737a7d6834d83205dda103b05e8cb7e01cd6813af0a09761cc3484
 DIST gecko-mediaplayer-1.0.0.tar.gz 263320 RMD160 218134c088669ae15ab12b7f008d988af3eba308 SHA1 702fbb47b45b92fcffbcd324983e96a8027bc075 SHA256 d0e5d6516c943de2257661d4718c91aa878e243d3fa891a121e99c887929499e
 DIST gecko-mediaplayer-1.0.3.tar.gz 271546 RMD160 4c13ee90d38382454b2d126f5d263e72a5adb0ca SHA1 48198a321504b11f53c563bceeac1bc3dc4b4058 SHA256 0c91f1e5f4f245558201b5088913a58203d423a95795323f7cfcc530920cdda2
 DIST gecko-mediaplayer-1.0.4.tar.gz 275024 RMD160 163dd0363a8369c66fa04533791e1977c1fd0d7b SHA1 1ad7de0a3ac5a9fa4680228f1b5f58831a8079f9 SHA256 575f4dfe4c06013c4f4a7b45eae9d1127b6d3299e570ce3a1b603c8b75ef5aa1
 EBUILD gecko-mediaplayer-1.0.0.ebuild 1370 RMD160 8a8bc6e744da002ced98ca8864d1d760895552f3 SHA1 2a7ec3dfba9d599a7a55a718d15070c669bdb295 SHA256 976a85d5f82f4d383c394516a05184eebe8735e32a1c4d094f04c1e93e52cab8
 EBUILD gecko-mediaplayer-1.0.3-r1.ebuild 1037 RMD160 a2434c5b33ff548977cb7994d0f593c1c9a59f64 SHA1 e9b6ece8e9a36b9bb76cd0f6d7b59bdbe9a5863b SHA256 835eaa6e49dbcef4894de6ccf0804570b06132bb565881d9c234e3d88c416ed9
-EBUILD gecko-mediaplayer-1.0.4.ebuild 1037 RMD160 646196cbdb4b4b7346ca7e13659aeca178c3aedc SHA1 995e91dbc7b9c08afa342bc9c9ed4119abfe0926 SHA256 bdffb4408f890f3fd0ac7a94a4eb3a67e7c5eab3ae39a1e90ce2c9de45b02821
-MISC ChangeLog 9471 RMD160 aec013a069852d3d044d60a87a6a1dad7cf0061c SHA1 999ae73f218172dad38858d10c4b4f0df312ab3e SHA256 0bf12b17ca38a5e4062b348f0b0afaaa54c0fb8b95cd2878caffce6f0e8b30c3
+EBUILD gecko-mediaplayer-1.0.4.ebuild 1174 RMD160 673f1d375c4cbee8f8f7a15f345848c167f64a0c SHA1 23417219dd3e2311d243dbaa47d0c374866cf243 SHA256 44736dfdff3e633deb17394838d69f59ccc84046fdd0ffc672bea963f62a6cce
+MISC ChangeLog 9653 RMD160 59c895cd4b3a62287a0fdc9c0e1a4cd42e961085 SHA1 24a2107d3167ce95a2ee95d2dbdeba70d8e80a1c SHA256 5ddc821bb378cd9fbf772025d8c458b50c2d61fb97935e8941f1ec9c41393098
 MISC metadata.xml 228 RMD160 3071d739d8e15041d594882afdfc434453568466 SHA1 06e3ee83b7a5a910d2d63ea77afb2e5a292606f6 SHA256 060670a1a67923937e4bf55598ae59368d5e716b0b618dedaf12b15f45e8e234
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk4cYc8ACgkQodBTJSDyo66C7AD/c97bSw9nuPPWrVT6wtFOFP+C
-fjPhJ2JxTvCbP05dzIoA/2bb/dykbBymLS8r4RBcV/E7zsHo1oEgEujCKINmVPMP
-=eBWI
+iF4EAREIAAYFAk5vY2cACgkQXkR9YqOcLPG9AgD+P+plBJnOBfojcsNCjI8HJmEZ
+KtO0Jc3x34UUHStnxmQA/3V8BHI8zA3YC7Fp8kCqoU0cDWbh+05gLVNpViGP5qj9
+=QGAG
 -----END PGP SIGNATURE-----

diff --git a/www-plugins/gecko-mediaplayer/files/libxul.pc b/www-plugins/gecko-mediaplayer/files/libxul.pc
new file mode 100644 (file)
index 0000000..bca5b63
--- /dev/null
+++ b/www-plugins/gecko-mediaplayer/files/libxul.pc
@@ -0,0 +1,5 @@
+Name: libxul
+Description: The Mozilla Runtime and Embedding Engine
+Requires: nspr
+Version: 6.0
+Cflags: -I/usr/include/firefox -fshort-wchar

diff --git a/www-plugins/gecko-mediaplayer/gecko-mediaplayer-1.0.4.ebuild b/www-plugins/gecko-mediaplayer/gecko-mediaplayer-1.0.4.ebuild
index 36bb318217e1f7e817ff63dd138427978b255d61..c79690f4581bed982a0086def182b15bb64b82f0 100644 (file)
--- a/www-plugins/gecko-mediaplayer/gecko-mediaplayer-1.0.4.ebuild
+++ b/www-plugins/gecko-mediaplayer/gecko-mediaplayer-1.0.4.ebuild
@@ -1,10 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gecko-mediaplayer/gecko-mediaplayer-1.0.4.ebuild,v 1.1 2011/07/04 14:15:54 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gecko-mediaplayer/gecko-mediaplayer-1.0.4.ebuild,v 1.2 2011/09/13 14:05:38 ssuominen Exp $
 
 EAPI=4
 inherit multilib nsplugins
 
+_fxver=6.0
+
 DESCRIPTION="A browser plugin that uses GNOME MPlayer"
 HOMEPAGE="http://code.google.com/p/gecko-mediaplayer/"
 SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
@@ -18,7 +20,7 @@ RDEPEND=">=dev-libs/dbus-glib-0.92
        >=dev-libs/glib-2.26:2
        dev-libs/nspr
        >=media-video/gnome-mplayer-1.0.4[dbus]
-       >=net-libs/xulrunner-1.9.2:1.9
+       || ( >=www-client/firefox-${_fxver} >=net-libs/xulrunner-1.9.2:1.9 )
        curl? ( net-misc/curl )
        !www-client/chromium"
 DEPEND="${RDEPEND}
@@ -28,6 +30,8 @@ DEPEND="${RDEPEND}
 DOCS="ChangeLog DOCS/tech/javascript.txt"
 
 src_configure() {
+       has_version ">=www-client/firefox-${_fxver}" && export PKG_CONFIG_PATH="${FILESDIR}"
+
        econf \
                --without-gconf \
                --with-gio \