add support to build against xulrunner, thanks to Frittella Laurento <mrfree@infinito.it>, bug #161340

Package-Manager: portage-2.1.3.12

3 files changed, 26 insertions, 17 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 065bb1f5feef..f52d2853c0b1 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/vlc
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.261 2007/10/10 09:45:32 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.262 2007/10/10 11:08:21 aballier Exp $
+
+  10 Oct 2007; Alexis Ballier <aballier@gentoo.org>
+  vlc-0.9.0_alpha20071009.ebuild:
+  add support to build against xulrunner, thanks to Frittella Laurento
+  <mrfree@infinito.it>, bug #161340
 
   10 Oct 2007; Alexis Ballier <aballier@gentoo.org>
   vlc-0.9.0_alpha20071009.ebuild:
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 033911ad9c2e..290ab3b415d9 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -9,14 +9,14 @@ EBUILD vlc-0.8.6c.ebuild 9232 RMD160 c2b012f3226b9373e0811957de649da794598fd6 SH
 MD5 840a569cbeefd866582860e18786ff24 vlc-0.8.6c.ebuild 9232
 RMD160 c2b012f3226b9373e0811957de649da794598fd6 vlc-0.8.6c.ebuild 9232
 SHA256 8f6b0eb7cd354933ff64ea64c14db34b13d5a7ee29aedf156dcd32dd4e8f2cf4 vlc-0.8.6c.ebuild 9232
-EBUILD vlc-0.9.0_alpha20071009.ebuild 10058 RMD160 9a9af3825cf7972540ee01a2e6c05d6a824aae76 SHA1 2828b14c8160993451b577bac9e0595506fe6cef SHA256 afab6a5bf7a0cfc84d44951902e55ce8a0f05bb139767868b24e6ba8c53adfd4
-MD5 f6e7390a907a9f3d6794cb5e60ed1375 vlc-0.9.0_alpha20071009.ebuild 10058
-RMD160 9a9af3825cf7972540ee01a2e6c05d6a824aae76 vlc-0.9.0_alpha20071009.ebuild 10058
-SHA256 afab6a5bf7a0cfc84d44951902e55ce8a0f05bb139767868b24e6ba8c53adfd4 vlc-0.9.0_alpha20071009.ebuild 10058
-MISC ChangeLog 45921 RMD160 8b1f5531c3f35b3a1e52718031d94c44b87e9d85 SHA1 65a20c309cf7851e6d2c3a136727414235863d99 SHA256 a6926bb83b278e4852a7b59aeb88833361d9d59a8751f879a47c76574c5d265b
-MD5 b5473bb196b73014200287a032f0c412 ChangeLog 45921
-RMD160 8b1f5531c3f35b3a1e52718031d94c44b87e9d85 ChangeLog 45921
-SHA256 a6926bb83b278e4852a7b59aeb88833361d9d59a8751f879a47c76574c5d265b ChangeLog 45921
+EBUILD vlc-0.9.0_alpha20071009.ebuild 10246 RMD160 b8a8df6192a700986eb05c0de35459f00632c1f1 SHA1 269edf110c4271c14a773432f704ed9e931e3b97 SHA256 2bff0d032b25389c0c933a5ad9abb641d2520dc8777027f0f365e2fbf923e5ae
+MD5 8b8021550f9302fadc44c664b1cdfa06 vlc-0.9.0_alpha20071009.ebuild 10246
+RMD160 b8a8df6192a700986eb05c0de35459f00632c1f1 vlc-0.9.0_alpha20071009.ebuild 10246
+SHA256 2bff0d032b25389c0c933a5ad9abb641d2520dc8777027f0f365e2fbf923e5ae vlc-0.9.0_alpha20071009.ebuild 10246
+MISC ChangeLog 46115 RMD160 46d8270a125557d7466c982011800e94c4c6e204 SHA1 158e55a2c34872fe3b5a6c32db241909ea703103 SHA256 e7ae09f874a4eee255456324063fddc0026557f8828339e62a40f1bcb39dab49
+MD5 d8b544bd1a43466f9450a2a0be955fa3 ChangeLog 46115
+RMD160 46d8270a125557d7466c982011800e94c4c6e204 ChangeLog 46115
+SHA256 e7ae09f874a4eee255456324063fddc0026557f8828339e62a40f1bcb39dab49 ChangeLog 46115
 MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5
 MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d metadata.xml 225
@@ -30,7 +30,7 @@ SHA256 2b05cba79b1af61169f0a696109070cc3e0a7cbd18f1010ddf78fae313cce3b6 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHDJ9FvFcC4BYPU0oRAp0qAKC9kj7cWYwRsi9NuvA/1q6ueMlp4wCgkaKY
-6vyrR7sle0lz45wt0BoapO4=
-=Bz/9
+iD8DBQFHDLKuvFcC4BYPU0oRAqxJAJ9+KjiutFgCuFv5an1gQ9O0b0o+HgCeJXNv
+TlLj0QESTIl35UOWszpcdnw=
+=0J8i
 -----END PGP SIGNATURE-----
diff --git a/media-video/vlc/vlc-0.9.0_alpha20071009.ebuild b/media-video/vlc/vlc-0.9.0_alpha20071009.ebuild
index 09ecad144892..c350e3580994 100644
--- a/media-video/vlc/vlc-0.9.0_alpha20071009.ebuild
+++ b/media-video/vlc/vlc-0.9.0_alpha20071009.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.9.0_alpha20071009.ebuild,v 1.3 2007/10/10 09:45:32 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.9.0_alpha20071009.ebuild,v 1.4 2007/10/10 11:08:21 aballier Exp $
 
 WANT_AUTOMAKE=latest
 WANT_AUTOCONF=latest
@@ -46,7 +46,7 @@ oss aalib ggi libcaca esd arts alsa wxwindows ncurses xosd lirc stream
 mp3 xv bidi sdl sdl-image png xml samba daap mod speex shout rtsp
 win32codecs skins hal avahi xinerama cddb directfb upnp nsplugin seamonkey
 optimisememory libnotify jack musepack x264 dc1394 lua gnome pvr taglib
-musicbrainz dbus libgcrypt id3tag cdio ffmpeg twolame"
+musicbrainz dbus libgcrypt id3tag cdio ffmpeg twolame xulrunner"
 
 RDEPEND="
 		ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20050226-r1 )
@@ -115,8 +115,9 @@ RDEPEND="
 		directfb? ( dev-libs/DirectFB )
 		upnp? ( net-libs/libupnp )
 		nsplugin? (
-			!seamonkey? ( www-client/mozilla-firefox )
-			seamonkey? ( www-client/seamonkey )
+			xulrunner? ( net-libs/xulrunner )
+			!xulrunner? ( seamonkey? ( www-client/seamonkey ) )
+			!xulrunner? ( !seamonkey? ( www-client/mozilla-firefox ) )
 		)
 		libnotify? ( x11-libs/libnotify )
 		musepack? ( media-libs/libmpcdec )
@@ -197,7 +198,10 @@ src_compile () {
 		myconf="${myconf} --disable-vlm"
 
 	if use nsplugin; then
-		if use seamonkey; then
+		if use xulrunner; then
+			XPIDL=/usr/$(get_libdir)/xulrunner
+			MOZILLA_CONFIG=/usr/bin/xulrunner-config
+		elif use seamonkey; then
 			XPIDL=/usr/$(get_libdir)/seamonkey
 			MOZILLA_CONFIG=/usr/$(get_libdir)/seamonkey/seamonkey-config
 		else