[gentoo-commits] proj/sci:master commit in: sci-libs/simpleitk/

2022-07-11 Thread Horea Christian
commit: a86429cc5183e439e13405dcc1a4fc1e0968725e
Author: Horea Christian  chymera  eu>
AuthorDate: Mon Jul 11 14:06:16 2022 +
Commit: Horea Christian  gmail  com>
CommitDate: Mon Jul 11 14:06:16 2022 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=a86429cc

sci-libs/simpleitk: EAPI and PYTHON_COMPAT bump

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Horea Christian  chymera.eu>

 sci-libs/simpleitk/simpleitk-1.2.4.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sci-libs/simpleitk/simpleitk-1.2.4.ebuild 
b/sci-libs/simpleitk/simpleitk-1.2.4.ebuild
index 8a3bf5f5a..fa9a721e3 100644
--- a/sci-libs/simpleitk/simpleitk-1.2.4.ebuild
+++ b/sci-libs/simpleitk/simpleitk-1.2.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 LUA_COMPAT=( lua5-{1..3} )
 
 inherit lua-single cmake python-single-r1



[gentoo-commits] proj/sci:master commit in: sci-libs/simpleitk/

2021-12-16 Thread Andrew Ammerlaan
commit: b2e5ef2f4318714b8cb9cb8ed7a0b3deaeaffda2
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Thu Dec 16 10:48:17 2021 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Thu Dec 16 10:48:17 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=b2e5ef2f

sci-libs/simpleitk: drop UnusedInherits

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-libs/simpleitk/simpleitk-1.2.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/simpleitk/simpleitk-1.2.4.ebuild 
b/sci-libs/simpleitk/simpleitk-1.2.4.ebuild
index afc114669..8a3bf5f5a 100644
--- a/sci-libs/simpleitk/simpleitk-1.2.4.ebuild
+++ b/sci-libs/simpleitk/simpleitk-1.2.4.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{7..9} )
 LUA_COMPAT=( lua5-{1..3} )
 
-inherit lua-single toolchain-funcs cmake python-single-r1
+inherit lua-single cmake python-single-r1
 
 MY_PN="SimpleITK"
 



[gentoo-commits] proj/sci:master commit in: sci-libs/simpleitk/

2021-08-31 Thread Andrew Ammerlaan
commit: bfb01f2d1b4d5b7f4cba8151cec18a828f7ae0a3
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Tue Aug 31 09:43:54 2021 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Tue Aug 31 09:43:54 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=bfb01f2d

sci-libs/simpleitk: remove unknown RESTRICT

Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-libs/simpleitk/simpleitk-1.2.4.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sci-libs/simpleitk/simpleitk-1.2.4.ebuild 
b/sci-libs/simpleitk/simpleitk-1.2.4.ebuild
index d8324a014..afc114669 100644
--- a/sci-libs/simpleitk/simpleitk-1.2.4.ebuild
+++ b/sci-libs/simpleitk/simpleitk-1.2.4.ebuild
@@ -16,7 +16,6 @@ SRC_URI="

https://github.com/SimpleITK/SimpleITK/releases/download/v${PV}/SimpleITK-${PV}.tar.gz

https://github.com/SimpleITK/SimpleITK/releases/download/v${PV}/SimpleITKData-${PV}.tar.gz
 "
-RESTRICT="primaryuri"
 
 LICENSE="Apache-2.0"
 SLOT="0"



[gentoo-commits] proj/sci:master commit in: sci-libs/simpleitk/

2021-02-12 Thread Sam James
commit: 6e935f5b03eb6ea1e71c72b5a68a356575e590e4
Author: Sam James  gentoo  org>
AuthorDate: Fri Feb 12 21:32:49 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb 12 21:32:49 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=6e935f5b

sci-libs/simpleitk: drop ChangeLog

::gentoo dropped these post-git migration, but
this contained an invalid email anyway.

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 sci-libs/simpleitk/ChangeLog | 10 --
 1 file changed, 10 deletions(-)

diff --git a/sci-libs/simpleitk/ChangeLog b/sci-libs/simpleitk/ChangeLog
deleted file mode 100644
index 308cd02b7..0
--- a/sci-libs/simpleitk/ChangeLog
+++ /dev/null
@@ -1,10 +0,0 @@
-  27 Nov 2020;   +files/0dfae3e_reversed.patch,
-  +files/77a3d89_reversed.patch, +files/simpleitk-1.2.4-int-cast.patch,
-  +files/simpleitk-1.2.4-module.patch, -simpleitk-1.2.3.ebuild,
-  simpleitk-1.2.4.ebuild, simpleitk-2.0.0.ebuild:
-  sci-libs/simpleitk: new package ahead of Gentoo Science
-
-*simpleitk-2.0.0 (25 Sep 2020)
-
-  25 Sep 2020;   +metadata.xml, +simpleitk-2.0.0.ebuild:
-  sci-libs/simpleitk: new package ahead of Gentoo Science



[gentoo-commits] proj/sci:master commit in: sci-libs/simpleitk/

2021-02-12 Thread Sam James
commit: c136fc7e63792438dd329548975e49f5e5e1
Author: Sam James  gentoo  org>
AuthorDate: Fri Feb 12 21:30:46 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb 12 21:30:46 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=c136fc7e

sci-libs/simpleitk: fix incorrect non-slotted Lua dependency

* We let the eclass figure out the dependencies on Lua for us
  via ${LUA_DEPS}. Hardcoding a single Lua version is contradictory.

* If we were to depend on a single version, we should still
  let the Lua eclass do this, but we should depend on the
  slotted ebuild (e.g. :5.1) if we are to do it at all,
  not the unslotted :0.

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 sci-libs/simpleitk/simpleitk-1.2.4.ebuild | 8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/sci-libs/simpleitk/simpleitk-1.2.4.ebuild 
b/sci-libs/simpleitk/simpleitk-1.2.4.ebuild
index ef20b6629..383d63268 100644
--- a/sci-libs/simpleitk/simpleitk-1.2.4.ebuild
+++ b/sci-libs/simpleitk/simpleitk-1.2.4.ebuild
@@ -25,17 +25,15 @@ KEYWORDS="~amd64 ~x86"
 IUSE="python"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
+BDEPEND="dev-lang/swig"
 RDEPEND="
-   dev-lang/lua:0
+   ${LUA_DEPS}
dev-cpp/gtest
sci-libs/itk
dev-python/virtualenv
python? ( ${PYTHON_DEPS} )
 "
-DEPEND="
-   ${RDEPEND}
-   dev-lang/swig
-"
+DEPEND="${RDEPEND}"
 
 PATCHES=(
"${FILESDIR}/${P}-module.patch"



[gentoo-commits] proj/sci:master commit in: sci-libs/simpleitk/

2021-01-19 Thread Andrew Ammerlaan
commit: a8ef7d64b496c3ab7286f78cf8a923d3aa27c6d5
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Tue Jan 19 16:49:38 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Tue Jan 19 16:49:38 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=a8ef7d64

sci-libs/simpleitk: add python deps

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

 sci-libs/simpleitk/simpleitk-1.2.4.ebuild | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sci-libs/simpleitk/simpleitk-1.2.4.ebuild 
b/sci-libs/simpleitk/simpleitk-1.2.4.ebuild
index bd37550a8..ef20b6629 100644
--- a/sci-libs/simpleitk/simpleitk-1.2.4.ebuild
+++ b/sci-libs/simpleitk/simpleitk-1.2.4.ebuild
@@ -21,13 +21,16 @@ RESTRICT="primaryuri"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+
 IUSE="python"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
dev-lang/lua:0
dev-cpp/gtest
sci-libs/itk
dev-python/virtualenv
+   python? ( ${PYTHON_DEPS} )
 "
 DEPEND="
${RDEPEND}



[gentoo-commits] proj/sci:master commit in: sci-libs/simpleitk/

2021-01-06 Thread Andrew Ammerlaan
commit: 84af6e5a12e998df40a8bb7893766193f5a87ac4
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Wed Jan  6 09:36:45 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Wed Jan  6 09:36:45 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=84af6e5a

sci-libs/simpleitk: drop keywords not available in itk dep

can't add keywords to itk, cause its dep dcmtk does not
have those keywords

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan  riseup.net>

 sci-libs/simpleitk/simpleitk-1.2.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/simpleitk/simpleitk-1.2.4.ebuild 
b/sci-libs/simpleitk/simpleitk-1.2.4.ebuild
index 331a5d23c..bd37550a8 100644
--- a/sci-libs/simpleitk/simpleitk-1.2.4.ebuild
+++ b/sci-libs/simpleitk/simpleitk-1.2.4.ebuild
@@ -20,7 +20,7 @@ RESTRICT="primaryuri"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="python"
 
 RDEPEND="



[gentoo-commits] proj/sci:master commit in: sci-libs/simpleitk/files/, sci-libs/simpleitk/

2021-01-02 Thread Horea Christian
commit: a60da02d4be89f4e8dc338ffd488ef88dbe388a4
Author: Horea Christian  chymera  eu>
AuthorDate: Sun Jan  3 07:04:02 2021 +
Commit: Horea Christian  gmail  com>
CommitDate: Sun Jan  3 07:06:20 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=a60da02d

sci-libs/simpleitk: new package

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Horea Christian  chymera.eu>

 sci-libs/simpleitk/ChangeLog   | 10 
 .../simpleitk/files/simpleitk-1.2.4-int-cast.patch | 64 +
 .../simpleitk/files/simpleitk-1.2.4-module.patch   | 22 
 sci-libs/simpleitk/metadata.xml| 19 +++
 sci-libs/simpleitk/simpleitk-1.2.4.ebuild  | 65 ++
 5 files changed, 180 insertions(+)

diff --git a/sci-libs/simpleitk/ChangeLog b/sci-libs/simpleitk/ChangeLog
new file mode 100644
index 0..308cd02b7
--- /dev/null
+++ b/sci-libs/simpleitk/ChangeLog
@@ -0,0 +1,10 @@
+  27 Nov 2020;   +files/0dfae3e_reversed.patch,
+  +files/77a3d89_reversed.patch, +files/simpleitk-1.2.4-int-cast.patch,
+  +files/simpleitk-1.2.4-module.patch, -simpleitk-1.2.3.ebuild,
+  simpleitk-1.2.4.ebuild, simpleitk-2.0.0.ebuild:
+  sci-libs/simpleitk: new package ahead of Gentoo Science
+
+*simpleitk-2.0.0 (25 Sep 2020)
+
+  25 Sep 2020;   +metadata.xml, +simpleitk-2.0.0.ebuild:
+  sci-libs/simpleitk: new package ahead of Gentoo Science

diff --git a/sci-libs/simpleitk/files/simpleitk-1.2.4-int-cast.patch 
b/sci-libs/simpleitk/files/simpleitk-1.2.4-int-cast.patch
new file mode 100644
index 0..9477194c4
--- /dev/null
+++ b/sci-libs/simpleitk/files/simpleitk-1.2.4-int-cast.patch
@@ -0,0 +1,64 @@
+From 73caeaa545859cffd68f9aebe1e8b66de5ab812d Mon Sep 17 00:00:00 2001
+From: Bradley Lowekamp 
+Date: Fri, 14 Feb 2020 09:35:29 -0500
+Subject: [PATCH] Explicitly cast int to ITK strongly typed enums
+
+---
+ Code/IO/src/sitkImageReaderBase.cxx | 12 ++--
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/Code/IO/src/sitkImageReaderBase.cxx 
b/Code/IO/src/sitkImageReaderBase.cxx
+index b8c93a2ac..a5e6d9cd9 100644
+--- a/Code/IO/src/sitkImageReaderBase.cxx
 b/Code/IO/src/sitkImageReaderBase.cxx
+@@ -214,7 +214,7 @@ ::GetPixelIDFromImageIO( const ImageIOBase *iobase,
+   if (numberOfComponents == 1 &&
+   ( pixelType == itk::ImageIOBase::SCALAR || pixelType == 
itk::ImageIOBase::COMPLEX ) )
+ {
+-outPixelType = this->ExecuteInternalReadScalar( componentType );
++outPixelType = this->ExecuteInternalReadScalar( 
static_cast(componentType) );
+ return;
+ }
+   // we try to load anything else into a VectorImage
+@@ -226,12 +226,12 @@ ::GetPixelIDFromImageIO( const ImageIOBase *iobase,
+ pixelType == itk::ImageIOBase::POINT ||
+ pixelType == itk::ImageIOBase::OFFSET )
+ {
+-outPixelType = this->ExecuteInternalReadVector( componentType );
++outPixelType = this->ExecuteInternalReadVector( 
static_cast(componentType) );
+ return;
+ }
+   else if ( pixelType == itk::ImageIOBase::COMPLEX )
+ {
+-outPixelType = this->ExecuteInternalReadComplex( componentType );
++outPixelType = this->ExecuteInternalReadComplex( 
static_cast(componentType) );
+ return;
+ }
+   else
+@@ -268,7 +268,7 @@ ::ExecuteInternalReadScalar( int componentType )
+ {
+   const unsigned int UnusedDimension = 2;
+ 
+-  switch(componentType)
++  switch(static_cast(componentType))
+ {
+ case itk::ImageIOBase::CHAR:
+   return ImageTypeToPixelIDValue< itk::Image 
>::Result;
+@@ -326,7 +326,7 @@ ::ExecuteInternalReadComplex( int componentType )
+ {
+   const unsigned int UnusedDimension = 2;
+ 
+-  switch(componentType)
++  switch(static_cast(componentType))
+ {
+ case itk::ImageIOBase::FLOAT:
+   return ImageTypeToPixelIDValue< itk::Image, 
UnusedDimension> >::Result;
+@@ -346,7 +346,7 @@ ::ExecuteInternalReadVector( int componentType )
+ {
+   const unsigned int UnusedDimension = 2;
+ 
+-  switch(componentType)
++  switch(static_cast(componentType))
+ {
+ case itk::ImageIOBase::CHAR:
+   return ImageTypeToPixelIDValue< itk::VectorImage >::Result;

diff --git a/sci-libs/simpleitk/files/simpleitk-1.2.4-module.patch 
b/sci-libs/simpleitk/files/simpleitk-1.2.4-module.patch
new file mode 100644
index 0..9b40d5e02
--- /dev/null
+++ b/sci-libs/simpleitk/files/simpleitk-1.2.4-module.patch
@@ -0,0 +1,22 @@
+From 9a9f67416683d69c1c8d2362ba6e50c4848803b2 Mon Sep 17 00:00:00 2001
+From: Bradley Lowekamp 
+Date: Wed, 20 Nov 2019 15:30:50 -0500
+Subject: [PATCH] Update SLICImageFilter's module
+
+---
+ Code/BasicFilters/json/SLICImageFilter.json | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Code/BasicFilters/json/SLICImageFilter.json 
b/Code/BasicFilters/json/SLICImageFilter.json
+index 2ffba2f4c..0e9ced7d7 100644
+--- a/Code/BasicFilters/json/SLICImageFilter.json