Fix slot-deps on gnome libs, remove old

(Portage version: 2.1.9.44/cvs/Linux x86_64)

4 files changed, 13 insertions, 79 deletions

diff --git a/gnome-extra/sensors-applet/ChangeLog b/gnome-extra/sensors-applet/ChangeLog
index f6398f8f0727..103cf68d192b 100644
--- a/gnome-extra/sensors-applet/ChangeLog
+++ b/gnome-extra/sensors-applet/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/sensors-applet
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/sensors-applet/ChangeLog,v 1.50 2011/03/07 09:22:31 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/sensors-applet/ChangeLog,v 1.51 2011/03/23 08:30:12 nirbheek Exp $
+
+  23 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  sensors-applet-2.2.4.ebuild, -sensors-applet-2.2.7.ebuild,
+  sensors-applet-2.2.7-r1.ebuild:
+  Fix slot-deps on gnome libs, remove old
 
 *sensors-applet-2.2.7-r1 (07 Mar 2011)
 
diff --git a/gnome-extra/sensors-applet/sensors-applet-2.2.4.ebuild b/gnome-extra/sensors-applet/sensors-applet-2.2.4.ebuild
index 9b4f9bac6fba..622f67d10a3f 100644
--- a/gnome-extra/sensors-applet/sensors-applet-2.2.4.ebuild
+++ b/gnome-extra/sensors-applet/sensors-applet-2.2.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/sensors-applet/sensors-applet-2.2.4.ebuild,v 1.6 2010/12/08 17:54:46 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/sensors-applet/sensors-applet-2.2.4.ebuild,v 1.7 2011/03/23 08:30:12 nirbheek Exp $
 
 EAPI="2"
 
@@ -16,8 +16,8 @@ KEYWORDS="alpha amd64 ppc x86"
 IUSE="hddtemp libnotify lm_sensors nvidia"
 
 RDEPEND="
-	>=dev-libs/glib-2.6
-	>=x11-libs/gtk+-2.8.0
+	>=dev-libs/glib-2.6:2
+	>=x11-libs/gtk+-2.8.0:2
 	|| ( gnome-base/gnome-panel[bonobo] <gnome-base/gnome-panel-2.32 )
 	>=gnome-base/libgnome-2.8
 	>=gnome-base/libgnomeui-2.8
diff --git a/gnome-extra/sensors-applet/sensors-applet-2.2.7-r1.ebuild b/gnome-extra/sensors-applet/sensors-applet-2.2.7-r1.ebuild
index 7acce06bdf93..f2549116b91e 100644
--- a/gnome-extra/sensors-applet/sensors-applet-2.2.7-r1.ebuild
+++ b/gnome-extra/sensors-applet/sensors-applet-2.2.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/sensors-applet/sensors-applet-2.2.7-r1.ebuild,v 1.1 2011/03/07 09:22:31 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/sensors-applet/sensors-applet-2.2.7-r1.ebuild,v 1.2 2011/03/23 08:30:12 nirbheek Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
@@ -17,8 +17,8 @@ KEYWORDS="~alpha ~amd64 ~ppc ~x86"
 IUSE="+dbus hddtemp libnotify lm_sensors video_cards_fglrx video_cards_nvidia"
 
 RDEPEND="
-	>=dev-libs/glib-2.14
-	>=x11-libs/gtk+-2.14
+	>=dev-libs/glib-2.14:2
+	>=x11-libs/gtk+-2.14:2
 	|| ( gnome-base/gnome-panel[bonobo] <gnome-base/gnome-panel-2.32 )
 	>=gnome-base/libgnome-2.8
 	>=gnome-base/libgnomeui-2.8
diff --git a/gnome-extra/sensors-applet/sensors-applet-2.2.7.ebuild b/gnome-extra/sensors-applet/sensors-applet-2.2.7.ebuild
deleted file mode 100644
index a837ee0d5af2..000000000000
--- a/gnome-extra/sensors-applet/sensors-applet-2.2.7.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/sensors-applet/sensors-applet-2.2.7.ebuild,v 1.4 2011/03/07 08:37:43 jlec Exp $
-
-EAPI="2"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="GNOME panel applet to display readings from hardware sensors"
-HOMEPAGE="http://sensors-applet.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sensors-applet/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
-IUSE="+dbus hddtemp libnotify lm_sensors video_cards_fglrx video_cards_nvidia"
-
-RDEPEND="
-	>=dev-libs/glib-2.14
-	>=x11-libs/gtk+-2.14
-	|| ( gnome-base/gnome-panel[bonobo] <gnome-base/gnome-panel-2.32 )
-	>=gnome-base/libgnome-2.8
-	>=gnome-base/libgnomeui-2.8
-	>=x11-libs/cairo-1.0.4
-	hddtemp? (
-		dbus? (
-			>=dev-libs/dbus-glib-0.80
-			>=dev-libs/libatasmart-0.16 )
-		!dbus? ( >=app-admin/hddtemp-0.3_beta13 ) )
-	libnotify? ( <x11-libs/libnotify-0.7.1 )
-	lm_sensors? ( sys-apps/lm_sensors )
-	video_cards_fglrx? ( x11-drivers/ati-drivers )
-	video_cards_nvidia? ( || (
-		>=x11-drivers/nvidia-drivers-100.14.09
-		media-video/nvidia-settings
-	) )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12
-	>=app-text/scrollkeeper-0.3.14
-	>=app-text/gnome-doc-utils-0.3.2
-	dev-util/intltool"
-# Requires libxslt only for use by gnome-doc-utils
-
-PDEPEND="hddtemp? ( dbus? ( sys-fs/udisks ) )"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-scrollkeeper
-		--disable-static
-		$(use_enable dbus udisks)
-		$(use_enable libnotify)
-		$(use_with lm_sensors libsensors)
-		$(use_with video_cards_fglrx aticonfig)
-		$(use_with video_cards_nvidia nvidia)"
-
-	if use hddtemp; then
-		G2CONF="${G2CONF} $(use_enable dbus udisks)"
-	else
-		G2CONF="${G2CONF} --disable-udisks"
-	fi
-}
-
-src_install() {
-	gnome2_src_install
-
-	find "${D}" -name "*.la" -delete || die "failed to delete *.la"
-}