Drop old.

(Portage version: 2.2.0_alpha77/cvs/Linux x86_64)

3 files changed, 6 insertions, 178 deletions

diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog
index 6dd79ebb362d..4ef6eb793178 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.385 2011/11/02 16:51:46 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.386 2011/11/25 06:17:44 tetromino Exp $
+
+  25 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -nautilus-3.0.2.ebuild,
+  -files/nautilus-3.0.2-segfault-in-gtk_icon_info_load_symbolic.patch:
+  Drop old.
 
 *nautilus-3.2.1 (02 Nov 2011)
 
diff --git a/gnome-base/nautilus/files/nautilus-3.0.2-segfault-in-gtk_icon_info_load_symbolic.patch b/gnome-base/nautilus/files/nautilus-3.0.2-segfault-in-gtk_icon_info_load_symbolic.patch
deleted file mode 100644
index 82781f7ed5e7..000000000000
--- a/gnome-base/nautilus/files/nautilus-3.0.2-segfault-in-gtk_icon_info_load_symbolic.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From a37ecf869f4772b1ea3b578b687b5b83dd4bd067 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gmail.com>
-Date: Fri, 27 May 2011 01:10:24 -0400
-Subject: [PATCH] Prevent segfault in gtk_icon_info_load_symbolic when icon is not found (gnome bug 651209)
-
-Users of Gentoo and Fedora have reported segfaults in nautilus-3.0.x
-in gtk_icon_info_load_symbolic (see Gentoo bug 365779, Fedora bug
-690357). One of them was helpful enough to post a backtrace with
-debugging information: https://bugzilla.redhat.com/attachment.cgi?id=489928
-
-The backtrace shows that the crash occurs because we are passing a
-NULL icon_info to gtk_icon_info_load_symbolic in lookup_and_color_symbolic_find
-in nautilus-search-bar.c; indeed, icon_info will be NULL if
-gtk_icon_theme_lookup_icon fails to find an icon.
-
-An identical problem exists in get_eject_icon in nautilus-places-sidebar.c,
-where gtk_icon_info_load_symbolic_for_context and
-gtk_icon_theme_lookup_by_gicon are used.
-
-The solution is to check for the NULL icon_info, and return a
-NULL GdkPixbuf. Note that returning a NULL from
-lookup_and_color_symbolic_find and get_eject_icon is
-safe: in both cases, the return value is only used in functions
-that can safely deal with a NULL.
----
- src/nautilus-places-sidebar.c |   11 ++++++-----
- src/nautilus-search-bar.c     |    9 +++++----
- 2 files changed, 11 insertions(+), 9 deletions(-)
-
-diff --git a/src/nautilus-places-sidebar.c b/src/nautilus-places-sidebar.c
-index aa08f14..de53cd1 100644
---- a/src/nautilus-places-sidebar.c
-+++ b/src/nautilus-places-sidebar.c
-@@ -214,7 +214,7 @@ static GdkPixbuf *
- get_eject_icon (NautilusPlacesSidebar *sidebar,
- 		gboolean highlighted)
- {
--	GdkPixbuf *eject;
-+	GdkPixbuf *eject = NULL;
- 	GtkIconInfo *icon_info;
- 	GIcon *icon;
- 	int icon_size;
-@@ -227,10 +227,11 @@ get_eject_icon (NautilusPlacesSidebar *sidebar,
- 	icon_info = gtk_icon_theme_lookup_by_gicon (icon_theme, icon, icon_size, 0);
- 
- 	style = gtk_widget_get_style_context (GTK_WIDGET (sidebar));
--	eject = gtk_icon_info_load_symbolic_for_context (icon_info,
--							 style,
--							 NULL,
--							 NULL);
-+	if (icon_info != NULL)
-+		eject = gtk_icon_info_load_symbolic_for_context (icon_info,
-+								 style,
-+								 NULL,
-+								 NULL);
- 
- 	if (highlighted) {
- 		GdkPixbuf *high;
-diff --git a/src/nautilus-search-bar.c b/src/nautilus-search-bar.c
-index 6148807..17412d9 100644
---- a/src/nautilus-search-bar.c
-+++ b/src/nautilus-search-bar.c
-@@ -160,7 +160,7 @@ lookup_and_color_symbolic_find (NautilusSearchBar *bar)
- {
- 	GtkIconInfo *icon_info;
- 	GdkRGBA color;
--	GdkPixbuf *icon;
-+	GdkPixbuf *icon = NULL;
- 	GtkStyleContext *context;
- 
- 	context = gtk_widget_get_style_context (GTK_WIDGET (bar));
-@@ -172,9 +172,10 @@ lookup_and_color_symbolic_find (NautilusSearchBar *bar)
- 						"edit-find-symbolic",
- 						nautilus_get_icon_size_for_stock_size (GTK_ICON_SIZE_MENU),
- 						GTK_ICON_LOOKUP_GENERIC_FALLBACK);
--	icon = gtk_icon_info_load_symbolic (icon_info, &color,
--					    NULL, NULL, NULL,
--					    NULL, NULL);
-+	if (icon_info != NULL)
-+		icon = gtk_icon_info_load_symbolic (icon_info, &color,
-+						    NULL, NULL, NULL,
-+						    NULL, NULL);
- 
- 	gtk_style_context_restore (context);
- 
--- 
-1.7.5.rc3
-
diff --git a/gnome-base/nautilus/nautilus-3.0.2.ebuild b/gnome-base/nautilus/nautilus-3.0.2.ebuild
deleted file mode 100644
index 70972efc7f79..000000000000
--- a/gnome-base/nautilus/nautilus-3.0.2.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# 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-3.0.2.ebuild,v 1.2 2011/09/22 15:43:04 pacho Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils gnome2 virtualx
-
-DESCRIPTION="A file manager for the GNOME desktop"
-HOMEPAGE="http://live.gnome.org/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 exif gnome +introspection sendto xmp"
-
-COMMON_DEPEND=">=dev-libs/glib-2.28.0:2
-	>=x11-libs/pango-1.28.3
-	>=x11-libs/gtk+-3.0.8:3[introspection?]
-	>=dev-libs/libxml2-2.7.8:2
-	>=gnome-base/gnome-desktop-3.0.0:3
-
-	gnome-base/dconf
-	gnome-base/gsettings-desktop-schemas
-	>=x11-libs/libnotify-0.7
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-
-	exif? ( >=media-libs/libexif-0.6.20 )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.4 )
-	xmp? ( >=media-libs/exempi-2.1.0 )"
-DEPEND="${COMMON_DEPEND}
-	>=dev-lang/perl-5
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.40.1
-	sys-devel/gettext
-	x11-proto/xproto
-	doc? ( >=dev-util/gtk-doc-1.4 )"
-RDEPEND="${COMMON_DEPEND}
-	sendto? ( !gnome-extra/nautilus-sendto )"
-# For eautoreconf
-#	gnome-base/gnome-common
-#	dev-util/gtk-doc-am"
-PDEPEND="gnome? (
-		>=x11-themes/gnome-icon-theme-1.1.91
-		x11-themes/gnome-icon-theme-symbolic )
-	>=gnome-base/gvfs-0.1.2"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-maintainer-mode
-		--disable-update-mimedb
-		--disable-packagekit
-		$(use_enable exif libexif)
-		$(use_enable introspection)
-		$(use_enable sendto nst-extension)
-		$(use_enable xmp)"
-	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README THANKS TODO"
-}
-
-src_prepare() {
-	# Gentoo bug #365779 + https://bugzilla.gnome.org/show_bug.cgi?id=651209
-	epatch "${FILESDIR}/${PN}-3.0.2-segfault-in-gtk_icon_info_load_symbolic.patch"
-
-	gnome2_src_prepare
-
-	# Remove crazy CFLAGS
-	sed 's:-DG.*DISABLE_DEPRECATED::g' -i configure.in configure \
-		|| die "sed 1 failed"
-}
-
-src_test() {
-	addpredict "/root/.gnome2_private"
-	unset SESSION_MANAGER
-	unset ORBIT_SOCKETDIR
-	unset DBUS_SESSION_BUS_ADDRESS
-	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"
-}