Remove support for building against xulrunner from www-client/firefox wrt #390729 by Billy DeVincentis

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

4 files changed, 17 insertions, 22 deletions

diff --git a/www-plugins/gecko-mediaplayer/ChangeLog b/www-plugins/gecko-mediaplayer/ChangeLog
index eab7b47b8d50..4d12a7f2581a 100644
--- a/www-plugins/gecko-mediaplayer/ChangeLog
+++ b/www-plugins/gecko-mediaplayer/ChangeLog
@@ -1,6 +1,11 @@
 # 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.57 2011/11/18 15:33:06 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gecko-mediaplayer/ChangeLog,v 1.58 2011/11/18 15:35:03 ssuominen Exp $
+
+  18 Nov 2011; Samuli Suominen <ssuominen@gentoo.org>
+  gecko-mediaplayer-1.0.4.ebuild, -files/libxul.pc:
+  Remove support for building against xulrunner from www-client/firefox wrt
+  #390729 by Billy DeVincentis
 
   18 Nov 2011; Samuli Suominen <ssuominen@gentoo.org>
   -gecko-mediaplayer-1.0.0.ebuild, -gecko-mediaplayer-1.0.3-r1.ebuild:
diff --git a/www-plugins/gecko-mediaplayer/Manifest b/www-plugins/gecko-mediaplayer/Manifest
index 19ec5055f5b1..d738c2b2797a 100644
--- a/www-plugins/gecko-mediaplayer/Manifest
+++ b/www-plugins/gecko-mediaplayer/Manifest
@@ -1,21 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX libxul.pc 140 RMD160 56c10d614aecace08c9a30eb05b7da4ef61c0da7 SHA1 e6f231aab8c89111f5429546be90776e61895cf5 SHA256 46832fa41d737a7d6834d83205dda103b05e8cb7e01cd6813af0a09761cc3484
 DIST gecko-mediaplayer-1.0.4.tar.gz 275024 RMD160 163dd0363a8369c66fa04533791e1977c1fd0d7b SHA1 1ad7de0a3ac5a9fa4680228f1b5f58831a8079f9 SHA256 575f4dfe4c06013c4f4a7b45eae9d1127b6d3299e570ce3a1b603c8b75ef5aa1
 DIST gecko-mediaplayer-1.0.5b1.tar.gz 260120 RMD160 30722136572f350400220d08ff58cd98f74aae15 SHA1 c5e8e927325b7503d8dc082407a89177ef93874e SHA256 1fb2dc17060e9748ead2e0ad2b37824e48c529af4718e939dbff5b8f5736f973
-EBUILD gecko-mediaplayer-1.0.4.ebuild 1162 RMD160 7e5d3fbc57c275106a78da2daea331c7e5ebd3ae SHA1 b3c401f9453916ce03cf04d3f694c2711d2b75b5 SHA256 efbdac228a3feae0ae67aa9add16c0bb317972f4b803bdaca97c9bb72249b6d8
+EBUILD gecko-mediaplayer-1.0.4.ebuild 1028 RMD160 1e0ed695f83e14dbfa8c5ff77ff9fe22426858a8 SHA1 79770fca19104ab946f60e8f299a5b6afb145599 SHA256 a9ea8edae70d82a1f1c6350756028c8184a14913577a00c86161094e82bf19b8
 EBUILD gecko-mediaplayer-1.0.5_beta1.ebuild 1047 RMD160 f699bce98a7ef20641b0972d33df42efc1ece70d SHA1 fb181be1dcc0af5b0a5f271f8c014116703e3ee0 SHA256 91e5795d505c892938eb7a6027e49f0efe81423c887445020748804edbb20110
-MISC ChangeLog 10341 RMD160 a6e791b4a310a6f150e83edc854a25f822a7bcec SHA1 516f4dc214defbe7e315a8cf72c7edcc74435cd5 SHA256 40a59d6061684fd907bad4545825ec42aa56d8170722de07c321dbd1cdedc658
+MISC ChangeLog 10555 RMD160 ed6b460cdf6ce29d04155333956acf0c9db21b2a SHA1 eda84fda9e2dbbea88dd9e182273f44ce404f715 SHA256 a23ce9be3320f7b95ec2a90f7263b4fe4b0e043818026c9dd3c78b2f758c9099
 MISC metadata.xml 228 RMD160 3071d739d8e15041d594882afdfc434453568466 SHA1 06e3ee83b7a5a910d2d63ea77afb2e5a292606f6 SHA256 060670a1a67923937e4bf55598ae59368d5e716b0b618dedaf12b15f45e8e234
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOxnpUAAoJEEdUh39IaPFNTuMH/3SrRz/QSGVD2vOpILXYesaD
-78ZqpNZjFHZfmlI8rMsig3Uv+4KQOgPFi6JAWl6lZGNFlQjPhX8dmU21VxYBlE1v
-dJ9wJuotwtXqhh5lSnjkXi4HDL7oelcsEou9pfQ5j8sycMB5Blj4uvKf9w5Kuan8
-decCmK2BQnJdXwQ12jtwdzjpO8SdF45LobATFl3NyGLoOmJmru0qo1YhOjNtZpaO
-HEa8KmnefzLiMvGeevVzcfavWJWjr97ClLR8MqY+cvD0M7UxC/hUDVQpP13G6fo3
-aZdghqZsITOf3hkFpTu8IS1nVp1+PCMS53VXdLhEdXsxeXTiYjFxwyWRcKPJvoo=
-=yWS9
+iQEcBAEBAgAGBQJOxnrJAAoJEEdUh39IaPFNYGAH/0fh4wgtArimSvc6g501TiQC
+o1gya+xgbzUfauydg/lhpoQfZLCmQEsQeThHyL6pZX4YQg4YMYuqdBiLYDffynZj
+sdw89G9tJSDoeF0OxMaANRUtAy5r+IoAVIA9l/sEUeaLl4cwRXttaEM62e+e0L9V
+rGsNX4Vm06geqTen+hvRDzKYLOPxhq9Dr35pHsx2l4JWefQuagGy1X08eZ8FpoIp
+W4RZ0I/k7WsL+6XW9pQFTV1BZzXNCemPep9DNPr2aEpxxBAKYnKcUGnMhSQBblhy
+/bsbaUdTRdi+dXGEISFA+512YoFAy4ST08rprAQLo0VSIfeBTxjoWhStmcO5WaI=
+=bFAd
 -----END PGP SIGNATURE-----
diff --git a/www-plugins/gecko-mediaplayer/files/libxul.pc b/www-plugins/gecko-mediaplayer/files/libxul.pc
deleted file mode 100644
index bca5b6384d51..000000000000
--- a/www-plugins/gecko-mediaplayer/files/libxul.pc
+++ /dev/null
@@ -1,5 +0,0 @@
-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 1876d594d8ce..ac5077cb0ea2 100644
--- a/www-plugins/gecko-mediaplayer/gecko-mediaplayer-1.0.4.ebuild
+++ b/www-plugins/gecko-mediaplayer/gecko-mediaplayer-1.0.4.ebuild
@@ -1,12 +1,10 @@
 # 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.5 2011/10/23 12:07:40 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gecko-mediaplayer/gecko-mediaplayer-1.0.4.ebuild,v 1.6 2011/11/18 15:35:03 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"
@@ -20,7 +18,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]
-	|| ( >=www-client/firefox-${_fxver} >=net-libs/xulrunner-1.9.2:1.9 )
+	>=net-libs/xulrunner-1.9.2:1.9
 	curl? ( net-misc/curl )
 	!www-client/chromium"
 DEPEND="${RDEPEND}
@@ -30,8 +28,6 @@ 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 \