Version bump with bugfixes and translation updates, remove old.

(Portage version: 2.1.9.25/cvs/Linux x86_64)

4 files changed, 9 insertions, 179 deletions

diff --git a/gnome-base/gnome-applets/ChangeLog b/gnome-base/gnome-applets/ChangeLog
index 66d26271cad4..9b9720adfddd 100644
--- a/gnome-base/gnome-applets/ChangeLog
+++ b/gnome-base/gnome-applets/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/gnome-applets
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.328 2010/11/02 02:04:10 ford_prefect Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.329 2010/12/04 00:53:02 pacho Exp $
+
+*gnome-applets-2.32.1.1 (04 Dec 2010)
+
+  04 Dec 2010; Pacho Ramos <pacho@gentoo.org> -gnome-applets-2.28.0.ebuild,
+  -files/gnome-applets-2.28.0-stickynotes-duplicate-labels-ui.patch,
+  -gnome-applets-2.32.0.ebuild, +gnome-applets-2.32.1.1.ebuild:
+  Version bump with bugfixes and translation updates, remove old.
 
   02 Nov 2010; Arun Raghavan <ford_prefect@gentoo.org>
   gnome-applets-2.32.0.ebuild:
diff --git a/gnome-base/gnome-applets/files/gnome-applets-2.28.0-stickynotes-duplicate-labels-ui.patch b/gnome-base/gnome-applets/files/gnome-applets-2.28.0-stickynotes-duplicate-labels-ui.patch
deleted file mode 100644
index 92073395e778..000000000000
--- a/gnome-base/gnome-applets/files/gnome-applets-2.28.0-stickynotes-duplicate-labels-ui.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 26488f7c397fd3e41c7c64eaf2b14b577605e97e Mon Sep 17 00:00:00 2001
-From: Callum McKenzie <callum@spooky-possum.org>
-Date: Wed, 07 Oct 2009 18:38:05 +0000
-Subject: stickynotes: More fixes for duplicate labels in the .ui file.
-
-Patch from Michael Pryc in bug 594797.
----
-diff --git a/stickynotes/stickynotes.ui b/stickynotes/stickynotes.ui
-index 7035355..16c3a29 100644
---- a/stickynotes/stickynotes.ui
-+++ b/stickynotes/stickynotes.ui
-@@ -474,7 +474,7 @@
-               </packing>
-             </child>
-             <child>
--              <object class="GtkVBox" id="vbox1">
-+              <object class="GtkVBox" id="vbox3">
-                 <property name="visible">True</property>
-                 <property name="orientation">vertical</property>
-                 <child>
-@@ -494,7 +494,7 @@
-                   </packing>
-                 </child>
-                 <child>
--                  <object class="GtkLabel" id="label1">
-+                  <object class="GtkLabel" id="label2">
-                     <property name="visible">True</property>
-                     <property name="xalign">0</property>
-                     <property name="label" translatable="yes">This cannot be undone.</property>
---
-cgit v0.8.2
diff --git a/gnome-base/gnome-applets/gnome-applets-2.28.0.ebuild b/gnome-base/gnome-applets/gnome-applets-2.28.0.ebuild
deleted file mode 100644
index 3fa73d2cc114..000000000000
--- a/gnome-base/gnome-applets/gnome-applets-2.28.0.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2010 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.28.0.ebuild,v 1.9 2010/08/14 18:44:58 armin76 Exp $
-
-inherit eutils gnome2 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 ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
-IUSE="acpi apm doc gnome gstreamer hal ipv6 networkmanager policykit"
-
-# TODO: configure says python stuff is optional
-# my secret script says cpufrequtils might be needed in RDEPEND
-
-RDEPEND=">=x11-libs/gtk+-2.13
-	>=dev-libs/glib-2.18.0
-	>=gnome-base/gconf-2.8
-	>=gnome-base/gnome-panel-2.13.4
-	>=x11-libs/libxklavier-4.0
-	>=x11-libs/libwnck-2.9.3
-	>=gnome-base/gnome-desktop-2.11.1
-	>=x11-libs/libnotify-0.3.2
-	>=sys-apps/dbus-1.1.2
-	>=dev-libs/dbus-glib-0.74
-	>=dev-libs/libxml2-2.5.0
-	>=x11-themes/gnome-icon-theme-2.15.91
-	>=dev-libs/libgweather-2.22.1
-	>=virtual/python-2.4
-	x11-libs/libX11
-
-	apm? ( sys-apps/apmd )
-	gnome?	(
-		>=gnome-base/libgnomekbd-2.21.4.1
-		gnome-base/gnome-settings-daemon
-
-		>=gnome-extra/gucharmap-2.23
-		>=gnome-base/libgtop-2.11.92
-
-		>=dev-python/pygobject-2.6
-		>=dev-python/pygtk-2.6
-		>=dev-python/libgnome-python-2.10
-		>=dev-python/gconf-python-2.10
-		>=dev-python/gnome-applets-python-2.10 )
-	gstreamer?	(
-		>=media-libs/gstreamer-0.10.2
-		>=media-libs/gst-plugins-base-0.10.14
-		|| (
-			>=media-plugins/gst-plugins-alsa-0.10.14
-			>=media-plugins/gst-plugins-oss-0.10.14 ) )
-	hal? ( >=sys-apps/hal-0.5.3 )
-	networkmanager? ( >=net-misc/networkmanager-0.7.0 )
-	policykit? ( >=sys-auth/polkit-0.91 )"
-
-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
-	~app-text/docbook-xml-dtd-4.3
-	doc? ( app-text/docbook-sgml-utils )"
-
-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
-
-	# Invest applet tests need gconf/proxy/...
-	sed 's/^TESTS.*/TESTS=/g' -i invest-applet/invest/Makefile.am \
-		invest-applet/invest/Makefile.in || die "disabling invest tests failed"
-
-	# Fixes a crash when creating new sticky note, bug #207877, upstream #594797
-	epatch "${FILESDIR}/${P}-stickynotes-duplicate-labels-ui.patch"
-
-	# Fix intltoolize broken file, see upstream #577133
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
-		|| die "intltool rules fix failed"
-}
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-scrollkeeper
-		--disable-schemas-install
-		--enable-flags
-		$(use_enable gstreamer mixer-applet)
-		$(use_with hal)
-		$(use_enable ipv6)
-		$(use_enable networkmanager)
-		$(use_enable policykit polkit)"
-
-	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_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	emake check || die "emake check failed"
-}
-
-src_install() {
-	gnome2_src_install
-
-	local APPLETS="accessx-status battstat charpick cpufreq drivemount geyes
-			 gkb-new gswitchit gweather invest-applet mini-commander
-			 mixer modemlights multiload null_applet stickynotes trashapplet"
-
-	# modemlights is out because it needs system-tools-backends-1
-
-	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_mod_optimize $(python_get_sitedir)/invest
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/invest
-}
diff --git a/gnome-base/gnome-applets/gnome-applets-2.32.0.ebuild b/gnome-base/gnome-applets/gnome-applets-2.32.1.1.ebuild
index 1c5607cb713f..3d58a6ac853f 100644
--- a/gnome-base/gnome-applets/gnome-applets-2.32.0.ebuild
+++ b/gnome-base/gnome-applets/gnome-applets-2.32.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.32.0.ebuild,v 1.4 2010/11/02 02:04:10 ford_prefect Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.32.1.1.ebuild,v 1.1 2010/12/04 00:53:02 pacho Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"