Add new version for Gnome 2.30

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

5 files changed, 119 insertions, 131 deletions

diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog
index eb8d6ec79669..a213d2ea4784 100644
--- a/gnome-base/nautilus/ChangeLog
+++ b/gnome-base/nautilus/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/nautilus
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.345 2010/06/04 21:10:09 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.346 2010/06/13 17:44:02 pacho Exp $
+
+*nautilus-2.30.1-r1 (13 Jun 2010)
+
+  13 Jun 2010; Pacho Ramos <pacho@gentoo.org> -nautilus-2.28.1.ebuild,
+  -nautilus-2.28.2.ebuild, +nautilus-2.30.1-r1.ebuild,
+  +files/nautilus-2.30.1-unmount-entries.patch:
+  Add new version for Gnome 2.30, clean old versions.
 
   04 Jun 2010; Markus Meier <maekke@gentoo.org> nautilus-2.28.4-r1.ebuild:
   x86 stable, bug #314899
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index 69ab7a62527b..71957d6728f9 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -9,24 +9,23 @@ AUX nautilus-2.26.2-change-reg-desktop-file-with-no-desktop.patch 1421 RMD160 e4
 AUX nautilus-2.26.3-thumbnail-zoom-level.patch 3411 RMD160 296a997116f96100d067c6dfd7a6e936c2946d90 SHA1 e2477c779e182f6609e08167ceafab54d081fd79 SHA256 400d809f16d0dd470ea287cd288ed378c2afcbf45ead48639d7b5b1b0a71828c
 AUX nautilus-2.26.4-file-roller-drag-n-drop.patch 2746 RMD160 0c2d7bc4627c840a167db6b3f852c7d19996647d SHA1 9bcb0b677714c924b3c31b6d22c7581dd7fac4a5 SHA256 b107464ef573c7d1036eb10562b5d62faf015d8ced9fb335d4639fdcb8c93b33
 AUX nautilus-2.27.4-change-reg-desktop-file-with-no-desktop.patch 1396 RMD160 7efbc47c5f4ac647a15a56a26f80898e8ec896d0 SHA1 24f5281406066fc7fd5ffda23a061144c3667fe1 SHA256 ae9f91dddbbe2d562f5f21786daec6468b8788ece48419cce438d13201eef251
+AUX nautilus-2.30.1-unmount-entries.patch 3048 RMD160 06ff25300206c097e7589221b0875847a63ac454 SHA1 b4090aecb652825b36a860fcd70583225489b934 SHA256 95a60074602cfb5c3855474c4f7c35e3814fe1c536a2d8a404ef1211fa0e85c3
 DIST nautilus-2.24.2.tar.bz2 5356516 RMD160 a0159b7a6814a731bdbbcee33f4c6aafaee4c8ef SHA1 9bc2cf110ae50d69633095aa8115cf89c095ef42 SHA256 a793ebe4245656f0ae23d5a87895555182f62943e02e9667303ad20c4e690c1d
 DIST nautilus-2.26.4.tar.bz2 5815912 RMD160 4af723021ece1fb9a37bd3bcc2de903b6c7dca61 SHA1 7eab587e0b88e3eab8196f64596207a1dc1c4b33 SHA256 63dc4f76925f73bf17aafcffbac87f272ac2a13fb098c8ddf5bd70cd80a6ab58
-DIST nautilus-2.28.1.tar.bz2 6020681 RMD160 c3e3b22783d992aa8eb983525dfc23f0d421c2b5 SHA1 f2c3d61c442bec1665717fd8163be0871462f510 SHA256 197147d04529ee14e63609fa4755c9effff19842f77594ff8cce6e2433d0bec0
-DIST nautilus-2.28.2.tar.bz2 6043915 RMD160 ae0093b7fd536548beef40a60b3a5c34c460f8ae SHA1 cc1e0e80df8ee38c8e787e7b7249c0fbc8ba3808 SHA256 6e4ff8d1533e0786721f9d4958d4f78c5c89ac7e8fff00b3989895c00cf2cffe
 DIST nautilus-2.28.4.tar.bz2 6045403 RMD160 8960342fa3a6f976e283f338c060896d67a4c028 SHA1 f6db915e725e6f45cd2d3f933eb251499dccf038 SHA256 3aceda1c36acda20a0f9ce75165a31b1285a7aca2097d0583e340ccb2b01ea87
+DIST nautilus-2.30.1.tar.bz2 6156330 RMD160 285e0b9d000725b11013ed6f8e98db59573b83dc SHA1 232afa5d7d977714667645adff1f952989edc185 SHA256 83df19591c4d0d359fe67d16b3f73f71e6a2aa5ba7d477739276c7562f221144
 EBUILD nautilus-2.24.2-r3.ebuild 2241 RMD160 b4fa3199a4bcbca28797ee48f3569c611efdede0 SHA1 07684219e272048a2269c4c83ca94f2db7781b1b SHA256 d884cc9ba3f161b4f430b13d1b7cc54888d7a24fd3d73118b5ea95dfea4f9285
 EBUILD nautilus-2.26.4-r1.ebuild 2841 RMD160 058712e74f094e85c421f5d674ff4023be984a89 SHA1 8ae0c925008bb63e41cd7c12447644fdde50d124 SHA256 1dbca982fc35e803495df8832b519cea8467ae26ba7ba61b67169eac0ae17845
 EBUILD nautilus-2.26.4.ebuild 2704 RMD160 d46a2c6118d834a4865309e93d6008b0000a181a SHA1 1dd8a89af73235849dc1febf4cb25be859dc73cb SHA256 9ba0cd088519c0cc99bfb90b059ce523a758034e3d606c831585fc2dd02b0476
-EBUILD nautilus-2.28.1.ebuild 2693 RMD160 be87cc6ad315e776951b2f430ebebad50a76f781 SHA1 73797f00dc3da48ddd2fcfde7d5ffe8b0921d265 SHA256 36613b6cab032b8c5b1be3901243b6905294a8ae1c953f1b97130d7e555efe74
-EBUILD nautilus-2.28.2.ebuild 2685 RMD160 dd2e2ee8f57d347bcc08c56f993abd35a20282b3 SHA1 2d52a0517e8e120f6cced02a65bf3dd602efd915 SHA256 b3355ede9f5cff4763693be1695104fb64490457b555e574109e997187f39abc
 EBUILD nautilus-2.28.4-r1.ebuild 2722 RMD160 d4ee3ab236b676730613d7653e1b56fbca898188 SHA1 d1ad9dee28c6dc50a589451ec18ffc97efb562c1 SHA256 beeb0e1c1b2988682a6e160e0c57eea75a2f4b116242ff037f1bcfe394b56b69
 EBUILD nautilus-2.28.4-r2.ebuild 2774 RMD160 8fe1011995fa47657cacad5d35e3335b45e6597a SHA1 65e762bbc1b1df25f00cf731535b5ed046efd9e8 SHA256 106190fd73af570c8fe8476f0a2bb5b109a6e003dfdea886efbcc7c7a9db700a
-MISC ChangeLog 49925 RMD160 40428b4a37090a29b24fee30885a27ce2d2a0708 SHA1 4a5d9c00e04885fbc5f612dde472703fd6ae137c SHA256 c73a3c31ff78b45dc2f29701688e97de205ba20d4cfc2469ba224bf1f2ae66bc
+EBUILD nautilus-2.30.1-r1.ebuild 2524 RMD160 30daae7149196f1295a10730491c94998625f17b SHA1 1c2a5f01f68009d1629ec883539260b84b0b20c5 SHA256 ae1f1b80a4c1d85f1a5442595ca77dd45e0f6c72ef4fe4dcd2c023c43671e3f6
+MISC ChangeLog 50188 RMD160 364b290ca0e4a1f5951d91c976e298c90cfd7b10 SHA1 7bf5e3d66ed041e3260187b0c8a7a94e71460287 SHA256 a34d654c8c2aff7138aceab5a8531cafd24717c9f2940a5c26d1773f35bfe85e
 MISC metadata.xml 418 RMD160 950ac903bccee9717bb2aa3ab8b1269ad96d7fb2 SHA1 b8c46a622a2725f2860557b2a1c2ffee0ff000ff SHA256 eecdd5e524b283e5cf158c17c89828a17f67cdd64e2c552a7c5ae9a4dd977ebc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwJa1AACgkQkKaRLQcq0GKGxgCeORl8NmjZbAX7Q06FVxkfk3Qy
-7hQAn02/9EC7zMVHgSywD2GZPuLDpR7Y
-=+skm
+iEYEARECAAYFAkwVGOcACgkQCaWpQKGI+9RzPgCfR+Xhr8RCA+Szat2YBw6KMu5C
+lbIAnin3K/kHwgg7q78/rVq+OsoVr843
+=V+4p
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/nautilus/files/nautilus-2.30.1-unmount-entries.patch b/gnome-base/nautilus/files/nautilus-2.30.1-unmount-entries.patch
new file mode 100644
index 000000000000..bc953bbc4aa6
--- /dev/null
+++ b/gnome-base/nautilus/files/nautilus-2.30.1-unmount-entries.patch
@@ -0,0 +1,92 @@
+From 9bdd0ef925a1e660031917746f8914a38e352576 Mon Sep 17 00:00:00 2001
+From: Martin Pitt <martin.pitt@ubuntu.com>
+Date: Tue, 30 Mar 2010 16:33:51 +0000
+Subject: Do not show Unmount when showing Eject/Safe removal
+
+Having three menu entries (unmount/eject/safe removal) in a volume/drive menu
+entry is too confusing. Unmount only really makes sense for internal drives,
+for external ones it is pretty much a "geek" option. Geeks can use palimpsest
+or "unmount /media/foo" from the CLI if they really want to, for everyone else
+it is just an unintuitive and hard to to explain menu entry.
+
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=598690
+Bug-Ubuntu: https://launchpad.net/bugs/453072
+(cherry picked from commit 0a5cc4c4e5b01eb8aa38dfae926502ce920efc94)
+---
+diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
+index d8b9050..361b994 100644
+--- a/src/file-manager/fm-directory-view.c
++++ b/src/file-manager/fm-directory-view.c
+@@ -7782,10 +7782,6 @@ file_should_show_foreach (NautilusFile        *file,
+ 		*show_eject = TRUE;
+ 	}
+ 
+-	if (nautilus_file_can_unmount (file)) {
+-		*show_unmount = TRUE;
+-	}
+-
+ 	if (nautilus_file_can_mount (file)) {
+ 		*show_mount = TRUE;
+ 
+@@ -7805,6 +7801,12 @@ file_should_show_foreach (NautilusFile        *file,
+ 		*show_stop = TRUE;
+ 	}
+ 
++	/* Dot not show both Unmount and Eject/Safe Removal; too confusing to
++	 * have too many menu entries */
++	if (nautilus_file_can_unmount (file) && !*show_eject && !*show_stop) {
++		*show_unmount = TRUE;
++	}
++
+ 	if (nautilus_file_can_poll_for_media (file) && !nautilus_file_is_media_check_automatic (file)) {
+ 		*show_poll = TRUE;
+ 	}
+@@ -7852,10 +7854,6 @@ file_should_show_self (NautilusFile        *file,
+ 		*show_eject = TRUE;
+ 	}
+ 
+-	if (nautilus_file_can_unmount (file)) {
+-		*show_unmount = TRUE;
+-	}
+-
+ 	if (nautilus_file_can_mount (file)) {
+ 		*show_mount = TRUE;
+ 	}
+@@ -7874,6 +7872,12 @@ file_should_show_self (NautilusFile        *file,
+ 		*show_stop = TRUE;
+ 	}
+ 
++	/* Dot not show both Unmount and Eject/Safe Removal; too confusing to
++	 * have too many menu entries */
++	if (nautilus_file_can_unmount (file) && !*show_eject && !*show_stop) {
++		*show_unmount = TRUE;
++	}
++
+ 	if (nautilus_file_can_poll_for_media (file) && !nautilus_file_is_media_check_automatic (file)) {
+ 		*show_poll = TRUE;
+ 	}
+diff --git a/src/nautilus-places-sidebar.c b/src/nautilus-places-sidebar.c
+index 95c06eb..6dc2df7 100644
+--- a/src/nautilus-places-sidebar.c
++++ b/src/nautilus-places-sidebar.c
+@@ -1317,7 +1317,7 @@ check_unmount_and_eject (GMount *mount,
+ 	}
+ 	if (mount != NULL) {
+ 		*show_eject |= g_mount_can_eject (mount);
+-		*show_unmount = g_mount_can_unmount (mount);
++		*show_unmount = g_mount_can_unmount (mount) && !*show_eject;
+ 	}
+ }
+ 
+@@ -1349,6 +1349,9 @@ check_visibility (GMount           *mount,
+ 
+ 		*show_start = g_drive_can_start (drive) || g_drive_can_start_degraded (drive);
+ 		*show_stop  = g_drive_can_stop (drive);
++
++		if (*show_stop)
++			*show_unmount = FALSE;
+ 	}
+ 
+ 	if (volume != NULL) {
+--
+cgit v0.8.3.1
diff --git a/gnome-base/nautilus/nautilus-2.28.2.ebuild b/gnome-base/nautilus/nautilus-2.28.2.ebuild
deleted file mode 100644
index 1a8201881e17..000000000000
--- a/gnome-base/nautilus/nautilus-2.28.2.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# 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.28.2.ebuild,v 1.1 2009/12/13 22:32:39 eva 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="~amd64 ~x86"
-IUSE="beagle doc gnome tracker xmp"
-
-# not adding gnome-base/gail because it is in >=gtk+-2.13
-RDEPEND=">=dev-libs/glib-2.21.3
-	>=gnome-base/gnome-desktop-2.25.5
-	>=x11-libs/pango-1.1.2
-	>=x11-libs/gtk+-2.16.0
-	>=dev-libs/libxml2-2.4.7
-	>=media-libs/libexif-0.5.12
-	>=gnome-base/gconf-2.0
-	>=gnome-base/gvfs-0.1.2
-	dev-libs/libunique
-	dev-libs/dbus-glib
-	x11-libs/libXft
-	x11-libs/libXrender
-	beagle? ( || (
-		dev-libs/libbeagle
-		=app-misc/beagle-0.2* ) )
-	tracker? ( >=app-misc/tracker-0.7 )
-	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 )"
-
-DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README THANKS TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-update-mimedb
-		--disable-packagekit
-		$(use_enable beagle)
-		$(use_enable tracker)
-		$(use_enable xmp)"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# FIXME: tarball generated with broken gtk-doc, revisit me.
-	if use doc; then
-		sed "/^TARGET_DIR/i \GTKDOC_REBASE=/usr/bin/gtkdoc-rebase" \
-			-i gtk-doc.make || die "sed 1 failed"
-	else
-		sed "/^TARGET_DIR/i \GTKDOC_REBASE=/bin/true" \
-			-i gtk-doc.make || die "sed 2 failed"
-	fi
-
-	# Fix intltoolize broken file, see upstream #577133
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
-		|| die "sed 3 failed"
-
-	# 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"
-}
-
-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.28.1.ebuild b/gnome-base/nautilus/nautilus-2.30.1-r1.ebuild
index c6bc2840e900..f7d0f6814bfe 100644
--- a/gnome-base/nautilus/nautilus-2.28.1.ebuild
+++ b/gnome-base/nautilus/nautilus-2.30.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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.28.1.ebuild,v 1.3 2009/12/13 22:32:39 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.30.1-r1.ebuild,v 1.1 2010/06/13 17:44:02 pacho Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
@@ -12,25 +12,20 @@ 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 doc gnome xmp"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux"
+IUSE="doc gnome xmp"
 
-# not adding gnome-base/gail because it is in >=gtk+-2.13
-RDEPEND=">=dev-libs/glib-2.21.3
-	>=gnome-base/gnome-desktop-2.25.5
+RDEPEND=">=dev-libs/glib-2.24.0
+	>=gnome-base/gnome-desktop-2.29.91
 	>=x11-libs/pango-1.1.2
-	>=x11-libs/gtk+-2.16.0
+	>=x11-libs/gtk+-2.20.0
 	>=dev-libs/libxml2-2.4.7
 	>=media-libs/libexif-0.5.12
 	>=gnome-base/gconf-2.0
-	>=gnome-base/gvfs-0.1.2
 	dev-libs/libunique
 	dev-libs/dbus-glib
 	x11-libs/libXft
 	x11-libs/libXrender
-	beagle? ( || (
-		dev-libs/libbeagle
-		=app-misc/beagle-0.2* ) )
 	xmp? ( >=media-libs/exempi-2 )"
 
 DEPEND="${RDEPEND}
@@ -43,7 +38,8 @@ DEPEND="${RDEPEND}
 #	gnome-base/gnome-common
 #	dev-util/gtk-doc-am"
 
-PDEPEND="gnome? ( >=x11-themes/gnome-icon-theme-1.1.91 )"
+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"
 
@@ -51,8 +47,6 @@ pkg_setup() {
 	G2CONF="${G2CONF}
 		--disable-update-mimedb
 		--disable-packagekit
-		--disable-tracker
-		$(use_enable beagle)
 		$(use_enable xmp)"
 }
 
@@ -68,16 +62,15 @@ src_prepare() {
 			-i gtk-doc.make || die "sed 2 failed"
 	fi
 
-	# Fix intltoolize broken file, see upstream #577133
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
-		|| die "sed 3 failed"
-
 	# 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"
 }
 
 src_test() {