Fix ggl crashing on startup. http://code.google.com/p/google-gadgets-for-linux/issues/detail?id=220

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.25.8 i686

3 files changed, 156 insertions, 2 deletions

diff --git a/x11-misc/google-gadgets/ChangeLog b/x11-misc/google-gadgets/ChangeLog
index 457e2a1bdbed..0c47bbc045cb 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/google-gadgets/ChangeLog,v 1.9 2008/09/14 15:41:29 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/google-gadgets/ChangeLog,v 1.10 2008/09/24 15:13:30 loki_val Exp $
+
+*google-gadgets-0.10.2-r1 (24 Sep 2008)
+
+  24 Sep 2008; Peter Alfredsen <loki_val@gentoo.org>
+  +google-gadgets-0.10.2-r1.ebuild:
+  Fix ggl crashing on startup.
+  http://code.google.com/p/google-gadgets-for-linux/issues/detail?id=220
 
 *google-gadgets-0.10.2 (14 Sep 2008)
 
diff --git a/x11-misc/google-gadgets/Manifest b/x11-misc/google-gadgets/Manifest
index 6b7ded971074..48f3b12c668f 100644
--- a/x11-misc/google-gadgets/Manifest
+++ b/x11-misc/google-gadgets/Manifest
@@ -2,6 +2,7 @@ AUX google-gadgets-0.10.0-xulrunner-1.9.patch 13284 RMD160 4bbb2f3ba511bafddd888
 DIST google-gadgets-for-linux-0.10.0.tar.gz 2499027 RMD160 c76ba7b37f7bb976c018c5cbdb60e8ec504601dd SHA1 198e71445e5be4f5880b51cc0dfd9c6b51b908e5 SHA256 5367a44d47d60e31fc17dc43b7b1e1d393147bd901cb8c24f7975781e4abed5a
 DIST google-gadgets-for-linux-0.10.2.tar.bz2 2188977 RMD160 c38346902f7c5e9cb176677e914683a8e8bf7256 SHA1 b8e18080aeb0758e8eeddfa3f8373e7a95ec958c SHA256 0429408cd215dc8cb33c6fda31c65425366597426e3679004633b874f8fed164
 EBUILD google-gadgets-0.10.0-r2.ebuild 4131 RMD160 8dfabe6b0de0591bfa3601eb5868be030a2146d5 SHA1 80a0d9deb5c9ffca3a15dd4bfd1cd1ec0c87d729 SHA256 b5602b80df5dbe69b2d09862be7011c13581bce157659765f63fd3790da6efc7
+EBUILD google-gadgets-0.10.2-r1.ebuild 4597 RMD160 45c0767ddd4f7448f4c4faa752f7648a02598a26 SHA1 253d65b7a52e863338f03d4deff3c4819698daad SHA256 d486b5930d3fa68403f81729904751f66d62ab2c21b37f0ad43f7cbc8e7e15de
 EBUILD google-gadgets-0.10.2.ebuild 4510 RMD160 bc1bf0ef57d205e17ed0320ed40c189c4510bc75 SHA1 b5ea12fe16670339fb77566dd359c6ca3c161358 SHA256 c5d1eaf13ec2f497e62e91c2d9bc63ecf1f5339142963d8291f65040572a4b12
-MISC ChangeLog 2030 RMD160 32de6249dc3c1d0d026c82632d82b3d90c307f64 SHA1 bf125808eed214de17bc5316ed8914c152a583e5 SHA256 7a149853d72bc824632d59bdd5d8097ab9a43cc2d5207965399a2432e8aede15
+MISC ChangeLog 2266 RMD160 481259c24a0339e62ca042004849f438774da455 SHA1 3cde5e9d004ef8a681491570ccf13385f2a16bef SHA256 bca39fb561c22411e87f7201a3dc3f1793d7cd3cfcf9b3653bc2532837a4ea6c
 MISC metadata.xml 258 RMD160 e363fac4024fa1d6e8481465c06e42cbe2eb9e2a SHA1 26ea33fa143b55cfa84ee879aab41f1b5e337127 SHA256 960cfc8d2eda3540d50ea76f60889fb72e3dc8342ecd9dce2070517e4469f599
diff --git a/x11-misc/google-gadgets/google-gadgets-0.10.2-r1.ebuild b/x11-misc/google-gadgets/google-gadgets-0.10.2-r1.ebuild
new file mode 100644
index 000000000000..3db53c628b25
--- /dev/null
+++ b/x11-misc/google-gadgets/google-gadgets-0.10.2-r1.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2008 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.2-r1.ebuild,v 1.1 2008/09/24 15:13:30 loki_val Exp $
+
+EAPI=1
+
+inherit base 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="~amd64 ~x86"
+IUSE="+dbus debug +gtk +qt4 +gstreamer"
+
+# 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.
+
+# FIXME: ggl should be able to compile with xulrunner-1.9, xulrunner-1.8 and
+# various combinations of mozilla and spidermonkey. Since its configure script
+# is broken, though, I've hacked it to depend only on xulrunner-1.9, to avoid
+# mid-air symbol collisions. A giant bonanza of automagic is what it takes to get
+# this to work. I say blah.
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	>=dev-libs/libxml2-2.6.32
+	sys-libs/zlib
+	net-libs/xulrunner:1.9
+
+	dbus? ( sys-apps/dbus )
+
+	gstreamer? (	>=media-libs/gstreamer-0.10.19
+			>=media-libs/gst-plugins-base-0.10.19 )
+
+	gtk? (	dbus? ( >=dev-libs/dbus-glib-0.74 )
+		>=x11-libs/cairo-1.6.4
+		>=x11-libs/gtk+-2.12.10
+		>=x11-libs/pango-1.20.3
+		gnome-base/librsvg
+		>=net-misc/curl-7.18.2
+		>=dev-libs/atk-1.22.0 )
+
+	qt4? (	dbus? ( >=x11-libs/qt-dbus-4.4.0 )
+		>=x11-libs/qt-core-4.4.0
+		>=x11-libs/qt-webkit-4.4.0
+		>=x11-libs/qt-xmlpatterns-4.4.0
+		>=x11-libs/qt-opengl-4.4.0
+		>=x11-libs/qt-script-4.4.0 )"
+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
+
+	if use gtk
+	then
+		if built_with_use net-misc/curl ssl
+		then
+			if built_with_use net-misc/curl nss || built_with_use net-misc/curl gnutls
+			then
+				curl_die
+			else
+				einfo "Congratulations! Your net-misc/curl is configured correctly to run"
+				einfo "${PN}. Not many can say that."
+			fi
+		else
+			curl_die
+		fi
+	fi
+}
+
+src_compile() {
+	#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/lib/xulrunner-1.9 \
+		--with-smjs-incdir=/usr/include/xulrunner-1.9/unstable \
+		$(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-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) \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
+
+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
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
+
+curl_die() {
+	eerror "net-misc/curl must be built with these use flags: ssl -gnutls -nss"
+	eerror "to do so, do:"
+	eerror 'echo "net-misc/curl ssl -gnutls -nss" >> /etc/portage/package.use'
+	die "Your net-misc/curl was misconfigured."
+}