Fixed access violation with both versions wrt bug #277863

Package-Manager: portage-2.2_rc23/cvs/Linux i686

5 files changed, 54 insertions, 8 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/Manifest b/dev-python/adodb-py/Manifest
index 9d17eaa52ea0..ca2c88a931eb 100644
--- a/dev-python/adodb-py/Manifest
+++ b/dev-python/adodb-py/Manifest
@@ -1,6 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX adodb-py_sandbox_violation.patch 801 RMD160 874614ed77158199cd83b12e0870f72e0339e212 SHA1 6bf95227a87e2985dadbe81a598ced7c04085baf SHA256 eb64c8bc401f734ce6b31876d0c878dcc7e2aff314adea165e6a8a71fd67f585
 DIST adodb-220.zip 32438 RMD160 d69c1989f462c8796fbfc868e06d10103d29e12c SHA1 ac4f90bdbb8e0488b7dc6170525c520db481fd78 SHA256 92dd475b96853f4932da64c1833cd5247e83cd61196dce67827b4b682d1fa50b
 DIST adodb-py200.zip 40505 RMD160 69dfc5c351748cc395bd9497c5347b6921eaca6b SHA1 8efda1a7175a0193628da11937aae50a806a31ab SHA256 4d09ddadb600e971874d60f5e8ae82596666601300ef59411f2cfa37318fd3bd
-EBUILD adodb-py-2.00.ebuild 825 RMD160 4cb1ca6e6af1aaba4c3eb7f354f43cde075d64c1 SHA1 789006ff9112c8dbe41334e0c905cff8d4937a5b SHA256 1238e771e024d6b9702fca9df3fbdf29bdc520bb2bc1b0c61340cb603b6c8e91
-EBUILD adodb-py-2.20.ebuild 841 RMD160 e98bf16036696cc354576f2d81e2a84ddf8916e5 SHA1 eeebf5d4b9886e568d554e4065a688cbca96616e SHA256 978457a10db56c0c337fa8a51fe707a8b1e52c8336db25f8c83ebfd86b91412d
-MISC ChangeLog 3206 RMD160 92f123cd6d7aab28a21e1249b8a4ba96a8468cc1 SHA1 63da078b7831a983f7a87b1280a024acd623be81 SHA256 428c5972b51f432e10a025c6e33f5b14a1a3f6f5e0024e7f3a479c9b74c0c575
+EBUILD adodb-py-2.00.ebuild 906 RMD160 dfee632b14d0c984910bb6c90df07440423a5f09 SHA1 ae597db0d3437062a1f64b3e770a2dbf380c1492 SHA256 2c85729e00d1e88e6789be93c479c4e8eea779859a3ca4b08f91a115cdc6b2d1
+EBUILD adodb-py-2.20.ebuild 926 RMD160 7cb1ff24b331f4341c668185ae6dcf16e716d18b SHA1 7449f487652b53c8ca691683228dc1389106333c SHA256 50853e47af79123a0fa14d717e49c587a7b737cc53e315d63fc282ad8b471f87
+MISC ChangeLog 3407 RMD160 f1e27e02dedd313e73e9663a262a893873ee465d SHA1 818e8d755c034e4f9f6d7dd3267fc036777604ff SHA256 d7450180d9c18b8e374de73a817e39877eb31d62750bb80da83fc62c9461913f
 MISC metadata.xml 433 RMD160 36e9e49273d697c7d013942c85783dbba3a6f3da SHA1 1317e1bb2b4c0f2bf98362b1975aebf02dee5061 SHA256 0a583f80fbf75dbcede5d46b117d5065bb13eda325f45926ea0c7a8c2c99475f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkq0bngACgkQdIssYB9vBoPYzgCeODjm8MNZk5PGkGV2bulfJ4/y
+bgoAn3XbvbfVt8U52GLW0FpYvVAlOOQB
+=XZMd
+-----END PGP SIGNATURE-----
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