Bugfixes wrt bug 231990 (love to eva) and cleanup of ebuild.

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

3 files changed, 151 insertions, 2 deletions

diff --git a/x11-misc/google-gadgets/ChangeLog b/x11-misc/google-gadgets/ChangeLog
index 1a342f843c6c..983577bea29b 100644
--- a/x11-misc/google-gadgets/ChangeLog
+++ b/x11-misc/google-gadgets/ChangeLog
@@ -1,6 +1,12 @@
 # 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.5 2008/07/11 20:20:31 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/google-gadgets/ChangeLog,v 1.6 2008/07/16 21:00:38 loki_val Exp $
+
+*google-gadgets-0.10.0-r1 (16 Jul 2008)
+
+  16 Jul 2008; Peter Alfredsen <loki_val@gentoo.org>
+  +google-gadgets-0.10.0-r1.ebuild:
+  Bugfixes wrt bug 231990 (love to eva) and cleanup of ebuild.
 
 *google-gadgets-0.10.0 (11 Jul 2008)
 
diff --git a/x11-misc/google-gadgets/Manifest b/x11-misc/google-gadgets/Manifest
index 60ecf0494a9c..89fabcd288b5 100644
--- a/x11-misc/google-gadgets/Manifest
+++ b/x11-misc/google-gadgets/Manifest
@@ -1,4 +1,5 @@
 DIST google-gadgets-for-linux-0.10.0.tar.gz 2499027 RMD160 c76ba7b37f7bb976c018c5cbdb60e8ec504601dd SHA1 198e71445e5be4f5880b51cc0dfd9c6b51b908e5 SHA256 5367a44d47d60e31fc17dc43b7b1e1d393147bd901cb8c24f7975781e4abed5a
+EBUILD google-gadgets-0.10.0-r1.ebuild 4354 RMD160 b33d659cb520d1c1abb90faf1e6176760f324888 SHA1 01089438b9639ece0912d47a1f6fec59181e4882 SHA256 ef679522b9ca8e514d31bf9bbbd327a401e64f5065a8eb623645276f2fd4cf09
 EBUILD google-gadgets-0.10.0.ebuild 4186 RMD160 5b3468c67c1f6310787453d3406e511db06bbd39 SHA1 22bed8c2f79e94c3582a08af5dd64077d1ece2fc SHA256 19d6d7ad98c3a94a13e660ecab234d332ef84ce952f0271d23702ed763d16407
-MISC ChangeLog 1131 RMD160 d679ee60ee5e741c78d3e86f29c96e0ca886dbf7 SHA1 a2824c3a070fe541869651f55513eae7f1665fec SHA256 f180f28165f7bcad6a428668762ed6fb5171f8462be0dcef7038ca5bd57cc9a8
+MISC ChangeLog 1325 RMD160 5271adfbc92efaff5cca4d6c6ffbb502cf5a5777 SHA1 515908d8dee3acfbc29d30902fb33ac1a7ba34c7 SHA256 a0b5d6f506d4275affef8d6936a618e2ba7a73f2d1316667e772df3e9d4241ff
 MISC metadata.xml 258 RMD160 e363fac4024fa1d6e8481465c06e42cbe2eb9e2a SHA1 26ea33fa143b55cfa84ee879aab41f1b5e337127 SHA256 960cfc8d2eda3540d50ea76f60889fb72e3dc8342ecd9dce2070517e4469f599
diff --git a/x11-misc/google-gadgets/google-gadgets-0.10.0-r1.ebuild b/x11-misc/google-gadgets/google-gadgets-0.10.0-r1.ebuild
new file mode 100644
index 000000000000..7955f6273bc9
--- /dev/null
+++ b/x11-misc/google-gadgets/google-gadgets-0.10.0-r1.ebuild
@@ -0,0 +1,142 @@
+# 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.0-r1.ebuild,v 1.1 2008/07/16 21:00:38 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.gz"
+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 have.
+RDEPEND=">=dev-lang/spidermonkey-1.7.0
+	x11-libs/libX11
+	x11-libs/libXext
+	>=dev-libs/libxml2-2.6.32
+	>=sys-libs/zlib-1.2.3-r1
+
+	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-libs/xulrunner-1.8.1.14
+		>=net-misc/curl-7.18.1
+		>=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 ! use qt4
+	then
+		ewarn "Since >=x11-libs/qt-core-4.4.0 and related packages are package.masked"
+		ewarn "pending updates to the tree, the qt4 backend for ${PN} will not be built"
+		ewarn "unless you unmask the qt dependencies of this package and add"
+		ewarn "${CATEGORY}/${PN} -qt4"
+		ewarn "to /etc/portage/profile/package.use.mask"
+	fi
+
+	# 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.
+	econf	--disable-dependency-tracking \
+		--disable-update-desktop-database \
+		--disable-update-mime-database \
+		--disable-werror \
+		--enable-libxml2-xml-parser \
+		--enable-smjs-script-runtime \
+		$(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."
+}