more cleaning of obsolete

(Portage version: 2.2.01.20757-prefix/cvs/Linux x86_64)

3 files changed, 7 insertions, 76 deletions

diff --git a/dev-python/oosuite/ChangeLog b/dev-python/oosuite/ChangeLog
index 07f8c5025c5e..8bff3add1576 100644
--- a/dev-python/oosuite/ChangeLog
+++ b/dev-python/oosuite/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/oosuite
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/oosuite/ChangeLog,v 1.3 2012/07/09 19:14:39 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/oosuite/ChangeLog,v 1.4 2012/07/09 19:33:27 bicatali Exp $
+
+  09 Jul 2012; Sébastien Fabbro <bicatali@gentoo.org>
+  -files/oosuite-0.37-no-init-msg.patch, oosuite-0.39.ebuild:
+  more cleaning of obsolete
 
 *oosuite-0.39 (09 Jul 2012)
 
diff --git a/dev-python/oosuite/files/oosuite-0.37-no-init-msg.patch b/dev-python/oosuite/files/oosuite-0.37-no-init-msg.patch
deleted file mode 100644
index db477e55a87f..000000000000
--- a/dev-python/oosuite/files/oosuite-0.37-no-init-msg.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff -Nur PythonPackages.orig/FuncDesigner/FuncDesigner/__init__.py PythonPackages/FuncDesigner/FuncDesigner/__init__.py
---- PythonPackages.orig/FuncDesigner/FuncDesigner/__init__.py	2011-12-15 15:43:56.000000000 +0000
-+++ PythonPackages/FuncDesigner/FuncDesigner/__init__.py	2012-01-07 16:26:48.000000000 +0000
-@@ -15,31 +15,3 @@
- from interpolate import scipy_UnivariateSpline as interpolator
- from integrate import integrator
- __version__ = '0.37'
--
--isE = False
--try:
--    import enthought
--    isE = True
--except ImportError:
--    pass
--try:
--    import envisage
--    import mayavi
--    isE = True
--except ImportError:
--    pass
--try:
--    import xy
--    isE = False
--except ImportError:
--    pass
--  
--if isE:
--    s = """
--    Seems like you are using OpenOpt from 
--    commercial Enthought Python Distribution;
--    consider using free GPL-licensed alternatives
--    PythonXY (http://www.pythonxy.com) or
--    Sage (http://sagemath.org) instead.
--    """
--    print(s)
-diff -Nur PythonPackages.orig/OpenOpt/openopt/__init__.py PythonPackages/OpenOpt/openopt/__init__.py
---- PythonPackages.orig/OpenOpt/openopt/__init__.py	2011-10-23 19:17:28.000000000 +0100
-+++ PythonPackages/OpenOpt/openopt/__init__.py	2012-01-07 16:26:19.000000000 +0000
-@@ -19,33 +19,6 @@
- from mfa import MFA
- 
- 
--isE = False
--try:
--    import enthought
--    isE = True
--except ImportError:
--    pass
--try:
--    import envisage
--    import mayavi
--    isE = True
--except ImportError:
--    pass
--try:
--    import xy
--    isE = False
--except ImportError:
--    pass
--  
--if isE:
--    s = """
--    Seems like you are using OpenOpt from 
--    commercial Enthought Python Distribution;
--    consider using free GPL-licensed alternatives
--    PythonXY (http://www.pythonxy.com) or
--    Sage (http://sagemath.org) instead.
--    """
--    print(s)
- 
-     
- #__all__ = filter(lambda s:not s.startswith('_'),dir())
diff --git a/dev-python/oosuite/oosuite-0.39.ebuild b/dev-python/oosuite/oosuite-0.39.ebuild
index 5b8a9530b487..eff1cb793db6 100644
--- a/dev-python/oosuite/oosuite-0.39.ebuild
+++ b/dev-python/oosuite/oosuite-0.39.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/oosuite/oosuite-0.39.ebuild,v 1.1 2012/07/09 19:14:39 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/oosuite/oosuite-0.39.ebuild,v 1.2 2012/07/09 19:33:27 bicatali Exp $
 
 EAPI=4
 
@@ -38,14 +38,13 @@ DEPEND="app-arch/unzip
 S="${WORKDIR}/PythonPackages"
 
 src_prepare() {
-	#epatch "${FILESDIR}"/${PN}-0.37-no-init-msg.patch
 	OO_DIRS="DerApproximator FuncDesigner OpenOpt SpaceFuncs"
 	find . -name "*COPYING*" -delete
 	# move all examples and tests to ease installation in proper directory
 	mkdir "${WORKDIR}/examples"
 	local d e
 	for d in ${OO_DIRS}; do
-			mkdir "${WORKDIR}/examples/${d}"
+		mkdir "${WORKDIR}/examples/${d}"
 		for e in $(find ${d} -type d -name examples -or -name tests -or -name doc); do
 			mv ${e} "${WORKDIR}/examples/${d}/" || die
 		done