summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2009-09-29 17:33:26 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2009-09-29 17:33:26 +0000
commit9e12cbb8f4d77b34ec5829ae579d6f944f5350ce (patch)
tree774a9f76ce24ac6b28c66fde4245310f3ca74814
parentStable on alpha, bug #279426 (diff)
downloadhistorical-9e12cbb8f4d77b34ec5829ae579d6f944f5350ce.tar.gz
historical-9e12cbb8f4d77b34ec5829ae579d6f944f5350ce.tar.bz2
historical-9e12cbb8f4d77b34ec5829ae579d6f944f5350ce.zip
Force xulrunner usage to avoid breakage when seamonkey is installed.
Package-Manager: portage-2.2_rc42/cvs/Linux x86_64
-rw-r--r--www-plugins/gecko-mediaplayer/ChangeLog6
-rw-r--r--www-plugins/gecko-mediaplayer/Manifest4
-rw-r--r--www-plugins/gecko-mediaplayer/gecko-mediaplayer-0.9.8.ebuild13
3 files changed, 17 insertions, 6 deletions
diff --git a/www-plugins/gecko-mediaplayer/ChangeLog b/www-plugins/gecko-mediaplayer/ChangeLog
index 04c606643938..d9c5a8d545f2 100644
--- a/www-plugins/gecko-mediaplayer/ChangeLog
+++ b/www-plugins/gecko-mediaplayer/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for www-plugins/gecko-mediaplayer
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gecko-mediaplayer/ChangeLog,v 1.17 2009/09/29 16:59:21 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gecko-mediaplayer/ChangeLog,v 1.18 2009/09/29 17:33:26 ssuominen Exp $
+
+ 29 Sep 2009; Samuli Suominen <ssuominen@gentoo.org>
+ gecko-mediaplayer-0.9.8.ebuild:
+ Force xulrunner usage to avoid breakage when seamonkey is installed.
*gecko-mediaplayer-0.9.8 (29 Sep 2009)
diff --git a/www-plugins/gecko-mediaplayer/Manifest b/www-plugins/gecko-mediaplayer/Manifest
index c332c6b6f4d2..b8e0e7a8852d 100644
--- a/www-plugins/gecko-mediaplayer/Manifest
+++ b/www-plugins/gecko-mediaplayer/Manifest
@@ -5,6 +5,6 @@ DIST gecko-mediaplayer-0.9.7.tar.gz 255773 RMD160 7b05c8942a1158db0a1a31bfb72f3b
DIST gecko-mediaplayer-0.9.8.tar.gz 257788 RMD160 46ae679d112f7853b58268de7d6e5a4444a4797d SHA1 a1f90176c0447374ac6518f1eb23984bc2a88ae3 SHA256 a51ebf00021b1d5d43837edebd0fb28d8f6d2626111c4c391e8b0f6515004aa1
EBUILD gecko-mediaplayer-0.9.6.ebuild 1341 RMD160 440b0015de715bf32ecad0b0408834f0bde06109 SHA1 77df1397664c6ce9fbd71abc700f2813ef87ced1 SHA256 2043db79bbeb558b3b716743493c0a7674f9dac853db609a41a63db5de24042f
EBUILD gecko-mediaplayer-0.9.7-r1.ebuild 1613 RMD160 fec1a3d9946bb09dad973cd6a684a72ff361fe3f SHA1 c5a5b524704559da2203ed0f3d6dfea247412836 SHA256 678de63746270393e3c59cf8861818aac7f5c07b53ac31415112def053e4ce92
-EBUILD gecko-mediaplayer-0.9.8.ebuild 1418 RMD160 5f911e32647fc2681382c27c0be2c9327b98faa6 SHA1 935d30aa27072f57eec065abfa8f261992f81dcb SHA256 f32ffc7083c262815bb78d3a7bd48b9852b7395bdfff3dea638200181e91f844
-MISC ChangeLog 4411 RMD160 e1727b36d7bfc0721d534eb5740b68bb30537ae1 SHA1 2d5ddfe1fb8ba036918a3efe35f0769b82e73ecd SHA256 258a31b97f5be2e0645b273ecec68a0065539b5e9977da775e276c3c51f0d36a
+EBUILD gecko-mediaplayer-0.9.8.ebuild 1582 RMD160 1b13331918613763d347e8bf1d021850030d8271 SHA1 6cafcb667838d87bbd0abfd84c433dd11da8e9b4 SHA256 1d373fd9ccad4d12c9cfd8141b21fe7b0091881222fcddd4c1ece22bb34b357e
+MISC ChangeLog 4571 RMD160 46753d33cc93bc708c8234c02ed6eac90b0d1dd3 SHA1 faa0a4d614b9484281ea3da2159fae6235513d66 SHA256 3e2ddbc5dde057af09f95ac7302a55deb934d5e69cac11e08f2716ef06ec8789
MISC metadata.xml 228 RMD160 3071d739d8e15041d594882afdfc434453568466 SHA1 06e3ee83b7a5a910d2d63ea77afb2e5a292606f6 SHA256 060670a1a67923937e4bf55598ae59368d5e716b0b618dedaf12b15f45e8e234
diff --git a/www-plugins/gecko-mediaplayer/gecko-mediaplayer-0.9.8.ebuild b/www-plugins/gecko-mediaplayer/gecko-mediaplayer-0.9.8.ebuild
index e354bd84e7bd..9eef939cbd25 100644
--- a/www-plugins/gecko-mediaplayer/gecko-mediaplayer-0.9.8.ebuild
+++ b/www-plugins/gecko-mediaplayer/gecko-mediaplayer-0.9.8.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gecko-mediaplayer/gecko-mediaplayer-0.9.8.ebuild,v 1.1 2009/09/29 16:59:21 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gecko-mediaplayer/gecko-mediaplayer-0.9.8.ebuild,v 1.2 2009/09/29 17:33:26 ssuominen Exp $
EAPI=2
GCONF_DEBUG=no
-inherit autotools eutils gnome2 multilib
+inherit autotools eutils flag-o-matic gnome2 multilib
DESCRIPTION="A browser multimedia plugin using gnome-mplayer"
HOMEPAGE="http://code.google.com/p/gecko-mediaplayer"
@@ -26,7 +26,9 @@ DEPEND="${RDEPEND}
sys-devel/gettext"
pkg_setup() {
- G2CONF="$(use_enable gnome schemas-install)
+ G2CONF="--disable-dependency-tracking
+ $(use_enable gnome schemas-install)
+ --with-xulrunner-sdk
$(use_with gnome gconf)
--with-gio"
DOCS="ChangeLog DOCS/tech/javascript.txt"
@@ -38,6 +40,11 @@ src_prepare() {
AT_M4DIR=m4 eautoreconf
}
+src_configure() {
+ append-flags "$(pkg-config --cflags-only-I libxul)"
+ gnome2_src_configure
+}
+
src_install() {
gnome2_src_install
rm -rf "${D}"/usr/share/doc/${PN}