Remove unused patches. Fix repoman complains.

(Portage version: 2.2_rc40/cvs/Linux x86_64)

4 files changed, 8 insertions, 111 deletions

diff --git a/dev-util/eric/ChangeLog b/dev-util/eric/ChangeLog
index a3532c75b69e..1e8555a045e0 100644
--- a/dev-util/eric/ChangeLog
+++ b/dev-util/eric/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/eric
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/ChangeLog,v 1.87 2009/08/24 20:21:54 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/ChangeLog,v 1.88 2009/09/06 19:57:47 idl0r Exp $
+
+  06 Sep 2009; Christian Ruppert <idl0r@gentoo.org>
+  -files/3.9.5-disable_compilation.patch, eric-4.3.1.ebuild,
+  -files/4.1.4-paths.patch:
+  Remove unused patches. Fix repoman complains.
 
   24 Aug 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   eric-4.3.6.ebuild:
diff --git a/dev-util/eric/eric-4.3.1.ebuild b/dev-util/eric/eric-4.3.1.ebuild
index 697fcb2cdd1e..5cc4e9d21cb2 100644
--- a/dev-util/eric/eric-4.3.1.ebuild
+++ b/dev-util/eric/eric-4.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-4.3.1.ebuild,v 1.6 2009/05/16 18:58:28 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-4.3.1.ebuild,v 1.7 2009/09/06 19:57:47 idl0r Exp $
 
 EAPI="2"
 
@@ -35,9 +35,7 @@ LANGS="cs de es fr ru tr"
 
 python_version
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	#epatch "${FILESDIR}"/4.3.0-paths.patch
 	epatch "${FILESDIR}"/4.2.3-no-interactive.patch
 }
diff --git a/dev-util/eric/files/3.9.5-disable_compilation.patch b/dev-util/eric/files/3.9.5-disable_compilation.patch
deleted file mode 100644
index 24a46b525e54..000000000000
--- a/dev-util/eric/files/3.9.5-disable_compilation.patch
+++ /dev/null
@@ -1,74 +0,0 @@
---- eric-3.9.5/install.py.orig	2007-06-23 14:21:07.000000000 +0200
-+++ eric-3.9.5/install.py	2007-06-23 14:21:57.000000000 +0200
-@@ -15,8 +15,8 @@
- import os
- import string
- import re
--import compileall
--import py_compile
-+#import compileall
-+#import py_compile
- import glob
- import shutil
- import fnmatch
-@@ -195,7 +195,7 @@
-             os.remove(rwname)
-     
-     # Cleanup our config file
--    for name in ['eric3config.py', 'eric3config.pyc']:
-+    for name in ['eric3config.py']:
-         e3cfile = os.path.join(pyModDir, name)
-         if os.path.exists(e3cfile):
-             os.remove(e3cfile)
-@@ -263,18 +263,14 @@
-     # copy the new sitecustomize.py
-     if distDir:
-         shutil.copy('sitecustomize.py', cfg['mdir'])
--        shutil.copy('sitecustomize.pyc', cfg['mdir'])
-     else:
-         shutil.copy('sitecustomize.py', pyModDir)
--        shutil.copy('sitecustomize.pyc', pyModDir)
-     
-     # copy the eric3 config file
-     if distDir:
-         shutil.copy('eric3config.py', cfg['mdir'])
--        shutil.copy('eric3config.pyc', cfg['mdir'])
-     else:
-         shutil.copy('eric3config.py', pyModDir)
--        shutil.copy('eric3config.pyc', pyModDir)
-     
-     # copy the various parts of eric3
-     copyTree('eric', cfg['ericDir'], ['*.py', '*.pyc', '*.pyo', '*.pyw'], 
-@@ -611,19 +607,19 @@
- 
-     # Create/modify the sitecustomize file
-     createSitecustomize()
--    print "Compiling debugger files."
--    if distDir:
--        compileall.compile_dir("eric", ddir=os.path.join(distDir, modDir, cfg['ericDir']))
--        py_compile.compile("eric3config.py", 
--                           dfile = os.path.join(distDir, modDir, "eric3config.py"))
--        py_compile.compile("sitecustomize.py", 
--                           dfile = os.path.join(distDir, modDir, "sitecustomize.py"))
--    else:
--        compileall.compile_dir("eric", ddir=os.path.join(modDir, cfg['ericDir']))
--        py_compile.compile("eric3config.py", 
--                           dfile = os.path.join(modDir, "eric3config.py"))
--        py_compile.compile("sitecustomize.py", 
--                           dfile = os.path.join(modDir, "sitecustomize.py"))
-+#    print "Compiling debugger files."
-+#    if distDir:
-+#        compileall.compile_dir("eric", ddir=os.path.join(distDir, modDir, cfg['ericDir']))
-+#        py_compile.compile("eric3config.py", 
-+#                           dfile = os.path.join(distDir, modDir, "eric3config.py"))
-+#        py_compile.compile("sitecustomize.py", 
-+#                           dfile = os.path.join(distDir, modDir, "sitecustomize.py"))
-+#    else:
-+#        compileall.compile_dir("eric", ddir=os.path.join(modDir, cfg['ericDir']))
-+#        py_compile.compile("eric3config.py", 
-+#                           dfile = os.path.join(modDir, "eric3config.py"))
-+#        py_compile.compile("sitecustomize.py", 
-+#                           dfile = os.path.join(modDir, "sitecustomize.py"))
-     print "\nInstalling eric3 ..."
-     installEric()
-     print "\nInstallation complete."
diff --git a/dev-util/eric/files/4.1.4-paths.patch b/dev-util/eric/files/4.1.4-paths.patch
deleted file mode 100644
index 7c3e62b5a341..000000000000
--- a/dev-util/eric/files/4.1.4-paths.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- eric4-4.1.4-orig/install.py	2008-05-22 00:13:29.000000000 +0200
-+++ eric4-4.1.4/install.py	2008-05-22 00:21:27.000000000 +0200
-@@ -187,7 +187,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 -*-
-@@ -210,7 +210,10 @@
-     
-     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."
-@@ -475,7 +478,7 @@
-        cfg['ericTemplatesDir'],
-        cfg['ericCodeTemplatesDir'], cfg['ericOthersDir'],
-        cfg['bindir'], cfg['mdir'], 
--       getAPIsPath(), apis)
-+       getAPIsPath()[len(distDir):], apis)
-     copyToFile(fn, config)
- 
- def doDependancyChecks():