public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/sci:master commit in: sci-visualization/fsleyes/
@ 2020-09-27 15:26 Aisha Tammy
  0 siblings, 0 replies; 6+ messages in thread
From: Aisha Tammy @ 2020-09-27 15:26 UTC (permalink / raw
  To: gentoo-commits

commit:     41237dc8ba8dee5cc4e3ef45fbd57daff48b2a59
Author:     Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Sun Sep 27 13:55:01 2020 +0000
Commit:     Aisha Tammy <gentoo <AT> aisha <DOT> cc>
CommitDate: Sun Sep 27 13:55:01 2020 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=41237dc8

sci-visualization/fsleyes: fix python compat

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>

 sci-visualization/fsleyes/fsleyes-0.32.0.ebuild | 2 +-
 sci-visualization/fsleyes/fsleyes-0.32.3.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-visualization/fsleyes/fsleyes-0.32.0.ebuild b/sci-visualization/fsleyes/fsleyes-0.32.0.ebuild
index 2a0000cd8..0ff118e75 100644
--- a/sci-visualization/fsleyes/fsleyes-0.32.0.ebuild
+++ b/sci-visualization/fsleyes/fsleyes-0.32.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_7 )
 
 inherit distutils-r1 desktop virtualx
 

diff --git a/sci-visualization/fsleyes/fsleyes-0.32.3.ebuild b/sci-visualization/fsleyes/fsleyes-0.32.3.ebuild
index 836f48587..37c5a3827 100644
--- a/sci-visualization/fsleyes/fsleyes-0.32.3.ebuild
+++ b/sci-visualization/fsleyes/fsleyes-0.32.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_7 )
 
 inherit distutils-r1 desktop virtualx
 


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-visualization/fsleyes/
@ 2021-01-20 12:29 Andrew Ammerlaan
  0 siblings, 0 replies; 6+ messages in thread
From: Andrew Ammerlaan @ 2021-01-20 12:29 UTC (permalink / raw
  To: gentoo-commits

commit:     5d56a3102b8a8ce588bfcd4f09f418dc03c49cd8
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Wed Jan 20 12:29:26 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Wed Jan 20 12:29:26 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=5d56a310

sci-visualization/fsleyes: version bump

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>

 sci-visualization/fsleyes/fsleyes-0.32.3.ebuild    | 80 ----------------------
 ...fsleyes-0.32.0.ebuild => fsleyes-0.34.2.ebuild} | 47 ++++++++-----
 2 files changed, 31 insertions(+), 96 deletions(-)

diff --git a/sci-visualization/fsleyes/fsleyes-0.32.3.ebuild b/sci-visualization/fsleyes/fsleyes-0.32.3.ebuild
deleted file mode 100644
index 37c5a3827..000000000
--- a/sci-visualization/fsleyes/fsleyes-0.32.3.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 )
-
-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"
-SRC_URI="
-	https://git.fmrib.ox.ac.uk/fsl/fsleyes/fsleyes/-/archive/${PV}/${P}.tar.gz
-	https://github.com/pauldmccarthy/fsleyes/archive/${PV}.tar.gz -> ${P}.tar.gz
-	"
-
-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-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.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[${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"
-	)
-
-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() {
-	distutils-r1_python_install_all
-	doicon userdoc/images/fsleyes_icon.png
-	local size
-	for size in 16 32 128 256 512 ; do
-		doicon -s ${size} assets/icons/app_icon/${PN}.iconset/icon_${size}x${size}.png
-	done
-	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() {
-	virtx pytest -vv || die
-}

diff --git a/sci-visualization/fsleyes/fsleyes-0.32.0.ebuild b/sci-visualization/fsleyes/fsleyes-0.34.2.ebuild
similarity index 56%
rename from sci-visualization/fsleyes/fsleyes-0.32.0.ebuild
rename to sci-visualization/fsleyes/fsleyes-0.34.2.ebuild
index 0ff118e75..8c69cbc50 100644
--- a/sci-visualization/fsleyes/fsleyes-0.32.0.ebuild
+++ b/sci-visualization/fsleyes/fsleyes-0.34.2.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_7 )
+PYTHON_COMPAT=( python3_{7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1 desktop virtualx
 
@@ -17,44 +18,58 @@ 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-1.13.2[${PYTHON_USEDEP}]
+	>=dev-python/fslpy-3.1[${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.4.2[${PYTHON_USEDEP}]
+	>=dev-python/pillow-3.2.0[${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*[${PYTHON_USEDEP}]
-	sci-visualization/fsleyes-widgets[${PYTHON_USEDEP}]
-	sci-visualization/fsleyes-props[${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}]
 	"
 
 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"
 	)
 
-src_prepare() {
-	sed -i -e "s/Pillow>=3.2.0,<6.0/Pillow>=3.2.0/g" requirements.txt
-	distutils-r1_src_prepare
+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
 }
 
 python_install_all() {
@@ -62,9 +77,9 @@ python_install_all() {
 	doicon userdoc/images/fsleyes_icon.png
 	local size
 	for size in 16 32 128 256 512 ; do
-		doicon -s ${size} assets/icons/app_icon/${PN}.iconset/icon_${size}x${size}.png
+		newicon -s ${size} assets/icons/app_icon/${PN}.iconset/icon_${size}x${size}.png "${PN}.png"
 	done
-	make_desktop_entry fsleyes FSLeyes /usr/share/icons/hicolor/128x128/apps/icon_128x128.png
+	make_desktop_entry fsleyes FSLeyes "${PN}"
 }
 
 pkg_postinst() {


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-visualization/fsleyes/
@ 2021-01-20 12:31 Andrew Ammerlaan
  0 siblings, 0 replies; 6+ messages in thread
From: Andrew Ammerlaan @ 2021-01-20 12:31 UTC (permalink / raw
  To: gentoo-commits

commit:     4fe4c27bbb9d3d3d1a55c932c57da483839f918e
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Wed Jan 20 12:30:57 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Wed Jan 20 12:30:57 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=4fe4c27b

sci-visualization/fsleyes: fix postinst/postrm phases

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>

 sci-visualization/fsleyes/fsleyes-0.34.2.ebuild | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/sci-visualization/fsleyes/fsleyes-0.34.2.ebuild b/sci-visualization/fsleyes/fsleyes-0.34.2.ebuild
index 8c69cbc50..b9b221a1e 100644
--- a/sci-visualization/fsleyes/fsleyes-0.34.2.ebuild
+++ b/sci-visualization/fsleyes/fsleyes-0.34.2.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{7,8} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
-inherit distutils-r1 desktop virtualx
+inherit xdg 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"
@@ -82,13 +82,6 @@ python_install_all() {
 	make_desktop_entry fsleyes FSLeyes "${PN}"
 }
 
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
-
 python_test() {
 	virtx pytest -vv || die
 }


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-visualization/fsleyes/
@ 2021-02-01  1:54 Horea Christian
  0 siblings, 0 replies; 6+ messages in thread
From: Horea Christian @ 2021-02-01  1:54 UTC (permalink / raw
  To: gentoo-commits

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? (


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-visualization/fsleyes/
@ 2022-10-11 19:20 Andrew Ammerlaan
  0 siblings, 0 replies; 6+ messages in thread
From: Andrew Ammerlaan @ 2022-10-11 19:20 UTC (permalink / raw
  To: gentoo-commits

commit:     957a023f81d9815aba951deeb01c4f70f7013656
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 11 19:08:08 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Oct 11 19:16:54 2022 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=957a023f

sci-visualization/fsleyes: add 1.5.0

Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 sci-visualization/fsleyes/fsleyes-1.5.0.ebuild | 65 ++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)

diff --git a/sci-visualization/fsleyes/fsleyes-1.5.0.ebuild b/sci-visualization/fsleyes/fsleyes-1.5.0.ebuild
new file mode 100644
index 000000000..83fe78c68
--- /dev/null
+++ b/sci-visualization/fsleyes/fsleyes-1.5.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_PEP517=setuptools
+inherit xdg 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"
+SRC_URI="
+	https://git.fmrib.ox.ac.uk/fsl/fsleyes/fsleyes/-/archive/${PV}/${P}.tar.gz
+	https://github.com/pauldmccarthy/fsleyes/archive/${PV}.tar.gz -> ${P}.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/fslpy-3.9[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2[${PYTHON_USEDEP}]
+	>=dev-python/matplotlib-1.5.1[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.14[${PYTHON_USEDEP}]
+	>=dev-python/pillow-3.2.0[${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/wxpython-4[${PYTHON_USEDEP}]
+	>=dev-python/scipy-0.18[${PYTHON_USEDEP}]
+	>=sci-libs/nibabel-2.3[${PYTHON_USEDEP}]
+	>=sci-visualization/fsleyes-widgets-0.12.3[${PYTHON_USEDEP}]
+	>=sci-visualization/fsleyes-props-1.8[${PYTHON_USEDEP}]
+	"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.26.2-fsldir.patch"
+)
+
+distutils_enable_tests pytest
+distutils_enable_sphinx userdoc dev-python/sphinx_rtd_theme
+
+python_prepare_all() {
+	# do not depend on pytest-cov
+	sed -i -e '/addopts/d' setup.cfg || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	doicon -s 48 fsleyes/assets/linux/hicolor/48x48/apps/*.png
+	domenu fsleyes/assets/linux/*.desktop
+	insinto /usr/share/metainfo
+	doins fsleyes/assets/linux/*.appdata.xml
+	local size
+	for size in 16 32 128 256 512 ; do
+		newicon -s ${size} fsleyes/assets/icons/app_icon/${PN}.iconset/icon_${size}x${size}.png "${PN}.png"
+	done
+}
+
+python_test() {
+	virtx epytest
+}


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-visualization/fsleyes/
@ 2022-10-11 19:20 Andrew Ammerlaan
  0 siblings, 0 replies; 6+ messages in thread
From: Andrew Ammerlaan @ 2022-10-11 19:20 UTC (permalink / raw
  To: gentoo-commits

commit:     fa2a4ce12d39391486ec58da56e45b64c5df934a
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 11 19:17:45 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Oct 11 19:17:45 2022 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=fa2a4ce1

sci-visualization/fsleyes: drop 1.3.3

Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 sci-visualization/fsleyes/fsleyes-1.3.3.ebuild | 65 --------------------------
 1 file changed, 65 deletions(-)

diff --git a/sci-visualization/fsleyes/fsleyes-1.3.3.ebuild b/sci-visualization/fsleyes/fsleyes-1.3.3.ebuild
deleted file mode 100644
index ac86c16fd..000000000
--- a/sci-visualization/fsleyes/fsleyes-1.3.3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit xdg 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"
-SRC_URI="
-	https://git.fmrib.ox.ac.uk/fsl/fsleyes/fsleyes/-/archive/${PV}/${P}.tar.gz
-	https://github.com/pauldmccarthy/fsleyes/archive/${PV}.tar.gz -> ${P}.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-python/fslpy-3.6[${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/pyopengl-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/pyopengl_accelerate-3.1.0[${PYTHON_USEDEP}]
-	=dev-python/pyparsing-2*[${PYTHON_USEDEP}]
-	>=dev-python/wxpython-4[${PYTHON_USEDEP}]
-	>=dev-python/scipy-0.18[${PYTHON_USEDEP}]
-	>=sci-libs/nibabel-2.3[${PYTHON_USEDEP}]
-	>=sci-visualization/fsleyes-widgets-0.12[${PYTHON_USEDEP}]
-	>=sci-visualization/fsleyes-props-1.7.2[${PYTHON_USEDEP}]
-	"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.26.2-fsldir.patch"
-)
-
-distutils_enable_tests pytest
-distutils_enable_sphinx userdoc dev-python/sphinx_rtd_theme
-
-python_prepare_all() {
-	# do not depend on pytest-cov
-	sed -i -e '/addopts/d' setup.cfg || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doicon -s 48 fsleyes/assets/linux/hicolor/48x48/apps/*.png
-	domenu fsleyes/assets/linux/*.desktop
-	insinto /usr/share/metainfo
-	doins fsleyes/assets/linux/*.appdata.xml
-	local size
-	for size in 16 32 128 256 512 ; do
-		newicon -s ${size} fsleyes/assets/icons/app_icon/${PN}.iconset/icon_${size}x${size}.png "${PN}.png"
-	done
-}
-
-python_test() {
-	virtx epytest
-}


^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2022-10-11 19:20 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-01-20 12:29 [gentoo-commits] proj/sci:master commit in: sci-visualization/fsleyes/ Andrew Ammerlaan
  -- strict thread matches above, loose matches on Subject: below --
2022-10-11 19:20 Andrew Ammerlaan
2022-10-11 19:20 Andrew Ammerlaan
2021-02-01  1:54 Horea Christian
2021-01-20 12:31 Andrew Ammerlaan
2020-09-27 15:26 Aisha Tammy

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox