[gentoo-commits] proj/sci:master commit in: sci-visualization/fsleyes/

[Horea Christian]

commit:     a3babd9de1be7a1cf9dd33b3835738e23c441f1f
Author:     Horea Christian <chr <AT> chymera <DOT> eu>
AuthorDate: Mon Feb  1 01:54:25 2021 +0000
Commit:     Horea Christian <horea.christ <AT> gmail <DOT> com>
CommitDate: Mon Feb  1 01:54:25 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=a3babd9d

sci-visualization/fsleyes: keep old version

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Horea Christian <chr <AT> chymera.eu>

 ...fsleyes-0.34.2.ebuild => fsleyes-0.32.3.ebuild} | 53 ++++++++++------------
 sci-visualization/fsleyes/fsleyes-0.34.2.ebuild    |  3 +-
 2 files changed, 25 insertions(+), 31 deletions(-)

diff --git a/sci-visualization/fsleyes/fsleyes-0.34.2.ebuild b/sci-visualization/fsleyes/fsleyes-0.32.3.ebuild
similarity index 56%
copy from sci-visualization/fsleyes/fsleyes-0.34.2.ebuild
copy to sci-visualization/fsleyes/fsleyes-0.32.3.ebuild
index b9b221a1e..5c98f015d 100644
--- a/sci-visualization/fsleyes/fsleyes-0.34.2.ebuild
+++ b/sci-visualization/fsleyes/fsleyes-0.32.3.ebuild
@@ -4,9 +4,8 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
 
-inherit xdg distutils-r1 desktop virtualx
+inherit distutils-r1 desktop virtualx
 
 DESCRIPTION="The new FSL image viewer, released with FSL 5.0.10"
 HOMEPAGE="https://git.fmrib.ox.ac.uk/fsl/fsleyes/fsleyes/tree/master"
@@ -18,58 +17,45 @@ SRC_URI="
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+IUSE="test"
 
 DEPEND="
 	test? (
 		${RDEPEND}
 		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
 		)
+	dev-python/setuptools[${PYTHON_USEDEP}]
 	"
 
 RDEPEND="
-	>=dev-python/fslpy-3.1[${PYTHON_USEDEP}]
+	>=dev-python/fslpy-1.13.2[${PYTHON_USEDEP}]
 	=dev-python/jinja-2*[${PYTHON_USEDEP}]
 	>=dev-python/matplotlib-1.5.1[${PYTHON_USEDEP}]
 	>=dev-python/numpy-1.14.0[${PYTHON_USEDEP}]
-	>=dev-python/pillow-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pillow-3.4.2[${PYTHON_USEDEP}]
 	>=dev-python/pyopengl-3.1.0[${PYTHON_USEDEP}]
 	>=dev-python/pyopengl_accelerate-3.1.0[${PYTHON_USEDEP}]
 	=dev-python/pyparsing-2*[${PYTHON_USEDEP}]
 	=dev-python/six-1*[${PYTHON_USEDEP}]
 	>=dev-python/wxpython-3.0.2.0[${PYTHON_USEDEP}]
 	>=dev-python/scipy-0.18[${PYTHON_USEDEP}]
-	>=sci-libs/nibabel-2.3[${PYTHON_USEDEP}]
-	>=sci-visualization/fsleyes-widgets-0.8.4[${PYTHON_USEDEP}]
-	>=sci-visualization/fsleyes-props-1.6.7[${PYTHON_USEDEP}]
+	sci-libs/nibabel[${PYTHON_USEDEP}]
+	sci-visualization/fsleyes-widgets[${PYTHON_USEDEP}]
+	sci-visualization/fsleyes-props[${PYTHON_USEDEP}]
 	"
+#=sci-libs/nibabel-2*[${PYTHON_USEDEP}]
 
 PATCHES=(
 	"${FILESDIR}/${PN}-0.26.2-fsldir.patch"
+	"${FILESDIR}/${PN}-0.32.0-coverage.patch"
 	"${FILESDIR}/${PN}-0.32.0-tests_timeout.patch"
 	"${FILESDIR}/${PN}-0.32.0-tests_fail.patch"
 	)
 
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# do not depend on pytest-cov
-	sed -i -e '/addopts/d' setup.cfg || die
-
-	# Fatal Python error: Segmentation fault
-	sed -i -e 's:test_crop:_&:' \
-		tests/test_ortho_cropmode.py || die
-	sed -i -e 's:test_fillSelection:_&:' \
-		tests/test_ortho_editmode.py || die
-
-	# KeyError: 'Unknown atlas ID: harvardoxford-cortical'
-	sed -i -e 's:test_atlaspanel_toggleOverlay:_&:' \
-		tests/test_atlaspanel.py || die
-
-	# This hangs forever
-	sed -i -e 's:test_lightbox:_&:' \
-		tests/test_layouts.py || die
-
-	distutils-r1_python_prepare_all
+src_prepare() {
+	sed -i -e "s/Pillow>=3.2.0,<6.0/Pillow>=3.2.0/g" requirements.txt
+	distutils-r1_src_prepare
 }
 
 python_install_all() {
@@ -77,9 +63,16 @@ python_install_all() {
 	doicon userdoc/images/fsleyes_icon.png
 	local size
 	for size in 16 32 128 256 512 ; do
-		newicon -s ${size} assets/icons/app_icon/${PN}.iconset/icon_${size}x${size}.png "${PN}.png"
+		doicon -s ${size} assets/icons/app_icon/${PN}.iconset/icon_${size}x${size}.png
 	done
-	make_desktop_entry fsleyes FSLeyes "${PN}"
+	make_desktop_entry fsleyes FSLeyes /usr/share/icons/hicolor/128x128/apps/icon_128x128.png
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+pkg_postrm() {
+	gnome2_icon_cache_update
 }
 
 python_test() {

diff --git a/sci-visualization/fsleyes/fsleyes-0.34.2.ebuild b/sci-visualization/fsleyes/fsleyes-0.34.2.ebuild
index b9b221a1e..36533c5a8 100644
--- a/sci-visualization/fsleyes/fsleyes-0.34.2.ebuild
+++ b/sci-visualization/fsleyes/fsleyes-0.34.2.ebuild
@@ -17,7 +17,8 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+# hard masked dependency  >=dev-python/fslpy-3.1
+KEYWORDS=""
 
 DEPEND="
 	test? (