From 169e848e5a458f446b11e53dd359166028c2b8d3 Mon Sep 17 00:00:00 2001 From: Christian Faulhammer Date: Mon, 29 Mar 2010 11:10:25 +0000 Subject: [PATCH] clean up Package-Manager: portage-2.1.7.17/cvs/Linux i686 --- dev-python/nautilus-python/ChangeLog | 8 ++- dev-python/nautilus-python/Manifest | 16 +++-- .../nautilus-python-0.5.1-CVE-2009-0317.patch | 15 ----- ...autilus-python-0.5.1-submenu-example.patch | 63 ------------------- .../nautilus-python-0.5.1-r1.ebuild | 32 ---------- 5 files changed, 18 insertions(+), 116 deletions(-) delete mode 100644 dev-python/nautilus-python/files/nautilus-python-0.5.1-CVE-2009-0317.patch delete mode 100644 dev-python/nautilus-python/files/nautilus-python-0.5.1-submenu-example.patch delete mode 100644 dev-python/nautilus-python/nautilus-python-0.5.1-r1.ebuild 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 + -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 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/Manifest b/dev-python/nautilus-python/Manifest index 88b1cbc280ce..daf5ac845490 100644 --- a/dev-python/nautilus-python/Manifest +++ b/dev-python/nautilus-python/Manifest @@ -1,8 +1,14 @@ -AUX nautilus-python-0.5.1-CVE-2009-0317.patch 420 RMD160 288cd24f5d95fe30e7fff54c333669dd5296e91b SHA1 31ade5425ab815128ba59a5be43680a291fdf658 SHA256 f4cea075d2e0837ae1ca042c89c383bf2f527fef0efcaf4516e778441697192c -AUX nautilus-python-0.5.1-submenu-example.patch 2029 RMD160 df0b324ec582e3d9937dd46ab722a841ff3f0fd0 SHA1 87c4b8e9d0c99ac406d77c16c3d8c9c04666c081 SHA256 ac2850aacd3923edf35ccc2d157dac20a44961b0d2a55374abd86c040e7ebfb9 -DIST nautilus-python-0.5.1.tar.bz2 230999 RMD160 a3a54af229c2718332fe467415f09e16bab6c456 SHA1 3059dd959152081bc845ba846da5c22a4c3d1099 SHA256 34e79046b9bd420bc980befeabeac9c229a6a12e21e04c7648849cd540593d89 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + DIST nautilus-python-0.6.1.tar.bz2 243352 RMD160 e8f37b7fbe571b57032332db4c4689c8b42391b5 SHA1 bb981f346a45f484aa25a21aadbd047dad3be306 SHA256 b80c814c4f08daa92369077625e2cbf4865cb5423a4151b1e61f12cbbe148f2b -EBUILD nautilus-python-0.5.1-r1.ebuild 805 RMD160 d5c67ee772e56d5502b931f16b832c53e246ce43 SHA1 4f65dd8d5e09f1f008babc9eca5d4d4b207902b1 SHA256 521618355ad8e3ed05ab9a52ef9074b471bafde7b1797cf2bf8c9c99cb154c69 EBUILD nautilus-python-0.6.1.ebuild 665 RMD160 c78bae488a7aa4bcc60a2c0f6c935f79308d4be8 SHA1 0ca638414eb8bfc9521ebe35ce33c54505932609 SHA256 4c39ec5215417151f8ef7e81d1c7ff312efdabe986d13a2f293cbf80370b61bb -MISC ChangeLog 925 RMD160 84a31f788e076227a49c57254312e8ae19b5f2be SHA1 9d572c2c03ea6daa322a142fed503a11be64276d SHA256 edee903cd32737f420fab9689154cfec912a75604416ea1a5363acc32a5d8ee6 +MISC ChangeLog 1136 RMD160 12b21ee4d195400e95765c004d1a2100092dbc90 SHA1 857df8042f9228553175503ce74569faf054457e SHA256 d5972f333c8ee63c7a7e1b240e86c8732fb918ddf66ba28e56e2ac574696bbe1 MISC metadata.xml 250 RMD160 f27bc8272125f15d03c2bfc87e961842bdb303ae SHA1 c4991bbfca89085d81f56ed53f8b0c827a35a4f1 SHA256 68999dde540491efec63a8f47366dbc2d5f2c9f2c1211709d92366a56b6cd27d +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.14 (GNU/Linux) + +iEYEARECAAYFAkuwirAACgkQNQqtfCuFneObWgCgkYiMLd+X67xcOUXusffg9Z6B +GHQAoIzST5h1Wx5I2G3UpwxxEPxraXBu +=f2p4 +-----END PGP SIGNATURE----- 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 -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 - - * 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 -+ -+ * 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 - -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 -} -- 2.26.2