Fix sandbox violations, bug #298752.

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

4 files changed, 50 insertions, 4 deletions

diff --git a/app-editors/editra/ChangeLog b/app-editors/editra/ChangeLog
index ad7ea5f96b14..f195d4401757 100644
--- a/app-editors/editra/ChangeLog
+++ b/app-editors/editra/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/editra
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/editra/ChangeLog,v 1.9 2010/01/23 00:15:12 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/editra/ChangeLog,v 1.10 2010/02/19 00:21:13 dirtyepic Exp $
+
+  19 Feb 2010; Ryan Hill <dirtyepic@gentoo.org> editra-0.5.32.ebuild,
+  +files/editra-0.5.32-sandbox.patch:
+  Fix sandbox violations, bug #298752.
 
 *editra-0.5.32 (23 Jan 2010)
 
diff --git a/app-editors/editra/Manifest b/app-editors/editra/Manifest
index 9cbbdbea50cd..807a02d31612 100644
--- a/app-editors/editra/Manifest
+++ b/app-editors/editra/Manifest
@@ -1,3 +1,7 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX editra-0.5.32-sandbox.patch 789 RMD160 4ec995d217a78b254a03b393707b50d8da4e0a5c SHA1 cfbec588e0b8bad5a3fc9f36ab537033adc6e4a5 SHA256 32c2533685d275a1ca2eac862f2dcff4e8063d6d5d71008582f17309322a7d85
 DIST Editra-0.5.05.tar.gz 3239110 RMD160 532145e3651cb6a752af004995c7a80d7c7c56e0 SHA1 a92aaaf8ee51076d9166f8be76f0acb621d47e99 SHA256 285bfc77737ea301865a290c6b4bcc6d2722fbb8490498b012558c7a05db06cd
 DIST Editra-0.5.15.tar.gz 3264600 RMD160 260b1ca46516f8ac9d3a0d6bbf8b78e79beeb464 SHA1 2604b486c2420be41859dc1f99dab39fb12a21ac SHA256 c9a35f3e13fc0a408d651a7b32612f046769584c209d1250e9664f95e876f4bb
 DIST Editra-0.5.25.tar.gz 3036677 RMD160 f62560ded6f36f1f946d113abd42b49d84d5b712 SHA1 75fe19337e8338f49791b7be3cabf43fd118cf95 SHA256 c511dd2a899de35c3391a603b31fe178aa808c172328904d05fe844cfc399685
@@ -5,6 +9,13 @@ DIST Editra-0.5.32.tar.gz 3036861 RMD160 b44ecd98eb237e5c9e1e39c78f056538ebc5de0
 EBUILD editra-0.5.05.ebuild 1084 RMD160 541d76d34796b2aa92ca45f6e96d834be3bf59a3 SHA1 ae9aeeb7be3a22a84b6700c7bef63658d68e33ca SHA256 526ff7e14b2adc127f706f4747ffa244d2cec92354c5b72722d33e8e34280cc6
 EBUILD editra-0.5.15.ebuild 1157 RMD160 cb75d3a562414b12bcfbd09cabee6f70138f6ebd SHA1 1db7fea53abc00add087aab9edb80d5ddf3782d9 SHA256 27cc7ea90d1351f10c1dbc9815b1e651503d46f4563c1e5036e3482b303f974d
 EBUILD editra-0.5.25.ebuild 1157 RMD160 80ef8eae47f70cf846a4c04c2f6de3a78a620005 SHA1 0cebef6cf424e7cea435292bf52fe66975648eb6 SHA256 03617777dfda67ce2827742c9bf48a00f7ae578e9d49b5c475e8f36375d62359
-EBUILD editra-0.5.32.ebuild 1154 RMD160 ea77cfb9bbeb4ac03939f1ff3ab3319ff0e10c92 SHA1 6862cf9983885d3f6349a3ceeeaed7fb1f222991 SHA256 de2ccb88f7f20cfa8c75a922c18c8fec2e44192327e59e0a511c79e1ca2fcc2d
-MISC ChangeLog 1752 RMD160 5fa58f3cdb3bb31fbd23c01d4ffc8c736eac21e8 SHA1 84c5e506cd153f7200f1126cf5d04271d20c2083 SHA256 7df5fffaf904b52c466899a82c1f8018cc5f48c523fe95fb6fc8036a990190ff
+EBUILD editra-0.5.32.ebuild 1321 RMD160 a815044b0490269bb3b14d84428f9648f2043d72 SHA1 53dc57d8d39f5fda2d3684b0066844e144124736 SHA256 56b8d28cc0ef69aaa7be0dc074002f02b824fb2e7b4d85b6307974b2dd16fde1
+MISC ChangeLog 1904 RMD160 cd668afac68f0ed2df6fdf7b53638470e487d2bd SHA1 0d996855490b15cce302565c1852ed81003ab185 SHA256 afbc2711d730b0b6f2d4975d733490132ec7122da23a949e246023c6462279e5
 MISC metadata.xml 163 RMD160 9a0dfd25dd8d78688f888da6873ba81236f6ed02 SHA1 a3f0779e6edd3b5eff0964b594051edd3de40978 SHA256 f80859bf7a6a4f9003e458590a617debc14e3e1766004a67b368b327f3afc535
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkt92hUACgkQiqiDRvmkBmKNpACZARjfoAsgtHpErEzzBqhezlXY
+D1YAoMcwYnQ8rVscYjm5TuFj+ngKiYlu
+=xY9n
+-----END PGP SIGNATURE-----
diff --git a/app-editors/editra/editra-0.5.32.ebuild b/app-editors/editra/editra-0.5.32.ebuild
index 90bac53a46e7..95f6da0a099a 100644
--- a/app-editors/editra/editra-0.5.32.ebuild
+++ b/app-editors/editra/editra-0.5.32.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/editra/editra-0.5.32.ebuild,v 1.1 2010/01/23 00:15:12 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/editra/editra-0.5.32.ebuild,v 1.2 2010/02/19 00:21:13 dirtyepic Exp $
 
 EAPI=2
 
@@ -26,6 +26,12 @@ RDEPEND="${DEPEND}
 
 S="${WORKDIR}"/${MY_PN}-${PV}
 
+src_prepare() {
+	#http://code.google.com/p/editra/issues/detail?id=481
+	epatch "${FILESDIR}"/${P}-sandbox.patch
+	# next version, use setup.py install --no-clean
+}
+
 src_install() {
 	distutils_src_install
 	insinto /usr/share/pixmaps
diff --git a/app-editors/editra/files/editra-0.5.32-sandbox.patch b/app-editors/editra/files/editra-0.5.32-sandbox.patch
new file mode 100644
index 000000000000..4b138291648c
--- /dev/null
+++ b/app-editors/editra/files/editra-0.5.32-sandbox.patch
@@ -0,0 +1,25 @@
+diff --git a/setup.py b/setup.py
+index 8db801c..80aa3bf 100755
+--- a/setup.py
++++ b/setup.py
+@@ -482,20 +482,6 @@ def DoSourcePackage():
+     else:
+         from distutils.core import setup
+ 
+-    # Try to remove possibly conflicting files from an old install
+-    try:
+-        import Editra
+-        path = Editra.__file__
+-        if '__init__' in path:
+-            path = os.path.dirname(path)
+-            path = os.path.join(path, 'src')
+-            del sys.modules['Editra']
+-            shutil.rmtree(path)
+-    except (ImportError, OSError):
+-        pass
+-    except:
+-        sys.stderr.write("[ERROR] Failed to remove old source files")
+-
+     # Make sure to delete any existing MANIFEST file beforehand to
+     # prevent stale file lists
+     if os.path.exists('MANIFEST'):