Version bump, bugfixes and optimization, more gadgets supported including the new youtube gadget. Also install ChangeLog

Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.26-gentoo x86_64

3 files changed, 149 insertions, 2 deletions

diff --git a/x11-misc/google-gadgets/ChangeLog b/x11-misc/google-gadgets/ChangeLog
index c783ed73b75d..cd82ab4e4d22 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.15 2008/12/15 10:14:36 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/google-gadgets/ChangeLog,v 1.16 2008/12/16 10:31:22 voyageur Exp $
+
+*google-gadgets-0.10.4 (16 Dec 2008)
+
+  16 Dec 2008; Bernard Cafarelli <voyageur@gentoo.org>
+  +google-gadgets-0.10.4.ebuild:
+  Version bump, bugfixes and optimization, more gadgets supported including
+  the new youtube gadget. Also install ChangeLog
 
   15 Dec 2008; Bernard Cafarelli <voyageur@gentoo.org>
   google-gadgets-0.10.3.ebuild:
diff --git a/x11-misc/google-gadgets/Manifest b/x11-misc/google-gadgets/Manifest
index 013c9711692b..748f826674dd 100644
--- a/x11-misc/google-gadgets/Manifest
+++ b/x11-misc/google-gadgets/Manifest
@@ -2,8 +2,10 @@ 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
 DIST google-gadgets-for-linux-0.10.3.tar.bz2 2310377 RMD160 6256a0e34e4c157aef4b88537c54192d93f3af0c SHA1 a067ba48fa195bbeed407dc0e528e608e59156ee SHA256 fe63758aacb3842829c5a6d7698152b34becb44fe3e2d84d9706bf4ea9956c1e
+DIST google-gadgets-for-linux-0.10.4.tar.bz2 2384725 RMD160 d47586e7a97e27c3a2a0a4dbb11087b0a2b98b5d SHA1 d1d53b7a1fff2dd3bbe7670ebaf4a9a0996d92a9 SHA256 03ff4140070ae7518a40fef94993c1f32b02d8f65f88f69363447cff501977df
 EBUILD google-gadgets-0.10.0-r2.ebuild 4131 RMD160 8dfabe6b0de0591bfa3601eb5868be030a2146d5 SHA1 80a0d9deb5c9ffca3a15dd4bfd1cd1ec0c87d729 SHA256 b5602b80df5dbe69b2d09862be7011c13581bce157659765f63fd3790da6efc7
 EBUILD google-gadgets-0.10.2-r2.ebuild 4668 RMD160 e4e72d58f191ebce8394672f6ddfe27cdf7a5a6d SHA1 d3ff404e5289833a01d3ef549f2940f08ac34289 SHA256 531100d5da78b869a923197571f5257d7491909517ed82e8aca54720ea0a9155
 EBUILD google-gadgets-0.10.3.ebuild 4185 RMD160 dd39ea87bfd4de1aabe07ed3b58bd05868a9edd8 SHA1 93a9a7cb1bbf7e0a5631b74f7e720c90bab94855 SHA256 00a143b2e38b3d05716cebde77980078c073fd8c17a2e943281637b2f21e39f5
-MISC ChangeLog 3342 RMD160 5c99816f86615d05605a1692115c896806158317 SHA1 8586f96260ea5b66d88cbc1c753a5a77ab0d9102 SHA256 5c7fc4af15b472708eeeb1dd74fe3140bfda0ee53c27940e28f5096fe8f6c405
+EBUILD google-gadgets-0.10.4.ebuild 4246 RMD160 3f5c204865a876438106b28f5b44abf4e3c1053b SHA1 2f5156a3bb9e4c66a29f005932a3f74366516639 SHA256 54324d44098460be8b7c706596ea01b27f14adcca8797e36119d1c23f782e015
+MISC ChangeLog 3594 RMD160 ff9c6fea530ce0d1de2aba39746fc282194baacf SHA1 02159f3af0585af698e20e340ccfc5087b3f51ae SHA256 0bd8d3a6667637dd9fb520c7d3008d3d414162a4b6e5d20ee8d1223e18810e16
 MISC metadata.xml 260 RMD160 af6650245d6ccbcbdb2e829cd5d7be36bef71058 SHA1 a09861327ac9225fbbfafb891a8998f2ea6c73bb SHA256 1dfcd18a238fd7d714e848ad5661fbe98c7556e276b054d962cccfe44f7240f6
diff --git a/x11-misc/google-gadgets/google-gadgets-0.10.4.ebuild b/x11-misc/google-gadgets/google-gadgets-0.10.4.ebuild
new file mode 100644
index 000000000000..041d7870cea3
--- /dev/null
+++ b/x11-misc/google-gadgets/google-gadgets-0.10.4.ebuild
@@ -0,0 +1,138 @@
+# 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.4.ebuild,v 1.1 2008/12/16 10:31:22 voyageur 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="~amd64 ~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.
+
+#BIG DANGLING NOTE: This fails with gcc <4.2.
+
+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 )
+
+	networkmanager? ( net-misc/networkmanager )
+	startup-notification? ( x11-libs/startup-notification )
+
+	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
+
+}
+
+src_unpack() {
+	base_src_unpack
+	cd "${S}"
+
+	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) \
+		|| die "econf 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
+}
+
+src_install() {
+	base_src_install
+	dodoc ChangeLog README
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}