Version bumps, #382183 by Michael Mair-Keimberger.

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

4 files changed, 148 insertions, 26 deletions

diff --git a/dev-util/eric/ChangeLog b/dev-util/eric/ChangeLog
index 3f00cb35ea74..eb6a17a8a2b5 100644
--- a/dev-util/eric/ChangeLog
+++ b/dev-util/eric/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/eric
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/ChangeLog,v 1.165 2011/07/06 19:38:47 djc Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/ChangeLog,v 1.166 2012/01/01 22:54:42 pesa Exp $
+
+*eric-4.4.19 (01 Jan 2012)
+*eric-5.1.7 (01 Jan 2012)
+
+  01 Jan 2012; Davide Pesavento <pesa@gentoo.org> +eric-4.4.19.ebuild,
+  +eric-5.1.7.ebuild, -eric-5.1.4.ebuild:
+  Version bumps, #382183 by Michael Mair-Keimberger.
 
 *eric-5.1.4 (06 Jul 2011)
 
diff --git a/dev-util/eric/Manifest b/dev-util/eric/Manifest
index a4bf68ae5206..b03adfad72fb 100644
--- a/dev-util/eric/Manifest
+++ b/dev-util/eric/Manifest
@@ -6,41 +6,63 @@ AUX eric-4.4-no-pykde.patch 4499 RMD160 909a9e0fe1dc39b8ea21b383c6612742cceab6bc
 AUX eric-5.0.2-remove_coverage.patch 5750 RMD160 e20f3a8528bd9d45da5ba637c86b627dce13f715 SHA1 447ea286ca864f46375711f7530d2c3d1970b93f SHA256 560d41c88e597ea6aa1bd023e400a9700b397d4d850aca408c65f8683920c507
 AUX remove_coverage.patch 5678 RMD160 34f6aec97d9f78bc83eca73f44d22ccb943aa14b SHA1 5c7c3611ba36b104e3f3a03953a19f22541ec30a SHA256 c0627f72a2237d20ce5dbcf01b8fabf0464062ca63d8dbf9a5cd7e5bb4df20a0
 DIST eric4-4.4.14.tar.gz 6677208 RMD160 5ce31c30ce6d1a817c67f68abdae0d6ea97c8b92 SHA1 cd706e4eed52e62739980c9b0837f6fd0a0bdedb SHA256 7ff8548c419f3ed09100e84d4c94ffce74bae8eb5ce956bf43f3a79308e86822
+DIST eric4-4.4.19.tar.gz 7319253 RMD160 bba9667aa3c9e93113040d2c9466e209450be798 SHA1 a31eed62d07a1aa136d577fe87f50904bd6a096c SHA256 e2536babe6638c590561bbd957317e7a5bfe028b1fed259a3bac48ea35ab2aa7
 DIST eric4-i18n-cs-4.4.14.tar.gz 452074 RMD160 cada51a61ab0fe7bf6681da090f187b464a58663 SHA1 f5fce1cb325fdae3ab34ad5b75a37443db7cc1aa SHA256 1b1f74a2ffc173f177e19f8beadc8d11c954359ead15f36e16e2a429d61bf76b
+DIST eric4-i18n-cs-4.4.19.tar.gz 452072 RMD160 eaf0fb59882ddeced92f47702bb864abac2be0b5 SHA1 d88ae16f25dc047704d14bd782a14ed6daaf4f15 SHA256 433eb2c2d2002e5b1d5e7cf1295485362717a7d9050268a4f322ab3e2e52acfa
 DIST eric4-i18n-de-4.4.14.tar.gz 452987 RMD160 2226f13a67d577dd92c254f4f78d195ce8841611 SHA1 bc4795378e73a33e46e7dee6d2e7fbbb6cef4205 SHA256 e66aa50305b12e82d8227d360b226bf25f406f5273fa54e02092608d0b44275b
+DIST eric4-i18n-de-4.4.19.tar.gz 452984 RMD160 bea4984e694fa6a54cfbcb4279e6b15e2cc28004 SHA1 3d80fb77016a1254f30e10f91dbf9adbca8afe0e SHA256 63078d14794767ffdfd6424f06acf3372e083eff6eef317f96ccc0858782405b
+DIST eric4-i18n-en-4.4.19.tar.gz 122559 RMD160 2bd721e5efd8cc41208eba0552fd9da5047bbd63 SHA1 4e7edb36361afa57c0bd04c242881ed79e9097c1 SHA256 a8fa4baf3b9ca343a3f21ddd562a11d2c3cd6bd91bada356fa7f3cb3f114ed2f
 DIST eric4-i18n-es-4.4.14.tar.gz 456855 RMD160 ca4e35087137e10481264bda3bc75eab890d01f0 SHA1 9a2be60bbe1e731bc903edf9d7a51f3c8d78405c SHA256 602ba2005a9bafbe3cbcaedaec4c085a1cd14c6c1c71c1ac1db8f3e714356d82
+DIST eric4-i18n-es-4.4.19.tar.gz 456852 RMD160 e4bf7b140d9a753480fdc125720641c0bff3411e SHA1 4c3897ab65f5727a16eeb07acca8a51d3681ff61 SHA256 08899557d30f15d9f1da8cd09a5ce0415b242a955d7ec35845eb2d4e6340c410
 DIST eric4-i18n-fr-4.4.14.tar.gz 430151 RMD160 f372ca5c8341c2e6c743878f8ed93197234908fc SHA1 54ef2d555b6063fb092150799dd9b7a120b6bac4 SHA256 d9f58894b61b8720fe75762df7475cf023742a466499744b8bc32b6674c2690d
+DIST eric4-i18n-fr-4.4.19.tar.gz 457548 RMD160 be9974c02af5e0a3c3615762b38aeb0d8acc0a40 SHA1 0e816f54ce1b809f921bf0b05681b07998cdd784 SHA256 5a48957b513bf87f42e286b55083fdf095dac942a0eed71d48467b6ac499d510
 DIST eric4-i18n-it-4.4.14.tar.gz 445334 RMD160 aa9d13630338a8c3c96fd45647086f2ce2b4f49a SHA1 124c13ce61aeb198440916e9642324f75fb6900f SHA256 3fbd0e1b222d197da9bb909385eec99fdb10d7e07aad4b9e4be3bee7f3faf23b
+DIST eric4-i18n-it-4.4.19.tar.gz 445331 RMD160 b895839b9d83973d58e4e4bf3f7f985ed52f1710 SHA1 54c24dfeee0095fbe8d108f217103adf6bf0b6ec SHA256 0b597c2d2bd63603df6fa768a1dd0f62f5d29472aec74cdfaac3282c08a2a6ee
 DIST eric4-i18n-ru-4.4.14.tar.gz 472659 RMD160 04f967c6989cd0a217f95e8bd1bb6fa396abca5a SHA1 9cbd66472798918eeeb4eb1884b3947a9f6f88df SHA256 a4174b538cccf77ed130d8c1414860ac8658600d236adecac29e09fdc601151c
+DIST eric4-i18n-ru-4.4.19.tar.gz 472655 RMD160 e4dc996e9c1f645890c4ddf14f34bf03f5699d86 SHA1 cd53007b37c7db9e7046b52baae0eeffdc5ea690 SHA256 c488a66283dc7541e773abe57be540607fcbb87c81e0f05e319f7fad030a6c65
 DIST eric4-i18n-tr-4.4.14.tar.gz 357758 RMD160 8f83c5a928a5cbd9fa7c558c11c59e8082873260 SHA1 da6981987fe2b1380850a4d51ad271f8400734d7 SHA256 d125de55e8914bad5cd75885488c9e5d548e6066318e150b72e833e5d1a8b78f
+DIST eric4-i18n-tr-4.4.19.tar.gz 357755 RMD160 d6872a8fe526950846ac41cf98b66e6e9b64adec SHA1 9700f4836512f481154bfc21f6a5badff7809def SHA256 f4c53779f3ecaa3b70151005f5f10155df5ac9677732ec5f590329be4a6df53b
 DIST eric4-i18n-zh_CN.GB2312-4.4.14.tar.gz 392204 RMD160 20f0222cd5e6f01c4ca43fc48a727fb46fd1ea35 SHA1 67d612b90ee98b57f01b77ab7bec2285e3ba93fb SHA256 82f1b955817b2026781f937caa5475871f3e9557e0e77c2903a4d36ce1e3c2e7
+DIST eric4-i18n-zh_CN.GB2312-4.4.19.tar.gz 392199 RMD160 3c4c2da84beb2cf9dbd28b45ad162c958f9de594 SHA1 d8b650cd53083038171f0180d473297481857a6d SHA256 63a393bad8edfcdfe08977184abc10121e83f630f42a41b11ce9a4b008c0e919
 DIST eric5-5.1.2.tar.gz 7217433 RMD160 e02bae94f338d4e9181d2f3cd18c594f1c9962c6 SHA1 853f67dec620c53b732ec7ec19a87d87fc72dc7e SHA256 14b095affa96d100e67969d6c3626ee611caa7d4497279d8be91775e6ee4d44d
-DIST eric5-5.1.4.tar.gz 7215997 RMD160 952787774ac7bb36f2a8ffa7692d1b277c991942 SHA1 f8749f0bc97e2e01d339d2e3e22125a9fa9fd4a4 SHA256 a095aae8569cf283acb7fcb47652195c09ded34da2506a76c5173dff5f4183b0
+DIST eric5-5.1.7.tar.gz 7871838 RMD160 e8d70e4255eb8eadc2b07cefe8a9df33a827088f SHA1 6d4c1a5ecc643caae9e1f06f022dbe6b8001f879 SHA256 e8c91327c180c71e636cd281409186b05aad734733a51f1077a14f11ce54cc53
 DIST eric5-i18n-cs-5.1.2.tar.gz 502070 RMD160 8f06931229b2e5cbf76abc0543fe70b9e21217f4 SHA1 58ece324be205c8bd6e666a80610f2bf0374a63c SHA256 073425bf1be885e4ec405efb1eda829c7bf86e5b983875da2a9e9d186d487c4d
-DIST eric5-i18n-cs-5.1.4.tar.gz 502073 RMD160 d7655de3b92452db17c3fedff0ba379e5a5877db SHA1 0a46c04e1a92c66c095b196818f4a4f5a7f6b442 SHA256 1c65f0a4562c1859968c2416cb72bb6cb8373ca035830fb91906fb63b46ac07c
+DIST eric5-i18n-cs-5.1.7.tar.gz 502697 RMD160 70bf4dcfd30919a5676f5df44c46a72ad7303ed0 SHA1 7837f7a4109257d0d0d891b31d9c48561c4b1cca SHA256 10c5e94253d819f9c6a39e9bedb6e0c1b605ca6fda8bc004eec775968bbeb94b
 DIST eric5-i18n-de-5.1.2.tar.gz 531114 RMD160 1d9c37c4eea2022cedeb4622e0fb65cf40ee9d6f SHA1 e51395ddd7d8bb1b4a1282dab46b80a5fb9a0bd1 SHA256 5ea945c17c88eab0bbade1b3dbe7aa76213be26437151cfebd3275ca282622df
-DIST eric5-i18n-de-5.1.4.tar.gz 531114 RMD160 9f84e33d554d771ca1aa644eb7c8d1d998c24646 SHA1 7a01e4a26cd6f5456f1a039958a32094ccdb1d04 SHA256 d9ed0d5f192030453332a8c34c7fd0f88e175767a6c20864399b3956e6c88d9d
+DIST eric5-i18n-de-5.1.7.tar.gz 532337 RMD160 87778fda366179193721095b37ee90e58c1e9388 SHA1 76c0696282836ec47299a1ab44650d1b7ed5e48e SHA256 86f3e33950c19715c2d357f54ae2e7ff9e9a2bdc3139fb026fe7f005baf95c7f
+DIST eric5-i18n-en-5.1.7.tar.gz 145230 RMD160 7ada1aad68d12dd630794a80889f9b8a6b79faba SHA1 6df78c1a7ceb2e29aec8bf82059dfa00b2cb6080 SHA256 5ba11a0e91057c1963d3b5bb55c2af8372e5e9c0041262e0b5db11497a151937
 DIST eric5-i18n-es-5.1.2.tar.gz 535570 RMD160 ec08584a1509852d739a2f661e0ee9e5c7bf5c8b SHA1 31ef56a8c3fa245fdedbcfe57628b8934090ea52 SHA256 12c46ddc72b6285924c21daeff62a4964fc9d1529ff760cebbe615822da0b832
-DIST eric5-i18n-es-5.1.4.tar.gz 535571 RMD160 4a5c8be321f012151a0e76408ba99a05cdf042fe SHA1 9dd03430bfceb800830eb5727d1f9f00be62bf7b SHA256 b3ed9420f85b51dd0a85cf973b078c02083382eeaf71145bd7b621fc94e0a2ef
+DIST eric5-i18n-es-5.1.7.tar.gz 536745 RMD160 08d38458d55d0592352fd68a83f33c9e7991a075 SHA1 1d4fa864b70e1d1e3f1be87f405cda32d911bcf9 SHA256 6f5b317326ec402f63a6e6bdcd10af67e2855b7c0f99dcdb2ce8ca562d838dc6
 DIST eric5-i18n-fr-5.1.2.tar.gz 423505 RMD160 7f2097b121e1d964cfb9a63fae5b59b6649433f8 SHA1 54b7e081745415c8bb2dadd2036a8923db00c706 SHA256 853fe42e119df2246d533e25ee9a73ffb48239b851b0c2c7b5ce88f0c788c346
-DIST eric5-i18n-fr-5.1.4.tar.gz 423506 RMD160 21b74d90251451e4a84423cc8e245a81b2ee1cdf SHA1 9da0346b59a78e3ad1e9548e94a31264aa775948 SHA256 613b9e44402339c81a7493ef08abd9f3a03a832c7c14631ca766b14962a9fb57
+DIST eric5-i18n-fr-5.1.7.tar.gz 424237 RMD160 f6e566f70f09af5a8667e7f0c421dd143e0170b9 SHA1 4480423613f1b47512a682c5b2efaf7468876964 SHA256 991ac86b38331e7aabae138746646e091729c023c232490bff2ea3824c163056
 DIST eric5-i18n-it-5.1.2.tar.gz 523308 RMD160 b40ac0d64cfbf5d913388e4c7a5643e499c22440 SHA1 7efdf31dea4cd7f9617ba507b1ded2c95ad570c1 SHA256 0285b7c8515ee168885407ad10f1d45a352200ff0bca805bb8c49b8a3328aa06
-DIST eric5-i18n-it-5.1.4.tar.gz 523282 RMD160 8e44f63002687e1e6d74bb759294105b55e97515 SHA1 428ad4cb86cc2e365665e585aa57dcecabd8d9f4 SHA256 d092b071e835b0b90d41d2b4152aa9c341c58b929a1fbb9e2edb1f7793a00a41
+DIST eric5-i18n-it-5.1.7.tar.gz 524052 RMD160 da04153a64110a95bc2c4b8c46593ff2516f7c0a SHA1 9b4afedacec15e5db4580381651f9fd98af79e6b SHA256 8b4db00e694057530f0ac2706d45c2bc9aeb8fc61cb863609f998bc126060794
 DIST eric5-i18n-ru-5.1.2.tar.gz 549398 RMD160 fb54c30e645fbf5451985a45b5984b55f659e86f SHA1 2687a6e17e91f6fabc79926d258fed31d1545841 SHA256 80fc756c905bbeaa837b70a96bf6487267f451b2edee8b172b4acea014cbd947
-DIST eric5-i18n-ru-5.1.4.tar.gz 549401 RMD160 b34c43de105f14ba5829c0ec1adfb1c1ac52574c SHA1 c6182f7263d931f2e2cb27345d515f0c7a849190 SHA256 0e219e46803c36fcf31d7a97d7fa9f1ac1e5c3f8a0ff2bc8060a2e6f21ef58a3
+DIST eric5-i18n-ru-5.1.7.tar.gz 550251 RMD160 d154b3e030dec22d1c8812606a39c99a81a3447a SHA1 27297fad381279b8fce2ac14cac95cc3841a2a1a SHA256 ff0f9ee7be67b90295805a684c15670db6b9483b576cd4be00913334e6cec0e5
 DIST eric5-i18n-tr-5.1.2.tar.gz 424715 RMD160 9133070f96cc34347a4410d02d06de5b933799ea SHA1 430b26dab77138a73a5ba6792604b256b6b64c85 SHA256 95615b371e709979a660398eae905f7736b31e309f03ac3ae15ba9e962a79f0a
-DIST eric5-i18n-tr-5.1.4.tar.gz 424716 RMD160 3a20cb7c54bbae24b9a571fcc6d15cc2e3c2a940 SHA1 adf8a37525327e0de7ffc111328fd2a6dd6ce98a SHA256 b5133277c51b5a93ee52de29b756cd8a0f78817a7d4306bf23113d306f9ff25b
+DIST eric5-i18n-tr-5.1.7.tar.gz 425501 RMD160 6957484b00a364ecfc6b159e782e5eb6da465d02 SHA1 135238163fd87e43bd772cb397bc5863b3bf11b9 SHA256 301f5f35eb231e475c4da24f8e1f7c3028074b829910198f92e85d0d3605b2eb
 DIST eric5-i18n-zh_CN.GB2312-5.1.2.tar.gz 388663 RMD160 58f55d52a36442c60ef09d1107241ba6bc0de381 SHA1 81cd1474a5c91b4a8d1a081bdba40ff5d90247ac SHA256 ccc071162d8675beeb5afca2548632421b1e61e54abced6c7750816db4e03df7
-DIST eric5-i18n-zh_CN.GB2312-5.1.4.tar.gz 388663 RMD160 4ab4e8a70e2a6f3383fe569dc233dc846a3d82ce SHA1 32278c87ab7357f5c99e864aea4ecdb379c9e554 SHA256 e7425ac9527f9f308744f0883f75a6132f3bb9cb7a6d82c098b1865037d841f2
+DIST eric5-i18n-zh_CN.GB2312-5.1.7.tar.gz 389317 RMD160 6c39fad1678c90610416fefaa6fefa98f393f2d8 SHA1 43442df45a148457b808fa76ae62684b1abc46c5 SHA256 c3e381a72655005e4270e9768d49fd7748c8269e197088e4caced2dfa70ca327
 EBUILD eric-4.4.14.ebuild 2669 RMD160 a3bc8572a221d49fe3e1bb904886b21ac2b2118a SHA1 79d54d8937d291fffde25d1be398a2d7c19679ba SHA256 dddd64f427d49786afb6341888ae5d8542505e9072a35b9c0368cac3d880fb39
+EBUILD eric-4.4.19.ebuild 2695 RMD160 af721bcae62c70b564ff307374876c1cd7a69ee9 SHA1 00fa5f395293d519e2851bf896c1bb7aecba74eb SHA256 d443f640be72ce431537e02e3bca01e78541afe91072c5fa8b555dbfcffae088
 EBUILD eric-5.1.2.ebuild 2843 RMD160 b28103c4232b3213186a43ae1a21ab2e986a00a1 SHA1 0110e897c4b3309e6826afa4f35795208f17f485 SHA256 467aeb918b7409d3f0fd9effb9f93cb024a7b52c72531d1a1940f66f431a4d05
-EBUILD eric-5.1.4.ebuild 2842 RMD160 4c0ee1dbd7827cb7fc8c85ef33e6c43e5dd36545 SHA1 8d2ef53015f1e5a320508ab24ad4fd50cbb39f5c SHA256 78d81cdf8c9bf81d2689b8abddbaa248e4646e627cffdeca5dcee4c5429381e9
-MISC ChangeLog 21693 RMD160 51771b07e51f8e54af4cc28b17d94d1a801d6123 SHA1 d55eef3b082c77b2ef362b349f56a64db531ca24 SHA256 2238d0b5fe0c42bf740ac95eb6548132e178d3455889e9f6138d61a3caf125dd
+EBUILD eric-5.1.7.ebuild 2856 RMD160 06f861436bc127352ea61c130777155adfe59cb1 SHA1 af53fe50f3499bfba6af3b60d58449df267d8969 SHA256 ee3d85f0ca4a6c048007b81249a1a264027795c07b339e6924c0985527d56d21
+MISC ChangeLog 21915 RMD160 c2b6ad33d0151295e298263150c2d1313fa6dbf1 SHA1 a990c9482aa0098c7121d1912020ddac7b7644e4 SHA256 89572d975596baaabc9eac50db78930f38f9f49dece52abc2f949797ef20d28c
 MISC metadata.xml 179 RMD160 887c899594fdaa3d82028c3d84188354d3784cd9 SHA1 551c6b2378ff31eadc1e4860211ec8709ce960bd SHA256 1fbdee58e0ba0f8730f6a27979cb7eeed8ebd3afa316d61b34a5f4893291a646
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk4UudAACgkQxeMuLWsGW/sPXACdGtnbj6IBC730tC/u4Cs+C70T
-B+cAoJuiMn9K6VTeyBmCdvfXDXeR7Mt8
-=HZQ5
+iQIcBAEBCgAGBQJPAOQ2AAoJENXLsxwXqFxysQAP/A6Y98y+V8jYsWODU/cVO628
+y1KnaBPhy5krdeV32Cnxpkg8ViicAXxI2ferpmCBPL0jbcntVjdQ4TeiI+B0Ix5Y
+B2CRXDmiyggY9fwunvToh4n2pBKFciMYO3a1SgEUOryr64tAmH9JAncI43Mo4GT5
+q7HAUe6wFAXgX5w9ixM3qDsZzsJ5pLG6uSZosZr1U1/nLcrwW9NmB9eZXh1Q1bGK
+4Ioyf7GmMn4pNMmDJpbDo23ZfvJlujTes9zYk4NJ3hdY7Y+gvFw8yi3wL31cLOdQ
+5BE+TectSFPDDlnCh2GRG8hWPGImMup+AwuYbgORSuSnYZBvXGs9niCzKwuGXlOL
+qnVveCinVVM7ybdHL0bkdOg2FibQ8sHHpdsL87pD2ttgr9vqIpdRJkjR/CNacBxI
+4jVlT/XkjptEYgrE1IysgRsozSIailC2er/11OSnY2ayMPTfzRkBXRC/rA4RhZz/
+IghSkJkSwejuV8penpHXmtGnQ4Y/mFtNI/N2HM+OPsnn/dXoMTiGcYtDjERhvRiY
+ORiD81fYlzh0iYJKs8h+pUxd39ZGpViX06QHlK8nFIusDFEH+8yLEIl07bnuXHUN
+jbAgNDWQ+jsOmJENR3AyJDhy1a7aSku6Oq6epJtjqMIzZgqFzyXVMPhz6mookhqz
+g7B/7L3N0idG7BT5mhcy
+=fmDN
 -----END PGP SIGNATURE-----
diff --git a/dev-util/eric/eric-4.4.19.ebuild b/dev-util/eric/eric-4.4.19.ebuild
new file mode 100644
index 000000000000..10f7eb7033bb
--- /dev/null
+++ b/dev-util/eric/eric-4.4.19.ebuild
@@ -0,0 +1,93 @@
+# 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.4.19.ebuild,v 1.1 2012/01/01 22:54:42 pesa Exp $
+
+EAPI="3"
+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"
+
+inherit eutils python
+
+MY_PN="${PN}${PV%%.*}"
+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"
+SLOT="4"
+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.2
+	kde? ( kde-base/pykde4 )"
+RDEPEND="${DEPEND}
+	>=dev-python/chardet-2.0.1
+	dev-python/coverage
+	>=dev-python/pygments-1.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"
+	epatch "${FILESDIR}/remove_coverage.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
+}
+
+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 "doicon failed"
+	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-5.1.4.ebuild b/dev-util/eric/eric-5.1.7.ebuild
index b130931f176d..a44247369f1e 100644
--- a/dev-util/eric/eric-5.1.4.ebuild
+++ b/dev-util/eric/eric-5.1.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.1.4.ebuild,v 1.1 2011/07/06 19:38:47 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-5.1.7.ebuild,v 1.1 2012/01/01 22:54:42 pesa Exp $
 
 EAPI="3"
-PYTHON_DEPEND="3"
+PYTHON_DEPEND="3:3.1"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="2.* *-jython"
 
@@ -23,7 +23,8 @@ SLOT="5"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="spell"
 
-DEPEND=">=dev-python/PyQt4-4.7[assistant,svg,webkit,X]
+DEPEND=">=dev-python/sip-4.12.4
+	>=dev-python/PyQt4-4.7[assistant,svg,webkit,X]
 	>=dev-python/qscintilla-python-2.4"
 RDEPEND="${DEPEND}
 	>=dev-python/chardet-2.0.1
@@ -31,15 +32,14 @@ RDEPEND="${DEPEND}
 	>=dev-python/pygments-1.4"
 PDEPEND="spell? ( dev-python/pyenchant )"
 
-LANGS="cs de es fr it ru tr zh_CN"
+LANGS="cs de en es fr it ru tr zh_CN"
 for L in ${LANGS}; do
-	SRC_URI="${SRC_URI}
-		linguas_${L}? ( ${BASE_URI}/${MY_PN}-i18n-${L/zh_CN/zh_CN.GB2312}-${MY_PV}.tar.gz )"
-	IUSE="${IUSE} linguas_${L}"
+	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}"
+S=${WORKDIR}/${MY_P}
 
 PYTHON_VERSIONED_EXECUTABLES=("/usr/bin/.*")