Bump to 2.24.2-r1. Fix scrollbar updates in tabbed naviguation, bug #260965. Clean up old revisions.

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

7 files changed, 59 insertions, 181 deletions

diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog
index 425ddb73ab63..bfecaed9b904 100644
--- a/gnome-base/nautilus/ChangeLog
+++ b/gnome-base/nautilus/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for gnome-base/nautilus
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.295 2009/03/06 15:42:51 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.296 2009/03/09 23:55:52 eva Exp $
+
+*nautilus-2.24.2-r1 (09 Mar 2009)
+
+  09 Mar 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/nautilus-2.24.2-scrollbars.patch, nautilus-2.20.0-r1.ebuild,
+  -nautilus-2.20.0-r2.ebuild, -nautilus-2.22.5.1.ebuild,
+  -nautilus-2.24.1.ebuild, +nautilus-2.24.2-r1.ebuild:
+  Bump to 2.24.2-r1. Fix scrollbar updates in tabbed naviguation, bug
+  #260965. Clean up old revisions.
 
   06 Mar 2009; Brent Baude <ranger@gentoo.org> nautilus-2.24.2.ebuild:
   Marking nautilus-2.24.2 ppc stable for bug 260063
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index b482433ad4d4..eb22b956502e 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX nautilus-2.20.0-async-thumbnail-framing.patch 911 RMD160 c7886957cb703ef97b3210d4d84f9b21a261c634 SHA1 93c2ccfac58fb1832cdc726f2a7c19f423a1ac45 SHA256 80afad12814bc55540e0a98535a81b4fc9a409b7bfc58a06f0bd35a6b2cb89db
 AUX nautilus-2.20.0-exempi.patch 1021 RMD160 b59d0898af04bccc0e367303bf62d670c2e881ea SHA1 5ed5268a4b1d30ef15cb799443120b51e4db83e2 SHA256 5ed239f6085881310438f5da349d30924693f114d82096183c2156cede9f10d9
 AUX nautilus-2.20.0-fix_broken_configure.patch 437 RMD160 9bacd41cc689561f2d31e104100a2f6d542ca0f0 SHA1 bc170c178f72527e307e4c13c53aa674e979637a SHA256 a396a5192041c32ca0d44d080230ed70e85e9f6e0f8191977ea9edbbf7edeaf2
@@ -11,15 +14,20 @@ AUX nautilus-2.22.3-prevent-recursive-mvcp.patch 3101 RMD160 2a1952958a6996675d4
 AUX nautilus-2.22.5-ask-what-to-do.patch 830 RMD160 253e9376c7d3dc7852781c61a1d92cdd08583be5 SHA1 51c5696e619c60e33629a9b6c51cf29454415859 SHA256 f88dc8a326fc51f6e5ed69dddef1a66185d795bbb54aa449701a22394048a1bb
 AUX nautilus-2.22.5.1-exempi.patch 1258 RMD160 7b70d4006c7167c2229e52e936a98a7749a846ac SHA1 40ad0a492fae882d19ab003fb52dc895601fa68a SHA256 d40cdc614f03f7d096a03271b2fdfe79120579048860031b5650b1b3399bc2c8
 AUX nautilus-2.22.5.1-fix-stat-include.patch 1036 RMD160 741bb6328bce3a09a3821ed70b1df4c9cee9d041 SHA1 3c4e154e635b491dffe110b71789f8e38b1e5b0d SHA256 18865d9b41281c730d47300727d9614f9e045b616fa5111a8987f015e5b5200c
+AUX nautilus-2.24.2-scrollbars.patch 732 RMD160 6856d895ec70d6e24f3bd3f112141dceb25eb896 SHA1 62570bad726066dd0238aee0a203fa3895f3a556 SHA256 93f5dacec1a88fbbdb32fe75fde52301053f5c29aadb483ad1d59fb7c107b344
 DIST nautilus-2.20.0.tar.bz2 4916284 RMD160 9eeb18c886795ebbdd6dfc61ccddaee8eab81808 SHA1 f6a75a854728ef308e2721424a9638d228661b1d SHA256 98f9d9f7bc89db67cbcc4c7d08ec72175b8c9b3eb9489f7869c5cec9f16feb08
 DIST nautilus-2.22.5.1.tar.bz2 5017090 RMD160 102c5608e3dbf9815cb9b82262799ac0001870a4 SHA1 81c1d875779f5d95ad7bf7dc18ab8a8244abb429 SHA256 3c98d410f2d535ab2f000df91527b4a30c8d3ce2a7f6c7d1697e89f3868c66b9
-DIST nautilus-2.24.1.tar.bz2 5330025 RMD160 e2523a9154a3a136890cd897568a6e8b65435948 SHA1 d9661a75bb02859b2275d61d77f8e4926fcf8c7b SHA256 48f1d25af102d216fdc2ebcd6396ffce963558c119b88730dc02fb1c158fcc4c
 DIST nautilus-2.24.2.tar.bz2 5356516 RMD160 a0159b7a6814a731bdbbcee33f4c6aafaee4c8ef SHA1 9bc2cf110ae50d69633095aa8115cf89c095ef42 SHA256 a793ebe4245656f0ae23d5a87895555182f62943e02e9667303ad20c4e690c1d
-EBUILD nautilus-2.20.0-r1.ebuild 2964 RMD160 76dba02ab2886d3c655a2722024bd30161f72444 SHA1 d9d8156025de2342e6f73ea89b6455083d4182ff SHA256 dfa60ad31c56184611645499990aa8103f22c0ca23ca3c7f71770a4c6703f97a
-EBUILD nautilus-2.20.0-r2.ebuild 3065 RMD160 4bf3823fabcc2475393e7df534ead5512b4a29db SHA1 367f8f49d75bc351f8ea5ee6a8b7ec21e3c6be3e SHA256 7aa4d3d4a68536e9d63ef09fb6ebabac5e28e40fdfbf8f537d5f4d4db063e66a
+EBUILD nautilus-2.20.0-r1.ebuild 2909 RMD160 ddc0bff7eee69c87ecc4a3bb77432ac2f2d6d171 SHA1 ddf5a3190d4efbe075b3ab5aee68f9777b232e3d SHA256 8fa57b4b12bcc16a71db63c37b536b0c757cd2520000b4a4946b451bfab00b2c
 EBUILD nautilus-2.22.5.1-r1.ebuild 2180 RMD160 6e5363cf410aa0b8f6c7a77f44b0b7ba91a06264 SHA1 284ad9a8eb49e04e35fa01bb181b14e98a613b1e SHA256 ab2fd7636d5c804b6995a9d12ad2854ab252cadba89c81e496ec52526787220e
-EBUILD nautilus-2.22.5.1.ebuild 2021 RMD160 8ad49a28f81be267718665a11eff22942d99555f SHA1 e435ec66e0ed7d6117706054a0c1f2627b5cfd45 SHA256 307f1c92e68b42f265bd71d148f504f2e133a371237cedf001eb3c68a18aeac2
-EBUILD nautilus-2.24.1.ebuild 1724 RMD160 ad1ae75dadb210a1da15924b3d695ab7d14ed928 SHA1 d22ee117baf2dbcfeffb1b78ed8bee4c121e68e3 SHA256 3a7c68d939a104e8958bb309a31c5e0608fd0f877f6782854d5dfa245c388c77
+EBUILD nautilus-2.24.2-r1.ebuild 1898 RMD160 ebaa5d84b4ed103741d7d9faaa06de47e5d7a7fd SHA1 d01a03dd4d85dc3a4ae00600d4cc52c72ac9bb17 SHA256 4486dfc7b5252ece9c2f8e6735b3bf97bc32e9ad9fc7ca2b5f2511258753c9a0
 EBUILD nautilus-2.24.2.ebuild 1782 RMD160 6720a96fcb7d7a1611c01961320593452ccd006c SHA1 583e1e9f726470e5c193d72c025c24d2b2ed6824 SHA256 598ef1a548823888487322d7078056a6c98ceaa025c7a60d087a7148261d74cb
-MISC ChangeLog 41341 RMD160 ff819ef84e4411363225a3c25ff58d936771e905 SHA1 46583a1631cb8140cd3b157e6dc93ab7bfccb0ba SHA256 c42a2870f9edb2e5d016554953e2e0679dcd2d6d304d53330e600afadb9298c6
+MISC ChangeLog 41715 RMD160 4c3d15b0c06d1465cdf687b868166b4e0e3cafeb SHA1 0f90a26b92353e1583960c1ee6c8ed9f045f8881 SHA256 daaf20cbd53897170d99eeac55feb18047248d373988ae1cfb4fb618efcac38c
 MISC metadata.xml 473 RMD160 d06a14b541ddb9774c9d81895146a14557c196fd SHA1 99497b8bede2582b76a802d7c3f75adbad6fc9a0 SHA256 8e0fbacc02474a585de7d90b28041754ae260c032ef32952ed5da3e0cc377dfc
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.10 (GNU/Linux)
+
+iEYEARECAAYFAkm1rI4ACgkQ1fmVwcYIWAZJkgCgkOZaPN4UGSXR8PHlczPIrCN5
+AW0AoO46AVZG+D9ORJvSW33JRHKffZe1
+=LeNK
+-----END PGP SIGNATURE-----
diff --git a/gnome-base/nautilus/files/nautilus-2.24.2-scrollbars.patch b/gnome-base/nautilus/files/nautilus-2.24.2-scrollbars.patch
new file mode 100644
index 000000000000..4d854bd0d038
--- /dev/null
+++ b/gnome-base/nautilus/files/nautilus-2.24.2-scrollbars.patch
@@ -0,0 +1,22 @@
+Solve issue with scrollbars not being updated in tabbed browsing.
+
+https://bugs.gentoo.org/show_bug.cgi?id=260965
+https://bugzilla.gnome.org/show_bug.cgi?id=542396
+
+Index: src/nautilus-navigation-window.c
+===================================================================
+--- src/nautilus-navigation-window.c	(revision 14834)
++++ src/nautilus-navigation-window.c	(working copy)
+@@ -200,6 +200,12 @@
+ 	g_assert (slot != NULL);
+ 
+ 	nautilus_window_set_active_slot (nautilus_window, slot);
++	
++	if (slot->content_view != NULL)
++	{
++		gtk_scrolled_window_set_hadjustment (GTK_SCROLLED_WINDOW (slot->content_view), NULL);
++		gtk_scrolled_window_set_vadjustment (GTK_SCROLLED_WINDOW (slot->content_view), NULL);
++	}
+ 
+ 	return FALSE;
+ }
diff --git a/gnome-base/nautilus/nautilus-2.20.0-r1.ebuild b/gnome-base/nautilus/nautilus-2.20.0-r1.ebuild
index 25879598125b..6bf65fc49f58 100644
--- a/gnome-base/nautilus/nautilus-2.20.0-r1.ebuild
+++ b/gnome-base/nautilus/nautilus-2.20.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.20.0-r1.ebuild,v 1.11 2008/04/20 02:18:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.20.0-r1.ebuild,v 1.12 2009/03/09 23:55:52 eva Exp $
 
 inherit virtualx eutils gnome2 autotools
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.gnome.org/projects/nautilus/"
 
 LICENSE="GPL-2 LGPL-2 FDL-1.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
+KEYWORDS="arm sh"
 IUSE="beagle esd gnome tracker"
 # cups flac gstreamer mad ogg vorbis
 
diff --git a/gnome-base/nautilus/nautilus-2.20.0-r2.ebuild b/gnome-base/nautilus/nautilus-2.20.0-r2.ebuild
deleted file mode 100644
index 8bef0feb5aa4..000000000000
--- a/gnome-base/nautilus/nautilus-2.20.0-r2.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.20.0-r2.ebuild,v 1.1 2008/10/11 15:18:48 eva Exp $
-
-inherit virtualx eutils gnome2 autotools
-
-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 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="beagle esd gnome tracker"
-# cups flac gstreamer mad ogg vorbis
-
-RDEPEND=">=media-libs/libart_lgpl-2.3.10
-	>=gnome-base/libbonobo-2.1
-	>=gnome-base/eel-2.15.92
-	esd? ( >=media-sound/esound-0.2.27 )
-	>=dev-libs/glib-2.13
-	>=gnome-base/gnome-desktop-2.9.91
-	>=gnome-base/libgnome-2.14.0
-	>=gnome-base/libgnomeui-2.6
-	>=gnome-base/gnome-vfs-2.19.3
-	>=gnome-base/orbit-2.4
-	>=x11-libs/pango-1.1.2
-	>=x11-libs/gtk+-2.11.6
-	>=gnome-base/librsvg-2.0.1
-	>=dev-libs/libxml2-2.4.7
-	>=x11-libs/startup-notification-0.8
-	>=media-libs/libexif-0.5.12
-	>=gnome-base/gconf-2
-	media-libs/audiofile
-	beagle? ( =app-misc/beagle-0.2* )
-	x86? ( tracker? ( >=app-misc/tracker-0.0.1 ) )
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-proto/xproto
-	virtual/eject"
-#	!gstreamer? ( vorbis? ( media-sound/vorbis-tools ) )
-#	gstreamer? (
-#		>=media-libs/gstreamer-0.8
-#		>=media-libs/gst-plugins-0.8
-#		>=media-plugins/gst-plugins-gnomevfs-0.8
-#		mad? ( >=media-plugins/gst-plugins-mad-0.8 )
-#		ogg? ( >=media-plugins/gst-plugins-ogg-0.8 )
-#		vorbis? ( >=media-plugins/gst-plugins-vorbis-0.8 )
-#		flac? (	>=media-plugins/gst-plugins-flac-0.8 ) )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.9"
-PDEPEND="gnome? ( >=x11-themes/gnome-icon-theme-1.1.91 )"
-
-DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README THANKS TODO"
-
-pkg_setup() {
-	G2CONF="--disable-update-mimedb --disable-xmp $(use_enable beagle) $(use_enable tracker) $(use_enable esd esound)"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	epatch "${FILESDIR}/${P}-sound-preview-cleanup.patch"
-	epatch "${FILESDIR}/${P}-statfs.patch"
-
-	# Patches from unreleased 2.20.1
-	epatch "${FILESDIR}/${P}-async-thumbnail-framing.patch"
-	epatch "${FILESDIR}/${P}-thumbnail-flashing.patch"
-	epatch "${FILESDIR}/${P}-small-font-crasher.patch"
-
-	# Fix for autoconf 2.62, see Gnome Bug #527315
-	epatch "${FILESDIR}/${P}-fix_broken_configure.patch"
-
-	# Fix automagic exempi detection, bug #206041
-	epatch "${FILESDIR}/${P}-exempi.patch"
-
-	eautoreconf
-}
-
-src_test() {
-	addwrite "/root/.gnome2_private"
-	unset SESSION_MANAGER
-	Xmake check || die "Test phase failed"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	elog "nautilus now has three ways of previewing sound.  First, if the esd"
-	elog "USE flag is given, it will attempt to play directly via esd.  If"
-	elog "the esd USE flag is *not* given, it will attempt to use totem to"
-	elog "play the sound.  If totem is not installed, it will attempt to use"
-	elog "gstreamer 10.x to play the sound.  If gstreamer 10.x is not installed"
-	elog "it will fail to preview the sound."
-}
diff --git a/gnome-base/nautilus/nautilus-2.22.5.1.ebuild b/gnome-base/nautilus/nautilus-2.22.5.1.ebuild
deleted file mode 100644
index c13b611cc14c..000000000000
--- a/gnome-base/nautilus/nautilus-2.22.5.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.22.5.1.ebuild,v 1.10 2008/11/13 19:11:19 ranger Exp $
-
-inherit virtualx eutils gnome2
-
-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 hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
-IUSE="beagle gnome"
-
-RDEPEND=">=x11-libs/startup-notification-0.8
-		 >=gnome-base/libbonobo-2.1
-		 >=gnome-base/eel-2.21.90
-		 >=dev-libs/glib-2.15.6
-		 >=gnome-base/gnome-desktop-2.10
-		 >=gnome-base/orbit-2.4
-		 >=x11-libs/pango-1.1.2
-		 >=x11-libs/gtk+-2.11.6
-		 >=gnome-base/librsvg-2.0.1
-		 >=dev-libs/libxml2-2.4.7
-		 >=media-libs/libexif-0.5.12
-		 >=gnome-base/gconf-2.0
-		 >=gnome-base/gvfs-0.1.2
-		 beagle? ( || (
-			dev-libs/libbeagle
-			=app-misc/beagle-0.2*
-			) )
-		 >=gnome-base/libgnome-2.14
-		 >=gnome-base/libgnomeui-2.6"
-DEPEND="${RDEPEND}
-		  sys-devel/gettext
-		>=dev-util/pkgconfig-0.9
-		>=dev-util/intltool-0.35"
-PDEPEND="gnome? ( >=x11-themes/gnome-icon-theme-1.1.91 )"
-
-DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README THANKS TODO"
-
-pkg_setup() {
-	G2CONF="--disable-update-mimedb $(use_enable beagle) --disable-tracker"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# bug #229719, #229723
-	epatch "${FILESDIR}/${PN}-2.22.3-open-folder.patch"
-	epatch "${FILESDIR}/${PN}-2.22.3-prevent-recursive-mvcp.patch"
-
-	# "Ask what to do" by default, bug #229725
-	epatch "${FILESDIR}/${PN}-2.22.5-ask-what-to-do.patch"
-
-	# Compatibility with gtk+-2.14
-	epatch "${FILESDIR}/${P}-fix-stat-include.patch"
-}
-
-src_test() {
-	addwrite "/root/.gnome2_private"
-	unset SESSION_MANAGER
-	Xemake check || die "Test phase 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.24.1.ebuild b/gnome-base/nautilus/nautilus-2.24.2-r1.ebuild
index 165fde3f6ae0..4b2f6aa3a15a 100644
--- a/gnome-base/nautilus/nautilus-2.24.1.ebuild
+++ b/gnome-base/nautilus/nautilus-2.24.2-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.24.1.ebuild,v 1.1 2008/10/20 21:55:53 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.24.2-r1.ebuild,v 1.1 2009/03/09 23:55:52 eva Exp $
+
+EAPI="2"
 
 inherit gnome2 eutils virtualx
 
@@ -9,7 +11,7 @@ HOMEPAGE="http://www.gnome.org/projects/nautilus/"
 
 LICENSE="GPL-2 LGPL-2 FDL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="beagle doc gnome tracker xmp"
 
 RDEPEND=">=gnome-base/libbonobo-2.1
@@ -51,6 +53,11 @@ pkg_setup() {
 		$(use_enable xmp)"
 }
 
+src_prepare() {
+	# Fix update of scrollbars, bug #260965
+	epatch "${FILESDIR}/${P}-scrollbars.patch"
+}
+
 src_test() {
 	addwrite "/root/.gnome2_private"
 	unset SESSION_MANAGER