Remove unused patches. Fix repoman complains.

Package-Manager: portage-2.2_rc40/cvs/Linux x86_64

5 files changed, 10 insertions, 115 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/Manifest b/dev-util/eric/Manifest
index 0b3ba8700610..0dde860362be 100644
--- a/dev-util/eric/Manifest
+++ b/dev-util/eric/Manifest
@@ -1,5 +1,3 @@
-AUX 3.9.5-disable_compilation.patch 3017 RMD160 cd93973f117235af31082b6c1ccce70575ec3d92 SHA1 c1f6ad2d35f8235e59f8c72c68b165ee089981c2 SHA256 2d2d797f28d4c654ba1087cea1aa770584682541e726f83f1a5124817429eca9
-AUX 4.1.4-paths.patch 1134 RMD160 e250092e8baaeec67e5602af76e8bb6100b898bc SHA1 fbd304a8c77fd0ac4fedd165b2d501d71607bfa2 SHA256 8842b9791b0352e6b6c734f849619cb8ee93316f56898debfb8ad5c913f79eea
 AUX 4.2.3-no-interactive.patch 958 RMD160 0f96217e49cd30e042315b73fe39afc827006cce SHA1 4c4784ebe9b58f8de62f33b6f4c30f131a0fd6cf SHA256 a947414abd6176809b258e885fbe80ec54f1fe1c2e2c621cc65e5483a9d19eee
 AUX 4.3.0-paths.patch 1287 RMD160 c07033acb7ebd247888e6691cf660b001ebd99f2 SHA1 5f9ee98dde9583a76d3628e3bcec8946ea8acb8f SHA256 221fa84cbb32273f85715c301dd0c9fc2649e2ea229bc7abf0a828e2b2d5f923
 DIST eric4-4.3.1.tar.gz 5132500 RMD160 719a955bb1d2f64efb3e9958a63bb3f4313d1423 SHA1 58d6c8cf1cb9acbfeab634a165cdee731fe4a257 SHA256 463b82e1f226d0f5b76e5b6e4158e9518f88a6f7f751963a87d9587b423ff9a1
@@ -41,10 +39,10 @@ DIST eric4-i18n-zh_CN.GB2312-4.3.3.tar.gz 370512 RMD160 f65e81c111e47453199276f7
 DIST eric4-i18n-zh_CN.GB2312-4.3.4.tar.gz 370531 RMD160 273192cf60ef77238f190056b9a9987160fc5f33 SHA1 018c4e0391e1785c55bc9da29754e49f0cd52f1d SHA256 fc13760ad273e3065f3a42b940b00364d0b8f919b6fd0a8f0dca72d1aa63496a
 DIST eric4-i18n-zh_CN.GB2312-4.3.5.tar.gz 370531 RMD160 8e27b92a25f906dada386932ea21f9b32f6944e1 SHA1 9488ce8ea4233210452790adf2dd946992666dcd SHA256 d48e0f9ada3be0c98d31d1de45ef5f66bd8dbc11f5e42ebcfd590742a181bcc0
 DIST eric4-i18n-zh_CN.GB2312-4.3.6.tar.gz 370570 RMD160 e1892f0ec001813a08517eb995cc0c0f19c2131b SHA1 b2f2637effe4abf76f1a1b8e636ed52244523618 SHA256 a3aa2c9744f854e4bc92a47c63dc7bb5b6e59c2b9bcb0e2d1331aec4d7149659
-EBUILD eric-4.3.1.ebuild 2429 RMD160 68be29d2e18d8a070af40ba910cb960b31ffa3be SHA1 43e76014f0c74da30cb0bb7877d5507ac486b8ce SHA256 42f062583384b35d00f0d320735d4b5eb5426daf673b34f85fbd683bba5bb106
+EBUILD eric-4.3.1.ebuild 2405 RMD160 cf8f1868e343921aba576693c180aa06559b6c76 SHA1 172fd5c5b3766dfb10b1023fe8fb5197a43dd820 SHA256 7c0012f175589914b795a37e47a1b7bfe488792b963a7eeaa6538f6c066ca6a2
 EBUILD eric-4.3.3.ebuild 2508 RMD160 5bd0f417c5072f6b6b7a5ecdd83bc27722b87bea SHA1 2b73883a1d0d75d21f5594cdc8817279ba6d647a SHA256 f57d22e83856595a01e04b003cefddbe42e331c38f2eccc74f27a5fbc9c83bd4
 EBUILD eric-4.3.4.ebuild 2503 RMD160 474568c3aad819c0c5be2d6b184a1e9a009131ef SHA1 df8c696f752e0a57270bc515e6dbfeeec52950ed SHA256 9b5b765db80dcc5598aeab2994647edf82d417ec17f5a7cfe8bf3f608779469c
 EBUILD eric-4.3.5.ebuild 2462 RMD160 a75f3b145ff93d3700a49184128702c466ca93ee SHA1 0ad671bf796f64764d6938a73e452e3f309b4803 SHA256 87d557381357c6b1a074979e2016702ec24d618f8c05cbde210e065bcba1fec0
 EBUILD eric-4.3.6.ebuild 2459 RMD160 f3c4af0b5bf8b82a6a81872c9960f044e7894805 SHA1 52512e70e0c711bd9a3d84c9f35ca460e21fafd9 SHA256 095071667543b9bb9c10804cdfe19a1001d3836a26c2a15bef541f48b7468802
-MISC ChangeLog 11404 RMD160 90c14b88f0cbeeb18b5ea6639ddcc1db8831ce61 SHA1 f11508f5f9210195d2b38e48f5a98396f1d0b691 SHA256 bb1c72e03f7ca0fe3eb89155bd7570611509a81e7c302372331336f9099e725e
+MISC ChangeLog 11591 RMD160 4653acda74009c062a9ffa7eb5c79ac49d6a587f SHA1 6ea80d42db375832643f76475f067cf000664eef SHA256 777d284d32d97e5adf734481fba63d0b7c983c6b8c2eeea9e099c747c8601a79
 MISC metadata.xml 179 RMD160 887c899594fdaa3d82028c3d84188354d3784cd9 SHA1 551c6b2378ff31eadc1e4860211ec8709ce960bd SHA256 1fbdee58e0ba0f8730f6a27979cb7eeed8ebd3afa316d61b34a5f4893291a646
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():