summaryrefslogtreecommitdiff
path: root/dev-util/eric
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2017-11-15 17:13:45 +0000
committerV3n3RiX <venerix@redcorelinux.org>2017-11-15 17:13:45 +0000
commite2d84e38284aeb9d522a7e935554340ddf0e4a6f (patch)
tree5a7444ee5f2af59431481999f729676090b1e0f3 /dev-util/eric
parent519e4d5d99fc43d5c9a038098c029dc4ef9d6792 (diff)
gentoo resync : 15.11.2017
Diffstat (limited to 'dev-util/eric')
-rw-r--r--dev-util/eric/Manifest4
-rw-r--r--dev-util/eric/eric-17.11.ebuild (renamed from dev-util/eric/eric-17.08.ebuild)13
2 files changed, 9 insertions, 8 deletions
diff --git a/dev-util/eric/Manifest b/dev-util/eric/Manifest
index 3f2363707c60..efc17b588f23 100644
--- a/dev-util/eric/Manifest
+++ b/dev-util/eric/Manifest
@@ -1,7 +1,7 @@
-DIST eric6-17.08.tar.gz 18867453 SHA256 15283d103dd4295d0c539d670e41f6fd8645cb5cddc630917c41f880efde90fa SHA512 9a8184318cbd4d578606e57f9ad55571387288df86fc87d661f8235b2fde0a74102c7af627ac0d32ae7c2a990c38e7df96fa3e1525f10290c2d2726e71fcd68b WHIRLPOOL de6dcfe8aeb641b912975c37c2a5c2012ac08af936600426ef75a190f22bb6c7b35aae89036b095f1e7f41ad84184b85b272c68718073196d893b2b4eebf7300
DIST eric6-17.09.tar.gz 18914614 SHA256 e006e3d7d98e16bc210799fc116182ffd6dc89dfd5715cdb798a53e07a471989 SHA512 73631ff1faef01b51a640af13dbb3adabebc63280f15b5e594e1fcbfb799a40a8e7ecb7395c52c6878b1fa232d7c00fb531a24be9f89a3592602aeb10520737d WHIRLPOOL 1079c63aa95efb623f36481357dde15e2669c8a56c0cbf481f4531fce4e3c8e08e348f22baaa9b37e39c6eb268b060878ee6c878c78875f0ace8cea184e57afe
-EBUILD eric-17.08.ebuild 1697 SHA256 afbb037c7a9b3493dc2da745ad7c89fa6c4bd76e4f0ff8c28e28aa4541c9c868 SHA512 1c3c7a39cbc8bb66b010f55faa526bb042c39364fe6b505cc696e927a78447f840bc615705849f2c6eef83393b88d911c86be7ceb170eab767dbe00bf9b7c42d WHIRLPOOL fc335b0df2a69800a6406230fc63dc077fe31d4b5f96ed08f78a59e26c5e006b0d72171a917baefb6b474cc4951df0a91c5c9c64ee0cdab99efd38bb9778eb5f
+DIST eric6-17.11.tar.gz 18984264 SHA256 ea722650cac550ed3f1be0ddbd7a596054b19cb793bc40d1847d658f14259a1b SHA512 e95941805d44f01de67d5f256f822a829bd224841a7f2b0bd245e7388b96a5eb94ab34004720c05a355fbeeb30ed4a521e07ea7069441fe6a90c13ff8cf853f8 WHIRLPOOL bc79cc15f29ec325500486434fe1095c6d8500b357df7a542ed19a4f4d0a699c8838c2bf7c547ad2b893fbf929d8c7f9467c04aed15baaa6c1103dbc18fe28c4
EBUILD eric-17.09.ebuild 1697 SHA256 afbb037c7a9b3493dc2da745ad7c89fa6c4bd76e4f0ff8c28e28aa4541c9c868 SHA512 1c3c7a39cbc8bb66b010f55faa526bb042c39364fe6b505cc696e927a78447f840bc615705849f2c6eef83393b88d911c86be7ceb170eab767dbe00bf9b7c42d WHIRLPOOL fc335b0df2a69800a6406230fc63dc077fe31d4b5f96ed08f78a59e26c5e006b0d72171a917baefb6b474cc4951df0a91c5c9c64ee0cdab99efd38bb9778eb5f
+EBUILD eric-17.11.ebuild 1681 SHA256 0d0645a8a08abaa51996f5576d877c9a2d73716de20cd9d7764e175f8697df60 SHA512 18f269ff22da039493cc6755cbea1ae6e31d1b49e37f82dfd73e75ed3cf2f04155e05acc9bdc6efe4fd50a7c27b364a84f82721329643a568a8f8625ce02050f WHIRLPOOL 854ae9818d9d3bf05772e45a5909872aa8dc5a4f5e1898493b5bff18b10d7db88cb6063e05ae469eccbaa503ecb1ba85cae8775cf1b8d6f468534d8af4696025
MISC ChangeLog 3396 SHA256 37318db46eb4a0775b6f946137c7df84502fcedbc10abc1ff0711e67fa33b747 SHA512 dcbd73108e1d7199b473d4905b1db2e89541e8037c657ee431fe8de8fec04a694750ca2e71dd9aa8dac7c40ceb985537d7a46b79b85240e9402f5fcb389854a1 WHIRLPOOL 46dc42b2facd0d1fe531e581a7983ba21b2c1bdcdcb04116e16298992110b6bda24d9b4c9a459a723e18e8be2996fdea5cc0796e31d659d44c06262c910098f8
MISC ChangeLog-2015 30074 SHA256 34efc33a892f3a1d09e50d2c8ec87ca138db3445c0662a974d87b8c825733de2 SHA512 625a34af33ec63b57bdd51a6da4ed38d3b2e24b2a0253589f85b3981619fb3c3632ea71f6642532c1a0d2b2e9e3f9d9338a656e3a6eea5c36c8c94bc65adbe76 WHIRLPOOL 403c6a2a161a033a6f0c8ca0ce8b0bf0e24ba8884e090c0c61cb2d676c29451ec2f45dfddaa539796825c8d5a7b47e94d09402675b6654eb55aa597b8b33be93
MISC metadata.xml 325 SHA256 382c0afc07012bff579b843df7e841ad2651307e11dd153a7bee2b74fdd364cb SHA512 e3da71c04a1a2af6b72ff068eba586c14b159034f759448c669032b30a82cc618e58467cc8cec8090d22d0e864338fc62b735f73dc31fd2a33d63cb677178f9e WHIRLPOOL 9b24c9135e11b76a7b8508f3614bbec5b389119f7f944d260a6e48753cef1708fad414322593fcfa82127d7f5f7184f5ff2ed01169771f7df39bc9cb3ef73ffa
diff --git a/dev-util/eric/eric-17.08.ebuild b/dev-util/eric/eric-17.11.ebuild
index 02c5b8f9d387..6d5d56d78f52 100644
--- a/dev-util/eric/eric-17.08.ebuild
+++ b/dev-util/eric/eric-17.11.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
PYTHON_REQ_USE="sqlite,xml"
inherit python-single-r1
@@ -21,10 +21,14 @@ IUSE=""
DEPEND="
${PYTHON_DEPS}
>=dev-python/sip-4.14.3[${PYTHON_USEDEP}]
- >=dev-python/PyQt5-5.5.1[${PYTHON_USEDEP},gui,help,network,printsupport,sql,svg,webkit]
- >=dev-python/qscintilla-python-2.8[qt5,${PYTHON_USEDEP}]
+ >=dev-python/PyQt5-5.7.1[${PYTHON_USEDEP},gui,network,printsupport,sql,svg,widgets]
+ >=dev-python/qscintilla-python-2.9.4-r1[${PYTHON_USEDEP},qt5]
"
RDEPEND="${DEPEND}
+ || (
+ dev-python/PyQt5[${PYTHON_USEDEP},help,webkit]
+ dev-python/PyQt5[${PYTHON_USEDEP},help,webengine]
+ )
>=dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
>=dev-python/coverage-4.1.0[${PYTHON_USEDEP}]
>=dev-python/pygments-2.2.0[${PYTHON_USEDEP}]
@@ -47,9 +51,6 @@ src_prepare() {
rm -fr eric/DebugClients/Python{,3}/coverage || die
sed -i -e 's/from DebugClients\.Python3\?\.coverage/from coverage/' \
$(grep -lr 'from DebugClients\.Python3\?\.coverage' .) || die
-
- # Fix desktop files (bug 458092)
- sed -i -re '/^Categories=/s:(Python|QtWeb):X-&:g' eric/eric6{,_{,web}browser}.desktop || die
}
src_install() {