Revbump. Added patch to prevent running against other SLOTs of wxpython, #201165. Drop old.

(Portage version: 2.1.4_rc4)

4 files changed, 33 insertions, 3 deletions

diff --git a/dev-python/python-dsv/ChangeLog b/dev-python/python-dsv/ChangeLog
index a00315ae62f6..526fc4eba1e1 100644
--- a/dev-python/python-dsv/ChangeLog
+++ b/dev-python/python-dsv/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-python/python-dsv
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-dsv/ChangeLog,v 1.3 2007/10/03 04:41:12 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-dsv/ChangeLog,v 1.4 2007/12/04 08:34:03 hawking Exp $
+
+*python-dsv-1.4.0-r1 (04 Dec 2007)
+
+  04 Dec 2007; Ali Polatel <hawking@gentoo.org>
+  +files/python-dsv-1.4.0-wxversion.patch, -python-dsv-1.4.0.ebuild,
+  +python-dsv-1.4.0-r1.ebuild:
+  Revbump. Added patch to prevent running against other SLOTs of wxpython,
+  #201165. Drop old.
 
   03 Oct 2007; Ryan Hill <dirtyepic@gentoo.org> python-dsv-1.4.0.ebuild:
   Lock wxpython dependency.
diff --git a/dev-python/python-dsv/files/digest-python-dsv-1.4.0 b/dev-python/python-dsv/files/digest-python-dsv-1.4.0-r1
index 7a5d01a66971..7a5d01a66971 100644
--- a/dev-python/python-dsv/files/digest-python-dsv-1.4.0
+++ b/dev-python/python-dsv/files/digest-python-dsv-1.4.0-r1
diff --git a/dev-python/python-dsv/files/python-dsv-1.4.0-wxversion.patch b/dev-python/python-dsv/files/python-dsv-1.4.0-wxversion.patch
new file mode 100644
index 000000000000..249cf73b474e
--- /dev/null
+++ b/dev-python/python-dsv/files/python-dsv-1.4.0-wxversion.patch
@@ -0,0 +1,17 @@
+diff -Naur DSV-1.4.0-orig/DSV/DSV.py DSV-1.4.0/DSV/DSV.py
+--- DSV-1.4.0-orig/DSV/DSV.py	2003-01-22 16:50:40.000000000 -0600
++++ DSV-1.4.0/DSV/DSV.py	2007-12-03 19:30:54.000000000 -0600
+@@ -124,6 +124,13 @@
+ os.putenv('LANG', 'C')
+ 
+ try:
++    import wxversion
++    wxversion.select("2.6")
++except Exception, e:
++    print >> sys.stderr, "%s: wxPython 2.6 not installed." %e
++    sys.exit(1)
++
++try:
+     from wxPython import wx, grid
+ except ImportError:
+     wx = None
diff --git a/dev-python/python-dsv/python-dsv-1.4.0.ebuild b/dev-python/python-dsv/python-dsv-1.4.0-r1.ebuild
index 4a04113ee4d6..5939d2675a74 100644
--- a/dev-python/python-dsv/python-dsv-1.4.0.ebuild
+++ b/dev-python/python-dsv/python-dsv-1.4.0-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-dsv/python-dsv-1.4.0.ebuild,v 1.2 2007/10/03 04:41:12 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-dsv/python-dsv-1.4.0-r1.ebuild,v 1.1 2007/12/04 08:34:03 hawking Exp $
 
-inherit distutils
+inherit distutils eutils
 
 DESCRIPTION="Python module for importing and exporting DSV files"
 HOMEPAGE="http://python-dsv.sourceforge.net/"
@@ -16,3 +16,8 @@ IUSE=""
 DEPEND="=dev-python/wxpython-2.6*"
 
 S="${WORKDIR}/DSV-${PV}"
+
+src_unpack() {
+	distutils_src_unpack
+	epatch "${FILESDIR}"/${P}-wxversion.patch
+}