New version for GNOME-2.22.

 * libgweather has been broken out into its own library so it can be used
   throughout GNOME.
 * The battery status applet handles older systems better.
 * The keyboard indicator can now print the keyboard layout.
 * Lots of bug fixes.
 * fix gnome-doc-utils dependency, bug #206440
(Portage version: 2.1.4.4)

3 files changed, 147 insertions, 3 deletions

diff --git a/gnome-base/gnome-applets/ChangeLog b/gnome-base/gnome-applets/ChangeLog
index 6c90308f0593..3f6ad9ac1adf 100644
--- a/gnome-base/gnome-applets/ChangeLog
+++ b/gnome-base/gnome-applets/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for gnome-base/gnome-applets
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.255 2008/02/11 22:57:56 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.256 2008/03/24 18:14:33 eva Exp $
+
+  24 Mar 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  gnome-applets-2.20.1.ebuild, gnome-applets-2.22.0.ebuild:
+  fix gnome-doc-utils dependency, bug #206440
+
+*gnome-applets-2.22.0 (24 Mar 2008)
+
+  24 Mar 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  +gnome-applets-2.22.0.ebuild:
+  New version for GNOME-2.22.
+  * libgweather has been broken out into its own library so it can be used
+    throughout GNOME.
+  * The battery status applet handles older systems better.
+  * The keyboard indicator can now print the keyboard layout.
+  * Lots of bug fixes.
 
   11 Feb 2008; Gilles Dartiguelongue <eva@gentoo.org>
   gnome-applets-2.20.1.ebuild:
diff --git a/gnome-base/gnome-applets/gnome-applets-2.20.1.ebuild b/gnome-base/gnome-applets/gnome-applets-2.20.1.ebuild
index c0874d08ea78..cdba5e680e82 100644
--- a/gnome-base/gnome-applets/gnome-applets-2.20.1.ebuild
+++ b/gnome-base/gnome-applets/gnome-applets-2.20.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.20.1.ebuild,v 1.8 2008/02/11 22:57:56 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.20.1.ebuild,v 1.9 2008/03/24 18:14:33 eva Exp $
 
 inherit eutils gnome2 autotools python
 
@@ -50,12 +50,12 @@ RDEPEND=">=x11-libs/gtk+-2.11
 
 DEPEND="${RDEPEND}
 		>=app-text/scrollkeeper-0.1.4
+		>=app-text/gnome-doc-utils-0.3.2
 		>=dev-util/pkgconfig-0.19
 		>=dev-util/intltool-0.35
 		dev-libs/libxslt
 		doc? (
 				app-text/docbook-sgml-utils
-				>=app-text/gnome-doc-utils-0.3.2
 				~app-text/docbook-xml-dtd-4.3
 			)
 		test? ( ~app-text/docbook-xml-dtd-4.3 )"
diff --git a/gnome-base/gnome-applets/gnome-applets-2.22.0.ebuild b/gnome-base/gnome-applets/gnome-applets-2.22.0.ebuild
new file mode 100644
index 000000000000..be18faa06789
--- /dev/null
+++ b/gnome-base/gnome-applets/gnome-applets-2.22.0.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.22.0.ebuild,v 1.1 2008/03/24 18:14:33 eva Exp $
+
+inherit eutils gnome2 autotools python
+
+DESCRIPTION="Applets for the GNOME Desktop and Panel"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2 FDL-1.1 LGPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="acpi apm doc gnome gstreamer hal ipv6 test"
+
+# TODO: configure says python stuff is optional
+# my secret script says cpufrequtils might be needed in RDEPEND
+
+RDEPEND=">=x11-libs/gtk+-2.11
+		>=dev-libs/glib-2.15.6
+		>=gnome-base/libgnome-2.8
+		>=gnome-base/libgnomeui-2.8
+		>=gnome-base/gconf-2.8
+		>=gnome-base/gnome-panel-2.13.4
+		>=gnome-base/libglade-2.4
+		>=gnome-base/gail-1.1
+		>=x11-libs/libxklavier-2.91
+		>=x11-libs/libwnck-2.9.3
+		>=app-admin/system-tools-backends-1.1.3
+		>=gnome-base/gnome-desktop-2.11.1
+		>=x11-libs/libnotify-0.3.2
+		hal? ( >=sys-apps/hal-0.5.3 )
+		>=dev-libs/dbus-glib-0.71
+		>=x11-themes/gnome-icon-theme-2.15.91
+		>=dev-libs/libxml2-2.5.0
+		>=dev-libs/libgweather-2.21.1
+		>=virtual/python-2.4
+		apm? ( sys-apps/apmd )
+		x11-apps/xrdb x11-libs/libX11
+		gnome?	(
+					>=gnome-base/libgnomekbd-2.21.4.1
+					gnome-base/control-center
+
+					>=gnome-extra/gucharmap-1.4
+					>=gnome-base/libgtop-2.11.92
+					>=gnome-base/gnome-vfs-2.15.4
+
+					>=dev-python/pygtk-2.6
+					>=dev-python/gnome-python-2.10
+				)
+		gstreamer?	(
+						>=media-libs/gstreamer-0.10.2
+						>=media-libs/gst-plugins-base-0.10.14
+					)"
+DEPEND="${RDEPEND}
+		>=app-text/scrollkeeper-0.1.4
+		>=app-text/gnome-doc-utils-0.3.2
+		>=dev-util/pkgconfig-0.19
+		>=dev-util/intltool-0.35
+		dev-libs/libxslt
+		doc? (
+				app-text/docbook-sgml-utils
+				~app-text/docbook-xml-dtd-4.3
+			)
+		test? ( ~app-text/docbook-xml-dtd-4.3 )"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# disable pyc compiling
+	mv py-compile py-compile.orig
+	ln -s $(type -P true) py-compile
+}
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-scrollkeeper --enable-flags
+		$(use_with hal)
+		$(use_enable ipv6)"
+
+	if use gstreamer; then
+		G2CONF="${G2CONF} --with-gstreamer=0.10"
+	fi
+
+	if ! use ppc && ! use apm && ! use acpi; then
+		G2CONF="${G2CONF} --disable-battstat"
+	fi
+
+	if use ppc && ! use apm; then
+		G2CONF="${G2CONF} --disable-battstat"
+	fi
+}
+
+src_install() {
+	gnome2_src_install
+
+	APPLETS="accessx-status battstat charpick cpufreq drivemount geyes \
+			 gkb-new gswitchit gweather invest-applet mini-commander \
+			 mixer modemlights multiload null_applet stickynotes trashapplet"
+
+	for applet in ${APPLETS} ; do
+		docinto ${applet}
+
+		for d in AUTHORS ChangeLog NEWS README README.themes TODO ; do
+			[ -s ${applet}/${d} ] && dodoc ${applet}/${d}
+		done
+	done
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if use acpi && ! use hal ; then
+		elog "It is highly recommended that you install acpid if you use the"
+		elog "battstat applet to prevent any issues with other applications "
+		elog "trying to read acpi information."
+	fi
+
+	# check for new python modules on bumps
+	python_version
+	python_mod_optimize "${ROOT}"/usr/$(get_libdir)/python${PYVER}/site-packages/invest
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+	python_version
+	python_mod_cleanup /usr/$(get_libdir)/python${PYVER}/site-packages/invest
+}