Make xulrunner optional, now that there is a webkit backend

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

3 files changed, 26 insertions, 17 deletions

diff --git a/x11-misc/google-gadgets/ChangeLog b/x11-misc/google-gadgets/ChangeLog
index 2285a821cfef..4f61ad95e7a5 100644
--- a/x11-misc/google-gadgets/ChangeLog
+++ b/x11-misc/google-gadgets/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/google-gadgets
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/google-gadgets/ChangeLog,v 1.25 2009/06/01 22:50:41 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/google-gadgets/ChangeLog,v 1.26 2009/06/02 08:08:16 voyageur Exp $
+
+  02 Jun 2009; Bernard Cafarelli <voyageur@gentoo.org>
+  google-gadgets-0.11.0.ebuild:
+  Make xulrunner optional, now that there is a webkit backend
 
 *google-gadgets-0.11.0 (01 Jun 2009)
 
diff --git a/x11-misc/google-gadgets/Manifest b/x11-misc/google-gadgets/Manifest
index 176e9f937d62..3733efd58342 100644
--- a/x11-misc/google-gadgets/Manifest
+++ b/x11-misc/google-gadgets/Manifest
@@ -8,6 +8,6 @@ DIST google-gadgets-for-linux-0.11.0.tar.bz2 2526161 RMD160 f9f8b7e7462ab26cce87
 EBUILD google-gadgets-0.10.3.ebuild 4138 RMD160 ebca1f9c2f520b51cc252435ce2181ffb68de639 SHA1 3ddbd963ae7122910b8f15589d9073b96e6e8e23 SHA256 85e5c00decff6dd2e8763545d0730e747d3e8063c6065237520fdbc4ea7fda71
 EBUILD google-gadgets-0.10.4.ebuild 4288 RMD160 adf8a9965d0b787a09442129e90b559d52c40ab4 SHA1 668c296fbe7e9090c6baf7f69862ef323bbce0fc SHA256 7188126e09438f76e6f0251058a79bfa06fb0472828f0d1e34d77250d804a0f5
 EBUILD google-gadgets-0.10.5.ebuild 4184 RMD160 38f538b544ed6bf32c7b4355773c2fd14000353f SHA1 5ba9dc86d187f151dfe6560d310f910ca990998b SHA256 9199428814ead82d90443cb81e3cd34ad7f7b8d791db43bea2b0479b058873eb
-EBUILD google-gadgets-0.11.0.ebuild 4534 RMD160 294f6400ec956f30938af6a38bacda5869ee36fd SHA1 017e14ed714a3ab69f8b568d4600190c5571f0d4 SHA256 7c4a1d1c8615976377b25d8e005c67972f700739bc5785c98d3a0b6f3519ad23
-MISC ChangeLog 5275 RMD160 bfa23123126f2cdfe0279e77e4973b9d8d774c8a SHA1 92a0dae6294bbaa0b8ced4a2b97e117693b59bcb SHA256 51c999d0fc4e82975636b485113dda8c7b2077ae196c83ad3e7f4face87f5f65
+EBUILD google-gadgets-0.11.0.ebuild 4527 RMD160 159c6ce84991aa284b7ccbf301ba54cb452c94ab SHA1 719aa2a45a2372e344da4e107468c6b09a4d70e1 SHA256 f3bb9867ee4f88d24ed8558aa75e2b70665179e78e173feb16f5e5a4e28aae8d
+MISC ChangeLog 5425 RMD160 f393da7d005bca18a118501bbaf5efc79bde55c2 SHA1 e2cf8067691213cfad7abfdd0d53ab4b90eba9b4 SHA256 2f0ee4aa5442c402b0e3cec6e86e9e0ac5c0805062ca1b9a93490d6a49d22151
 MISC metadata.xml 486 RMD160 b08018667c1efbe528ecbbb88b4a0fe5932464f9 SHA1 6d0a5c446e901d47be27b4c707e986b8b8964c64 SHA256 200d5369ac38f83f0fe143ab1d87c734b88e52eb6eca146208fd21dec5776dda
diff --git a/x11-misc/google-gadgets/google-gadgets-0.11.0.ebuild b/x11-misc/google-gadgets/google-gadgets-0.11.0.ebuild
index 6d8f90afeed5..31320673d402 100644
--- a/x11-misc/google-gadgets/google-gadgets-0.11.0.ebuild
+++ b/x11-misc/google-gadgets/google-gadgets-0.11.0.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/x11-misc/google-gadgets/google-gadgets-0.11.0.ebuild,v 1.1 2009/06/01 22:50:41 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/google-gadgets/google-gadgets-0.11.0.ebuild,v 1.2 2009/06/02 08:08:16 voyageur Exp $
 
 EAPI=2
 
@@ -16,7 +16,8 @@ SRC_URI="http://${MY_PN}.googlecode.com/files/${MY_P}.tar.bz2"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86"
-IUSE="+dbus debug +gtk +qt4 +gstreamer networkmanager soup startup-notification webkit"
+IUSE="+dbus debug +gtk +qt4 +gstreamer networkmanager soup startup-notification
+webkit +xulrunner"
 
 # Weird things happen when we start mix-n-matching, so for the time being
 # I've just locked the deps to the versions I had as of Summer 2008. With any
@@ -24,7 +25,6 @@ IUSE="+dbus debug +gtk +qt4 +gstreamer networkmanager soup startup-notification
 
 RDEPEND="
 	>=dev-libs/libxml2-2.6.32
-	net-libs/xulrunner:1.9
 	sys-libs/zlib
 	x11-libs/libX11
 	x11-libs/libXext
@@ -54,6 +54,7 @@ RDEPEND="
 	soup? ( >=net-libs/libsoup-2.26 )
 	startup-notification? ( x11-libs/startup-notification )
 	webkit? ( >=net-libs/webkit-gtk-1.0.3 )
+	xulrunner? ( net-libs/xulrunner:1.9 )
 "
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.20
@@ -88,19 +89,11 @@ src_prepare() {
 }
 
 src_configure() {
-	#For the time being, the smjs-script runtime is required for both gtk and qt
-	#versions, but the goal is to make the qt4 version depend only on qt-script.
-	has_pkg_smjs=no \
-	econf	--disable-dependency-tracking \
+	local myconf="--disable-dependency-tracking \
 		--disable-update-desktop-database \
 		--disable-update-mime-database \
 		--disable-werror \
 		--enable-libxml2-xml-parser \
-		--enable-smjs-script-runtime \
-		--with-gtkmozembed=libxul \
-		--with-smjs-cppflags=-I/usr/include/nspr \
-		--with-smjs-libdir=/usr/$(get_libdir)/xulrunner-1.9 \
-		--with-smjs-incdir=/usr/include/xulrunner-1.9/unstable \
 		--with-browser-plugins-dir=/usr/$(get_libdir)/nsbrowser/plugins \
 		--with-ssl-ca-file=/etc/ssl/certs/ca-certificates.crt \
 		--with-oem-brand=Gentoo \
@@ -113,7 +106,6 @@ src_configure() {
 		$(use_enable webkit gtkwebkit-browser-element) \
 		$(use_enable gtk gtk-host) \
 		$(use_enable gtk libggadget-gtk ) \
-		$(use_enable gtk gtkmoz-browser-element) \
 		$(use_enable gtk gtk-edit-element) \
 		$(use_enable gtk gtk-flash-element) \
 		$(use_enable gtk gtk-system-framework) \
@@ -124,7 +116,20 @@ src_configure() {
 		$(use_enable qt4 qt-system-framework) \
 		$(use_enable qt4 qtwebkit-browser-element) \
 		$(use_enable qt4 qt-xml-http-request) \
-		$(use_enable qt4 qt-script-runtime)
+		$(use_enable qt4 qt-script-runtime)"
+	if use xulrunner; then
+		myconf="${myconf} \
+			$(use_enable gtk gtkmoz-browser-element) \
+			--with-gtkmozembed=libxul \
+			--enable-smjs-script-runtime \
+			--with-smjs-cppflags=-I/usr/include/nspr \
+			--with-smjs-libdir=/usr/$(get_libdir)/xulrunner-1.9 \
+			--with-smjs-incdir=/usr/include/xulrunner-1.9/unstable"
+	else
+		myconf="${myconf} --disable-gtkmoz-browser-element"
+	fi
+
+	econf ${myconf}
 }
 
 src_test() {