Stable on amd64 and x86, drop old

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

9 files changed, 10 insertions, 483 deletions

diff --git a/dev-util/eric/ChangeLog b/dev-util/eric/ChangeLog
index f0800a471998..edff144f48d0 100644
--- a/dev-util/eric/ChangeLog
+++ b/dev-util/eric/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/eric
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/ChangeLog,v 1.68 2009/01/18 22:00:16 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/ChangeLog,v 1.69 2009/01/31 23:07:16 jokey Exp $
+
+  31 Jan 2009; <jokey@gentoo.org> -files/4.1.1-paths.patch,
+  -eric-4.1.1.ebuild, -eric-4.1.4.ebuild, -eric-4.1.6.ebuild,
+  -eric-4.2.0.ebuild, -eric-4.2.3.ebuild, eric-4.2.5.ebuild:
+  Stable on amd64 and x86, drop old
 
 *eric-4.2.5 (18 Jan 2009)
 
diff --git a/dev-util/eric/Manifest b/dev-util/eric/Manifest
index 8e9defe4f71d..5120e4d7f183 100644
--- a/dev-util/eric/Manifest
+++ b/dev-util/eric/Manifest
@@ -1,5 +1,4 @@
 AUX 3.9.5-disable_compilation.patch 3017 RMD160 cd93973f117235af31082b6c1ccce70575ec3d92 SHA1 c1f6ad2d35f8235e59f8c72c68b165ee089981c2 SHA256 2d2d797f28d4c654ba1087cea1aa770584682541e726f83f1a5124817429eca9
-AUX 4.1.1-paths.patch 1375 RMD160 776437203a7b32a46bf6d05ead31e7cb1030fa45 SHA1 d72a5de09928348b11b66431776c84dd0803ea2b SHA256 10f5f78b9a7d9f98ab4f86cdab1779fb63e1d4439d27773f3a0cdb05a41dc975
 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
 DIST eric-3.7.2.tar.gz 1733560 RMD160 2bbcdcdd74fe88c0d28f935e9c1b46886eb6988d SHA1 f8733c9c02bbf5bcba9b49b57f0edc43cff975b8 SHA256 d6cd4863fb20e4003eec95f20a8949f35e6c6664bdcab655bbee92a8a142aa5b
@@ -11,51 +10,19 @@ DIST eric-i18n-fr-3.9.5.tar.gz 243243 RMD160 f3339f6161e2d10102590486c1c49d9efe9
 DIST eric-i18n-ru-3.7.2.tar.gz 221137 RMD160 3abdfa2ff76c10311fa42d9f407001969970e4fc SHA1 f71f201ae9417929478df7e893fdb21c49367d29 SHA256 15fb7ce2d5160a33f7173dc6d9ad7bb207e816806f427a4b8509cfa5c6779315
 DIST eric-i18n-ru-3.9.5.tar.gz 251500 RMD160 5a3f0923fae810401afba0d7c9288844571ba660 SHA1 871578b4f30b5963f4a6c7bb8c6f438e19a74931 SHA256 5e0dbaad9b193f6d26721a4931e02d4079da73091661a5f008d98b65f9c497a7
 DIST eric4-4.0.4.tar.gz 2425843 RMD160 d46d29abac160d8f989559849cde4998e68a2626 SHA1 902e851423d2ccdf43e977514b710c29d7c96f54 SHA256 d8f2db51a67250b8dde37bdc229c60fb87853d7163a31c6d80a791004ce48a85
-DIST eric4-4.1.1.tar.gz 3833289 RMD160 7a9c6862b5f70d6774642355520402ccddb6afdb SHA1 fe97f9150b2ba83ad40f3843b39684ba46e58157 SHA256 df235642528148425eff1bf4bed330250dac647f7e7d70250d337c29e8734df4
-DIST eric4-4.1.4.tar.gz 3908945 RMD160 d4572bf2e5dd619d199e381dd93b99e9f1a10130 SHA1 1b925b8d90e0120a806f2eca65732471e329a855 SHA256 363731c18170090b5cee37ab4c95e1fafd7dcd31f35f2bc2b89ea90245888d44
-DIST eric4-4.1.6.tar.gz 3902714 RMD160 843dd711706a64682d46d82443638154b4ea8778 SHA1 195f8904142927d6ee4e02de2c2d49d8bf95a7e6 SHA256 24232ed02a959aaa5ed50616d0eac0e90ff9859be664ef25d4d40c261fe78e25
-DIST eric4-4.2.0.tar.gz 4018984 RMD160 53a5ead1cfdac769c1229da22ada880718bc3df2 SHA1 903b32fcf8086913aef497709b426373b9565358 SHA256 791450e0ca2ce8241632c05da190465276bfae21a35c3330ab5488155c8dc5f1
-DIST eric4-4.2.3.tar.gz 4022557 RMD160 6fd9e167aad5122ab098a39c8cb82b0f3a622675 SHA1 60a6488d8a91f6b6f7c13c14dc947a80d5269640 SHA256 ba7ae0a3eb0ee266532b4dae96dfffd074ace37fed648f35e982f79dbe570e57
 DIST eric4-4.2.5.tar.gz 4023693 RMD160 d7235616eff27ba83c192cbe209f3abfdf9900de SHA1 514cd269e575b8b7878445a2d86a2914d27b7ba7 SHA256 9e29ccf3bcff1543cddd1fd558a60a5679e249075ef2403b1885f60d59b2b95b
-DIST eric4-i18n-cs-4.1.1.tar.gz 383206 RMD160 85130e06cb1714fc6c7ac5724360ab1263e86030 SHA1 c899373642b41c1fd60e1bdf5ad90f5f3d8a8ab2 SHA256 1703575c8bdd38044e75a921c5a6b18c63426c2a59aafc685eb00d9a264d7315
-DIST eric4-i18n-cs-4.1.4.tar.gz 383207 RMD160 2835b724a9d6f6287c21dfb444574f0d1ecb9915 SHA1 28d4241ae861ccd5388512941f96259ebff1702b SHA256 f93d6ef3094c80aab600a58e085cd2f252275111d7322b61df94401b60c4cf78
-DIST eric4-i18n-cs-4.1.6.tar.gz 383294 RMD160 3c9784dd2c11aaf9fe5bb24dc8c098ea7eb2d17e SHA1 95d9f9e611cb6252f5cf520b1c1105b99252dc56 SHA256 6a054cf6820ca5b6a92a131b4b56d276f1272604b91b5f65946af4c29c96f67a
-DIST eric4-i18n-cs-4.2.0.tar.gz 377749 RMD160 a4c1f63fa60b2f09f6e3e850d8d845938699e0b4 SHA1 a94920903d8da69be9c073abe696c3c1fb4ad1de SHA256 59d39aa40e093cad39ae6ea370d80533251920bf9d90908f2cb33241599d0a08
-DIST eric4-i18n-cs-4.2.3.tar.gz 377749 RMD160 435e40c26c4352f5bfb05be1f61cc5e5e67453ea SHA1 75a3393a272e6ce9121b414bb14c1422b10a7e4c SHA256 a6a6a385e072d6a3505b768924d3611c0fa324a67ad70aa354a6b83148a571fa
 DIST eric4-i18n-cs-4.2.5.tar.gz 377830 RMD160 3e8bb771749c17ff3f32c2312c2f33415d986301 SHA1 9049641f921e8c491b7c76fa98064eba11057de1 SHA256 a2bca6d06bf0732362488ee34fff55db992bae15fb3c43307b81ae1d9f48d4ab
 DIST eric4-i18n-de-4.0.4.tar.gz 393891 RMD160 dcfe993ee36471c616da6f7b88791ecb0574e0ec SHA1 6ea4a9a1bb2ef66166298d142fad7eaf325e29a5 SHA256 c1ad459fcea61809cafdefc0c87f65b6398a7723e13926b17c75fa02e994f6e3
-DIST eric4-i18n-de-4.1.1.tar.gz 390066 RMD160 541e98d7e670bd862f81409eb2ecad1461b9b57b SHA1 48795ee5e1dfd4d1007eb5b4bb3ef312ef6e6f86 SHA256 7a57364f697657762a36e2d2eae719185ebe3fd3356974f423154da025ae543b
-DIST eric4-i18n-de-4.1.4.tar.gz 390066 RMD160 8a1f21e1989fa03baa2720f36d54a5eb113c3163 SHA1 a6ea86f6a21d46e4ad9017f4920d514a855b0634 SHA256 974ec3fd3234dfd1f77a83edc2bd2ec900f4642ada6c133915bfb5e69bd90287
-DIST eric4-i18n-de-4.1.6.tar.gz 357768 RMD160 0c1efc12c784210107f0aa0b033e9b3fbc322200 SHA1 0103a70f3aba6482bfdc177a0bd6c5590c51e448 SHA256 8b24b71375b3978eaa9b454fba1729fcf9f0846fa7e39199b07f559fe9b9391d
-DIST eric4-i18n-de-4.2.0.tar.gz 379849 RMD160 b09b541cb5c77884a496e8ac4edbe9d62c0d4bf4 SHA1 79aa1055df6aef074ef56576322d60952bf2c568 SHA256 c5d6d840ba6ca5579e104c818d17245444a68889ffb8cb018431d4aa1d392073
-DIST eric4-i18n-de-4.2.3.tar.gz 379849 RMD160 eaec49503ed56c6bbfd495b29042639fd51b9767 SHA1 9812fd6535a5b2ad251b6005edb8e7701fcbe84c SHA256 98340b4df8c445f7401a850891f03b55ec6274c77a2af7ce1d1ff24d0d21fac2
 DIST eric4-i18n-de-4.2.5.tar.gz 380048 RMD160 01313977a022f9bba19ddc826fad7e7e3aab1779 SHA1 98fc89aa3c58148b6492594ad60b1230f2c77637 SHA256 3631be15da61c171bba4fe45ea87ae9b9ee852851a41875cac80a021f407785a
-DIST eric4-i18n-es-4.2.3.tar.gz 383157 RMD160 410d6a726708159be11c196d0984769503b39f00 SHA1 8b32870ea18d7f67f3b7f2936b59b7c0d04d2232 SHA256 ee6e8b033d1ac476a64dd67fa7d1440a5483cfe90ca0a86516451b08dc6c67c3
 DIST eric4-i18n-es-4.2.5.tar.gz 383254 RMD160 4dde0f8cca0248aafe6d30c3a4d0f866d0316c04 SHA1 4e37d9c21255efe78aaa9c7c58cc4ed297475d17 SHA256 8989a255eaa82404f215cc9ca867b6c488da711d257816414e0b47ce7736ea8e
 DIST eric4-i18n-fr-4.0.4.tar.gz 398318 RMD160 ee60c3e2275814f5f021d9ae340b7b33db659bd0 SHA1 accd9806b546f431b0d09e5b6312f0f9d07951a9 SHA256 6c369f114d8abd6f5f587d4b0a347e428e796b93b71834c0c09d170c40133dea
-DIST eric4-i18n-fr-4.1.1.tar.gz 393435 RMD160 0ebceffcdd138076a1bf733eee6d3609ca256833 SHA1 9a0da9c513a6cd3e1d0a55d067c7f23b7f58e003 SHA256 75c2e226d0b4aa104e98d3dcdf6242aac95423b2ed4b4b5db2c4b28f0bce8f05
-DIST eric4-i18n-fr-4.1.4.tar.gz 393435 RMD160 8ceaafce257ccc47dbf97224bf808f5ac58c8deb SHA1 3a271c963351ec1d1aa3f21aea996c58327be149 SHA256 add2e022f018d4af219f541cebf089b59b8a1a340948d1313e0c9851dc729800
-DIST eric4-i18n-fr-4.1.6.tar.gz 393498 RMD160 1f365bdaa52aeb323d7d5bfbe6961f2ad65079ce SHA1 ca0393f5f6782e1379373ac7f38a18292ff8aaed SHA256 616ebd88a19bde45ce7cff6446cdf292db18efeb6c03495d1d0569ec81644ad1
-DIST eric4-i18n-fr-4.2.0.tar.gz 384587 RMD160 8b1ac605e1d5fc53d93a06c0f79a4e7856f59cbd SHA1 1d913b6c06bb78dde2c0313697a54872d38d383d SHA256 3c56edaf561e97b06ad1991567dbd9b8e2f7c4c02b56640f26c7d63e643adc98
-DIST eric4-i18n-fr-4.2.3.tar.gz 384587 RMD160 1cc1efbfd943ca7406881c664fd3bf4c9ca1f9a6 SHA1 45535c0816885f58e118b388a2c9212d9ea997d3 SHA256 de2dd441c80d353048f0b0de656759964e6cf1256daf75c9002aadaa9e24a2b0
 DIST eric4-i18n-fr-4.2.5.tar.gz 384826 RMD160 db371522ec6bcbaafc34b9786476629baf32f148 SHA1 ae8412674784aa31fc695bb594ca59916d1d8ca3 SHA256 b1ae8b099440c789de9ddd7e1541757fe48a05fe3fd6f20b0eefbf9ec7a29fe8
 DIST eric4-i18n-ru-4.0.4.tar.gz 410096 RMD160 716bcf701a4dea4f60f3b1ff522d51c7f08ba3fe SHA1 43b9a7c1a116270d46cb20f46e0d76af17859aa4 SHA256 03a2f1b6e3014144d077bdbff96758d21c1605ffbe8ed69d7d4812d2a46e51f7
-DIST eric4-i18n-ru-4.1.1.tar.gz 406814 RMD160 7d9260515b37abf5de7cb97383d85c05e3be2370 SHA1 ef083805eb305d2f7ddd5823b89327f30905ea3b SHA256 fdfb471cc8d32c559026b541d055d4ac2dc2d18c50fe12bcfe758e7d0d81f7e8
-DIST eric4-i18n-ru-4.1.4.tar.gz 406816 RMD160 147cde9dc4151fbacd36a320a6c46ba7ba615fdb SHA1 81f4e6ccf9d7b96a61233a91d0d78ff4d4c3054e SHA256 ea7513cddd2d03e669d6b6175a8a6992d92b43170c9412c2031bf5f6126d46ce
-DIST eric4-i18n-ru-4.1.6.tar.gz 406891 RMD160 7d838d943a9f9aba968380352728226e5637606e SHA1 5a6f9976cd795de18864a22631e27decfc547502 SHA256 e36d264ec437d7133fb7081a4cac16202d27ee11c838b477f577f3808bdd4076
-DIST eric4-i18n-ru-4.2.0.tar.gz 385651 RMD160 8d3f355fe3cb8fb3de35bb1a4f2d71e3060748a2 SHA1 6a4082f3e4479b83f3a8c224c3a2e6aca41cb80d SHA256 f72fa1720c0f45ce7a7dad730f5b5e42bea3668f52318743fa500194737b784e
-DIST eric4-i18n-ru-4.2.3.tar.gz 385650 RMD160 445e99c24488d359ecb73c5d2e3390793e182966 SHA1 bc1763b4c0e65f289633a815cba9a219ef9c0de8 SHA256 9f9863356441a020ddbeaecb5b7ebf54ecbc74bd952f0375c5c5adde9f57b18d
 DIST eric4-i18n-ru-4.2.5.tar.gz 385693 RMD160 ec32463033401312a2809e62019005ff8e192cea SHA1 93d0cabf7aaf3f2b6fd9931947f22cc09720e877 SHA256 873ae298db641fed0d41503aa29bfd1940cb314038b991cc9dfbf610c1ab9d0f
-DIST eric4-i18n-tr-4.2.3.tar.gz 306353 RMD160 7ed7f682b3649538d67393d1ee94af5c7477de3c SHA1 15a48cb54e85373cd3470c361cfd8aed6d0e74b5 SHA256 0c58d41ce63923db4cf0b497669d9fcc9559c1842ba6cfb31ef6815eabcf7606
 DIST eric4-i18n-tr-4.2.5.tar.gz 306402 RMD160 7e00c453e9eef094e49ebbfea627ae661dbcfad9 SHA1 5e20930ec789dbb00db75a8260258edf6fa174c4 SHA256 659dc52c326c8334142cd92782c831d3bffabf109896855f7645bf7cd46aa78c
 EBUILD eric-3.7.2-r1.ebuild 1972 RMD160 10bb122028676526f378c3f5a9f46e17743146f7 SHA1 dcdae1ec99b4ce8434eb77dff927ee5c7592644f SHA256 29640def4fb30b467ac321dc92f2e878d06885904b21b4407a832a57c15ee04e
 EBUILD eric-3.9.5.ebuild 2537 RMD160 0b3bdb636ab98f91018a19a9b06ad64f3145027a SHA1 695fc2900b34ff8cf99395a294bde8d3c923e9fb SHA256 9687f4e6476924b7faa061257e824ff0f86d5db974d3d36a7399a173ce0a9b0b
 EBUILD eric-4.0.4.ebuild 2137 RMD160 2a50b2f74c7164eb33b064d5dfbc9464f891f661 SHA1 3d67d970e0dc9d4e84070ea8853cee755be7f78b SHA256 2c367bc77a7cb486f2e2a8b776bba56c819dc4f2953b1bbffa0b0320c0de20b0
-EBUILD eric-4.1.1.ebuild 2376 RMD160 13713a6e5c73e8174a91e6acdca032d3a001a9de SHA1 99e87cccd444c1605440d271ef7c16dad3e784a3 SHA256 dac2ac9489ab18edc673469707aa35fb6e582c3a09d3301a30b1ccc407cf7924
-EBUILD eric-4.1.4.ebuild 2374 RMD160 97ac87bde6f27b711b698d5c1c46ccc81cf5582d SHA1 f7269c831b2f97de859551e7b63bb93a01c28179 SHA256 99ca6cf0159743b73052ac93db4220b883c5c146d420e7b0a555abc9583207fa
-EBUILD eric-4.1.6.ebuild 2367 RMD160 1fd2c0fed6064bec5c0aff4b5085f43b99d3ae2d SHA1 0b511f660b0e23063f7241a2eb431f4f6b626cce SHA256 1d91aaca032c12419a17879d4f50725807e5e3cd6a2a5ce424eb48c344dcd7b4
-EBUILD eric-4.2.0.ebuild 2371 RMD160 70e7e7b61e5e013fb5d229ae4ecd8833af4556c4 SHA1 0f9fc02d8e4d8981d8db9a4e8f345a4c40f21a51 SHA256 3befa6f2d1f4b514c310d4b48c07a0e376fad3d8fb0ba0ebb342402f4bda3f5a
-EBUILD eric-4.2.3.ebuild 2598 RMD160 5d5bd764811c4a7c20552ebcbf8607aa444fff99 SHA1 80001e812e70456c038414dd45a3317eb038e28b SHA256 dd60866e99a72402fe784f8cc8d0180b7c3bea7cc3baaa5950f2ccb26cb1e914
-EBUILD eric-4.2.5.ebuild 2597 RMD160 90ed6edbd09208e01cdb847a458f19f4adfd5968 SHA1 ffa621d52974505c24b0e8dce189435ce2752695 SHA256 26cc5fd21f03bbad4774b239f2253d793c5e6f3847a4d7e019a2dd0aec6a38c9
-MISC ChangeLog 8846 RMD160 7fb58d0e6b9f02ff707acc95540bb8ce30894834 SHA1 87312df56b4074d935ee252467c65e02e1cc4d57 SHA256 509c2e608d165aa9ad82ec67d2669c2170c3721023cbfc18f4e74294744a4cf4
+EBUILD eric-4.2.5.ebuild 2595 RMD160 089d3ddc8bcd4c26a5808fcd938598e917fafa47 SHA1 cd0d96e5ee04b6a554000ff8d28c48ebe4ae8ab4 SHA256 a11ead3310f54d3191b33fdcd6a8167eae71adc1b6298964426a3a6ebb914144
+MISC ChangeLog 9066 RMD160 5401900bacc70e846cc5f6e7ac26a11298a30f46 SHA1 cb1fad204ead5b8da001adf560910ed83be39bfd SHA256 5d64e05058a9a549f31c3eaa5fc9a3f0d7b65a1c46910b3018c6855822bfb340
 MISC metadata.xml 247 RMD160 d987660e3ba65adc34cfc094690b37ac40c1ecd6 SHA1 86508b26976197447614f9ce769a8b4463ead69d SHA256 b52a51d8296aa810b44f6d0cdffa2612e4d78d9c421f6f50f5b595eda9b6273d
diff --git a/dev-util/eric/eric-4.1.1.ebuild b/dev-util/eric/eric-4.1.1.ebuild
deleted file mode 100644
index 705bc2c16e2c..000000000000
--- a/dev-util/eric/eric-4.1.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-4.1.1.ebuild,v 1.4 2008/07/16 22:36:38 yngwin Exp $
-
-NEED_PYTHON=2.4
-
-inherit python eutils
-
-MY_PN=${PN}4
-MY_P=${MY_PN}-${PV}
-DESCRIPTION="eric4 is a full featured Python IDE that is written in PyQt4 using the QScintilla editor widget"
-HOMEPAGE="http://www.die-offenbachs.de/eric/index.html"
-SRC_URI="mirror://sourceforge/eric-ide/${MY_P}.tar.gz
-	linguas_cs? ( mirror://sourceforge/eric-ide/${MY_PN}-i18n-cs-${PV}.tar.gz )
-	linguas_de? ( mirror://sourceforge/eric-ide/${MY_PN}-i18n-de-${PV}.tar.gz )
-	linguas_fr? ( mirror://sourceforge/eric-ide/${MY_PN}-i18n-fr-${PV}.tar.gz )
-	linguas_ru? ( mirror://sourceforge/eric-ide/${MY_PN}-i18n-ru-${PV}.tar.gz )"
-
-SLOT="4"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="linguas_cs linguas_de linguas_fr linguas_ru"
-
-DEPEND="dev-python/PyQt4
-	>=dev-python/qscintilla-python-2.1"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-LANGS="cs de fr ru"
-
-python_version
-
-pkg_setup() {
-	if ! built_with_use 'dev-python/qscintilla-python' 'qt4'; then
-		eerror "Please build qscintilla-python with qt4 useflag."
-		die "qscintilla-python built without qt4."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PV}-paths.patch
-}
-
-src_install() {
-	# Change qt dir to be located in ${D}
-	dodir /usr/share/qt4/
-	${python} install.py \
-		-z \
-		-b "/usr/bin" \
-		-i "${D}" \
-		-d "/usr/$(get_libdir)/python${PYVER}/site-packages" \
-		-c || die "python install.py failed"
-
-	make_desktop_entry "eric4 --nosplash" \
-			eric4 \
-			"/usr/$(get_libdir)/python${PYVER}/site-packages/eric4/icons/default/eric.png" \
-			"Development;IDE;Qt"
-}
-
-pkg_postinst() {
-	python_version
-	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/eric4{,plugins}
-	elog "If you want to use eric4 with mod_python, have a look at"
-	elog "\"${ROOT}usr/$(get_libdir)/python${PYVER}/site-packages/eric4/patch_modpython.py\"."
-	elog
-	elog "The following packages will give eric extended functionality."
-	elog
-	elog "dev-python/pylint"
-	elog "dev-python/pysvn            (in sunrise overlay atm)"
-	elog
-	elog "This version has a new plugin interface with plugin-autofetch from"
-	elog "the App itself. You may want to check those as well"
-}
-
-pkg_postrm() {
-	python_mod_cleanup
-}
diff --git a/dev-util/eric/eric-4.1.4.ebuild b/dev-util/eric/eric-4.1.4.ebuild
deleted file mode 100644
index d10ce4a5214f..000000000000
--- a/dev-util/eric/eric-4.1.4.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-4.1.4.ebuild,v 1.2 2008/05/29 16:46:16 hawking Exp $
-
-NEED_PYTHON=2.4
-
-inherit python eutils
-
-MY_PN=${PN}4
-MY_P=${MY_PN}-${PV}
-DESCRIPTION="A full featured Python IDE that is written in PyQt4 using the QScintilla editor widget"
-HOMEPAGE="http://www.die-offenbachs.de/eric/index.html"
-SRC_URI="mirror://sourceforge/eric-ide/${MY_P}.tar.gz
-	linguas_cs? ( mirror://sourceforge/eric-ide/${MY_PN}-i18n-cs-${PV}.tar.gz )
-	linguas_de? ( mirror://sourceforge/eric-ide/${MY_PN}-i18n-de-${PV}.tar.gz )
-	linguas_fr? ( mirror://sourceforge/eric-ide/${MY_PN}-i18n-fr-${PV}.tar.gz )
-	linguas_ru? ( mirror://sourceforge/eric-ide/${MY_PN}-i18n-ru-${PV}.tar.gz )"
-
-SLOT="4"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="linguas_cs linguas_de linguas_fr linguas_ru"
-
-DEPEND=">=dev-python/PyQt4-4.1
-	>=dev-python/qscintilla-python-2.1"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-LANGS="cs de fr ru"
-
-python_version
-
-pkg_setup() {
-	if ! built_with_use 'dev-python/qscintilla-python' 'qt4'; then
-		eerror "Please build qscintilla-python with qt4 useflag."
-		die "qscintilla-python built without qt4."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PV}-paths.patch
-}
-
-src_install() {
-	# Change qt dir to be located in ${D}
-	dodir /usr/share/qt4/
-	${python} install.py \
-		-z \
-		-b "/usr/bin" \
-		-i "${D}" \
-		-d "/usr/$(get_libdir)/python${PYVER}/site-packages" \
-		-c || die "python install.py failed"
-
-	make_desktop_entry "eric4 --nosplash" \
-			eric4 \
-			"/usr/$(get_libdir)/python${PYVER}/site-packages/eric4/icons/default/eric.png" \
-			"Development;IDE;Qt"
-}
-
-pkg_postinst() {
-	python_version
-	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/eric4{,plugins}
-	elog "If you want to use eric4 with mod_python, have a look at"
-	elog "\"${ROOT}usr/$(get_libdir)/python${PYVER}/site-packages/eric4/patch_modpython.py\"."
-	elog
-	elog "The following packages will give eric extended functionality."
-	elog
-	elog "dev-python/pylint"
-	elog "dev-python/pysvn            (in sunrise overlay atm)"
-	elog
-	elog "This version has a new plugin interface with plugin-autofetch from"
-	elog "the App itself. You may want to check those as well"
-}
-
-pkg_postrm() {
-	python_mod_cleanup
-}
diff --git a/dev-util/eric/eric-4.1.6.ebuild b/dev-util/eric/eric-4.1.6.ebuild
deleted file mode 100644
index ed4d9223c6bc..000000000000
--- a/dev-util/eric/eric-4.1.6.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-4.1.6.ebuild,v 1.1 2008/07/16 23:17:46 yngwin Exp $
-
-NEED_PYTHON=2.4
-
-inherit python eutils
-
-MY_PN=${PN}4
-MY_P=${MY_PN}-${PV}
-DESCRIPTION="A full featured Python IDE that is written in PyQt4 using the QScintilla editor widget"
-HOMEPAGE="http://www.die-offenbachs.de/eric/index.html"
-SRC_URI="mirror://sourceforge/eric-ide/${MY_P}.tar.gz
-	linguas_cs? ( mirror://sourceforge/eric-ide/${MY_PN}-i18n-cs-${PV}.tar.gz )
-	linguas_de? ( mirror://sourceforge/eric-ide/${MY_PN}-i18n-de-${PV}.tar.gz )
-	linguas_fr? ( mirror://sourceforge/eric-ide/${MY_PN}-i18n-fr-${PV}.tar.gz )
-	linguas_ru? ( mirror://sourceforge/eric-ide/${MY_PN}-i18n-ru-${PV}.tar.gz )"
-
-SLOT="4"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="linguas_cs linguas_de linguas_fr linguas_ru"
-
-DEPEND="dev-python/PyQt4
-	>=dev-python/qscintilla-python-2.1"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-LANGS="cs de fr ru"
-
-python_version
-
-pkg_setup() {
-	if ! built_with_use 'dev-python/qscintilla-python' 'qt4'; then
-		eerror "Please build qscintilla-python with qt4 useflag."
-		die "qscintilla-python built without qt4."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/4.1.4-paths.patch
-}
-
-src_install() {
-	# Change qt dir to be located in ${D}
-	dodir /usr/share/qt4/
-	${python} install.py \
-		-z \
-		-b "/usr/bin" \
-		-i "${D}" \
-		-d "/usr/$(get_libdir)/python${PYVER}/site-packages" \
-		-c || die "python install.py failed"
-
-	make_desktop_entry "eric4 --nosplash" \
-			eric4 \
-			"/usr/$(get_libdir)/python${PYVER}/site-packages/eric4/icons/default/eric.png" \
-			"Development;IDE;Qt"
-}
-
-pkg_postinst() {
-	python_version
-	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/eric4{,plugins}
-	elog "If you want to use eric4 with mod_python, have a look at"
-	elog "\"${ROOT}usr/$(get_libdir)/python${PYVER}/site-packages/eric4/patch_modpython.py\"."
-	elog
-	elog "The following packages will give eric extended functionality."
-	elog
-	elog "dev-python/pylint"
-	elog "dev-python/pysvn            (in sunrise overlay atm)"
-	elog
-	elog "This version has a new plugin interface with plugin-autofetch from"
-	elog "the App itself. You may want to check those as well"
-}
-
-pkg_postrm() {
-	python_mod_cleanup
-}
diff --git a/dev-util/eric/eric-4.2.0.ebuild b/dev-util/eric/eric-4.2.0.ebuild
deleted file mode 100644
index bb688b677302..000000000000
--- a/dev-util/eric/eric-4.2.0.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-4.2.0.ebuild,v 1.2 2008/09/03 23:32:03 pythonhead Exp $
-
-NEED_PYTHON=2.4
-
-inherit python eutils
-
-MY_PN=${PN}4
-MY_P=${MY_PN}-${PV}
-DESCRIPTION="A full featured Python IDE that is written in PyQt4 using the QScintilla editor widget"
-HOMEPAGE="http://www.die-offenbachs.de/eric/index.html"
-SRC_URI="mirror://sourceforge/eric-ide/${MY_P}.tar.gz
-	linguas_cs? ( mirror://sourceforge/eric-ide/${MY_PN}-i18n-cs-${PV}.tar.gz )
-	linguas_de? ( mirror://sourceforge/eric-ide/${MY_PN}-i18n-de-${PV}.tar.gz )
-	linguas_fr? ( mirror://sourceforge/eric-ide/${MY_PN}-i18n-fr-${PV}.tar.gz )
-	linguas_ru? ( mirror://sourceforge/eric-ide/${MY_PN}-i18n-ru-${PV}.tar.gz )"
-
-SLOT="4"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="linguas_cs linguas_de linguas_fr linguas_ru"
-
-DEPEND="dev-python/PyQt4
-	>=dev-python/qscintilla-python-2.2"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-LANGS="cs de fr ru"
-
-python_version
-
-pkg_setup() {
-	if ! built_with_use 'dev-python/qscintilla-python' 'qt4'; then
-		eerror "Please build qscintilla-python with qt4 useflag."
-		die "qscintilla-python built without qt4."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/4.1.4-paths.patch
-}
-
-src_install() {
-	# Change qt dir to be located in ${D}
-	dodir /usr/share/qt4/
-	${python} install.py \
-		-z \
-		-b "/usr/bin" \
-		-i "${D}" \
-		-d "/usr/$(get_libdir)/python${PYVER}/site-packages" \
-		-c || die "python install.py failed"
-
-	make_desktop_entry "eric4 --nosplash" \
-			eric4 \
-			"/usr/$(get_libdir)/python${PYVER}/site-packages/eric4/icons/default/eric.png" \
-			"Development;IDE;Qt"
-}
-
-pkg_postinst() {
-	python_version
-	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/eric4{,plugins}
-	elog "If you want to use eric4 with mod_python, have a look at"
-	elog "\"${ROOT}usr/$(get_libdir)/python${PYVER}/site-packages/eric4/patch_modpython.py\"."
-	elog
-	elog "The following packages will give eric extended functionality."
-	elog
-	elog "dev-python/pylint"
-	elog "dev-python/pysvn            (in sunrise overlay atm)"
-	elog
-	elog "This version has a new plugin interface with plugin-autofetch from"
-	elog "the App itself. You may want to check those as well"
-}
-
-pkg_postrm() {
-	python_mod_cleanup
-}
diff --git a/dev-util/eric/eric-4.2.3.ebuild b/dev-util/eric/eric-4.2.3.ebuild
deleted file mode 100644
index 55d05e93d155..000000000000
--- a/dev-util/eric/eric-4.2.3.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-4.2.3.ebuild,v 1.1 2008/11/21 14:22:30 yngwin Exp $
-
-NEED_PYTHON=2.4
-
-inherit python eutils
-
-MY_PN=${PN}4
-MY_P=${MY_PN}-${PV}
-DESCRIPTION="A full featured Python IDE that is written in PyQt4 using the QScintilla editor widget"
-HOMEPAGE="http://www.die-offenbachs.de/eric/index.html"
-SRC_URI="mirror://sourceforge/eric-ide/${MY_P}.tar.gz
-	linguas_cs? ( mirror://sourceforge/eric-ide/${MY_PN}-i18n-cs-${PV}.tar.gz )
-	linguas_de? ( mirror://sourceforge/eric-ide/${MY_PN}-i18n-de-${PV}.tar.gz )
-	linguas_es? ( mirror://sourceforge/eric-ide/${MY_PN}-i18n-es-${PV}.tar.gz )
-	linguas_fr? ( mirror://sourceforge/eric-ide/${MY_PN}-i18n-fr-${PV}.tar.gz )
-	linguas_ru? ( mirror://sourceforge/eric-ide/${MY_PN}-i18n-ru-${PV}.tar.gz )
-	linguas_tr? ( mirror://sourceforge/eric-ide/${MY_PN}-i18n-tr-${PV}.tar.gz )"
-
-SLOT="4"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="linguas_cs linguas_de linguas_es linguas_fr linguas_ru linguas_tr"
-
-DEPEND="dev-python/PyQt4
-	>=dev-python/qscintilla-python-2.2"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-LANGS="cs de es fr ru tr"
-
-python_version
-
-pkg_setup() {
-	if ! built_with_use 'dev-python/qscintilla-python' 'qt4'; then
-		eerror "Please build qscintilla-python with qt4 useflag."
-		die "qscintilla-python built without qt4."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/4.1.4-paths.patch
-	epatch "${FILESDIR}"/4.2.3-no-interactive.patch
-}
-
-src_install() {
-	# Change qt dir to be located in ${D}
-	dodir /usr/share/qt4/
-	${python} install.py \
-		-z \
-		-b "/usr/bin" \
-		-i "${D}" \
-		-d "/usr/$(get_libdir)/python${PYVER}/site-packages" \
-		-c || die "python install.py failed"
-
-	make_desktop_entry "eric4 --nosplash" \
-			eric4 \
-			"/usr/$(get_libdir)/python${PYVER}/site-packages/eric4/icons/default/eric.png" \
-			"Development;IDE;Qt"
-}
-
-pkg_postinst() {
-	python_version
-	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/eric4{,plugins}
-	elog "If you want to use eric4 with mod_python, have a look at"
-	elog "\"${ROOT}usr/$(get_libdir)/python${PYVER}/site-packages/eric4/patch_modpython.py\"."
-	elog
-	elog "The following packages will give eric extended functionality."
-	elog
-	elog "dev-python/pylint"
-	elog "dev-python/pysvn            (in sunrise overlay atm)"
-	elog
-	elog "This version has a new plugin interface with plugin-autofetch from"
-	elog "the App itself. You may want to check those as well"
-}
-
-pkg_postrm() {
-	python_mod_cleanup
-}
diff --git a/dev-util/eric/eric-4.2.5.ebuild b/dev-util/eric/eric-4.2.5.ebuild
index cf7c03a51968..82940f5dd438 100644
--- a/dev-util/eric/eric-4.2.5.ebuild
+++ b/dev-util/eric/eric-4.2.5.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.2.5.ebuild,v 1.1 2009/01/18 22:00:16 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-4.2.5.ebuild,v 1.2 2009/01/31 23:07:16 jokey Exp $
 
 NEED_PYTHON=2.4
 
@@ -20,7 +20,7 @@ SRC_URI="mirror://sourceforge/eric-ide/${MY_P}.tar.gz
 
 SLOT="4"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
 IUSE="linguas_cs linguas_de linguas_es linguas_fr linguas_ru linguas_tr"
 
 DEPEND="dev-python/PyQt4
diff --git a/dev-util/eric/files/4.1.1-paths.patch b/dev-util/eric/files/4.1.1-paths.patch
deleted file mode 100644
index 7a647b6b7a0b..000000000000
--- a/dev-util/eric/files/4.1.1-paths.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- ./install.py.orig	2008-03-01 12:46:17.000000000 +0100
-+++ ./install.py	2008-03-11 15:34:36.000000000 +0100
-@@ -184,12 +184,10 @@
-     global cfg, distDir
-     
-     pdir = os.path.join(cfg['mdir'], "eric4plugins")
--    if distDir:
--        pdir = distDir + pdir
-     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 -*-
-@@ -208,11 +206,14 @@
-     
-     @return name of the directory containing the API files (string)
-     """
--    global cfg
-+    global cfg, distDir
-     
-     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."
-@@ -474,7 +475,7 @@
-        cfg['ericTemplatesDir'],
-        cfg['ericCodeTemplatesDir'], cfg['ericOthersDir'],
-        cfg['bindir'], cfg['mdir'], 
--       getAPIsPath(), apis)
-+       getAPIsPath()[len(distDir):], apis)
-     copyToFile(fn, config)
- 
- def doDependancyChecks():