[gentoo-commits] proj/gnome:master commit in: gnome-base/nautilus/

[Nirbheek Chauhan]

commit:     e0bae2d58ab915276a23796315a22ae76b509edf
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 21 22:15:59 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Mon Feb 21 22:15:59 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=e0bae2d5

gnome-base/nautilus: 2.91.9 -> 2.91.90

---
 ...tilus-2.91.9.ebuild => nautilus-2.91.90.ebuild} |    9 +++------
 gnome-base/nautilus/nautilus-9999.ebuild           |    9 +++------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/gnome-base/nautilus/nautilus-2.91.9.ebuild b/gnome-base/nautilus/nautilus-2.91.90.ebuild
similarity index 90%
rename from gnome-base/nautilus/nautilus-2.91.9.ebuild
rename to gnome-base/nautilus/nautilus-2.91.90.ebuild
index ddc9993..f314546 100644
--- a/gnome-base/nautilus/nautilus-2.91.9.ebuild
+++ b/gnome-base/nautilus/nautilus-2.91.90.ebuild
@@ -21,10 +21,10 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux"
 fi
 
-RDEPEND=">=dev-libs/glib-2.27.5
+RDEPEND=">=dev-libs/glib-2.28.0:2
 	>=x11-libs/pango-1.1.2
-	>=x11-libs/gtk+-2.99.0:3[introspection?]
-	>=dev-libs/libxml2-2.4.7
+	>=x11-libs/gtk+-3.0:3[introspection?]
+	>=dev-libs/libxml2-2.4.7:2
 	>=gnome-base/gnome-desktop-2.91.2:3
 
 	gnome-base/gsettings-desktop-schemas
@@ -78,9 +78,6 @@ src_prepare() {
 	sed 's:-DG.*DISABLE_DEPRECATED::g' -i configure.in \
 		|| 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"
-
 	eautoreconf
 }
 

diff --git a/gnome-base/nautilus/nautilus-9999.ebuild b/gnome-base/nautilus/nautilus-9999.ebuild
index ddc9993..f314546 100644
--- a/gnome-base/nautilus/nautilus-9999.ebuild
+++ b/gnome-base/nautilus/nautilus-9999.ebuild
@@ -21,10 +21,10 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux"
 fi
 
-RDEPEND=">=dev-libs/glib-2.27.5
+RDEPEND=">=dev-libs/glib-2.28.0:2
 	>=x11-libs/pango-1.1.2
-	>=x11-libs/gtk+-2.99.0:3[introspection?]
-	>=dev-libs/libxml2-2.4.7
+	>=x11-libs/gtk+-3.0:3[introspection?]
+	>=dev-libs/libxml2-2.4.7:2
 	>=gnome-base/gnome-desktop-2.91.2:3
 
 	gnome-base/gsettings-desktop-schemas
@@ -78,9 +78,6 @@ src_prepare() {
 	sed 's:-DG.*DISABLE_DEPRECATED::g' -i configure.in \
 		|| 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"
-
 	eautoreconf
 }