clean up

(Portage version: 2.1.7.17/cvs/Linux i686)

4 files changed, 7 insertions, 111 deletions

diff --git a/dev-python/nautilus-python/ChangeLog b/dev-python/nautilus-python/ChangeLog
index 76a549e704f0..39f61c2b473e 100644
--- a/dev-python/nautilus-python/ChangeLog
+++ b/dev-python/nautilus-python/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/nautilus-python
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/nautilus-python/ChangeLog,v 1.3 2010/03/28 13:45:38 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/nautilus-python/ChangeLog,v 1.4 2010/03/29 11:10:25 fauli Exp $
+
+  29 Mar 2010; Christian Faulhammer <fauli@gentoo.org>
+  -nautilus-python-0.5.1-r1.ebuild,
+  -files/nautilus-python-0.5.1-CVE-2009-0317.patch,
+  -files/nautilus-python-0.5.1-submenu-example.patch:
+  clean up
 
   28 Mar 2010; Peter Volkov <pva@gentoo.org> nautilus-python-0.6.1.ebuild:
   Dropped eel from DEPEND, bug #301922#c2, thank Michael Weber and Rion for
diff --git a/dev-python/nautilus-python/files/nautilus-python-0.5.1-CVE-2009-0317.patch b/dev-python/nautilus-python/files/nautilus-python-0.5.1-CVE-2009-0317.patch
deleted file mode 100644
index 12f56929968b..000000000000
--- a/dev-python/nautilus-python/files/nautilus-python-0.5.1-CVE-2009-0317.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- ./src/nautilus-python.c.old	2009-02-24 16:01:08.000000000 -0800
-+++ ./src/nautilus-python.c	2009-02-24 16:03:02.000000000 -0800
-@@ -223,6 +223,12 @@
- 		PyErr_Print();
- 		return FALSE;
- 	}
-+	/* Sanitize sys.path */
-+	PyRun_SimpleString("import sys; sys.path = filter(None, sys.path)");
-+	if (PyErr_Occurred()) {
-+		PyErr_Print();
-+		return FALSE;
-+	}
- 
- 	/* pygtk.require("2.0") */
- 	debug("pygtk.require(\"2.0\")");
diff --git a/dev-python/nautilus-python/files/nautilus-python-0.5.1-submenu-example.patch b/dev-python/nautilus-python/files/nautilus-python-0.5.1-submenu-example.patch
deleted file mode 100644
index 881d55aa00e0..000000000000
--- a/dev-python/nautilus-python/files/nautilus-python-0.5.1-submenu-example.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-commit b2e81c0b025d9b259f055a63d025c929bd302935
-Author: Cosimo Cecchi <cosimoc@gnome.org>
-Date:   Sat Mar 21 11:30:53 2009 +0000
-
-    fix the submenu example to make it work properly once installed. Patch by
-    
-    2009-03-21  Cosimo Cecchi  <cosimoc@gnome.org>
-    
-    	* examples/submenu.py: fix the submenu example to make it work
-    	properly once installed.
-    	Patch by Bruce van der Kooji (#559172).
-    
-    svn path=/trunk/; revision=61
-
-diff --git a/ChangeLog b/ChangeLog
-index 235d1a6..3467d2e 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,3 +1,9 @@
-+2009-03-21  Cosimo Cecchi  <cosimoc@gnome.org>
-+
-+	* examples/submenu.py: fix the submenu example to make it work
-+	properly once installed.
-+	Patch by Bruce van der Kooji (#559172).
-+
- === 0.5.1 ===
- 2008-09-16  Johan Dahlin  <johan@gnome.org>
- 
-diff --git a/examples/submenu.py b/examples/submenu.py
-index a2f2e30..9a98ebf 100644
---- a/examples/submenu.py
-+++ b/examples/submenu.py
-@@ -1,19 +1,23 @@
- import nautilus
- 
- class ExampleMenuProvider(nautilus.MenuProvider):
--
-+    
-+    # Nautilus crashes if a plugin doesn't implement the __init__ method.
-+    # See Bug #374958
-+    def __init__(self):
-+        pass
-+        
-     def get_file_items(self, window, files):
--        menuitem = nautilus.MenuItem('ExampleMenuProvider::Foo', 'Foo', '')
-+        top_menuitem = nautilus.MenuItem('ExampleMenuProvider::Foo', 'Foo', '')
- 
-         submenu = nautilus.Menu()
--        menuitem.set_submenu(submenu)
-+        top_menuitem.set_submenu(submenu)
- 
--        menuitem = nautilus.MenuItem('ExampleMenuProvider::Bar', 'Bar', '')
--        submenu.append_item(menuitem)
-+        sub_menuitem = nautilus.MenuItem('ExampleMenuProvider::Bar', 'Bar', '')
-+        submenu.append_item(sub_menuitem)
- 
--        return menuitem,
-+        return top_menuitem,
- 
--    # FIXME: Why isn't this working?
-     def get_background_items(self, window, file):
-         submenu = nautilus.Menu()
-         submenu.append_item(nautilus.MenuItem('ExampleMenuProvider::Bar', 'Bar', ''))
diff --git a/dev-python/nautilus-python/nautilus-python-0.5.1-r1.ebuild b/dev-python/nautilus-python/nautilus-python-0.5.1-r1.ebuild
deleted file mode 100644
index 1791c9eed5ae..000000000000
--- a/dev-python/nautilus-python/nautilus-python-0.5.1-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/nautilus-python/nautilus-python-0.5.1-r1.ebuild,v 1.1 2009/08/20 08:25:24 pva Exp $
-
-EAPI="2"
-
-inherit gnome.org eutils
-
-DESCRIPTION="Python bindings for the Nautilus file manager"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=dev-python/pygtk-2.8
-	>=dev-python/gnome-python-2.12
-	>=gnome-base/nautilus-2.6
-	>=gnome-base/eel-2.6"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-CVE-2009-0317.patch"
-	epatch "${FILESDIR}/${P}-submenu-example.patch"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	mv "${D}"/usr/share/doc/{${PN},${PF}}
-	dodoc AUTHORS ChangeLog NEWS || die
-}