Version bump, cleanup & ebuild rework.

Package-Manager: portage-2.1.3_rc5

5 files changed, 196 insertions, 5 deletions

diff --git a/dev-util/eric/ChangeLog b/dev-util/eric/ChangeLog
index 676205e86b60..aa096ce141dd 100644
--- a/dev-util/eric/ChangeLog
+++ b/dev-util/eric/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/eric
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/ChangeLog,v 1.42 2007/02/22 02:07:33 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/ChangeLog,v 1.43 2007/06/23 12:29:09 dev-zero Exp $
+
+*eric-3.9.5 (23 Jun 2007)
+
+  23 Jun 2007; Tiziano Müller <dev-zero@gentoo.org>
+  +files/3.9.5-disable_compilation.patch, +eric-3.9.5.ebuild:
+  Version bump, cleanup & ebuild rework.
 
   22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/dev-util/eric/Manifest b/dev-util/eric/Manifest
index 29594d9cf86d..4b88df5d3dc3 100644
--- a/dev-util/eric/Manifest
+++ b/dev-util/eric/Manifest
@@ -1,11 +1,19 @@
+AUX 3.9.5-disable_compilation.patch 3017 RMD160 cd93973f117235af31082b6c1ccce70575ec3d92 SHA1 c1f6ad2d35f8235e59f8c72c68b165ee089981c2 SHA256 2d2d797f28d4c654ba1087cea1aa770584682541e726f83f1a5124817429eca9
+MD5 716fa7bf47b5594d9248d9a019e22864 files/3.9.5-disable_compilation.patch 3017
+RMD160 cd93973f117235af31082b6c1ccce70575ec3d92 files/3.9.5-disable_compilation.patch 3017
+SHA256 2d2d797f28d4c654ba1087cea1aa770584682541e726f83f1a5124817429eca9 files/3.9.5-disable_compilation.patch 3017
 DIST eric-3.7.2.tar.gz 1733560 RMD160 2bbcdcdd74fe88c0d28f935e9c1b46886eb6988d SHA1 f8733c9c02bbf5bcba9b49b57f0edc43cff975b8 SHA256 d6cd4863fb20e4003eec95f20a8949f35e6c6664bdcab655bbee92a8a142aa5b
 DIST eric-3.9.4.tar.gz 1875650 RMD160 a84a05cdfad063d4e4797a156b2d5dde8fed7dd4 SHA1 57c657dd4e3b545732a1c11865bcf0a73680c9c0 SHA256 cd4197d65cc476bfb541c600b5da0184d1d34dfd158b1aa0e29422f37ca60e5e
+DIST eric-3.9.5.tar.gz 1875948 RMD160 702ba0fd40626d8bf3f35f350454112ba7d0c2d8 SHA1 bc67b3093576eb1952d6e7c40e52fd0368c365a7 SHA256 6dd9f001ac399d1fc81a54c6428bed065a07955d9087a11bbfd118f4f93020b5
 DIST eric-i18n-de-3.7.2.tar.gz 209704 RMD160 a588258c1f6fcd3b6c8d72923ad85905b6e31d72 SHA1 0c3cd90034c6c24611deccf91b7e1ed555f1530f SHA256 329c1e782db4104c3a5807bf0c1a200643f4f63ece676b2ef8f1a385dc258364
 DIST eric-i18n-de-3.9.4.tar.gz 239706 RMD160 c2ce71d7aa5728b154c01ef3e1c86010b5c3716f SHA1 01878a568801a7b3665c1aab7fddae00e8cd921e SHA256 2732b9ca7a662144506554d8272beb3f67063775ecb8d8bf3167a42f63678113
+DIST eric-i18n-de-3.9.5.tar.gz 239701 RMD160 083c59ff7dcdbbc1826d0c7141f3e32b71e9b577 SHA1 ac8aba11e9b1875329692c41c43c220bb62d9232 SHA256 087df0258059b2865574e44df48a91079e02817b8e1cecdbfdd12630cddf3cfb
 DIST eric-i18n-fr-3.7.2.tar.gz 212608 RMD160 11961481cd3476a2d87f2d049704c8aad6bf6761 SHA1 2b811725a32370ac280646c78eb5c830f32aee7c SHA256 4d7242eb43689a167755da945dfa4b5a3b6583c8e98e1ec840608a4871a68251
 DIST eric-i18n-fr-3.9.4.tar.gz 243243 RMD160 9f738f745667b7412c086a3df599db43eab8fe2b SHA1 b977a1f66c56d6da3f0aa54ee421dfdb17e0ebb8 SHA256 d3bfae18d00e933d909dab2ebd6cb37f934543f0f276bd2ab01191244cb8207a
+DIST eric-i18n-fr-3.9.5.tar.gz 243243 RMD160 f3339f6161e2d10102590486c1c49d9efe92494a SHA1 2ea11fb5aca45a71dff0d071dc4f01de432706bc SHA256 8e4f2dba0b2dd246ab376f6bfd510b8c8e593286a514cb31ff9cad6144459fcf
 DIST eric-i18n-ru-3.7.2.tar.gz 221137 RMD160 3abdfa2ff76c10311fa42d9f407001969970e4fc SHA1 f71f201ae9417929478df7e893fdb21c49367d29 SHA256 15fb7ce2d5160a33f7173dc6d9ad7bb207e816806f427a4b8509cfa5c6779315
 DIST eric-i18n-ru-3.9.4.tar.gz 251499 RMD160 83c37cccb1e8714fe973b5d4b7b2a83f89dacbe4 SHA1 2c0aec9e18e6a8953394db91535603ffcd7cd42f SHA256 62dc67cff3bc572f7292588f45a53d97137b34f2703ac547bea25a33f611d3a5
+DIST eric-i18n-ru-3.9.5.tar.gz 251500 RMD160 5a3f0923fae810401afba0d7c9288844571ba660 SHA1 871578b4f30b5963f4a6c7bb8c6f438e19a74931 SHA256 5e0dbaad9b193f6d26721a4931e02d4079da73091661a5f008d98b65f9c497a7
 EBUILD eric-3.7.2-r1.ebuild 1956 RMD160 5f3b1b946a16b9296fac9dc9d9f14184bfa91853 SHA1 2f5fd18b89d1ffc8c4e9a492d2e6337208ef40a7 SHA256 6931ae9add6a835c6f21671adc38790b938fca2fdb6437e0d7d1bd0ab8b9b6b9
 MD5 468617becc38106d25f025a37cba7516 eric-3.7.2-r1.ebuild 1956
 RMD160 5f3b1b946a16b9296fac9dc9d9f14184bfa91853 eric-3.7.2-r1.ebuild 1956
@@ -14,10 +22,14 @@ EBUILD eric-3.9.4.ebuild 1546 RMD160 1b8c047c624eaa56e265cdf753ffdcfa63c51c49 SH
 MD5 116f9949d93e02d86b8c556755b3344d eric-3.9.4.ebuild 1546
 RMD160 1b8c047c624eaa56e265cdf753ffdcfa63c51c49 eric-3.9.4.ebuild 1546
 SHA256 a0ce393ca1be93fca9129bc0a5526bf41802068532747499dae997eed4175497 eric-3.9.4.ebuild 1546
-MISC ChangeLog 5018 RMD160 033f9ae08ebf7302a9d9e83ff2ed066f64c440cc SHA1 a18c0d52621943a8beff5a7e5fe28057e052d014 SHA256 b204e55cb93e67990ff5d7cadc71d61bd5f272850f540281e20839b850b544cb
-MD5 50dfdf1b57b6621570e439f71f362064 ChangeLog 5018
-RMD160 033f9ae08ebf7302a9d9e83ff2ed066f64c440cc ChangeLog 5018
-SHA256 b204e55cb93e67990ff5d7cadc71d61bd5f272850f540281e20839b850b544cb ChangeLog 5018
+EBUILD eric-3.9.5.ebuild 2605 RMD160 9e1e0c8e154d7aabdf06d926a050519d5c9f78f8 SHA1 18e073d03a13bb8320a3c8988e0b5a8e04fa4a03 SHA256 f8537027f3bfd3885221fcd8d0b4526fe411af17c20df645da82750d23ce01b0
+MD5 0010174bb643eec5315fd8959fc96282 eric-3.9.5.ebuild 2605
+RMD160 9e1e0c8e154d7aabdf06d926a050519d5c9f78f8 eric-3.9.5.ebuild 2605
+SHA256 f8537027f3bfd3885221fcd8d0b4526fe411af17c20df645da82750d23ce01b0 eric-3.9.5.ebuild 2605
+MISC ChangeLog 5205 RMD160 d83940286382f56521987e6bb76915e33a1ba8cf SHA1 6b9a00a9e08309c07bf82924e922cc5ea65bdb52 SHA256 ad804c395fd2badbd4bb6a4cf209989309e3e55c86f729d00dbb1911d3eea0ff
+MD5 4dade1701625022f3a33273ab50f3250 ChangeLog 5205
+RMD160 d83940286382f56521987e6bb76915e33a1ba8cf ChangeLog 5205
+SHA256 ad804c395fd2badbd4bb6a4cf209989309e3e55c86f729d00dbb1911d3eea0ff ChangeLog 5205
 MISC metadata.xml 175 RMD160 220bb3f470a506fe50312f4b69c2e5df90b7c282 SHA1 a17b5760bd5ecd4be11ca0a15698fc6d3f3cc76e SHA256 815ada75b169c0b450bdb3429137e6edd42429656bb6369d42e89fd652bdf7c2
 MD5 56ad59727dbcdbf30e7ed8282d3913e5 metadata.xml 175
 RMD160 220bb3f470a506fe50312f4b69c2e5df90b7c282 metadata.xml 175
@@ -28,3 +40,6 @@ SHA256 a0a1be6e4521ff88c52ddf38c528ce85beb2bed28eb35e6a758ff1761b4bba0d files/di
 MD5 f06f87aafc877565c06e599884abf00f files/digest-eric-3.9.4 1003
 RMD160 4efdc75ede332a09cbafff8da84e0be70fa1f025 files/digest-eric-3.9.4 1003
 SHA256 974634bba00a8aa9f4a257e95f38f796419a48bb49f6a0acfa46dc92fea4226c files/digest-eric-3.9.4 1003
+MD5 0d1758f4c30fdf274569ebbd2a514557 files/digest-eric-3.9.5 1003
+RMD160 d98ce371bfcc3e13dbfdf6b694ae3c64e708477d files/digest-eric-3.9.5 1003
+SHA256 efdc6d9d5bc02435ff0b3051dda2b6345a85e82e9e6a41e40e8504fabc71da0b files/digest-eric-3.9.5 1003
diff --git a/dev-util/eric/eric-3.9.5.ebuild b/dev-util/eric/eric-3.9.5.ebuild
new file mode 100644
index 000000000000..78414cb5dcbf
--- /dev/null
+++ b/dev-util/eric/eric-3.9.5.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-3.9.5.ebuild,v 1.1 2007/06/23 12:29:09 dev-zero Exp $
+
+NEED_PYTHON=2.3
+
+inherit python eutils multilib
+
+DESCRIPTION="eric3 is a full featured Python IDE that is written in PyQt using the QScintilla editor widget"
+HOMEPAGE="http://www.die-offenbachs.de/detlev/eric3.html"
+SRC_URI="mirror://sourceforge/eric-ide/${P}.tar.gz
+	linguas_de? ( mirror://sourceforge/eric-ide/${PN}-i18n-de-${PV}.tar.gz )
+	linguas_fr? ( mirror://sourceforge/eric-ide/${PN}-i18n-fr-${PV}.tar.gz )
+	linguas_ru? ( mirror://sourceforge/eric-ide/${PN}-i18n-ru-${PV}.tar.gz )"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="idl"
+
+DEPEND=">=dev-python/PyQt-3.13
+	>=dev-python/pyxml-0.8.4
+	>=dev-python/qscintilla-1.0"
+RDEPEND="${DEPEND}
+	idl? ( !sparc? ( >=net-misc/omniORB-4.0.3 ) )"
+
+LANGS="de fr ru"
+
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PV}-disable_compilation.patch"
+}
+
+src_install() {
+	python_version
+
+cat >> gentoo_config.py <<- _EOF_
+
+cfg = {
+	'ericDir': r"/usr/$(get_libdir)/python${PYVER}/site-packages/eric3",
+	'ericPixDir': r"/usr/share/eric3/pixmaps",
+	'ericIconDir': r"/usr/share/eric3/icons",
+	'ericDTDDir': r"/usr/share/eric3/DTDs",
+	'ericCSSDir': r"/usr/share/eric3/CSSs",
+	'ericDocDir': r"/usr/share/doc/${PF}/Documentation",
+	'ericExamplesDir': r"/usr/share/doc/${PF}/Examples",
+	'ericTranslationsDir': r"/usr/share/eric3/i18n",
+	'ericWizardsDir': r"/usr/$(get_libdir)/python${PYVER}/site-packages/Wizards",
+	'ericTemplatesDir': r"/usr/share/eric3/DesignerTemplates",
+	'ericOthersDir': r"/usr/lib/python2.4/site-packages/eric3",
+	'bindir': r"/usr/bin",
+	'mdir': r"/usr/$(get_libdir)/python${PYVER}/site-packages"
+}
+_EOF_
+
+
+	${python} install.py \
+		-f "gentoo_config.py" \
+		-b "${ROOT}usr/bin" \
+		-i "${D}" \
+		-d "${ROOT}usr/$(get_libdir)/python${PYVER}/site-packages" \
+		-c || die "${python} install.py failed"
+
+	dodoc ChangeLog THANKS eric/README*
+	make_desktop_entry "eric3 --nosplash" \
+			eric3 \
+			"${ROOT}usr/$(get_libdir)/python${PYVER}/site-packages/eric3/icons/default/eric.png" \
+			"Development;IDE;Qt"
+}
+
+pkg_postinst() {
+	elog "If you want to use eric3 with mod_python, have a look at"
+	elog "  \"${ROOT}usr/$(get_libdir)/python${PYVER}/site-packages/eric3/patch_modpython.py\"."
+
+	python_version
+	python_mod_optimize "/usr/$(get_libdir)/python${PYVER}/site-packages/eric3"
+}
+
+pkg_postrm() {
+	python_version
+	python_mod_cleanup "/usr/$(get_libdir)/python${PYVER}/site-packages/eric3"
+}
diff --git a/dev-util/eric/files/3.9.5-disable_compilation.patch b/dev-util/eric/files/3.9.5-disable_compilation.patch
new file mode 100644
index 000000000000..24a46b525e54
--- /dev/null
+++ b/dev-util/eric/files/3.9.5-disable_compilation.patch
@@ -0,0 +1,74 @@
+--- 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/digest-eric-3.9.5 b/dev-util/eric/files/digest-eric-3.9.5
new file mode 100644
index 000000000000..f40cec5b7f1d
--- /dev/null
+++ b/dev-util/eric/files/digest-eric-3.9.5
@@ -0,0 +1,12 @@
+MD5 63d6fb3c302b603577554af62520c948 eric-3.9.5.tar.gz 1875948
+RMD160 702ba0fd40626d8bf3f35f350454112ba7d0c2d8 eric-3.9.5.tar.gz 1875948
+SHA256 6dd9f001ac399d1fc81a54c6428bed065a07955d9087a11bbfd118f4f93020b5 eric-3.9.5.tar.gz 1875948
+MD5 46138106a951e2af5c6dbc57cd558186 eric-i18n-de-3.9.5.tar.gz 239701
+RMD160 083c59ff7dcdbbc1826d0c7141f3e32b71e9b577 eric-i18n-de-3.9.5.tar.gz 239701
+SHA256 087df0258059b2865574e44df48a91079e02817b8e1cecdbfdd12630cddf3cfb eric-i18n-de-3.9.5.tar.gz 239701
+MD5 7f13aca3d31cc2f18b8d357172662834 eric-i18n-fr-3.9.5.tar.gz 243243
+RMD160 f3339f6161e2d10102590486c1c49d9efe92494a eric-i18n-fr-3.9.5.tar.gz 243243
+SHA256 8e4f2dba0b2dd246ab376f6bfd510b8c8e593286a514cb31ff9cad6144459fcf eric-i18n-fr-3.9.5.tar.gz 243243
+MD5 7b2927ae5a78622939d1e10f226b31cd eric-i18n-ru-3.9.5.tar.gz 251500
+RMD160 5a3f0923fae810401afba0d7c9288844571ba660 eric-i18n-ru-3.9.5.tar.gz 251500
+SHA256 5e0dbaad9b193f6d26721a4931e02d4079da73091661a5f008d98b65f9c497a7 eric-i18n-ru-3.9.5.tar.gz 251500