Fixed access violation with both versions wrt bug #277863

(Portage version: 2.2_rc23/cvs/Linux i686)

4 files changed, 40 insertions, 5 deletions

diff --git a/dev-python/adodb-py/ChangeLog b/dev-python/adodb-py/ChangeLog
index 0506457adbde..6e5b88913e23 100644
--- a/dev-python/adodb-py/ChangeLog
+++ b/dev-python/adodb-py/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/adodb-py
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/adodb-py/ChangeLog,v 1.24 2009/01/09 19:40:55 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/adodb-py/ChangeLog,v 1.25 2009/09/19 05:38:48 neurogeek Exp $
+
+  19 Sep 2009; Jesus Rivero <neurogeek@gentoo.org> adodb-py-2.00.ebuild,
+  adodb-py-2.20.ebuild, +files/adodb-py_sandbox_violation.patch:
+  Fixed access violation with both versions wrt bug #277863
 
   09 Jan 2009; Patrick Lauer <patrick@gentoo.org> -adodb-py-1.13.ebuild,
   -adodb-py-2.01.ebuild:
diff --git a/dev-python/adodb-py/adodb-py-2.00.ebuild b/dev-python/adodb-py/adodb-py-2.00.ebuild
index c3f89db3462c..c51811b09dc1 100644
--- a/dev-python/adodb-py/adodb-py-2.00.ebuild
+++ b/dev-python/adodb-py/adodb-py-2.00.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/adodb-py/adodb-py-2.00.ebuild,v 1.6 2006/10/15 17:48:48 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/adodb-py/adodb-py-2.00.ebuild,v 1.7 2009/09/19 05:38:48 neurogeek Exp $
 
+EAPI="2"
 inherit distutils
 
 MY_P=${PN}${PV//./}
@@ -26,6 +27,9 @@ S="${WORKDIR}/${MY_P/py/}"
 
 DOCS="LICENSE.txt README.txt"
 
+src_prepare(){
+	epatch "${FILESDIR}/${PN}_sandbox_violation.patch"
+}
 src_install() {
 	distutils_src_install
 	dohtml adodb-py-docs.htm icons/*.gif
diff --git a/dev-python/adodb-py/adodb-py-2.20.ebuild b/dev-python/adodb-py/adodb-py-2.20.ebuild
index 5812678b264e..57a4e903b974 100644
--- a/dev-python/adodb-py/adodb-py-2.20.ebuild
+++ b/dev-python/adodb-py/adodb-py-2.20.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/adodb-py/adodb-py-2.20.ebuild,v 1.1 2008/10/29 12:11:54 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/adodb-py/adodb-py-2.20.ebuild,v 1.2 2009/09/19 05:38:48 neurogeek Exp $
 
+EAPI="2"
 NEED_PYTHON=2.3
 
 inherit distutils
@@ -28,6 +29,10 @@ PYTHON_MODNAME="adodb"
 
 S=${WORKDIR}/${MY_P}
 
+src_prepare(){
+	epatch "${FILESDIR}/${PN}_sandbox_violation.patch"
+}
+
 src_install() {
 	distutils_src_install
 	dohtml adodb-py-docs.htm icons/*.gif
diff --git a/dev-python/adodb-py/files/adodb-py_sandbox_violation.patch b/dev-python/adodb-py/files/adodb-py_sandbox_violation.patch
new file mode 100644
index 000000000000..ca79eb5a7db6
--- /dev/null
+++ b/dev-python/adodb-py/files/adodb-py_sandbox_violation.patch
@@ -0,0 +1,22 @@
+diff -uNtr adodb-220.orig/setup.py adodb-220/setup.py
+--- adodb-220.orig/setup.py	2008-07-16 15:28:26.000000000 -0430
++++ adodb-220/setup.py	2009-09-19 00:01:24.000000000 -0430
+@@ -25,17 +25,3 @@
+     except:

+         pass

+ 

+-

+-for p in sys.path:

+-    if p.find('site-packages')>0:

+-        trydel(p+os.sep+'adodb.py')

+-        trydel(p+os.sep+'adodb_access.py')

+-        trydel(p+os.sep+'adodb_mssql.py')

+-        trydel(p+os.sep+'adodb_mxodbc.py')

+-        trydel(p+os.sep+'adodb_mxoracle.py')

+-        trydel(p+os.sep+'adodb_mysql.py')

+-        trydel(p+os.sep+'adodb_oci8.py')

+-        trydel(p+os.sep+'adodb_odbc.py')
+-        trydel(p+os.sep+'adodb_odbc_mssql.py')

+-        trydel(p+os.sep+'adodb_postgres.py')

+-        trydel(p+os.sep+'adodb_vfp.py')
+\ No newline at end of file