Remove support for xulrunner wrt bugs #351659 and #403415

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

3 files changed, 33 insertions, 36 deletions

diff --git a/x11-misc/google-gadgets/ChangeLog b/x11-misc/google-gadgets/ChangeLog
index 861e45b148ba..c026d3c142ca 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/google-gadgets/ChangeLog,v 1.42 2011/10/04 13:48:05 voyageur Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/google-gadgets/ChangeLog,v 1.43 2012/03/15 02:47:00 ssuominen Exp $
+
+  15 Mar 2012; Samuli Suominen <ssuominen@gentoo.org>
+  google-gadgets-0.11.2.ebuild:
+  Remove support for xulrunner wrt bugs #351659 and #403415
 
   04 Oct 2011; Bernard Cafarelli <voyageur@gentoo.org>
   google-gadgets-0.11.2.ebuild:
diff --git a/x11-misc/google-gadgets/Manifest b/x11-misc/google-gadgets/Manifest
index ca63a7f9021f..29549c153abf 100644
--- a/x11-misc/google-gadgets/Manifest
+++ b/x11-misc/google-gadgets/Manifest
@@ -1,14 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 DIST google-gadgets-for-linux-0.11.2.tar.bz2 2539750 RMD160 6497189e64793d2cab16058b4baeb42f3198b97b SHA1 22716f5ae640c7f201012d9d75868137c23ebc79 SHA256 2f129ae6c294876b3bc29bdf66c0f02e2c1000f97aadb3540d296560a14f343f
-EBUILD google-gadgets-0.11.2.ebuild 4743 RMD160 efdf17e614d9e46945dcd022baae93bad66cbc2d SHA1 fe8b9ed2433c6d36c7e3263bbee709d895b68116 SHA256 d3d3b3076efca626c44131e26531909267e1ac13ce5c303dc032dc6969bdb68e
-MISC ChangeLog 8343 RMD160 1b5c3643786624d3be3760667874042d6b2930fe SHA1 c95fc4ef03a1007993d75349b578791f0e01b21f SHA256 5df55fc0e8548cd4e4bb0d023280b5fca35b5ad3f4c5b85292b525844142857f
+EBUILD google-gadgets-0.11.2.ebuild 4357 RMD160 929941a80736c47239b237aa1ddde297c0ea6a4a SHA1 b993d2d34e1727023dd5e857a396f25b6e675566 SHA256 9cf30e3239c8e050cb4bc2d4bfae49ebcdf0625ea316e454702fa6355d35e065
+MISC ChangeLog 8491 RMD160 7b52c372c374512ff9dee412cb90cb94aa43280e SHA1 b9d2d5f35094d43acf721ee9b0e25490ce546601 SHA256 9886f42fc896c90cfdef51de96dac2c912138566e2b978c51b341ff7d273fdae
 MISC metadata.xml 464 RMD160 1c08fe6baa5fc02e03021ba76b2ac2bfbba0f735 SHA1 a1972f67e17c9449bbd43e3664da04cab8fdf21d SHA256 0743b51beb0949fc2f82bebe1a74f71c4c825214c90e10bf9ba6633e7f0658d6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk6LDqQACgkQFYEBGcdFJfJgmgEAm4Mo67/raljESoFOsDG+g2cx
-kkY0SJCAC20DnUoo9bkA/3U7WYl9Enbiw7e3V6w6rEhx0wlxmegQu8XBcViQ0hXT
-=evlT
+iQEcBAEBAgAGBQJPYVgmAAoJEEdUh39IaPFNm2MH/i5DMQGaHWhmocsHr8Bsywvl
+UDEKN1aEL0x/JGy+vxX0BoCyER9R66vHC++DFbxL7aDmAe2Gd8lX3Pm1kVIwA265
+X3plO6tgUK8n05FoYJJ0C+UDmVjl+CQo2suLDxD0IhdAGjWTqKk/SUqeoeT8zidR
+f7ZylAyH7tp5fNAnDc4oZbEQfOUyt1K/qpRyRU8OpBgpLtOx6alMRX7OUK7SZprk
+Tyah/I7EEJJO6OVauZbaseKHa8z/7I72EN0XBX6DStbTc+KmaqZ/4HA7dK4U3JDl
+jyktEPH+NZ3oDWP96DDyF102DV911Qjdj52r/SO4QDeLwzCCmc3M8kRCO97C6sk=
+=0nKp
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/google-gadgets/google-gadgets-0.11.2.ebuild b/x11-misc/google-gadgets/google-gadgets-0.11.2.ebuild
index 6827d36909af..ba3d70aac4b2 100644
--- a/x11-misc/google-gadgets/google-gadgets-0.11.2.ebuild
+++ b/x11-misc/google-gadgets/google-gadgets-0.11.2.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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.2.ebuild,v 1.12 2011/10/04 13:48:05 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/google-gadgets/google-gadgets-0.11.2.ebuild,v 1.13 2012/03/15 02:47:00 ssuominen Exp $
 
-EAPI=2
-
-inherit base autotools multilib eutils fdo-mime
+EAPI=4
+inherit autotools eutils fdo-mime multilib
 
 MY_PN=${PN}-for-linux
 MY_P=${MY_PN}-${PV}
@@ -16,7 +15,7 @@ SRC_URI="http://${MY_PN}.googlecode.com/files/${MY_P}.tar.bz2"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 x86"
-IUSE="+dbus debug +gtk +qt4 +gstreamer networkmanager soup startup-notification webkit +xulrunner"
+IUSE="+dbus debug +gtk +qt4 +gstreamer networkmanager soup startup-notification webkit"
 
 # 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
@@ -53,16 +52,17 @@ RDEPEND="
 	soup? ( >=net-libs/libsoup-2.26:2.4 )
 	startup-notification? ( x11-libs/startup-notification )
 	webkit? ( >=net-libs/webkit-gtk-1.0.3:2 )
-	xulrunner? ( =net-libs/xulrunner-1.9*:1.9 )
 "
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.20
 "
 
-S="${WORKDIR}/${MY_P}"
+S=${WORKDIR}/${MY_P}
 
 RESTRICT="test"
 
+DOCS="ChangeLog README"
+
 pkg_setup() {
 	# If a non-google, non-qt4 and non-gtk host system for google-gadgets is ever developed,
 	# I'll consider changing the error below.
@@ -93,7 +93,8 @@ src_prepare() {
 }
 
 src_configure() {
-	local myconf="--disable-dependency-tracking \
+	econf \
+		--disable-dependency-tracking \
 		--disable-update-desktop-database \
 		--disable-update-mime-database \
 		--disable-werror \
@@ -120,21 +121,9 @@ 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)"
-	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 \
-			--disable-smjs-script-runtime"
-	fi
-
-	econf ${myconf}
+		$(use_enable qt4 qt-script-runtime) \
+		--disable-gtkmoz-browser-element \
+		--disable-smjs-script-runtime
 }
 
 src_test() {
@@ -143,12 +132,12 @@ src_test() {
 	make check &> "${WORKDIR}"/check
 }
 
-src_install() {
-	base_src_install
-	dodoc ChangeLog README
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
 }
 
-pkg_postinst() {
+pkg_postrm() {
 	fdo-mime_desktop_database_update
 	fdo-mime_mime_database_update
 }