Do not allow xulrunner 2.0, thanks Logarithmenlord@googlemail.com in bug #351659. Drop old versions

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

6 files changed, 14 insertions, 348 deletions

diff --git a/x11-misc/google-gadgets/ChangeLog b/x11-misc/google-gadgets/ChangeLog
index d0fada41871b..a38d588461de 100644
--- a/x11-misc/google-gadgets/ChangeLog
+++ b/x11-misc/google-gadgets/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/google-gadgets
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/google-gadgets/ChangeLog,v 1.34 2010/11/08 04:29:18 jer Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/google-gadgets/ChangeLog,v 1.35 2011/01/19 12:09:51 voyageur Exp $
+
+  19 Jan 2011; Bernard Cafarelli <voyageur@gentoo.org>
+  -google-gadgets-0.10.5.ebuild, -google-gadgets-0.11.1-r1.ebuild,
+  -files/google-gadgets-0.11.1-xulrunner-1.9.2.patch,
+  google-gadgets-0.11.2.ebuild:
+  Do not allow xulrunner 2.0, thanks Logarithmenlord@googlemail.com in bug
+  #351659. Drop old versions
 
   07 Nov 2010; Jeroen Roovers <jer@gentoo.org> google-gadgets-0.10.5.ebuild,
   google-gadgets-0.11.1-r1.ebuild, google-gadgets-0.11.2.ebuild:
diff --git a/x11-misc/google-gadgets/Manifest b/x11-misc/google-gadgets/Manifest
index 1f37b274c3b5..03e1f219bf42 100644
--- a/x11-misc/google-gadgets/Manifest
+++ b/x11-misc/google-gadgets/Manifest
@@ -1,10 +1,4 @@
-AUX google-gadgets-0.11.1-xulrunner-1.9.2.patch 1463 RMD160 2d28d9313f3aad389eed101bef020cc712cbec97 SHA1 be142d9a21fb30d94fb998ac0d024b2f9155e9cd SHA256 7ab848e6f991a9a70608c3407bcde1a5039f54027b07b125a297ed0ecc4d6c76
-DIST google-gadgets-0.11.1-gtk+-2.18.patch.bz2 5842 RMD160 ecfd042b8e8026364524b7a85650ce2874803067 SHA1 4f5e17e618fa7af08eb83fa4c5058c942d517eb8 SHA256 050b55424f9833253b80a95870da7f557b305fa06cf69489ffd1dc3c753ebf96
-DIST google-gadgets-for-linux-0.10.5.tar.bz2 2429875 RMD160 974f135f8e1e15732f7492ab6ba5c43bc9d44daa SHA1 c85136c862384d789dc0fab7bc4d8b9d82572f30 SHA256 944810df4b134542a1e675e6d9518503466ce9398e8bfca5e3637d994ef5038d
-DIST google-gadgets-for-linux-0.11.1.tar.bz2 2531591 RMD160 e295ee6fd8694e6384d96282d2175f8e43767350 SHA1 f33be5c7bd8dde1103766c27cab638fe52b7b36a SHA256 353eccec0b10bea3ee7cac7594d9c20af606484ba71f2e04df09f4ad78ce7dbe
 DIST google-gadgets-for-linux-0.11.2.tar.bz2 2539750 RMD160 6497189e64793d2cab16058b4baeb42f3198b97b SHA1 22716f5ae640c7f201012d9d75868137c23ebc79 SHA256 2f129ae6c294876b3bc29bdf66c0f02e2c1000f97aadb3540d296560a14f343f
-EBUILD google-gadgets-0.10.5.ebuild 4175 RMD160 f2348b8c576ddc45e7f451f6db89e38c2c04d4fd SHA1 08b93c558c4e3583bfb5043447315a14c9670c75 SHA256 b7635179b15619bb3786ae78d29101461c7819e7bb972e2cb1257955e8faec51
-EBUILD google-gadgets-0.11.1-r1.ebuild 4828 RMD160 bdde1a3d3304092f64f873123eb12d31c07f50c6 SHA1 1fc73f35954d4193b118defcc6f76fe565d212b2 SHA256 3a0c238309bf60de4d14f3be6f17387014479a23826f2e99cb305adaf4059aae
-EBUILD google-gadgets-0.11.2.ebuild 4529 RMD160 8b65304967ad9670e2f5662d81545f4dae1e57fb SHA1 c875a61f9a5fdbc7e0fec2e663e9ee7a057da76a SHA256 a546283e765ccfdfd44f0e80d7c4f0870635b9a958557be47570efefdfc2a870
-MISC ChangeLog 7156 RMD160 c399438960d82f5b8a36d4769a6e3fdad7e733d8 SHA1 9ca44e5829b37676f7ed4aad9a773dabe9f07cbe SHA256 1409f8542fb40dc672dc28eac0ae8e00bb6387efcec75c719824bd396940805d
+EBUILD google-gadgets-0.11.2.ebuild 4540 RMD160 a5a0ebf32b28de0f7e5102e8ea7988cc8ea4c502 SHA1 3213ab6e559c7c8618553a2ee5a5b5c971a65bca SHA256 ab047581cdf6e451463d590f815784281a6b02326c4b0825f5a9288956cb5cb4
+MISC ChangeLog 7474 RMD160 144b914d555bf3572d9d9c92bc2d39ed4afdbc71 SHA1 ad049e5b5a0e46e126a04aa0117028c974947fe1 SHA256 d65a17dbc2fbbbc7a933f4900a25207e3fec8870bf017c3ccd2c5e4841ad0375
 MISC metadata.xml 486 RMD160 b08018667c1efbe528ecbbb88b4a0fe5932464f9 SHA1 6d0a5c446e901d47be27b4c707e986b8b8964c64 SHA256 200d5369ac38f83f0fe143ab1d87c734b88e52eb6eca146208fd21dec5776dda
diff --git a/x11-misc/google-gadgets/files/google-gadgets-0.11.1-xulrunner-1.9.2.patch b/x11-misc/google-gadgets/files/google-gadgets-0.11.1-xulrunner-1.9.2.patch
deleted file mode 100644
index 7ac7dc138c5c..000000000000
--- a/x11-misc/google-gadgets/files/google-gadgets-0.11.1-xulrunner-1.9.2.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Index: extensions/gtkmoz_browser_element/browser_child.cc
-===================================================================
---- extensions/gtkmoz_browser_element/browser_child.cc	(révision 1282)
-+++ extensions/gtkmoz_browser_element/browser_child.cc	(révision 1286)
-@@ -1269,7 +1269,7 @@
- 
-   static const GREVersionRange kGREVersion = {
-     "1.9a", PR_TRUE,
--    "1.9.2", PR_FALSE,
-+    "1.9.4", PR_FALSE,
-   };
- 
-   char xpcom_location[4096];
-Index: extensions/smjs_script_runtime/libmozjs_glue.cc
-===================================================================
---- extensions/smjs_script_runtime/libmozjs_glue.cc	(révision 1282)
-+++ extensions/smjs_script_runtime/libmozjs_glue.cc	(révision 1286)
-@@ -199,7 +199,7 @@
- 
-   static const GREVersionRange kGREVersion = {
-     "1.9a", PR_TRUE,
--    "1.9.2", PR_FALSE,
-+    "1.9.4", PR_FALSE,
-   };
- 
-   rv = GRE_GetGREPathWithProperties(&kGREVersion, 1, nsnull, 0,
-Index: extensions/smjs_script_runtime/converter.cc
-===================================================================
---- extensions/smjs_script_runtime/converter.cc	(révision 1282)
-+++ extensions/smjs_script_runtime/converter.cc	(révision 1286)
-@@ -16,11 +16,11 @@
- 
- #include "converter.h"
- 
--#include <cmath>
- #include <jsobj.h>
- #include <jscntxt.h>
- #include <jsfun.h>
- #include <jsnum.h>
-+#include <cmath>
- #include <ggadget/scriptable_array.h>
- #include <ggadget/scriptable_binary_data.h>
- #include <ggadget/scriptable_holder.h>
diff --git a/x11-misc/google-gadgets/google-gadgets-0.10.5.ebuild b/x11-misc/google-gadgets/google-gadgets-0.10.5.ebuild
deleted file mode 100644
index db058bf1e07e..000000000000
--- a/x11-misc/google-gadgets/google-gadgets-0.10.5.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2010 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.10.5.ebuild,v 1.10 2010/11/08 04:29:18 jer Exp $
-
-EAPI=2
-
-inherit base autotools multilib eutils fdo-mime
-
-MY_PN=${PN}-for-linux
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Cool gadgets from Google for your Desktop"
-HOMEPAGE="http://code.google.com/p/google-gadgets-for-linux/"
-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 startup-notification"
-
-# 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
-# luck, they'll be stable when we get to stabling this package.
-
-RDEPEND="
-	>=dev-libs/libxml2-2.6.32
-	net-libs/xulrunner:1.9
-	sys-libs/zlib
-	x11-libs/libX11
-	x11-libs/libXext
-	dbus? ( sys-apps/dbus )
-	gstreamer? (
-		>=media-libs/gstreamer-0.10.19
-		>=media-libs/gst-plugins-base-0.10.19
-	)
-	gtk? (
-		>=dev-libs/atk-1.22.0
-		gnome-base/librsvg
-		>=net-misc/curl-7.18.2
-		>=x11-libs/cairo-1.6.4
-		>=x11-libs/gtk+-2.12.10
-		>=x11-libs/pango-1.20.3
-		dbus? ( >=dev-libs/dbus-glib-0.74 )
-	)
-	networkmanager? ( net-misc/networkmanager )
-	qt4? (
-		>=x11-libs/qt-core-4.4.0
-		>=x11-libs/qt-opengl-4.4.0
-		>=x11-libs/qt-script-4.4.0
-		>=x11-libs/qt-webkit-4.4.0
-		>=x11-libs/qt-xmlpatterns-4.4.0
-		dbus? ( >=x11-libs/qt-dbus-4.4.0 )
-	)
-	startup-notification? ( x11-libs/startup-notification )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.20
-"
-
-S="${WORKDIR}/${MY_P}"
-
-RESTRICT="test"
-
-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.
-	if ! use gtk && ! use qt4; then
-		eerror "You must choose which toolkit to build for. Either qt4 or gtk can be"
-		eerror "chosen. For qt4, see also above. To enable \$toolkit, do:"
-		eerror "echo \"${CATEGORY}/${PN} \$toolkit\" >> /etc/portage/package.use"
-		die "You need to choose a toolkit"
-	fi
-
-	if ! use gstreamer; then
-		ewarn "Disabling gstreamer disables the multimedia functions of ${PN}."
-		ewarn "This is not recommended. To enable gstreamer, do:"
-		ewarn "echo \"${CATEGORY}/${PN} gstreamer\" >> /etc/portage/package.use"
-	fi
-}
-
-src_prepare() {
-	sed -i -r \
-		-e '/^GGL_SYSDEPS_INCLUDE_DIR/ c\GGL_SYSDEPS_INCLUDE_DIR=$GGL_INCLUDE_DIR' \
-		configure.ac||die "404"
-	eautoreconf
-}
-
-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 \
-		--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-oem-brand=Gentoo \
-		$(use_enable debug) \
-		$(use_enable dbus libggadget-dbus) \
-		$(use_enable gstreamer gst-audio-framework) \
-		$(use_enable gstreamer gst-mediaplayer-element) \
-		$(use_enable gtk gtk-host) \
-		$(use_enable gtk libggadget-gtk ) \
-		$(use_enable gtk gtkmoz-browser-element) \
-		$(use_enable gtk gtk-flash-element) \
-		$(use_enable gtk gtk-system-framework) \
-		$(use_enable gtk curl_xml_http_request) \
-		$(use_enable qt4 qt-host) \
-		$(use_enable qt4 libggadget-qt) \
-		$(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)
-}
-
-src_test() {
-	#If someone wants to guarantee that emake will not make
-	#tests fail promiscuosly, please do, otherwise we're using make.
-	make check &> "${WORKDIR}"/check
-}
-
-src_install() {
-	base_src_install
-	dodoc ChangeLog README
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
diff --git a/x11-misc/google-gadgets/google-gadgets-0.11.1-r1.ebuild b/x11-misc/google-gadgets/google-gadgets-0.11.1-r1.ebuild
deleted file mode 100644
index 356d89bce4f9..000000000000
--- a/x11-misc/google-gadgets/google-gadgets-0.11.1-r1.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2010 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.1-r1.ebuild,v 1.4 2010/11/08 04:29:18 jer Exp $
-
-EAPI=2
-
-inherit base autotools multilib eutils fdo-mime
-
-MY_PN=${PN}-for-linux
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Cool gadgets from Google for your Desktop"
-HOMEPAGE="http://code.google.com/p/google-gadgets-for-linux/"
-SRC_URI="http://${MY_PN}.googlecode.com/files/${MY_P}.tar.bz2
-	mirror://gentoo/${P}-gtk+-2.18.patch.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86"
-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
-# luck, they'll be stable when we get to stabling this package.
-
-RDEPEND="
-	>=dev-libs/libxml2-2.6.32
-	sys-libs/zlib
-	x11-libs/libX11
-	x11-libs/libXext
-	dbus? ( sys-apps/dbus )
-	gstreamer? (
-		>=media-libs/gstreamer-0.10.19
-		>=media-libs/gst-plugins-base-0.10.19
-	)
-	gtk? (
-		>=dev-libs/atk-1.22.0
-		gnome-base/librsvg
-		>=net-misc/curl-7.18.2
-		>=x11-libs/cairo-1.6.4
-		>=x11-libs/gtk+-2.12.10
-		>=x11-libs/pango-1.20.3
-		dbus? ( >=dev-libs/dbus-glib-0.74 )
-	)
-	networkmanager? ( net-misc/networkmanager )
-	qt4? (
-		>=x11-libs/qt-core-4.4.0
-		>=x11-libs/qt-opengl-4.4.0
-		>=x11-libs/qt-script-4.4.0
-		>=x11-libs/qt-webkit-4.4.0
-		>=x11-libs/qt-xmlpatterns-4.4.0
-		dbus? ( >=x11-libs/qt-dbus-4.4.0 )
-	)
-	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
-"
-
-S="${WORKDIR}/${MY_P}"
-
-RESTRICT="test"
-
-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.
-	if ! use gtk && ! use qt4; then
-		eerror "You must choose which toolkit to build for. Either qt4 or gtk can be"
-		eerror "chosen. For qt4, see also above. To enable \$toolkit, do:"
-		eerror "echo \"${CATEGORY}/${PN} \$toolkit\" >> /etc/portage/package.use"
-		die "You need to choose a toolkit"
-	fi
-
-	if ! use gstreamer; then
-		ewarn "Disabling gstreamer disables the multimedia functions of ${PN}."
-		ewarn "This is not recommended. To enable gstreamer, do:"
-		ewarn "echo \"${CATEGORY}/${PN} gstreamer\" >> /etc/portage/package.use"
-	fi
-}
-
-src_prepare() {
-	epatch "${DISTDIR}"/${P}-gtk+-2.18.patch.bz2
-
-	# http://code.google.com/p/google-gadgets-for-linux/issues/detail?id=352
-	# recommends CXXFLAGS="-Wno-invalid-offsetof", apparently we do not
-	# need it on Gentoo
-	epatch "${FILESDIR}"/${P}-xulrunner-1.9.2.patch
-
-	sed -i -r \
-		-e '/^GGL_SYSDEPS_INCLUDE_DIR/ c\GGL_SYSDEPS_INCLUDE_DIR=$GGL_INCLUDE_DIR' \
-		configure.ac||die "404"
-	eautoreconf
-}
-
-src_configure() {
-	local myconf="--disable-dependency-tracking \
-		--disable-update-desktop-database \
-		--disable-update-mime-database \
-		--disable-werror \
-		--enable-libxml2-xml-parser \
-		--with-browser-plugins-dir=/usr/$(get_libdir)/nsbrowser/plugins \
-		--with-ssl-ca-file=/etc/ssl/certs/ca-certificates.crt \
-		--with-oem-brand=Gentoo \
-		$(use_enable debug) \
-		$(use_enable dbus libggadget-dbus) \
-		$(use_enable gstreamer gst-audio-framework) \
-		$(use_enable gstreamer gst-video-element) \
-		$(use_enable soup soup-xml-http-request) \
-		$(use_enable webkit webkit-script-runtime) \
-		$(use_enable webkit gtkwebkit-browser-element) \
-		$(use_enable gtk gtk-host) \
-		$(use_enable gtk libggadget-gtk ) \
-		$(use_enable gtk gtk-edit-element) \
-		$(use_enable gtk gtk-flash-element) \
-		$(use_enable gtk gtk-system-framework) \
-		$(use_enable gtk curl_xml_http_request) \
-		$(use_enable qt4 qt-host) \
-		$(use_enable qt4 libggadget-qt) \
-		$(use_enable qt4 qt-edit-framework) \
-		$(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"
-	fi
-
-	econf ${myconf}
-}
-
-src_test() {
-	#If someone wants to guarantee that emake will not make
-	#tests fail promiscuosly, please do, otherwise we're using make.
-	make check &> "${WORKDIR}"/check
-}
-
-src_install() {
-	base_src_install
-	dodoc ChangeLog README
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
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 1744d31a0362..0bf971cc384c 100644
--- a/x11-misc/google-gadgets/google-gadgets-0.11.2.ebuild
+++ b/x11-misc/google-gadgets/google-gadgets-0.11.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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.4 2010/11/08 04:29:18 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/google-gadgets/google-gadgets-0.11.2.ebuild,v 1.5 2011/01/19 12:09:51 voyageur Exp $
 
 EAPI=2
 
@@ -53,7 +53,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 )
+	xulrunner? ( =net-libs/xulrunner-1.9*:1.9 )
 "
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.20