Fixed viewdocs.py thanks Ivan Todoroski <grnch@gmx.net> bug# 86625

(Portage version: 2.0.51.20-r5)

7 files changed, 71 insertions, 19 deletions

diff --git a/dev-python/wxpython-docs/ChangeLog b/dev-python/wxpython-docs/ChangeLog
index ae7fb9624193..d18578a5670e 100644
--- a/dev-python/wxpython-docs/ChangeLog
+++ b/dev-python/wxpython-docs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/wxpython-docs
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython-docs/ChangeLog,v 1.13 2005/05/02 19:02:13 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython-docs/ChangeLog,v 1.14 2005/05/02 20:47:44 pythonhead Exp $
+
+  02 May 2005; Rob Cakebread <pythonhead@gentoo.org>
+  +files/viewdocs-2.4.2.4.patch, +files/demo-2.6.0.0-version.patch,
+  +files/viewdocs-2.6.0.0.patch, wxpython-docs-2.4.2.4-r1.ebuild,
+  wxpython-docs-2.6.0.0.ebuild:
+  Fixed viewdocs.py thanks Ivan Todoroski <grnch@gmx.net> bug# 86625
 
 *wxpython-docs-2.6.0.0 (02 May 2005)
 *wxpython-docs-2.4.2.4-r1 (02 May 2005)
diff --git a/dev-python/wxpython-docs/Manifest b/dev-python/wxpython-docs/Manifest
index 8adf1c46b38d..3c45e2ad5b33 100644
--- a/dev-python/wxpython-docs/Manifest
+++ b/dev-python/wxpython-docs/Manifest
@@ -1,16 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 284dff0eab5d76821e02a51da1e11405 ChangeLog 2215
 MD5 3b06f1e87549af51d78bb7bfa33728b5 metadata.xml 182
-MD5 036257b95ad62e8247c6dc14f04e8273 wxpython-docs-2.4.2.4-r1.ebuild 1042
-MD5 9c758eca8750f9a1f84940bc78369428 wxpython-docs-2.6.0.0.ebuild 1475
+MD5 9d2c419e925826451517fde6f5fd65d4 wxpython-docs-2.4.2.4-r1.ebuild 1160
+MD5 afff6b652e74a616ac851cdf14a6dcf7 wxpython-docs-2.6.0.0.ebuild 1504
 MD5 2911f08ca57d7ce8297146ffd74e5fca files/digest-wxpython-docs-2.4.2.4-r1 146
 MD5 2e16d6b640e3678d8d85abe15dfbc3b0 files/digest-wxpython-docs-2.6.0.0 225
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCdnlPz2gxt1z4IGYRAswQAKCz63OmL+suq2T6Ly1AN4XE1d5HiACggXcj
-b3nr91uRTTWdr7pUI30J1c4=
-=YI+b
------END PGP SIGNATURE-----
+MD5 f98b398d5de65497f6e213f8a2dec801 files/demo-2.6.0.0-version.patch 219
+MD5 875e8ee40a9db65f42134928d4fd8e09 files/viewdocs-2.4.2.4.patch 329
+MD5 429fab69a37d5ee455fc7d734b5297d7 files/viewdocs-2.6.0.0.patch 561
diff --git a/dev-python/wxpython-docs/files/demo-2.6.0.0-version.patch b/dev-python/wxpython-docs/files/demo-2.6.0.0-version.patch
new file mode 100644
index 000000000000..8a2ef96d67eb
--- /dev/null
+++ b/dev-python/wxpython-docs/files/demo-2.6.0.0-version.patch
@@ -0,0 +1,10 @@
+--- demo/demo.org	2005-04-28 03:00:13.431583384 +0000
++++ demo/demo.py	2005-04-28 03:00:31.886777768 +0000
+@@ -1,4 +1,7 @@
+ #!/usr/bin/env python
+ 
++import wxversion
++wxversion.select("2.6")
++
+ import Main
+ Main.main()
diff --git a/dev-python/wxpython-docs/files/viewdocs-2.4.2.4.patch b/dev-python/wxpython-docs/files/viewdocs-2.4.2.4.patch
new file mode 100644
index 000000000000..de3f5262c6c6
--- /dev/null
+++ b/dev-python/wxpython-docs/files/viewdocs-2.4.2.4.patch
@@ -0,0 +1,14 @@
+--- docs/viewdocs-orig.py    2005-03-25 09:46:30.000000000 +0100
++++ docs/viewdocs.py 2005-03-25 10:46:26.923038904 +0100
+@@ -14,7 +14,7 @@
+ 
+ # setup the args
+ args = ['',
+-        '--cache='+basePath,
++        '--cache=/tmp',
+         os.path.join(basePath, 'wx.zip'),
+         os.path.join(basePath, 'ogl.zip'),
+         ]
+
+
+
diff --git a/dev-python/wxpython-docs/files/viewdocs-2.6.0.0.patch b/dev-python/wxpython-docs/files/viewdocs-2.6.0.0.patch
new file mode 100644
index 000000000000..a260f3ab68bb
--- /dev/null
+++ b/dev-python/wxpython-docs/files/viewdocs-2.6.0.0.patch
@@ -0,0 +1,21 @@
+--- docs/viewdocs.orig.py	2005-05-02 13:14:34.905664232 -0700
++++ docs/viewdocs.py	2005-05-02 13:16:12.129883904 -0700
+@@ -1,6 +1,9 @@
+ #!/usr/bin/env python
+ #---------------------------------------------------------------------------
+ 
++import wxversion
++wxversion.select("2.6")
++
+ import sys, os, glob
+ import wx
+ from wx.tools import helpviewer
+@@ -20,7 +23,7 @@
+ 
+     # setup the args
+     args = ['',
+-        '--cache='+basePath,
++        '--cache=/tmp',
+         os.path.join(basePath, 'wx.zip'),
+         os.path.join(basePath, 'ogl.zip'),
+         ]
diff --git a/dev-python/wxpython-docs/wxpython-docs-2.4.2.4-r1.ebuild b/dev-python/wxpython-docs/wxpython-docs-2.4.2.4-r1.ebuild
index 9bcae5dbb9d3..83205754d117 100644
--- a/dev-python/wxpython-docs/wxpython-docs-2.4.2.4-r1.ebuild
+++ b/dev-python/wxpython-docs/wxpython-docs-2.4.2.4-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython-docs/wxpython-docs-2.4.2.4-r1.ebuild,v 1.1 2005/05/02 19:02:13 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython-docs/wxpython-docs-2.4.2.4-r1.ebuild,v 1.2 2005/05/02 20:47:44 pythonhead Exp $
+
+inherit eutils
 
 MY_P="${P/wxpython-docs/wxPythonDocs}"
 
@@ -14,8 +16,14 @@ SLOT="2.4"
 KEYWORDS="x86 ~sparc amd64"
 IUSE=""
 
-S="${WORKDIR}/wxPython-${PVR}"
-DOCDIR="wxpython-${PVR}"
+S="${WORKDIR}/wxPython-${PV}"
+DOCDIR="wxPython-${PV}"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S} || die "Couldn't cd to ${S}"
+	epatch ${FILESDIR}/viewdocs-2.4.2.4.patch
+}
 
 src_install() {
 	dodir /usr/share/doc/${DOCDIR}/docs
diff --git a/dev-python/wxpython-docs/wxpython-docs-2.6.0.0.ebuild b/dev-python/wxpython-docs/wxpython-docs-2.6.0.0.ebuild
index 975f798e1287..8e6856ec94d1 100644
--- a/dev-python/wxpython-docs/wxpython-docs-2.6.0.0.ebuild
+++ b/dev-python/wxpython-docs/wxpython-docs-2.6.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython-docs/wxpython-docs-2.6.0.0.ebuild,v 1.1 2005/05/02 19:02:13 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython-docs/wxpython-docs-2.6.0.0.ebuild,v 1.2 2005/05/02 20:47:44 pythonhead Exp $
 
 inherit eutils
 
@@ -22,6 +22,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S} || die "Couldn't cd to ${S}"
 	epatch ${FILESDIR}/demo-${PV}-version.patch
+	epatch ${FILESDIR}/viewdocs-2.6.0.0.patch
 }
 
 src_install() {
@@ -37,8 +38,7 @@ src_install() {
 pkg_postinst() {
 	einfo "The demo files are now included with dev-python/wxpython-docs."
 	einfo "The new-style documentation is in:"
-	einfo "/usr/share/doc/${PF}/docs/api"
-	einfo " "
+	einfo "/usr/share/doc/${PF}/docs/api\n"
 	einfo "The old-style documentation can still be accessed by running"
 	einfo "/usr/share/doc/${PF}/docs/viewdocs.py"
 }