Fix slot-deps on gtk+ and other libs, remove old

(Portage version: 2.1.9.42/cvs/Linux x86_64)

4 files changed, 20 insertions, 104 deletions

diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog
index f76aa38fc792..2b113b7afabf 100644
--- a/gnome-base/nautilus/ChangeLog
+++ b/gnome-base/nautilus/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/nautilus
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.370 2011/03/12 18:58:45 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.371 2011/03/16 17:08:06 nirbheek Exp $
+
+  16 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  nautilus-2.30.1-r1.ebuild, -nautilus-2.30.1-r2.ebuild,
+  nautilus-2.32.2.1.ebuild:
+  Fix slot-deps on gtk+ and other libs, remove old
 
   12 Mar 2011; Raúl Porcel <armin76@gentoo.org> nautilus-2.32.2.1.ebuild:
   alpha/arm/ia64/sh/sparc stable wrt #353436
diff --git a/gnome-base/nautilus/nautilus-2.30.1-r1.ebuild b/gnome-base/nautilus/nautilus-2.30.1-r1.ebuild
index 1f06fde378f5..65a8cb5b8739 100644
--- a/gnome-base/nautilus/nautilus-2.30.1-r1.ebuild
+++ b/gnome-base/nautilus/nautilus-2.30.1-r1.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-base/nautilus/nautilus-2.30.1-r1.ebuild,v 1.9 2010/10/17 15:15:02 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.30.1-r1.ebuild,v 1.10 2011/03/16 17:08:06 nirbheek Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
@@ -15,18 +15,18 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux"
 IUSE="doc gnome xmp"
 
-RDEPEND=">=dev-libs/glib-2.24.0
-	>=gnome-base/gnome-desktop-2.29.91
+RDEPEND=">=dev-libs/glib-2.24.0:2
+	>=gnome-base/gnome-desktop-2.29.91:2
 	>=x11-libs/pango-1.1.2
-	>=x11-libs/gtk+-2.20.0
-	>=dev-libs/libxml2-2.4.7
+	>=x11-libs/gtk+-2.20.0:2
+	>=dev-libs/libxml2-2.4.7:2
 	>=media-libs/libexif-0.5.12
-	>=gnome-base/gconf-2.0
-	dev-libs/libunique
+	>=gnome-base/gconf-2.0:2
+	dev-libs/libunique:1
 	dev-libs/dbus-glib
 	x11-libs/libXft
 	x11-libs/libXrender
-	xmp? ( >=media-libs/exempi-2 )"
+	xmp? ( media-libs/exempi:2 )"
 
 DEPEND="${RDEPEND}
 	>=dev-lang/perl-5
diff --git a/gnome-base/nautilus/nautilus-2.30.1-r2.ebuild b/gnome-base/nautilus/nautilus-2.30.1-r2.ebuild
deleted file mode 100644
index 0cfeb7525175..000000000000
--- a/gnome-base/nautilus/nautilus-2.30.1-r2.ebuild
+++ /dev/null
@@ -1,89 +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/nautilus/nautilus-2.30.1-r2.ebuild,v 1.1 2010/09/26 17:10:20 nirbheek Exp $
-
-EAPI="2"
-GCONF_DEBUG="no"
-
-inherit eutils gnome2 virtualx
-
-DESCRIPTION="A file manager for the GNOME desktop"
-HOMEPAGE="http://www.gnome.org/projects/nautilus/"
-
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux"
-IUSE="doc gnome xmp"
-
-RDEPEND=">=dev-libs/glib-2.24.0
-	>=gnome-base/gnome-desktop-2.29.91
-	>=x11-libs/pango-1.1.2
-	>=x11-libs/gtk+-2.20.0
-	>=dev-libs/libxml2-2.4.7
-	>=media-libs/libexif-0.5.12
-	>=gnome-base/gconf-2.0
-	dev-libs/libunique
-	dev-libs/dbus-glib
-	x11-libs/libXft
-	x11-libs/libXrender
-	xmp? ( >=media-libs/exempi-2 )"
-
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5
-	sys-devel/gettext
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.40.1
-	doc? ( >=dev-util/gtk-doc-1.4 )"
-# For eautoreconf
-#	gnome-base/gnome-common
-#	dev-util/gtk-doc-am"
-
-PDEPEND="gnome? ( >=x11-themes/gnome-icon-theme-1.1.91 )
-	>=gnome-base/gvfs-0.1.2"
-
-DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README THANKS TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-update-mimedb
-		--disable-packagekit
-		$(use_enable xmp)"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Remove crazy CFLAGS
-	sed 's:-DG.*DISABLE_DEPRECATED::g' -i configure.in configure \
-		|| die "sed 4 failed"
-
-	# Fix nautilus flipping-out with --no-desktop -- bug 266398
-	epatch "${FILESDIR}/${PN}-2.27.4-change-reg-desktop-file-with-no-desktop.patch"
-
-	# Do not show Unmount when showing Eject/Safe removal
-	epatch "${FILESDIR}/${P}-unmount-entries.patch"
-
-	# Fixes compilation with gtk+-2.22
-	epatch "${FILESDIR}/${PN}-2.30.1-remove-eel-gdk-window-focus.patch"
-}
-
-src_test() {
-	addwrite "/root/.gnome2_private"
-	unset SESSION_MANAGER
-	unset ORBIT_SOCKETDIR
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check || die "Test phase failed"
-}
-
-src_install() {
-	gnome2_src_install
-	find "${D}" -name "*.la" -delete || die "remove of la files failed"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	elog "nautilus can use gstreamer to preview audio files. Just make sure"
-	elog "to have the necessary plugins available to play the media type you"
-	elog "want to preview"
-}
diff --git a/gnome-base/nautilus/nautilus-2.32.2.1.ebuild b/gnome-base/nautilus/nautilus-2.32.2.1.ebuild
index 0f38da26a4fa..1ec3cb6e552a 100644
--- a/gnome-base/nautilus/nautilus-2.32.2.1.ebuild
+++ b/gnome-base/nautilus/nautilus-2.32.2.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-base/nautilus/nautilus-2.32.2.1.ebuild,v 1.5 2011/03/12 18:58:45 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.32.2.1.ebuild,v 1.6 2011/03/16 17:08:06 nirbheek Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -15,18 +15,18 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 ~ppc ~ppc64 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux"
 IUSE="doc gnome +introspection xmp"
 
-RDEPEND=">=dev-libs/glib-2.25.9
+RDEPEND=">=dev-libs/glib-2.25.9:2
 	>=gnome-base/gnome-desktop-2.29.91:2
 	>=x11-libs/pango-1.1.2
 	>=x11-libs/gtk+-2.22:2[introspection?]
-	>=dev-libs/libxml2-2.4.7
+	>=dev-libs/libxml2-2.4.7:2
 	>=media-libs/libexif-0.5.12
-	>=gnome-base/gconf-2
+	>=gnome-base/gconf-2:2
 	dev-libs/libunique:1
 	x11-libs/libXext
 	x11-libs/libXrender
 	introspection? ( >=dev-libs/gobject-introspection-0.6.4 )
-	xmp? ( >=media-libs/exempi-2 )"
+	xmp? ( media-libs/exempi:2 )"
 
 DEPEND="${RDEPEND}
 	>=dev-lang/perl-5