x86 stable wrt bug 418953, remove old.

Package-Manager: portage-2.2.0_alpha109/cvs/Linux x86_64

6 files changed, 26 insertions, 241 deletions

diff --git a/dev-util/eric/ChangeLog b/dev-util/eric/ChangeLog
index e5a4dbbf33c2..9433d1a0fbff 100644
--- a/dev-util/eric/ChangeLog
+++ b/dev-util/eric/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/eric
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/ChangeLog,v 1.176 2012/06/02 22:00:19 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/ChangeLog,v 1.177 2012/06/03 17:50:58 pesa Exp $
+
+  03 Jun 2012; Davide Pesavento <pesa@gentoo.org> -eric-4.5.0.ebuild,
+  -eric-5.2.0.ebuild, eric-4.5.3.ebuild, eric-5.2.2.ebuild:
+  x86 stable wrt bug 418953, remove old.
 
   02 Jun 2012; Agostino Sarubbo <ago@gentoo.org> eric-4.5.3.ebuild,
   eric-5.2.2.ebuild:
diff --git a/dev-util/eric/Manifest b/dev-util/eric/Manifest
index 26e43511e760..d2711d15ce96 100644
--- a/dev-util/eric/Manifest
+++ b/dev-util/eric/Manifest
@@ -3,60 +3,44 @@ Hash: SHA512
 
 AUX eric-4.4-no-interactive.patch 600 RMD160 c2c0d5a4c08c7505e1d7871a782bf98cbc66a408 SHA1 60d593f9e3319a240170cff9243a92e63ae97b58 SHA256 ae818575da55ea4074fc8d1ac846f5ce338135b543b927c748bd94c8860325b5
 AUX eric-4.4-no-pykde.patch 4499 RMD160 909a9e0fe1dc39b8ea21b383c6612742cceab6bc SHA1 505dc2b630b9356b794da33cb8e20bc126f7ac40 SHA256 371c080e2f561ece22f4e6a0ff427efdf43b0d3d81cefc2b7efb99010f890dde
-DIST eric4-4.5.0.tar.gz 7986864 RMD160 b3eff69618bbb5ab4f10bbfbca3c2f9599c47026 SHA1 4b9112ce55741de60929a7e6defc2b8d717af761 SHA256 213a415fe56e9e2e0dfa12c190b6c2ae26d4a949f8ef0062edcf58f97a4775d3
 DIST eric4-4.5.3.tar.gz 8095323 RMD160 a0b83659e8ee80ef7fc799b878335d36ee425fb6 SHA1 edb447adb880645208a19a186216d5159f167a05 SHA256 211a5f41f66b28e9d68f0ab2442a6c07e29e550821f04dd5f78c2407297d1d86
-DIST eric4-i18n-cs-4.5.0.tar.gz 456601 RMD160 13ec241835e50e0c6910ad16ab76c2093e5a7c90 SHA1 ddf207c622e0c9730601ccb1d596d37cdca39ab7 SHA256 e5755882e9d580ef90bb5020c6adad983a52861e8711c2c06fe572a43a3e77fb
 DIST eric4-i18n-cs-4.5.3.tar.gz 457069 RMD160 caa92ce90b39925334f395003678d3e10c3a56da SHA1 2b44ff4e89e38596a1c98084b0721284ebcc9b68 SHA256 e702946149856ef58f30ba0d11e4a5020703ef81c98a002d36c2460297bae5e6
-DIST eric4-i18n-de-4.5.0.tar.gz 468372 RMD160 084dec0bdfa4ba950a10a22b643e5e4596145bf7 SHA1 e1daac3c9972c8d9c1b428232206c39bf10b9a77 SHA256 67e44e8435992731a9154a4aec8f641f84c4c067b14282e2f4fb7a44595d0764
 DIST eric4-i18n-de-4.5.3.tar.gz 469432 RMD160 40aaea56d6cf746da8f6242b8d38efb5e979e9b6 SHA1 64e71afd91a8c81296687e4cbb00577d9cf2aa88 SHA256 4b76cfcfe76ff6f4bd99fb6fba5265d7a517264262b5698e9fb9225b6262d853
-DIST eric4-i18n-en-4.5.0.tar.gz 126444 RMD160 88bbe0731cc39ba2d8cf3db030d8a1cad5a8cf6b SHA1 35a289b76b6fcd687161499becfe12881e8a0023 SHA256 345cbbc3212f6ebe5d37bb5d339b4a85ec45046d7beb8b1359e0a22807f9be44
 DIST eric4-i18n-en-4.5.3.tar.gz 126743 RMD160 7cfdcb91fee464ee63e64192bb812ca9e5b61c0a SHA1 96368dc99874209372674421174e479a4ed67cd7 SHA256 dc15d9f8bda50d7ce6bfbb6f9dc8c0cb915581089e674e12d9e36ce22286f0cb
-DIST eric4-i18n-es-4.5.0.tar.gz 472467 RMD160 0ed63ae05f48005a19e41fe81691278b9eb158dd SHA1 a4f242af359eca8b0019980bca847626aa82cabf SHA256 c8bd970ef804007976653ab1c5369969855bea755bfebd6ac1844bc2d093a246
 DIST eric4-i18n-es-4.5.3.tar.gz 474022 RMD160 715ca413e3402505d025cf9b0afd8f8c9cea52ad SHA1 e9d8bf8d79394ab8e3f321e7e43105cdf7277755 SHA256 368e37ca55779d1ce1db8e9ba0077e8b4593ea730bd365b25259a0bd21b1a7ef
-DIST eric4-i18n-fr-4.5.0.tar.gz 471361 RMD160 6c1ed4256341c594f2392cc2e8858079cf47815a SHA1 4e226ca1c627b3279890af249c52fff79ec45624 SHA256 32b21e91e02fc776eb0fc16e01263ae538471ad0b5ed1ef3154f2898377cd69a
 DIST eric4-i18n-fr-4.5.3.tar.gz 471882 RMD160 7dfb28a142b0d53d24299d88502294bb2e0840f9 SHA1 fab4a11218edf8875667c623991f097fbe69e4c2 SHA256 5d5e10075bdf01f81a2602dd13299aa4dbd13ac48020ce0269e683832c89d356
-DIST eric4-i18n-it-4.5.0.tar.gz 461086 RMD160 e9c13d3a820dbac0adbe4d136086e38ad6cfc100 SHA1 bab7302a7942d1c2be9396b2c7b427d16c7670aa SHA256 448a9a5142d6430a0725fa7ba680e22a43f86e001ac4923d82eb4995dd2f10ef
 DIST eric4-i18n-it-4.5.3.tar.gz 461615 RMD160 58d659cb286174a0b5b41f65c277c7123dadb444 SHA1 c918f547e101b9a51a615071dab7449b58f19e02 SHA256 9d99cff9963d106ce652418440cf225f996bbbd165808663b8abcc2da239e0da
-DIST eric4-i18n-ru-4.5.0.tar.gz 478204 RMD160 2b83436aa88feeb0ce1799fc5b98c83234e176ae SHA1 962873750747e9148e9cec4164fc06b0984cd352 SHA256 c06937b19b563963cc6b3bdd99783146a4e9169bdd28c714434d181c9c7a0ab2
 DIST eric4-i18n-ru-4.5.3.tar.gz 478775 RMD160 94aaddd315541506529429432ebe343c8aa23aa4 SHA1 fb1b773f45bcd39bc11023096940fe35480a852c SHA256 d98065318ec2b643d35c414ac5f71161d35a03227be2fac28d1320a82c590da0
-DIST eric4-i18n-tr-4.5.0.tar.gz 355691 RMD160 5af83ff7518e40b8b6aca06de6f4ff6e9a4c17ba SHA1 b951044dd011b89b12323ab013484499dde09003 SHA256 3d1016833475af50f02a84031ff06727ed61c8627a89d7e167958d3fdc59eb3c
 DIST eric4-i18n-tr-4.5.3.tar.gz 356033 RMD160 a9ed13c1ebc4a1b9586e0d326471e82601d95041 SHA1 a7188761c8b2d04f7ee8380e6d53ada718263ceb SHA256 79096459e4392f326b4f11e1789c42a57cc906c3a10ecfab0ec7660ac23acdb8
-DIST eric4-i18n-zh_CN.GB2312-4.5.0.tar.gz 388679 RMD160 abb2d6f1953dff64553f40c354c528c4afca2009 SHA1 0dd51e2e0901d0503629ea2d76241acc5adfa67d SHA256 bb3080582edf3512fe9a8eb177dc23e4f9b35e94dc351e83bcb95ad749f853d9
 DIST eric4-i18n-zh_CN.GB2312-4.5.3.tar.gz 389004 RMD160 a344f3a239812995619b1513313c598774632084 SHA1 e109e66c837fb37444d246f851e47768e67b879f SHA256 1a0bdfdfaa50b5487f2bb1694e9cea2c929ed9651612544cfde0c4bf5168f4fb
-DIST eric5-5.2.0.tar.gz 8832214 RMD160 d5e76a258b18b59a84b75f207d926589afbb6784 SHA1 65d9ca655d455de113543d425882122e82c0a923 SHA256 18fea6c012dce4326629777e8e55d8d56dab0d16497d7ed4924b7e6075838982
 DIST eric5-5.2.2.tar.gz 8835270 RMD160 b7f8d166616d7afecfc7e1c015f24f16912a0dcb SHA1 22843abf689508ea9fa6e546b60d47facb1c8fa7 SHA256 5d7a593a3501becd5231dc7c7463cbab38f9f99be4c5ae9961a8a50389979900
-DIST eric5-i18n-cs-5.2.0.tar.gz 530064 RMD160 428bae008a6fc657a080fe1331f25cb02ed480c6 SHA1 4e3ce610926a56b04cc7a4301f60b8157e0fb96c SHA256 44979acf362742af87bbf572f00b15eb031a3f8378b616cdb4b276e084843f66
 DIST eric5-i18n-cs-5.2.2.tar.gz 530091 RMD160 b23ecc5fa261e13ab9b7859ba482bc90a8dcf257 SHA1 bbb6ecea9eb228361d4ece428e9ccbfac410e62f SHA256 8afa8705a97716b8abc308b907cfb6eaf6faa527250a87743deb7c8f8da6f24a
-DIST eric5-i18n-de-5.2.0.tar.gz 600706 RMD160 ca5e372868e33a7c87e8a05fcd66f81a45077d71 SHA1 f5e7111bfe8e3ffbe69a1fbb56253eee145f4f6b SHA256 e877139f2440506a1884007e820b8592f37ae3136727258ae352af706083e19b
 DIST eric5-i18n-de-5.2.2.tar.gz 600801 RMD160 0bf8567ca5c8ba8ce5e5914d61ea58b66be46517 SHA1 9955404dfe9ea8220980fea2c637b5fe67c9f789 SHA256 c867f9356e4772b171b755a5afa014471d141feb056d90d52b78c72888ecbd4d
-DIST eric5-i18n-en-5.2.0.tar.gz 162856 RMD160 4a64794d2a9b87fb10b103f6c742505e4aae99dd SHA1 fa1e7d7ff0619b09f154b445ec99e3d7189f3fea SHA256 9ddd8db9d2495c1efd43d51e4919f667420594b200db6ed7f0c18f1afc26eefe
 DIST eric5-i18n-en-5.2.2.tar.gz 162892 RMD160 baf7f391166878b0ab7050751a243fd14086af3c SHA1 bc8116f7f7f77e07d4bb4b64e6c54c21cac14655 SHA256 1117a1d19804e48ce16cd467f692eac1500c61bdeff496e82dea7e1d868927f1
-DIST eric5-i18n-es-5.2.0.tar.gz 606047 RMD160 db43cb4642f7f0c06a5f1fcd2ee24613cfb6748c SHA1 a6116f5d404718979fa57713593dfc13dd6d151f SHA256 09f086f6f76ad3476c975fc082680ae04e626b56b450f9f5fd7c8f954bd33f1f
 DIST eric5-i18n-es-5.2.2.tar.gz 605005 RMD160 1e8ad473a5a2ba45af0669ee9bd8f9d725a8401f SHA1 594795a46043c08ed6ecd838c3c5a4afc4fbe8bd SHA256 1148e28c0ff20b2ad624f4440d44dcba305d31be80ea94c05be624f9f8b81b26
-DIST eric5-i18n-fr-5.2.0.tar.gz 470679 RMD160 ff9ffae4dd6bdb8049b6727d3879f2532f6577b5 SHA1 bfc418ea36244aea27f9d85bae42eb3ae1878e0f SHA256 6c6e498db3245938e318c8ca9f02e85b9e096e9c7f6db9af277ff0ccf9c88a8e
 DIST eric5-i18n-fr-5.2.2.tar.gz 470781 RMD160 ce487280df33845e2994e52ffacfd4c3b0b856f8 SHA1 ed05db390a7b130187f7f07254e07f6e33048c55 SHA256 f7f27011e1abece8cc7e428cd2e64b4bbb7a6ea75413a730ab6c8ecf68700199
-DIST eric5-i18n-it-5.2.0.tar.gz 547717 RMD160 0f76d72c78382a39206a53628dcee17c28b33b2d SHA1 be5e360cebdcf67bc96510ed3d11f9f20d800f5c SHA256 421b503b9432f2da41a174cd44506ad3201abe19c5f6176c7a58a5f14242006c
 DIST eric5-i18n-it-5.2.2.tar.gz 547787 RMD160 675f2a389f3903139d977e4289087d48355e313d SHA1 e803bbc79d4b5fa7b510f76f8d57ec730f558a63 SHA256 431da789e2bec80b9b4a718d07922572ecf8ce87fa954cb2f8289a75f28c5673
-DIST eric5-i18n-ru-5.2.0.tar.gz 576765 RMD160 ca71a0534ecf087cdc8c33ccb6a47407ca79b90b SHA1 668d5fc1611611ed8f14960bcbbf1a0ab0004c31 SHA256 8b884c75f11882857987e17940e3ffbe5d524dc8288a8a33e74c4be3a1561d0d
 DIST eric5-i18n-ru-5.2.2.tar.gz 576848 RMD160 93b401f7c950a4e07ba3ce37ed0bb68ba70aef87 SHA1 7afd5cfdb2f9517a698f3e7e0ea5d8201e2e6a95 SHA256 077e300390c97d61149ca3133a6750f2080ab1b7b6ad9dc140ae96c6eb7f8c6b
-DIST eric5-i18n-tr-5.2.0.tar.gz 450185 RMD160 1b014674cff7067be972212e84b7271b1c54ea6f SHA1 84bacb905d68bc6905668dd1d70c23eee8ea18d8 SHA256 8ee63dbb8e60aef5952070045f991afa046f00600a5e2c1b59ccb8527e78b40f
 DIST eric5-i18n-tr-5.2.2.tar.gz 450198 RMD160 301324f6c942efcffe0a26a3707df6cec7807bed SHA1 525ad741ef1491c339a2f0d228c31bce8c459499 SHA256 ea8754403413cc18a96b9a10e7e9abbd2c4c5949b5da4c09acde822603ec62c1
-DIST eric5-i18n-zh_CN.GB2312-5.2.0.tar.gz 436144 RMD160 b349bf407f2bc7e10f661898b06ddd4b34ad4e72 SHA1 b78df48cbde03c528593b2d85a3632db8e412562 SHA256 9d161d2f6e181d6205e7377c87b17310ba6fbf2a5ea94825be336e3b9fef304c
 DIST eric5-i18n-zh_CN.GB2312-5.2.2.tar.gz 436100 RMD160 3bac55e146e83817810a9f0e364378af6c0f7fa7 SHA1 6bd3e424fd1cd1fb3ebed80f038a96e52d95aee8 SHA256 ea6af74c413948ebae85a7e171854bd8f808c7ee3daaba928b3657912dd7a9e2
-EBUILD eric-4.5.0.ebuild 2850 RMD160 b921b4fb5a888db1755d0dbe34ad77e181203f1c SHA1 ded13347e1a229182302103676da16706a57f95b SHA256 c4e922654971925b4ee0f493cb6faa57db89564f3e44257411d56a01333f1750
-EBUILD eric-4.5.3.ebuild 2848 RMD160 a0f8a8968a90a3c595c6db44dec436a364d97b86 SHA1 cc3bf619227c033b6ad1b7e0b3231af4eafbc81f SHA256 c8d1f8b0d85fd8748aa303667a31a141e8618daa44469cbdbd70f281fed28bcf
-EBUILD eric-5.2.0.ebuild 2949 RMD160 2a6e382f401a91ddcc9756baafe32a85a37e5a8f SHA1 5dc09424d223cb8ca15b54ad24346ff3d3cea13d SHA256 fdaa19c721c81ae2de4edd5efaf0c4489d358f1086c1fb0330a33b121fdaa250
-EBUILD eric-5.2.2.ebuild 2947 RMD160 ddd0aeeab1fbd0584b77ad0e0c6c268270a1d4c0 SHA1 9c818ebcf4e4736c79e9035803306547b32a5752 SHA256 477c741f67da6ac0f717fd7d153cc65511ee251f26888a4389ddb1579e7008da
-MISC ChangeLog 23457 RMD160 87def6fa88fd2903d786ac5931e0da5ad40bae38 SHA1 b4350f76bc577f7ec611985968851542644218b2 SHA256 8ad15b0751caf0ebc5347f038da3231a06851aa39dd46b32970d71aacc430044
+EBUILD eric-4.5.3.ebuild 2848 RMD160 bed2d0eb4cc40ae4b930fa421f8d60a692920696 SHA1 150fa0c70f2ca6e61d8ac558cdd7986e4e12215c SHA256 311bcaf1ad0725bb85efef43d73f739f61c77b1b6d1c8581252364ab028746f5
+EBUILD eric-5.2.2.ebuild 2947 RMD160 3aa0ad8f33a7d27cf09e6b70bf0205ef85e37270 SHA1 3b3f2baca942e7f6d5d4907ec4034910d272873a SHA256 260339b38e303c257007eccfc7aa1d58d4412203a5d4a03b0b9663ef85c11696
+MISC ChangeLog 23630 RMD160 499cce0cb8d3db2d3728f67f3db3306434507438 SHA1 9db18c6b6ed45905970db3705ad8f3cc50cca9cb SHA256 a96bf07c87f837840ca948e4e26572bd4f5e7b3f351f1bc31fd0492f32b2f68e
 MISC metadata.xml 179 RMD160 887c899594fdaa3d82028c3d84188354d3784cd9 SHA1 551c6b2378ff31eadc1e4860211ec8709ce960bd SHA256 1fbdee58e0ba0f8730f6a27979cb7eeed8ebd3afa316d61b34a5f4893291a646
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPyoz5AAoJEOTDgjZ80txdDawIAKlkZa1cFmn7Vys7SrnHJPbb
-l1hjs53RKxBQ7qaYdFH3S7xeMR462NNag35ZLMe4WaVjdo9n3s7U7kWcN7PF21FI
-mpForKF8YBTB7Xlhh1m43U8fX4oTHrGZQ687Yvh3mEoqF70422mgLRtkyIGPL2gs
-owamJf2BjpzUPxfOOvaVD/y2c1/zDtb/lm2YHPcrE+tOvHN57cG8mR1fKKqBe1++
-XWQlygxAtQ/J/DKbQTeadTAhLv6OYkfs6SvRgArVu+iKTQA5RkiGVo++n9YzrUQB
-O/b4X8+Y/LDw4E3PXKZWHVZyl6dF+lq1O4aMXuSqV1Y23/200RgDhFUthdBxfWc=
-=hhi/
+iQIcBAEBCgAGBQJPy6QJAAoJENXLsxwXqFxyvA0QALEK+7/wwCOR6wAmaIc6K9WQ
+mKf2KlGGJNB9OIGbk+DSQ0GuuMUZ9SEYbhFckKn7bp4M6TJTvN4JDg4JcyK2jV0v
+OsiWMZc0xsUyAc0kf2pcfc1epm1ff3SqMDvYNUlk7XO4wlZWnLFZAmqq5s6XMt+S
+7g5O6OH2JqZs2WOATXxGkKlIouqjxhAJbe+LxGl7QLzvb7LNQjnT/+SfWFXLOE7K
+RfzcUjKfQuba4YCPatXAY5dcxptM1iaHcp7YfsYFZmuzgb8MTGRtazWboN1qaeMn
+dC1lizxX7p5JMpUocKEXT/r+keFh6xX9K9fWpVszhNdTW85Zw48ztbOhTd3HhXwg
+4Cr/RbHbOZR5KOygcomTlFHp9cyRlLqb6XlJmq20n/DGhiR93F1IkE1rIhSnOH3f
+tAl3++lysPj/ZSIqTBovA3zLpv6aMaJk6/vY/X6/dFUzvoaBUM/QwRU3MRgJAtra
++2jXjJ4nkq0CRiKXDvQ/Z7CHdwVdEq3w5mB3Je+Wbr9+2eDMpkfYJDrBTn9ltH4S
+f+HMXb5SG8p8Yizha8RMV3mXoRD9BKGVUXeu9tlbNS6WoqAizHFf/2WLgpRupUcN
+heGCvX+32M4AXcadRtrDrCpwKdfqlOF4WXCFCwcIV82GDfPw/+texl2+wLgBVraf
+g74iD65zCrU2Mx79/6Ow
+=7ARW
 -----END PGP SIGNATURE-----
diff --git a/dev-util/eric/eric-4.5.0.ebuild b/dev-util/eric/eric-4.5.0.ebuild
deleted file mode 100644
index a6450130ca6c..000000000000
--- a/dev-util/eric/eric-4.5.0.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-4.5.0.ebuild,v 1.3 2012/05/23 06:03:13 jdhore Exp $
-
-EAPI="4"
-PYTHON_DEPEND="2:2.6"
-SUPPORT_PYTHON_ABIS="1"
-# 2.4 and 2.5 are restricted to avoid conditional dependency on dev-python/simplejson.
-RESTRICT_PYTHON_ABIS="2.4 2.5 3.* *-jython 2.7-pypy-*"
-
-inherit eutils python
-
-SLOT="4"
-MY_PN="${PN}${SLOT}"
-MY_PV="${PV/_pre/-snapshot-}"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="A full featured Python IDE using PyQt4 and QScintilla"
-HOMEPAGE="http://eric-ide.python-projects.org/"
-BASE_URI="mirror://sourceforge/eric-ide/${MY_PN}/stable/${PV}"
-SRC_URI="${BASE_URI}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="kde spell"
-
-DEPEND="
-	>=dev-python/sip-4.12.4
-	>=dev-python/PyQt4-4.6[assistant,svg,webkit,X]
-	>=dev-python/qscintilla-python-2.3
-	kde? ( kde-base/pykde4 )
-"
-RDEPEND="${DEPEND}
-	>=dev-python/chardet-2.0.1
-	>=dev-python/coverage-3.0.1
-	>=dev-python/pygments-1.3.1
-"
-PDEPEND="
-	spell? ( dev-python/pyenchant )
-"
-
-LANGS="cs de en es fr it ru tr zh_CN"
-for L in ${LANGS}; do
-	SRC_URI+=" linguas_${L}? ( ${BASE_URI}/${MY_PN}-i18n-${L/zh_CN/zh_CN.GB2312}-${MY_PV}.tar.gz )"
-	IUSE+=" linguas_${L}"
-done
-unset L
-
-S=${WORKDIR}/${MY_P}
-
-PYTHON_VERSIONED_EXECUTABLES=("/usr/bin/.*")
-
-src_prepare() {
-	epatch "${FILESDIR}/eric-4.4-no-interactive.patch"
-	use kde || epatch "${FILESDIR}/eric-4.4-no-pykde.patch"
-
-	# Delete internal copies of dev-python/chardet, dev-python/coverage,
-	# dev-python/pygments and dev-python/simplejson.
-	rm -fr eric/ThirdParty
-	rm -fr eric/DebugClients/Python{,3}/coverage
-	sed -i -e '\|/coverage/|d' eric/${MY_PN}.e4p || die
-	sed -i -e 's/from DebugClients\.Python3\?\.coverage /from coverage /' \
-		$(grep -lr 'from DebugClients\.Python3\?\.coverage' .) || die
-}
-
-src_install() {
-	installation() {
-		"$(PYTHON)" install.py \
-			-z \
-			-b "${EPREFIX}/usr/bin" \
-			-i "${T}/images/${PYTHON_ABI}" \
-			-d "${EPREFIX}$(python_get_sitedir)" \
-			-c
-	}
-	python_execute_function installation
-	python_merge_intermediate_installation_images "${T}/images"
-
-	doicon eric/icons/default/eric.png || die
-	make_desktop_entry "${MY_PN} --nosplash" ${MY_PN} eric "Development;IDE;Qt"
-}
-
-pkg_postinst() {
-	python_mod_optimize ${MY_PN}{,config.py,plugins}
-
-	elog
-	elog "If you want to use Eric with mod_python, have a look at"
-	elog "\"${EROOT}$(python_get_sitedir -b -f)/${MY_PN}/patch_modpython.py\"."
-	elog
-	elog "The following packages will give Eric extended functionality:"
-	elog "  dev-python/pylint"
-	elog "  dev-python/pysvn"
-	elog
-	elog "This version has a plugin interface with plugin-autofetch from"
-	elog "the application itself. You may want to check those as well."
-	elog
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${MY_PN}{,config.py,plugins}
-}
diff --git a/dev-util/eric/eric-4.5.3.ebuild b/dev-util/eric/eric-4.5.3.ebuild
index 8d8c8a3efa80..9a7237870d91 100644
--- a/dev-util/eric/eric-4.5.3.ebuild
+++ b/dev-util/eric/eric-4.5.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-4.5.3.ebuild,v 1.2 2012/06/02 22:00:19 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-4.5.3.ebuild,v 1.3 2012/06/03 17:50:58 pesa Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -21,7 +21,7 @@ BASE_URI="mirror://sourceforge/eric-ide/${MY_PN}/stable/${PV}"
 SRC_URI="${BASE_URI}/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="kde spell"
 
 DEPEND="
diff --git a/dev-util/eric/eric-5.2.0.ebuild b/dev-util/eric/eric-5.2.0.ebuild
deleted file mode 100644
index 4f1a73919e88..000000000000
--- a/dev-util/eric/eric-5.2.0.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-5.2.0.ebuild,v 1.3 2012/05/23 06:03:13 jdhore Exp $
-
-EAPI="4"
-PYTHON_DEPEND="3:3.1"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.* *-jython 2.7-pypy-*"
-
-inherit eutils python
-
-SLOT="5"
-MY_PN="${PN}${SLOT}"
-MY_PV="${PV/_pre/-snapshot-}"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="A full featured Python IDE using PyQt4 and QScintilla"
-HOMEPAGE="http://eric-ide.python-projects.org/"
-BASE_URI="mirror://sourceforge/eric-ide/${MY_PN}/stable/${PV}"
-SRC_URI="${BASE_URI}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="spell"
-
-DEPEND="
-	>=dev-python/sip-4.12.4
-	>=dev-python/PyQt4-4.8[assistant,svg,webkit,X]
-	>=dev-python/qscintilla-python-2.4
-"
-RDEPEND="${DEPEND}
-	>=dev-python/chardet-2.0.1
-	>=dev-python/coverage-3.2
-	>=dev-python/pygments-1.4
-"
-PDEPEND="
-	spell? ( dev-python/pyenchant )
-"
-
-LANGS="cs de en es fr it ru tr zh_CN"
-for L in ${LANGS}; do
-	SRC_URI+=" linguas_${L}? ( ${BASE_URI}/${MY_PN}-i18n-${L/zh_CN/zh_CN.GB2312}-${MY_PV}.tar.gz )"
-	IUSE+=" linguas_${L}"
-done
-unset L
-
-S=${WORKDIR}/${MY_P}
-
-PYTHON_VERSIONED_EXECUTABLES=("/usr/bin/.*")
-
-src_prepare() {
-	# Avoid file collisions between different slots of Eric.
-	sed -e "s/^Icon=eric$/&${SLOT}/" -i eric/${MY_PN}.desktop || die
-	sed -e "s/\([^[:alnum:]]\)eric\.png\([^[:alnum:]]\)/\1eric5.png\2/" \
-		-i $(grep -lr "eric\.png" .) || die
-	mv eric/icons/default/eric{,5}.png || die
-	mv eric/pixmaps/eric{,5}.png || die
-	rm -f eric/APIs/Python/zope-*.api
-	rm -f eric/APIs/Ruby/Ruby-*.api
-
-	# Delete internal copies of dev-python/chardet,
-	# dev-python/coverage and dev-python/pygments.
-	rm -fr eric/ThirdParty
-	rm -fr eric/DebugClients/Python{,3}/coverage
-	sed -i -e '\|/coverage/|d' eric/${MY_PN}.e4p || die
-	sed -i -e 's/from DebugClients\.Python3\?\.coverage /from coverage /' \
-		$(grep -lr 'from DebugClients\.Python3\?\.coverage' .) || die
-}
-
-src_install() {
-	installation() {
-		"$(PYTHON)" install.py \
-			-z \
-			-b "${EPREFIX}/usr/bin" \
-			-i "${T}/images/${PYTHON_ABI}" \
-			-d "${EPREFIX}$(python_get_sitedir)" \
-			-c
-	}
-	python_execute_function installation
-	python_merge_intermediate_installation_images "${T}/images"
-
-	doicon eric/icons/default/${MY_PN}.png || die
-}
-
-pkg_postinst() {
-	python_mod_optimize -x "/eric5/(DebugClients/Python|UtilitiesPython2)/" ${MY_PN}{,config.py,plugins}
-
-	elog
-	elog "If you want to use Eric with mod_python, have a look at"
-	elog "\"${EROOT}$(python_get_sitedir -b -f)/${MY_PN}/patch_modpython.py\"."
-	elog
-	elog "The following packages will give Eric extended functionality:"
-	elog "  dev-python/pylint"
-	elog "  dev-python/pysvn"
-	elog
-	elog "This version has a plugin interface with plugin-autofetch from"
-	elog "the application itself. You may want to check those as well."
-	elog
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${MY_PN}{,config.py,plugins}
-}
diff --git a/dev-util/eric/eric-5.2.2.ebuild b/dev-util/eric/eric-5.2.2.ebuild
index c18025a7bcde..78b8a7bb141e 100644
--- a/dev-util/eric/eric-5.2.2.ebuild
+++ b/dev-util/eric/eric-5.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-5.2.2.ebuild,v 1.2 2012/06/02 22:00:19 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-5.2.2.ebuild,v 1.3 2012/06/03 17:50:58 pesa Exp $
 
 EAPI="4"
 PYTHON_DEPEND="3:3.1"
@@ -20,7 +20,7 @@ BASE_URI="mirror://sourceforge/eric-ide/${MY_PN}/stable/${PV}"
 SRC_URI="${BASE_URI}/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="spell"
 
 DEPEND="