diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-util/eric | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.xz |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-util/eric')
-rw-r--r-- | dev-util/eric/Manifest | 21 | ||||
-rw-r--r-- | dev-util/eric/eric-4.5.25-r1.ebuild | 97 | ||||
-rw-r--r-- | dev-util/eric/eric-5.5.2.ebuild | 93 | ||||
-rw-r--r-- | dev-util/eric/files/eric-4.4-no-pykde.patch | 146 | ||||
-rw-r--r-- | dev-util/eric/files/eric-4.5-no-interactive.patch | 15 | ||||
-rw-r--r-- | dev-util/eric/metadata.xml | 8 |
6 files changed, 380 insertions, 0 deletions
diff --git a/dev-util/eric/Manifest b/dev-util/eric/Manifest new file mode 100644 index 00000000000..788ffe5fc2a --- /dev/null +++ b/dev-util/eric/Manifest @@ -0,0 +1,21 @@ +DIST eric4-4.5.25.tar.gz 7989002 SHA256 d609d576476d63a71e4217605c05cbcdf303f03fc8a0067f2ea624295c301757 SHA512 2c1ce9387544654fdbe0515766f49a4ecd771d9a63c1782578b5224fcf4afc031af1ec53743a154026edb0cc3ff102ac7a4872204b1de54b7dafb432afe5d95f WHIRLPOOL 9acd05c04debddb09ccc76ddd35a03aa6ef7e5cb7bc4956992d25080fddc3ec70366e1559d187f3335268d2d434ed9acba3974f18c69e9d98edc43b229fde37e +DIST eric4-i18n-cs-4.5.25.tar.gz 451987 SHA256 34784f5ec942cb10077aa80c18c3b5f3e8a9a89bf6d147c58e48cfc81ce20885 SHA512 0c9dbf0744b577e75889a65abe303ec437ae69db15e7c3689b5d0f319dc1b125e8a6189e5ca769df815b46b5519aae1290bd84831c4ebb99b184983094f71b30 WHIRLPOOL b6c803e879489267dc5d1765101226536bdf448c11c7ec5d63d3695f9e008516f81e30f61232f4a49461aca53e43b005f8836b754151a542e2e4c420f4d3a2b5 +DIST eric4-i18n-de-4.5.25.tar.gz 468496 SHA256 acfbda7dac0bb3e9b77fdacfe685580cba69da30a119dabf634eb884e9afc8ac SHA512 f73a69e5a1f8dde01287c3eb80e33eb7842355d72cc77ed8c064dc52b7adfdeeeb3fc48bbc76b9fa779b04810dd7f1f96c027c240ca97a44561bf60473c44eaa WHIRLPOOL 4e8abc67b74f8597a6cc447cf49d9cf6254a0989b6a5279013dfb48670a1ef8265469ea2e95ee093ddcf0d88be5ff93ac5c517f77dba3ae48b33d96b12ea7c11 +DIST eric4-i18n-en-4.5.25.tar.gz 126955 SHA256 7a2578ce53867ed5f44a05d8e42643a9164dc20c6f114ec89ac8cb925aa869c8 SHA512 6d720e904a8580954668d532476d269201936869d9ab46cdbeec50f7ef6bdb456c6974b605ca68268afe3e338f298aeed74b80fb8d25934279f9840a5df1d3e1 WHIRLPOOL 4cfb655a957a065311b41c452180142972d2af241521e6a52e70d16f47a7573229b213fe7fa3d65d4a713f17260287390dbe453cdfd995a72cbdc198e52bb041 +DIST eric4-i18n-es-4.5.25.tar.gz 473331 SHA256 a95d6df0e4396ac97df2224c9755247c134163e57f6d579f6614585c3884b70b SHA512 3b2e2c24f13b0ec51a7951de6b5c64524c0da58da7f82e8856ba3be2f18210a4ed18b80cf3401c20c049826dca3e1354d4b539bee86b9430412254190f61a8f9 WHIRLPOOL c1e9567ccd74b08fb38f6ba571cd5abb6a00553d1262c20e08a05f6935b0c894e31f6d2a412716fcf03a5ec66f414984d1dabe5405923e76953af20319c41733 +DIST eric4-i18n-fr-4.5.25.tar.gz 468434 SHA256 de21c8db456110cfcfacfff29f97168df7359a97c7c3dea9ca5a41ce11f45934 SHA512 434fe4bd080eea7511988b8d3a6d90002651d4b74956e05410f71e797eb790f555077873abb5dd3d957a010f61e4644fad71494add42e4690d28521201a42cdf WHIRLPOOL 8e910e0d924d683fcdf70f53b05ff2b4e46fb72676dbe70c356385a3ae498d7ee29bc068dee08a9e49428a94c2581f853510e1e07b48dc256d832f4dc6f31699 +DIST eric4-i18n-it-4.5.25.tar.gz 461971 SHA256 490f9bf8757959de315076ddb911493574671a6f6bfa18b3884676a65ef84ac3 SHA512 012b2d193e121de1e79a3d1ece8054c9941157ea242f679e16d5058aa3a5d1456b433e81a12ea232974492baecaa7eded51dda3432565889f51184329dd4f3e7 WHIRLPOOL 3776a6a10c12806edffb0cda67bc517855862980f0137be8358ad8eb58cf6003da3b66b3811c5e3b34560b1249185b4c2cf69118320cc08b1a552a2ccf7e5e7f +DIST eric4-i18n-ru-4.5.25.tar.gz 474745 SHA256 f7b4caf81f38637ea0350b3281c30ee60fc32b833a2c22d899ab5eb578fc89e7 SHA512 cb8c42d921b181228f8d3476b2da02226927744772bcf5738f31c1504617928be30925d6a181313d241af76d068b2d951f781acda12cc616c2f7d52baf3aa8d1 WHIRLPOOL ff5237e010d39f8a33a8091a3a92ad2d566388d9d3a535552f7cf51f2855bf25f37b361b43641fe7743d7365e479f470df9f571cf48b6a315b63dc8235b81e72 +DIST eric4-i18n-tr-4.5.25.tar.gz 352461 SHA256 476f568ae4b2e764e014d704e5b062650ada6d7f957cc483d2fc733b5f3863ac SHA512 e3cdcd66e950123cbf668b3cf8c723f197a1aaa940b4234d2a63579bdc5a3678463215e1df26081ca8390c78156a408852bd7b2a674eb796cf97d32649323c9c WHIRLPOOL 294ff20bbf172e3b74f77ae8dd4148812bc7d046d1958391af43633a01073f849f234c2663bd556cab54555528a1a5b2a04c1714b3e255a10e1890f08a959ee1 +DIST eric4-i18n-zh_CN.GB2312-4.5.25.tar.gz 381281 SHA256 4c4c614fea86c42e067dbaa44e4804f5dfb203fb58188cee84b76a93cd6a9fa2 SHA512 691f9a652aae1be4f0f582d920c084ee51cea9d242647de6e3266d203c7ad12f41a300a4d2a121a2c94ffd6551eac247fce206ee8887bae552dca330c3ab70ff WHIRLPOOL 0501b6d7084193f3dc7ccda8f1fd909872bdf8c088eeb470fadcb83d2bdbb7ebe04bcafe578092ee80fd43c2ed826350b630d482bd1ed0231f667e6f105c4688 +DIST eric5-5.5.2.tar.gz 10649618 SHA256 501550e01617a3c8cd66ebcb5e071cd928029fb3aba64aec88617821bf5c3871 SHA512 ba48ffbda67de66f24819ac3389bb373a9945e8842a802ade185e5fcbfac34f8062999fe96cc5be9321dacca58f70c47bbe530ddef0349f3f103800b1fa689f9 WHIRLPOOL 7b450b6569b789c87d1a3b44d24fe91072f2a3d417249a46da8c6793b06a940807c724aad729dd7c969e816464bfe9c81fda82f3a8dbe3fccb4557cd33510bcc +DIST eric5-i18n-cs-5.5.2.tar.gz 556017 SHA256 ead32f57107701f1664543fd0e8dbd07764f07e8c2e4f684977f8cabc3e26685 SHA512 b4bff691d4067d2d91923aeb823678a02775d4a275a4cc2ee7e0dd207d33c696c8eebad4bc2b9c4add1b2f928e868cd183d477c5939e81cc8ab96a42db0f818b WHIRLPOOL 475209f28eb62e58db9d4629c6c1de77a38407f6abd3a101b9d313314e708c9597f6cb802b1112935728628551b4555762e952c4f1cb0992a59632d57f28b886 +DIST eric5-i18n-de-5.5.2.tar.gz 759671 SHA256 b08d6ddb10c332c8c020d8f8a3dd1dae315427d7067b67643848c79733ecce38 SHA512 6fd4fc26995fde57caf182989da1db5cf5fb92eb185645f0130d1c19eeffca3a8d4c495e5c3673fc6ae89a33cbb8f5593b2fa34c1aa530e2393ecf5e7180000d WHIRLPOOL 2bab53467a11f79934399348d00f70502e5fdc2ffb5cf217426a2a5e9fe88b79edc546c3615642385be18e2c92f0cabdfdaf686a9a261062a3c3f81771389be3 +DIST eric5-i18n-en-5.5.2.tar.gz 205563 SHA256 934bd715cde409e9dc79245dbdd845f14aa4b6bb36cbad064e16c85106110b85 SHA512 51aa8c4e6b938f13ee95bfa1759dc2e83d4e3cdcbfcb4db4b86d494669e09ea51d173e16fad0bf31ba67cb06e910fa109e931a89f431ac8ca902def15067489c WHIRLPOOL c8235fe9b5e6754bebd60c98086086bb479ae1f8456787985a68ea02d68fd93ec04bc9947b2770f0cb1b604e68d5ba365e04bbb7b185147ee91c246deddaa368 +DIST eric5-i18n-es-5.5.2.tar.gz 761577 SHA256 b0ffdc03c02a0fde6fa030871677de72e44675f0c4d557c3abeeea44798a1907 SHA512 39332f66acd2014f60360647d2096792a8d9d7dbf356b983d00362e08b5fe90aa844399c980e7d8a45e67e361614c3f11b321998dc322a3ea53cdb9700a2ae42 WHIRLPOOL a6580465c3473b414a8a3de86fe9e9504e78a2f730bd02f7a9c9099cda26bd269c04da6d092f00a853162881f09c2159dab718a79758c21d149781ec2a98cde5 +DIST eric5-i18n-fr-5.5.2.tar.gz 504012 SHA256 294e92b114b881ed764489e9dba137bb113e02fda8a5089fe3480d417f7e120d SHA512 9fc8e1205f00f27407bf0e9c8ce401ec640abcadc8eb12afe4d5846f6ab48bb6294ef96c0265ed8f2dfb52229370d3f243b0863da3814ebf4851a440318e42ff WHIRLPOOL 0b24e5b975162e5d735d7c713750ec9f7feb605264392b710d35c243585a341d618ce8f4f5aa80aa8d2ce74705bb30ed203473d6225c85fd1df08650f19ec288 +DIST eric5-i18n-it-5.5.2.tar.gz 630960 SHA256 94300cfb84d9b811d76e0be98bbd60924845ae1dca788dd74f8d0c5fd55fa46c SHA512 5cc02d2c3238eb44a2dbda9323ff073c1b51d3029623337c243e0bfc57736b2ba859d9b6b00aa5dd4d875824d504c3d9d763c76d92b3a9525f637f9d6efeaf18 WHIRLPOOL f1da01ff437090f15bb9c612ca61c4d15e34f484f0c05eeb1c5147a131d441d9ee023b0376acf0ab3a8774707f06c419e8dd37502afd449fc150fd0f3abfc2da +DIST eric5-i18n-pt-5.5.2.tar.gz 443308 SHA256 2baaa96bab273f8ad695101675fdac7a527ad7b62d14a25491dd846ca6933342 SHA512 6564fdab325251cd9898253c0c9ed9dc4406038600ccd6c7db5ec6da76517258919c8619846816ec43c6b799672c14306b291a4d274f980e35e634b98bc9e6f6 WHIRLPOOL 5ed5c90af0858cac6d275740c612c95a9f2af38c406cd090835cc07f5c63bdf23c319d4959654735d02066d4a8bf703375bf42d9d469034d7e65ed842731f8d0 +DIST eric5-i18n-ru-5.5.2.tar.gz 786342 SHA256 63c8fb9ab53010bddbb5049e227ca5cb49e50cc985745c7fd529fe4449d832ca SHA512 bbca86c04883d636d0a4afad721507a79796ee7a805e263845f1da79cbd0e2d098e93f919bc253a8a51d2ed003a24ae14fc9cda6d5e90568a928739582b0b486 WHIRLPOOL 714bdbf694326050e813b322576bc0009f12e3109a6a11f7acc0112fe15c332f83547308f6ab6ece117b8151f8bdae9551265344fd336d53014998a6f85436ac +DIST eric5-i18n-tr-5.5.2.tar.gz 481796 SHA256 b5935c2384608d87a8ff3e7f4b90613c686e9af176a724da44fb67486175532a SHA512 8831fb2039745b40f9f74f3ec8801a0dab5ee96ceb6686e418bfb58ddeeb44c2400bc0e36aa0035475923aaf20724cfbb656adf8a0ae27b78247d372ed747fc8 WHIRLPOOL 12075a1d44d2ff01662d3323cf5c985890da44d62eb7aad782e50e4067cc4e930d0dcd47eec63dc77b6fd6e42bf6098d67f30de7034e44b9b1dc8c38ea7f56fb +DIST eric5-i18n-zh_CN.GB2312-5.5.2.tar.gz 446780 SHA256 ebd592a1f28a28af2a00d79ebaa61e94b5ea8bc8b3883a098d79460c68940a97 SHA512 96a1263bca33c4a7709c8d86d5c5412779044f37d98fa62d18e37e7dd891607bf282808d25544bf7fef7206a669c57c49bf97bd5ae7db54fa49bc15c47dc5689 WHIRLPOOL 4d84c9b38f31a6fad71400367d20f6a707bc9dc4c2a30509bdde72fa83613e088e5c5ea36b173d69a9c7474929b81282a8cbbce3ea64a70877b9b5155f4346b4 diff --git a/dev-util/eric/eric-4.5.25-r1.ebuild b/dev-util/eric/eric-4.5.25-r1.ebuild new file mode 100644 index 00000000000..d0b6c47e84c --- /dev/null +++ b/dev-util/eric/eric-4.5.25-r1.ebuild @@ -0,0 +1,97 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=4 + +PYTHON_DEPEND="2:2.7" +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-*" +PYTHON_USE_WITH="sqlite xml" + +PLOCALES="cs de en es fr it ru tr zh_CN" + +inherit eutils l10n python + +DESCRIPTION="A full featured Python IDE using PyQt4 and QScintilla" +HOMEPAGE="http://eric-ide.python-projects.org/" + +SLOT="4" +MY_PV=${PV/_rc/-RC} +MY_P=${PN}${SLOT}-${MY_PV} + +BASE_URI="mirror://sourceforge/eric-ide/${PN}${SLOT}/stable/${MY_PV}" +SRC_URI="${BASE_URI}/${MY_P}.tar.gz" +for L in ${PLOCALES}; do + SRC_URI+=" linguas_${L}? ( ${BASE_URI}/${PN}${SLOT}-i18n-${L/zh_CN/zh_CN.GB2312}-${MY_PV}.tar.gz )" +done +unset L + +LICENSE="GPL-3" +KEYWORDS="amd64 ~ppc ~ppc64 x86" +IUSE="kde" + +DEPEND=" + >=dev-python/sip-4.12.4 + >=dev-python/PyQt4-4.9.6-r1[X,help,svg,webkit] + >=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.5 +" + +S=${WORKDIR}/${MY_P} + +PYTHON_VERSIONED_EXECUTABLES=("/usr/bin/.*") + +src_prepare() { + epatch "${FILESDIR}/eric-4.5-no-interactive.patch" + use kde || epatch "${FILESDIR}/eric-4.4-no-pykde.patch" + + # Delete internal copies of dev-python/chardet, + # dev-python/pygments and dev-python/simplejson + rm -fr eric/ThirdParty + + # Delete internal copy of dev-python/coverage + rm -fr eric/DebugClients/Python{,3}/coverage + 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 + make_desktop_entry "eric4 --nosplash" eric4 eric "Development;IDE;Qt" +} + +pkg_postinst() { + python_mod_optimize eric4{,config.py,plugins} + + elog "The following packages will give Eric extended functionality:" + elog " dev-python/cx_Freeze" + elog " dev-python/pyenchant" + elog " dev-python/pylint" + elog " dev-python/pysvn" + elog " dev-vcs/mercurial" + elog + elog "This version has a plugin interface with plugin-autofetch from" + elog "the application itself. You may want to check that as well." +} + +pkg_postrm() { + python_mod_cleanup eric4{,config.py,plugins} +} diff --git a/dev-util/eric/eric-5.5.2.ebuild b/dev-util/eric/eric-5.5.2.ebuild new file mode 100644 index 00000000000..3769513ecbe --- /dev/null +++ b/dev-util/eric/eric-5.5.2.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python{2_7,3_3,3_4} ) +PYTHON_REQ_USE="sqlite,xml" +PLOCALES="cs de en es fr it pt ru tr zh_CN" + +inherit eutils l10n python-single-r1 + +DESCRIPTION="A full featured Python IDE using PyQt4 and QScintilla" +HOMEPAGE="http://eric-ide.python-projects.org/" + +SLOT="5" +MY_PV=${PV/_rc/-RC} +MY_P=${PN}${SLOT}-${MY_PV} + +BASE_URI="mirror://sourceforge/eric-ide/${PN}${SLOT}/stable/${MY_PV}" +SRC_URI="${BASE_URI}/${MY_P}.tar.gz" +for L in ${PLOCALES}; do + SRC_URI+=" linguas_${L}? ( ${BASE_URI}/${PN}${SLOT}-i18n-${L/zh_CN/zh_CN.GB2312}-${MY_PV}.tar.gz )" +done +unset L + +LICENSE="GPL-3" +KEYWORDS="amd64 ~ppc ~ppc64 x86" +IUSE="" + +DEPEND=" + ${PYTHON_DEPS} + >=dev-python/sip-4.14.3[${PYTHON_USEDEP}] + >=dev-python/PyQt4-4.10[${PYTHON_USEDEP},X,help,sql,svg,webkit] + >=dev-python/qscintilla-python-2.7.1[${PYTHON_USEDEP}] +" +RDEPEND="${DEPEND} + >=dev-python/chardet-2.2.1[${PYTHON_USEDEP}] + >=dev-python/coverage-3.7.1[${PYTHON_USEDEP}] + >=dev-python/pygments-1.6[${PYTHON_USEDEP}] +" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +S=${WORKDIR}/${MY_P} + +src_prepare() { + # Avoid file collisions between different slots of Eric + sed -i -e 's/^Icon=eric$/&5/' eric/eric5.desktop || die + sed -i -e 's/\([^[:alnum:]]\)eric\.png\([^[:alnum:]]\)/\1eric5.png\2/' \ + $(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 and dev-python/pygments + rm -fr eric/ThirdParty/{CharDet,Pygments} + + # Delete internal copy of dev-python/coverage + rm -fr eric/DebugClients/Python{,3}/coverage + sed -i -e 's/from DebugClients\.Python3\?\.coverage/from coverage/' \ + $(grep -lr 'from DebugClients\.Python3\?\.coverage' .) || die + + # Fix desktop files (bug 458092) + sed -i -e '/^Categories=/s:Python:X-&:' eric/eric5{,_webbrowser}.desktop || die +} + +src_install() { + "${PYTHON}" install.py \ + -b "${EPREFIX}/usr/bin" \ + -d "$(python_get_sitedir)" \ + -i "${D}" \ + -c \ + -z \ + || die + + python_optimize + + doicon eric/icons/default/eric5.png + dodoc changelog THANKS +} + +pkg_postinst() { + elog "The following packages will give Eric extended functionality:" + elog " dev-python/cx_Freeze" + elog " dev-python/pyenchant" + elog " dev-python/pylint" + elog " dev-python/pysvn" + elog " dev-vcs/mercurial" + elog + elog "This version has a plugin interface with plugin-autofetch from" + elog "the application itself. You may want to check that as well." +} diff --git a/dev-util/eric/files/eric-4.4-no-pykde.patch b/dev-util/eric/files/eric-4.4-no-pykde.patch new file mode 100644 index 00000000000..26bbf8925d5 --- /dev/null +++ b/dev-util/eric/files/eric-4.4-no-pykde.patch @@ -0,0 +1,146 @@ +Index: eric4-4.4-snapshot-20091129/eric/KdeQt/__init__.py +=================================================================== +--- eric4-4.4-snapshot-20091129.orig/eric/KdeQt/__init__.py ++++ eric4-4.4-snapshot-20091129/eric/KdeQt/__init__.py +@@ -20,19 +20,6 @@ import sys + import Preferences + + if Preferences.getUI("UseKDEDialogs") and not sys.e4nokde: +- try: +- import PyKDE4 +- from PyQt4.QtCore import QString +- +- def __kdeIsKDE(): +- """ +- Public function to signal the availability of KDE4. +- +- @return availability flag (always True) +- """ +- return True +- +- except (ImportError, RuntimeError): + sys.e4nokde = True + + def __kdeKdeVersionString(): +@@ -56,96 +43,29 @@ def __kdeKdeVersionString(): + return QString("unknown") + + def __kdePyKdeVersionString(): +- """ +- Public function to return the PyKDE4 version as a string. +- +- @return PyKDE4 version as a string (QString) +- """ +- try: +- try: +- from PyKDE4.kdecore import pykde_versionMajor, pykde_versionMinor, \ +- pykde_versionRelease +- return QString("%d.%d.%d" % \ +- (pykde_versionMajor(), pykde_versionMinor(), +- pykde_versionRelease())) +- except (ImportError, AttributeError): +- from PyKDE4 import pykdeconfig +- try: +- return QString(pykdeconfig.Configuration().pykde_version_str) +- except AttributeError: +- return QString("unknown") +- except ImportError: +- return QString("unknown") ++ return QString("PyKDE support is disabled") + + from PyQt4.QtCore import QString + + def __qtIsKDE(): +- """ +- Private function to signal the availability of KDE. +- +- @return availability flag (always False) +- """ + return False + + def __qtKdeVersionString(): +- """ +- Private function to return the KDE version as a string. +- +- @return KDE version as a string (QString) (always empty) +- """ + return QString("") + + def __qtPyKdeVersionString(): +- """ +- Private function to return the PyKDE version as a string. +- +- @return PyKDE version as a string (QString) (always empty) +- """ + return QString("") + + ################################################################################ + + def isKDEAvailable(): +- """ +- Public function to signal the availability of KDE. +- +- @return availability flag (always False) +- """ +- try: +- import PyKDE4 +- return True +- except ImportError: +- return False ++ return False + + def isKDE(): +- """ +- Public function to signal, if KDE usage is enabled. +- +- @return KDE support flag (always False) +- """ +- if Preferences.getUI("UseKDEDialogs") and not sys.e4nokde: +- return __kdeIsKDE() +- else: +- return __qtIsKDE() ++ return __qtIsKDE() + + def kdeVersionString(): +- """ +- Public function to return the KDE version as a string. +- +- @return KDE version as a string (QString) (always empty) +- """ +- if isKDEAvailable(): +- return __kdeKdeVersionString() +- else: +- return __qtKdeVersionString() ++ return __qtKdeVersionString() + + def pyKdeVersionString(): +- """ +- Public function to return the PyKDE version as a string. +- +- @return PyKDE version as a string (QString) (always empty) +- """ +- if isKDEAvailable(): +- return __kdePyKdeVersionString() +- else: +- return __qtPyKdeVersionString() ++ return __qtPyKdeVersionString() +Index: eric4-4.4-snapshot-20091129/eric/eric4.py +=================================================================== +--- eric4-4.4-snapshot-20091129.orig/eric/eric4.py ++++ eric4-4.4-snapshot-20091129/eric/eric4.py +@@ -32,13 +32,12 @@ restartArgsList = ["--nokde", "--nosplas + restartArgs = [arg for arg in sys.argv[1:] if arg.split("=", 1)[0] in restartArgsList] + + # disable the usage of KDE widgets, if requested +-sys.e4nokde = False ++sys.e4nokde = True + if "--nokde" in sys.argv: + del sys.argv[sys.argv.index("--nokde")] + sys.e4nokde = True + else: +- sys.e4nokde = os.getenv("e4nokde") is not None and os.getenv("e4nokde") == "1" +- ++ print "PyKDE support has been disabled. Enable 'kde' useflag to bring it back" + if "--debug" in sys.argv: + del sys.argv[sys.argv.index("--debug")] + logging.basicConfig(level = logging.DEBUG) diff --git a/dev-util/eric/files/eric-4.5-no-interactive.patch b/dev-util/eric/files/eric-4.5-no-interactive.patch new file mode 100644 index 00000000000..37e57748e48 --- /dev/null +++ b/dev-util/eric/files/eric-4.5-no-interactive.patch @@ -0,0 +1,15 @@ +--- eric4-4.5.10/install.py ++++ eric4-4.5.10/install.py +@@ -1053,12 +1053,6 @@ + (v[0], v[1], v[2]) + print " with foreign characters. Please see 'README-PyXML.txt' for" + print " details." +- try: +- res = raw_input(" Shall pyXML be patched now (y/n)? ") +- if res in ["Y", "y"]: +- patchPyXML() +- except EOFError: +- pass + except ImportError: + pass + diff --git a/dev-util/eric/metadata.xml b/dev-util/eric/metadata.xml new file mode 100644 index 00000000000..0b863c387a3 --- /dev/null +++ b/dev-util/eric/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>qt</herd> + <upstream> + <remote-id type="sourceforge">eric-ide</remote-id> + </upstream> +</pkgmetadata> |