Fix slot-deps on gnome libs, remove old

Package-Manager: portage-2.1.9.44/cvs/Linux x86_64

11 files changed, 28 insertions, 259 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"
-}
diff --git a/gnome-extra/swfdec-gnome/ChangeLog b/gnome-extra/swfdec-gnome/ChangeLog
index b83528bb33dc..6b3825005122 100644
--- a/gnome-extra/swfdec-gnome/ChangeLog
+++ b/gnome-extra/swfdec-gnome/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/swfdec-gnome
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/swfdec-gnome/ChangeLog,v 1.53 2011/03/22 19:32:40 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/swfdec-gnome/ChangeLog,v 1.54 2011/03/23 08:31:08 nirbheek Exp $
+
+  23 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  -swfdec-gnome-2.30.0.ebuild, swfdec-gnome-2.30.1.ebuild:
+  Fix slot-deps on gnome libs, remove old
 
   22 Mar 2011; Brent Baude <ranger@gentoo.org> swfdec-gnome-2.30.1.ebuild:
   Marking swfdec-gnome-2.30.1 ppc stable for bug 353436
diff --git a/gnome-extra/swfdec-gnome/swfdec-gnome-2.30.0.ebuild b/gnome-extra/swfdec-gnome/swfdec-gnome-2.30.0.ebuild
deleted file mode 100644
index 9eb405f0e7ee..000000000000
--- a/gnome-extra/swfdec-gnome/swfdec-gnome-2.30.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/swfdec-gnome/swfdec-gnome-2.30.0.ebuild,v 1.7 2010/10/17 15:47:54 armin76 Exp $
-
-EAPI="2"
-
-inherit gnome2
-
-DESCRIPTION="Flash player and thumbnailer for GNOME"
-HOMEPAGE="http://swfdec.freedesktop.org/wiki/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=x11-libs/gtk+-2.12.0
-		gnome-base/gconf
-		>=media-libs/swfdec-0.8[gtk]"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35.0
-	sys-devel/gettext"
-
-DOCS="NEWS README"
diff --git a/gnome-extra/swfdec-gnome/swfdec-gnome-2.30.1.ebuild b/gnome-extra/swfdec-gnome/swfdec-gnome-2.30.1.ebuild
index 0248d342ef61..9c0e2974a28d 100644
--- a/gnome-extra/swfdec-gnome/swfdec-gnome-2.30.1.ebuild
+++ b/gnome-extra/swfdec-gnome/swfdec-gnome-2.30.1.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/swfdec-gnome/swfdec-gnome-2.30.1.ebuild,v 1.7 2011/03/22 19:32:40 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/swfdec-gnome/swfdec-gnome-2.30.1.ebuild,v 1.8 2011/03/23 08:31:08 nirbheek Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -16,7 +16,7 @@ KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=x11-libs/gtk+-2.14:2
-	>=gnome-base/gconf-2
+	>=gnome-base/gconf-2:2
 	>=media-libs/swfdec-0.8[gtk]"
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.35.0
diff --git a/gnome-extra/yelp/ChangeLog b/gnome-extra/yelp/ChangeLog
index d8b56eedfa92..db89eeb79d85 100644
--- a/gnome-extra/yelp/ChangeLog
+++ b/gnome-extra/yelp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/yelp
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.256 2011/03/22 19:33:12 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.257 2011/03/23 08:32:01 nirbheek Exp $
+
+  23 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  -yelp-2.30.1-r1.ebuild, -yelp-2.30.2.ebuild, yelp-2.30.2-r1.ebuild:
+  Fix slot-deps on gnome libs, remove old
 
   22 Mar 2011; Brent Baude <ranger@gentoo.org> yelp-2.30.2-r1.ebuild:
   Marking yelp-2.30.2-r1 ppc stable for bug 353436
diff --git a/gnome-extra/yelp/yelp-2.30.1-r1.ebuild b/gnome-extra/yelp/yelp-2.30.1-r1.ebuild
deleted file mode 100644
index 069d5d87cf0d..000000000000
--- a/gnome-extra/yelp/yelp-2.30.1-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.30.1-r1.ebuild,v 1.8 2010/10/17 15:34:03 armin76 Exp $
-
-EAPI="2"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Help browser for GNOME"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="beagle lzma"
-
-RDEPEND=">=gnome-base/gconf-2
-	>=app-text/gnome-doc-utils-0.19.1
-	>=x11-libs/gtk+-2.18
-	>=dev-libs/glib-2.16
-	>=dev-libs/libxml2-2.6.5
-	>=dev-libs/libxslt-1.1.4
-	>=x11-libs/startup-notification-0.8
-	>=dev-libs/dbus-glib-0.71
-	beagle? ( || (
-		>=dev-libs/libbeagle-0.3.0
-		=app-misc/beagle-0.2* ) )
-	net-libs/xulrunner:1.9
-	sys-libs/zlib
-	app-arch/bzip2
-	lzma? ( || (
-		app-arch/xz-utils
-		app-arch/lzma-utils ) )
-	>=app-text/rarian-0.7
-	>=app-text/scrollkeeper-9999"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.9
-	gnome-base/gnome-common"
-# If eautoreconf:
-#	gnome-base/gnome-common
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--with-gecko=libxul-embedding
-		$(use_enable lzma)"
-
-	if use beagle; then
-		G2CONF="${G2CONF} --with-search=beagle"
-	else
-		G2CONF="${G2CONF} --with-search=basic"
-	fi
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Fix automagic lzma support, bug #266128
-	epatch "${FILESDIR}/${PN}-2.26.0-automagic-lzma.patch"
-
-	# Fix build with xulrunner-1.9.2
-	epatch "${FILESDIR}/${PN}-2.28.1-system-nspr.patch"
-
-	# Fix TOC title I18N, bgo#615141
-	epatch "${FILESDIR}/${P}-fix-toc.patch"
-
-	# Fix "Open Link in New Window", bgo#615457
-	epatch "${FILESDIR}/${P}-open-link.patch"
-
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
-
-	# strip stupid options in configure, see bug #196621
-	sed -i 's|$AM_CFLAGS -pedantic -ansi|$AM_CFLAGS|' configure || die "sed	failed"
-}
diff --git a/gnome-extra/yelp/yelp-2.30.2-r1.ebuild b/gnome-extra/yelp/yelp-2.30.2-r1.ebuild
index 4a64fad5ce9c..55286b6fffff 100644
--- a/gnome-extra/yelp/yelp-2.30.2-r1.ebuild
+++ b/gnome-extra/yelp/yelp-2.30.2-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/yelp/yelp-2.30.2-r1.ebuild,v 1.6 2011/03/22 19:33:12 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.30.2-r1.ebuild,v 1.7 2011/03/23 08:32:01 nirbheek Exp $
 
 EAPI="3"
 GCONF_DEBUG="yes"
@@ -16,11 +16,11 @@ KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86 ~x86-freebsd ~amd64-lin
 # FIXME: lzma/xz support will be fixed in yelp3, bug #314923
 IUSE=""
 
-RDEPEND=">=gnome-base/gconf-2
+RDEPEND=">=gnome-base/gconf-2:2
 	>=app-text/gnome-doc-utils-0.19.1
 	>=x11-libs/gtk+-2.18:2
 	>=dev-libs/glib-2.16:2
-	>=dev-libs/libxml2-2.6.5
+	>=dev-libs/libxml2-2.6.5:2
 	>=dev-libs/libxslt-1.1.4
 	>=x11-libs/startup-notification-0.8
 	>=dev-libs/dbus-glib-0.71
diff --git a/gnome-extra/yelp/yelp-2.30.2.ebuild b/gnome-extra/yelp/yelp-2.30.2.ebuild
deleted file mode 100644
index 454fe8c4fb73..000000000000
--- a/gnome-extra/yelp/yelp-2.30.2.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/yelp/yelp-2.30.2.ebuild,v 1.5 2011/01/30 18:58:17 armin76 Exp $
-
-EAPI="2"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Help browser for GNOME"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ~ppc ~ppc64 sparc x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="beagle lzma"
-
-RDEPEND=">=gnome-base/gconf-2
-	>=app-text/gnome-doc-utils-0.19.1
-	>=x11-libs/gtk+-2.18:2
-	>=dev-libs/glib-2.16:2
-	>=dev-libs/libxml2-2.6.5
-	>=dev-libs/libxslt-1.1.4
-	>=x11-libs/startup-notification-0.8
-	>=dev-libs/dbus-glib-0.71
-	beagle? ( || (
-		>=dev-libs/libbeagle-0.3.0
-		=app-misc/beagle-0.2* ) )
-	net-libs/xulrunner:1.9
-	sys-libs/zlib
-	app-arch/bzip2
-	lzma? ( || (
-		app-arch/xz-utils
-		app-arch/lzma-utils ) )
-	>=app-text/rarian-0.7
-	>=app-text/scrollkeeper-9999"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.9
-	gnome-base/gnome-common"
-# If eautoreconf:
-#	gnome-base/gnome-common
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
-	G2CONF="${G2CONF}
-		--with-gecko=libxul-embedding
-		$(use_enable lzma)"
-
-	if use beagle; then
-		G2CONF="${G2CONF} --with-search=beagle"
-	else
-		G2CONF="${G2CONF} --with-search=basic"
-	fi
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Fix automagic lzma support, bug #266128
-	epatch "${FILESDIR}/${PN}-2.26.0-automagic-lzma.patch"
-
-	# Fix build with xulrunner-1.9.2
-	epatch "${FILESDIR}/${PN}-2.28.1-system-nspr.patch"
-
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
-
-	# strip stupid options in configure, see bug #196621
-	sed -i 's|$AM_CFLAGS -pedantic -ansi|$AM_CFLAGS|' configure || die "sed	failed"
-}