diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2024-04-10 08:19:00 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2024-04-10 08:19:00 +0000 |
| commit | e0c75eb5b399a500f3a7d5c96aeb97ad9170d914 (patch) | |
| tree | c1970e296451e8198ca11693a74b278eaa91c202 | |
| parent | Merge updates from master (diff) | |
| parent | java-pkg-simple.eclass: use --module-path for ejavadoc when applicable (diff) | |
| download | gentoo-e0c75eb5b399a500f3a7d5c96aeb97ad9170d914.tar.gz gentoo-e0c75eb5b399a500f3a7d5c96aeb97ad9170d914.tar.bz2 gentoo-e0c75eb5b399a500f3a7d5c96aeb97ad9170d914.zip | |
Merge updates from master
| -rw-r--r-- | dev-python/spyder/Manifest | 4 | ||||
| -rw-r--r-- | dev-python/spyder/spyder-5.5.4.ebuild (renamed from dev-python/spyder/spyder-5.5.3.ebuild) | 7 | ||||
| -rw-r--r-- | eclass/java-pkg-simple.eclass | 15 |
3 files changed, 16 insertions, 10 deletions
diff --git a/dev-python/spyder/Manifest b/dev-python/spyder/Manifest index ae30f5ae75c3..1a5fe8c9e0bc 100644 --- a/dev-python/spyder/Manifest +++ b/dev-python/spyder/Manifest @@ -1,4 +1,4 @@ -DIST spyder-5.5.3.gh.tar.gz 16254522 BLAKE2B 4f6fcaf68a451ff2253cdda1008c854374ef96f42d4edd8614dceee61d931cabe204a3d2c1a8141ab74b165a2dc63879cc8192a4cf3c29f0418fb0d648d12f15 SHA512 001b6208ce937efb9d7aa7225659efaad921b55a6ec0d464496a93f5bd31980724ab98706f4f3e24130ea6b8943a7ad203efe47f32fc0597c15c603b492ccc3d +DIST spyder-5.5.4.gh.tar.gz 16258160 BLAKE2B 4f29db0805e1d7eed33497df0b28754cd873cfa5c6bd6c7955efc881000498a7527e413de5107ca4414f2dcbf0aa55903b1bf496626e7b470942cc5142abc152 SHA512 4f68d1edc2901b4cffb67943c782ccd89e923722579ec4144064de2ec1b6bbf89f831feb3eb58a7adf7c403efc7d2529c38017b423bb32709170915792f4deb2 DIST spyder-6.0.0_alpha4.gh.tar.gz 15503538 BLAKE2B ee896fe2c3c2afd464a8c86204f770ef08ff2fdfc68f7431d2706f76516b6e2b31c9cda8df3236cb3b85799d67f983fbbbfcdc92400a2a88f1efdcd166622f50 SHA512 8ff36feecf6ce99d90ec07fc0cc3ecab075af4e36d64ba650316a46d1f79ca1a08ca7eb2b48dee6e5eddaaafaff14445f0b687742e9a439c3e4def098e489879 DIST spyder-docs-0aa81d44ec6490c155be1bb1acca0a27328b12e0.gh.tar.gz 94895731 BLAKE2B 468412372bf2f70f838fa89dc1b88997fa2d9d92e36d6a5abac736b6b5f2782f25121b18b876c7c6e2af9d7eda433aaccd017c2e8c8c06a223420f0ce9684fc1 SHA512 9ac0f930a1a864e81e4181f101449a6506728d0d89254409a58e68bc17a3de39f4d1bf329f11da433d8ee4f3122faf3b337654d011263a70b253459e9562e923 -DIST spyder-docs-390681bc6557a051579337723c11b835d3855222.gh.tar.gz 94896996 BLAKE2B 62b7709c8a587271758a51169b269771b4b56bf32218ee3beda66c7dc7836bff89df518af61bcbb03a97374b18d4107c47f33661b388dfc92d66a93482642371 SHA512 9456ba1b891b9668006ecb1f2baa6ecfbe4df944d8bf0519c3bdf346a13b25cb1b4d272421e4b96593bc2dfc8bce2a4aa89380d2bda53b3d907f13c31a21abf7 +DIST spyder-docs-32efdaebc11dab0b8e0767717342b7d306dc06ea.gh.tar.gz 94897009 BLAKE2B 30e0b42e34bddb60d8fc986183a363b71455067bc7f4411cb75a00c5758e87501ee07ad0b484caed2aa3cf91153be814c7faf935be8665b6984bce38ebcd0be2 SHA512 9f9aa56ab27aed8d27c3d653119d5c5454b4317a78a7ff27715d91cac9dec79143db85d4f1c87b10fa821eb33abc043912df308fa6c84ade59539bd633eefbd2 diff --git a/dev-python/spyder/spyder-5.5.3.ebuild b/dev-python/spyder/spyder-5.5.4.ebuild index 7cc3cfb2d35c..45aec287fb4a 100644 --- a/dev-python/spyder/spyder-5.5.3.ebuild +++ b/dev-python/spyder/spyder-5.5.4.ebuild @@ -9,7 +9,7 @@ DISTUTILS_USE_PEP517=setuptools inherit distutils-r1 optfeature virtualx xdg # Commit of documentation to fetch -DOCS_PV="390681bc6557a051579337723c11b835d3855222" +DOCS_PV="32efdaebc11dab0b8e0767717342b7d306dc06ea" DESCRIPTION="The Scientific Python Development Environment" HOMEPAGE=" @@ -50,7 +50,8 @@ RDEPEND=" >=dev-python/qdarkstyle-3.2[${PYTHON_USEDEP}] <dev-python/qdarkstyle-3.3[${PYTHON_USEDEP}] >=dev-python/qstylizer-0.2.2[${PYTHON_USEDEP}] - >=dev-python/qtawesome-1.2.1[${PYTHON_USEDEP}] + >=dev-python/qtawesome-1.3.1[${PYTHON_USEDEP}] + <dev-python/qtawesome-1.4.0[${PYTHON_USEDEP}] >=dev-python/qtconsole-5.5.1[${PYTHON_USEDEP}] <dev-python/qtconsole-5.6.0[${PYTHON_USEDEP}] >=dev-python/QtPy-2.1.0[${PYTHON_USEDEP},pyqt5,svg,webengine] @@ -136,7 +137,6 @@ python_prepare_all() { -e "/'parso[ 0-9<=>.,]*',/d" \ -e "/'jedi[ 0-9<=>.,]*',/d" \ -e "/'pylint[ 0-9<=>.,]*',/d" \ - -e "/'qtawesome[ 0-9<=>.,]*',/d" \ setup.py || die # -e "/'ipython[ 0-9<=>.,]*',/d" \ @@ -146,7 +146,6 @@ python_prepare_all() { -e "/^PARSO_REQVER/c\PARSO_REQVER = '>=0.0.1'" \ -e "/^JEDI_REQVER/c\JEDI_REQVER = '>=0.0.1'" \ -e "/^PYLINT_REQVER/c\PYLINT_REQVER = '>=0.0.1'" \ - -e "/^QTAWESOME_REQVER/c\QTAWESOME_REQVER = '>=0.0.1'" \ spyder/dependencies.py || die # -e "/^IPYTHON_REQVER/c\IPYTHON_REQVER = '>=0.0.1'" \ diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass index 1a4bcb1b0a63..6b473ed768ed 100644 --- a/eclass/java-pkg-simple.eclass +++ b/eclass/java-pkg-simple.eclass @@ -417,11 +417,18 @@ java-pkg-simple_src_compile() { einfo "JAVADOC_SRC_DIRS exists, you need to call ejavadoc separately" else mkdir -p ${apidoc} - ejavadoc -d ${apidoc} \ - -encoding ${JAVA_ENCODING} -docencoding UTF-8 -charset UTF-8 \ - ${classpath:+-classpath ${classpath}} ${JAVADOC_ARGS:- -quiet} \ - @${sources} || die "javadoc failed" + if [[ -z ${moduleinfo} ]] || [[ ${target#1.} -lt 9 ]]; then + ejavadoc -d ${apidoc} \ + -encoding ${JAVA_ENCODING} -docencoding UTF-8 -charset UTF-8 \ + ${classpath:+-classpath ${classpath}} ${JAVADOC_ARGS:- -quiet} \ + @${sources} || die "javadoc failed" + else + ejavadoc -d ${apidoc} \ + -encoding ${JAVA_ENCODING} -docencoding UTF-8 -charset UTF-8 \ + ${classpath:+--module-path ${classpath}} ${JAVADOC_ARGS:- -quiet} \ + @${sources} || die "javadoc failed" fi + fi fi # package |