Removed warning dialog. bug# 92481

(Portage version: 2.0.51.21-r1)

5 files changed, 63 insertions, 16 deletions

diff --git a/dev-python/wxpython-docs/ChangeLog b/dev-python/wxpython-docs/ChangeLog
index d18578a5670e..b058e1c405b1 100644
--- a/dev-python/wxpython-docs/ChangeLog
+++ b/dev-python/wxpython-docs/ChangeLog
@@ -1,6 +1,13 @@
 # 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.14 2005/05/02 20:47:44 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython-docs/ChangeLog,v 1.15 2005/05/13 19:31:46 pythonhead Exp $
+
+*wxpython-docs-2.6.0.0-r1 (13 May 2005)
+
+  13 May 2005; Rob Cakebread <pythonhead@gentoo.org>
+  +files/wxpython-docs-2.6.0.0-writable.patch,
+  -wxpython-docs-2.6.0.0.ebuild, +wxpython-docs-2.6.0.0-r1.ebuild:
+  Removed warning dialog. bug# 92481
 
   02 May 2005; Rob Cakebread <pythonhead@gentoo.org>
   +files/viewdocs-2.4.2.4.patch, +files/demo-2.6.0.0-version.patch,
diff --git a/dev-python/wxpython-docs/Manifest b/dev-python/wxpython-docs/Manifest
index 9c54b9040816..b3888c97537b 100644
--- a/dev-python/wxpython-docs/Manifest
+++ b/dev-python/wxpython-docs/Manifest
@@ -1,19 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 c73dd08ac0514918e2d62a7ba030e52b ChangeLog 2504
+MD5 2a49dd11c8b9da9fd8fae5cd390d6f3b ChangeLog 2750
 MD5 3b06f1e87549af51d78bb7bfa33728b5 metadata.xml 182
 MD5 0958b371c86b2107ebacc2b82ace5270 wxpython-docs-2.4.2.4-r1.ebuild 1168
-MD5 2c0c257394fd1d09d4d1564a2684208e wxpython-docs-2.6.0.0.ebuild 1509
+MD5 094497753095347e68bf0230ae88375e wxpython-docs-2.6.0.0-r1.ebuild 1501
 MD5 2911f08ca57d7ce8297146ffd74e5fca files/digest-wxpython-docs-2.4.2.4-r1 146
-MD5 2e16d6b640e3678d8d85abe15dfbc3b0 files/digest-wxpython-docs-2.6.0.0 225
 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
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCdpIMz2gxt1z4IGYRAspsAKC4ya1f6ZCLesq96KYanggWGNSZxQCfaeXg
-HZ2c+duchNYbOrOBcu8GPwc=
-=fWo2
------END PGP SIGNATURE-----
+MD5 f451c42589546a9015ae771ca742a53f files/wxpython-docs-2.6.0.0-writable.patch 1342
+MD5 2e16d6b640e3678d8d85abe15dfbc3b0 files/digest-wxpython-docs-2.6.0.0-r1 225
diff --git a/dev-python/wxpython-docs/files/digest-wxpython-docs-2.6.0.0 b/dev-python/wxpython-docs/files/digest-wxpython-docs-2.6.0.0-r1
index 75d8976c475f..75d8976c475f 100644
--- a/dev-python/wxpython-docs/files/digest-wxpython-docs-2.6.0.0
+++ b/dev-python/wxpython-docs/files/digest-wxpython-docs-2.6.0.0-r1
diff --git a/dev-python/wxpython-docs/files/wxpython-docs-2.6.0.0-writable.patch b/dev-python/wxpython-docs/files/wxpython-docs-2.6.0.0-writable.patch
new file mode 100644
index 000000000000..8e35306a9002
--- /dev/null
+++ b/dev-python/wxpython-docs/files/wxpython-docs-2.6.0.0-writable.patch
@@ -0,0 +1,49 @@
+--- docs/viewdocs.pyorg	2005-05-13 12:09:33.394994952 -0700
++++ docs/viewdocs.py	2005-05-13 12:10:23.778335520 -0700
+@@ -15,33 +15,19 @@
+     basePath = '.'
+ 
+ 
+-# test for write access
+-if os.access(basePath, os.W_OK):
++# setup the args
++args = ['',
++	'--cache=/tmp',
++	os.path.join(basePath, 'wx.zip'),
++	os.path.join(basePath, 'ogl.zip'),
++	]
++
++# add any other .zip files found
++for file in glob.glob(os.path.join(basePath, "*.zip")):
++	if file not in args:
++		args.append(file)
+ 
+-    # setup the args
+-    args = ['',
+-        '--cache='+basePath,
+-        os.path.join(basePath, 'wx.zip'),
+-        os.path.join(basePath, 'ogl.zip'),
+-        ]
+-
+-    # add any other .zip files found
+-    for file in glob.glob(os.path.join(basePath, "*.zip")):
+-        if file not in args:
+-            args.append(file)
+-
+-    # launch helpviewer
+-    helpviewer.main(args)
+-
+-else:
+-    app = wx.PySimpleApp()
+-    dlg = wx.MessageDialog(None,
+-        "The wxDocs need to be located in a directory that is writable by you.  "
+-        "I am unable to start the viewer in its current location.",
+-                           "Error!", wx.OK|wx.ICON_EXCLAMATION)
+-    dlg.ShowModal()
+-    dlg.Destroy()
+-    app.MainLoop()
++# launch helpviewer
++helpviewer.main(args)
+ 
+-#---------------------------------------------------------------------------
+ 
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-r1.ebuild
index 8e6856ec94d1..982371212e5f 100644
--- a/dev-python/wxpython-docs/wxpython-docs-2.6.0.0.ebuild
+++ b/dev-python/wxpython-docs/wxpython-docs-2.6.0.0-r1.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.2 2005/05/02 20:47:44 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython-docs/wxpython-docs-2.6.0.0-r1.ebuild,v 1.1 2005/05/13 19:31:46 pythonhead Exp $
 
 inherit eutils
 
@@ -22,7 +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
+	epatch ${FILESDIR}/${P}-writable.patch
 }
 
 src_install() {