summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Ullmann <jokey@gentoo.org>2009-02-16 21:02:52 +0000
committerMarkus Ullmann <jokey@gentoo.org>2009-02-16 21:02:52 +0000
commit6f8b68af79455aaa9e6944ab802c2b4e7bfe5312 (patch)
tree4252a23528df429a9146c77f430c651add18e9b2 /dev-util/eric/files
parentMarking klamav-0.44 ppc64 for bug 245552 (diff)
downloadgentoo-2-6f8b68af79455aaa9e6944ab802c2b4e7bfe5312.tar.gz
gentoo-2-6f8b68af79455aaa9e6944ab802c2b4e7bfe5312.tar.bz2
gentoo-2-6f8b68af79455aaa9e6944ab802c2b4e7bfe5312.zip
Version bump
(Portage version: 2.2_rc23/cvs/Linux x86_64)
Diffstat (limited to 'dev-util/eric/files')
-rw-r--r--dev-util/eric/files/4.3.0-paths.patch33
1 files changed, 33 insertions, 0 deletions
diff --git a/dev-util/eric/files/4.3.0-paths.patch b/dev-util/eric/files/4.3.0-paths.patch
new file mode 100644
index 000000000000..697cbe513113
--- /dev/null
+++ b/dev-util/eric/files/4.3.0-paths.patch
@@ -0,0 +1,33 @@
+diff -urN ./eric4-4.3.0.orig/install.py ./eric4-4.3.0/install.py
+--- ./eric4-4.3.0.orig/install.py 2009-02-08 14:10:24.000000000 +0100
++++ ./eric4-4.3.0/install.py 2009-02-16 16:49:39.261427434 +0100
+@@ -190,7 +190,7 @@
+ fname = os.path.join(pdir, "__init__.py")
+ if not os.path.exists(fname):
+ if not os.path.exists(pdir):
+- os.mkdir(pdir, 0755)
++ os.makedirs(pdir, 0755)
+ f = open(fname, "wb")
+ f.write(\
+ '''# -*- coding: utf-8 -*-
+@@ -215,7 +215,10 @@
+ if not specialInstall and qtDataDir is None:
+ try:
+ from PyQt4 import pyqtconfig
+- qtDataDir = pyqtconfig._pkg_config["qt_data_dir"]
++ if distDir:
++ qtDataDir = distDir + pyqtconfig._pkg_config["qt_data_dir"]
++ else:
++ qtDataDir = pyqtconfig._pkg_config["qt_data_dir"]
+ except (AttributeError, ImportError):
+ print
+ print "Please enter the name of the Qt data directory."
+@@ -494,7 +497,7 @@
+ cfg['ericTemplatesDir'],
+ cfg['ericCodeTemplatesDir'], cfg['ericOthersDir'],
+ cfg['bindir'], cfg['mdir'],
+- getAPIsPath(), apis)
++ getAPIsPath()[len(distDir):], apis)
+ copyToFile(fn, config)
+
+ def doDependancyChecks():