Version bump, bugfix release

(Portage version: 2.2_rc40/cvs/Linux x86_64)

3 files changed, 65 insertions, 179 deletions

diff --git a/x11-misc/google-gadgets/ChangeLog b/x11-misc/google-gadgets/ChangeLog
index 4f61ad95e7a5..b6ba4d7c2ce1 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/google-gadgets/ChangeLog,v 1.26 2009/06/02 08:08:16 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/google-gadgets/ChangeLog,v 1.27 2009/09/09 20:35:48 voyageur Exp $
+
+*google-gadgets-0.11.1 (09 Sep 2009)
+
+  09 Sep 2009; Bernard Cafarelli <voyageur@gentoo.org>
+  -google-gadgets-0.10.3.ebuild, -google-gadgets-0.10.4.ebuild,
+  +google-gadgets-0.11.1.ebuild:
+  Version bump, bugfix release
 
   02 Jun 2009; Bernard Cafarelli <voyageur@gentoo.org>
   google-gadgets-0.11.0.ebuild:
diff --git a/x11-misc/google-gadgets/google-gadgets-0.10.3.ebuild b/x11-misc/google-gadgets/google-gadgets-0.10.3.ebuild
deleted file mode 100644
index aabf76c3ef7b..000000000000
--- a/x11-misc/google-gadgets/google-gadgets-0.10.3.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# 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.3.ebuild,v 1.3 2008/12/17 09:18:59 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.
-
-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
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
diff --git a/x11-misc/google-gadgets/google-gadgets-0.10.4.ebuild b/x11-misc/google-gadgets/google-gadgets-0.11.1.ebuild
index 274f3553bdfb..68a3ed246bf1 100644
--- a/x11-misc/google-gadgets/google-gadgets-0.10.4.ebuild
+++ b/x11-misc/google-gadgets/google-gadgets-0.11.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.3 2008/12/30 10:42:12 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/google-gadgets/google-gadgets-0.11.1.ebuild,v 1.1 2009/09/09 20:35:48 voyageur Exp $
 
 EAPI=2
 
@@ -8,79 +8,80 @@ 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"
+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="x11-libs/libX11
-	x11-libs/libXext
+RDEPEND="
 	>=dev-libs/libxml2-2.6.32
 	sys-libs/zlib
-	net-libs/xulrunner:1.9
+	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? ( dbus? ( >=dev-libs/dbus-glib-0.74 )
+	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
-		gnome-base/librsvg
-		>=net-misc/curl-7.18.2
-		>=dev-libs/atk-1.22.0 )
-
+		dbus? ( >=dev-libs/dbus-glib-0.74 )
+	)
 	networkmanager? ( net-misc/networkmanager )
-	startup-notification? ( x11-libs/startup-notification )
-
-	qt4? ( dbus? ( >=x11-libs/qt-dbus-4.4.0 )
+	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
-		>=x11-libs/qt-opengl-4.4.0
-		>=x11-libs/qt-script-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"
+	>=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
+	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
+	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}"
-
-	epatch "${FILESDIR}"/${P}-gcc41.patch
-	epatch "${FILESDIR}"/${P}-xulrunner-1.9.1.patch
-
+src_prepare() {
 	sed -i -r \
 		-e '/^GGL_SYSDEPS_INCLUDE_DIR/ c\GGL_SYSDEPS_INCLUDE_DIR=$GGL_INCLUDE_DIR' \
 		configure.ac||die "404"
@@ -88,38 +89,47 @@ src_unpack() {
 }
 
 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 \
+	local myconf="--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-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-mediaplayer-element) \
+		$(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 gtkmoz-browser-element) \
+		$(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) \
-		|| die "econf failed"
+		$(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() {