sci-libs/itk: Version bump. Cleaned-up ebuild and metadata.xml

Package-Manager: portage-2.2.01.22288-prefix

6 files changed, 132 insertions, 193 deletions

diff --git a/sci-libs/itk/ChangeLog b/sci-libs/itk/ChangeLog
new file mode 100644
index 000000000..618618847
--- /dev/null
+++ b/sci-libs/itk/ChangeLog
@@ -0,0 +1,9 @@
+# ChangeLog for sci-libs/itk
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*itk-4.4.2 (12 Sep 2013)
+
+  12 Sep 2013; Sébastien Fabbro <bicatali@gentoo.org> +itk-4.4.2.ebuild,
+  -files/itk-4.4-v3compat_I2VI_const-fix.patch, -itk-4.4.0.ebuild, metadata.xml:
+  sci-libs/itk: Version bump. Cleaned-up ebuild and metadata.xml
diff --git a/sci-libs/itk/Manifest b/sci-libs/itk/Manifest
index 59c9ce913..2a83eb01b 100644
--- a/sci-libs/itk/Manifest
+++ b/sci-libs/itk/Manifest
@@ -1,4 +1 @@
-AUX itk-4.4-v3compat_I2VI_const-fix.patch 788 SHA256 c2473ea2576dba5ccbdb784f638c94d4c4120f16ed69b51a5ce97a9807114dfc SHA512 e7c7cdd5dd2ff8e74065f9013ed90c2e7c83d24f510633598d2067964561ed45306ed103d91e16dba635b38f17685d70ffcdc92f53e7c82eea8832271daf0c2b WHIRLPOOL ae5604b4d3827bb7d795ca678e5c3126a0b424af7e856b671a87fe9a2ed355c7944dbc2654b5a77303fe5a9b3ef92605548602df60b7b79062467bfd5d98ee04
-DIST InsightToolkit-4.4.0.tar.gz 206144269 SHA256 b489f3e3337f8d2831442ddf541f5c352328c080f2871154543ed37642672f23 SHA512 a1515f396d03a1ae3708b816cd522a1be324b74520550b1d676c22a7054db38217ed3555bf5b5ea84c27a22a57a7db843645d96fc3f49ee47b159d935ee26bb2 WHIRLPOOL ccee2d9953780188b3be06f9658ddff1ad97e83f2f399ed64db5cf169348a8f3711f71ab317e4e87795b0424d05849c8fcff0b0330863af81a974aa07fb596a1
-EBUILD itk-4.4.0.ebuild 4447 SHA256 2cabbc84dac41fd6fc916b414f1cf51d22a524edab9f198dab7dffd2c7ea5da5 SHA512 842ea59ed987e12e7f373d8bc42438bfe6f60d0aa775d346cd002398cd85ead40bec88d357377aad542c5741781532a2580e5b6249b6d01e279da64fdc186a64 WHIRLPOOL b6cec4bf500a4cc7e6f040080d9fa61dc8ad3d94e23aff501062b622fbe95dcf79cb6d2e9fa154a8187a47313eb6a318e8a9503f98f0c742d8bc8ce3f7567422
-MISC metadata.xml 534 SHA256 4110fe80d3b4318d2cb996086da03175d107ce0fd3a9495d2642157e54817454 SHA512 cd8d56df8a2a77c9d67b699ddc64ce4076485d4df692c14729ee1c703642aa36b1f405b58658ada7c9b7f0f1411ad094cb1641e5dfbcc6ed3487c2fde2bfc782 WHIRLPOOL 1c66d5edb94c03ad6f9f0c7665cd8988f5120ecc8e952db3a574542394393576bdae8a49e663125fb2200698f0d382fc11ee435999bd851713deec541bb49e19
+DIST InsightToolkit-4.4.2.tar.gz 231905134 SHA256 071a7929c295b80bc8a6ab80d50c06cdfb0e6aafd936103c6d0a4a086cf8bec3 SHA512 c65beca4dd60aa769871bb3089cbb421729a2dcbd8bd3ec42c378ed60828e4327f1faf062f77bcca34306315a1daee6bc29d858dab9aea1c08f4843405fd21e3 WHIRLPOOL 4036bce61d0900ef2f1484ca06e9b513f6154c2233122e41fe694c648dd6eef53510749bf75368f9851a4dbd45777ca7033ad43f28c86259d5efae9e0d4200bd
diff --git a/sci-libs/itk/files/itk-4.4-v3compat_I2VI_const-fix.patch b/sci-libs/itk/files/itk-4.4-v3compat_I2VI_const-fix.patch
deleted file mode 100644
index c1b5589d4..000000000
--- a/sci-libs/itk/files/itk-4.4-v3compat_I2VI_const-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru InsightToolkit-4.4.0/Modules/Compatibility/V3Compatibility/include/itkImageToVectorImageFilter.hxx InsightToolkit-4.4.0.new/Modules/Compatibility/V3Compatibility/include/itkImageToVectorImageFilter.hxx
---- InsightToolkit-4.4.0/Modules/Compatibility/V3Compatibility/include/itkImageToVectorImageFilter.hxx	2013-05-29 22:23:15.000000000 +0200
-+++ InsightToolkit-4.4.0.new/Modules/Compatibility/V3Compatibility/include/itkImageToVectorImageFilter.hxx	2013-06-09 22:04:35.157129143 +0200
-@@ -61,7 +61,7 @@
- 
-   for ( unsigned int i = 0; i < numberOfInputs; i++ )
-     {
--    InputImageType *input = this->Superclass::GetInput(i);
-+    const InputImageType *input = this->Superclass::GetInput(i);
-     if ( !input )
-       {
-       itkExceptionMacro(<< "Input " << i << " not set!");
diff --git a/sci-libs/itk/itk-4.4.0.ebuild b/sci-libs/itk/itk-4.4.0.ebuild
deleted file mode 100644
index 3544e4e41..000000000
--- a/sci-libs/itk/itk-4.4.0.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
-
-inherit eutils toolchain-funcs cmake-utils  python-single-r1
-
-DESCRIPTION="NLM Insight Segmentation and Registration Toolkit"
-HOMEPAGE="http://www.itk.org"
-SRC_URI="mirror://sourceforge/itk/InsightToolkit-${PV}.tar.gz"
-RESTRICT="primaryuri"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="debug examples fftw itkv3compat python  review sse2 test"
-
-RDEPEND="fftw? ( sci-libs/fftw:3.0 )
-	sci-libs/hdf5[cxx]
-	virtual/jpeg
-	media-libs/libpng
-	media-libs/tiff:0
-	sys-libs/zlib
-	"
-DEPEND="${RDEPEND}
-	>=dev-util/cmake-2.8
-	python? ( ${PYTHON_DEPS}  >=dev-lang/swig-2.0 >=dev-cpp/gccxml-0.9.0_pre20120309 )
-	"
-
-MY_PN=InsightToolkit
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/itk-4.4-v3compat_I2VI_const-fix.patch"
-)
-
-pkg_pretend() {
-	missing_memsize="no"
-	if [ "x$ITK_COMPUTER_MEMORY_SIZE" = "x" ]; then
-		elog "To tune ITK to make the best use ouf working memory you should set"
-		elog "ITK_COMPUTER_MEMORY_SIZE in /etc/make.conf to the size of the "
-		elog "memory installed in your machine. For example for 4GB you do:"
-		elog ""
-		elog "   echo 'ITK_COMPUTER_MEMORY_SIZE=4' >> /etc/make.conf"
-		elog "---"
-		missing_memsize="ITK_COMPUTER_MEMORY_SIZE and"
-	fi
-
-	if use python ; then
-
-		if [ "x$ITK_WRAP_DIMS" = "x" ]; then
-			eerror "For Python language bindings it is necessary to "
-			eerror "define the dimensions you want to create bindings for"
-			eerror "by setting in ITK_WRAP_DIMS in /etc/make.conf."
-			eerror "For example, to provide bindings for 2D and 3D data do:"
-			eerror ""
-			eerror "  echo 'ITK_WRAP_DIMS=2;3' >> /etc/make.conf"
-			eerror ""
-			# Compiling with python support takes very long, therefore it is better
-			# to bailout here if one or both of above variables are not set, and ask
-			# the user to provide the values.
-			die "Missing value for ITK_WRAP_DIMS"
-
-		fi
-	fi
-}
-
-src_configure() {
-
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX:PATH=/usr
-		-DWRAP_ITK_JAVA=OFF
-		-DWRAP_ITK_TCL=OFF
-		-DITK_USE_SYSTEM_JPEG=ON
-		-DITK_USE_SYSTEM_PNG=ON
-		-DITK_USE_SYSTEM_TIFF=ON
-		-DITK_USE_SYSTEM_ZLIB=ON
-		-DITK_BUILD_ALL_MODULES=ON
-		-DITK_USE_SYSTEM_GCCXML=ON
-		-DITK_USE_SYSTEM_SWIG=ON
-		-DBUILD_SHARED_LIBS=ON
-		-DITK_USE_SYSTEM_HDF5=ON
-		$(cmake-utils_use_build examples)
-		$(cmake-utils_use_build test TESTING)
-		$(cmake-utils_use review ITK_USE_REVIEW)
-		$(cmake-utils_use itkv3compat ITKV3_COMPATIBILITY)
-		$(cmake-utils_use sse2 VNL_CONFIG_ENABLE_SSE2)
-		)
-
-	# if this is not set, it defaults to 1GB, should be okay for most people.
-	#
-	if [ "x$ITK_COMPUTER_MEMORY_SIZE" != "x" ]; then
-		mycmakeargs+=(
-			-DITK_COMPUTER_MEMORY_SIZE="$ITK_COMPUTER_MEMORY_SIZE"
-		)
-	fi
-
-	if use fftw; then
-		mycmakeargs+=(
-			-DUSE_FFTWD=ON
-			-DUSE_FFTWF=ON
-			-DUSE_SYSTEM_FFTW=ON
-			-DITK_WRAP_double=ON
-			-DITK_WRAP_vector_double=ON
-			-DITK_WRAP_covariant_vector_double=ON
-			-DITK_WRAP_complex_double=ON
-			)
-	fi
-
-	if use python; then
-		mycmakeargs+=(
-			-DITK_WRAP_PYTHON=ON
-			-DITK_WRAP_DIMS="$ITK_WRAP_DIMS"
-		)
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-
-	cmake-utils_src_install
-
-	pushd "${CMAKE_BUILD_DIR}" &> /dev/null
-
-	# install the examples
-	if use examples; then
-		# Copy Example sources
-		rm -rf $(find "Examples" -type d -a -name "CMakeFiles") \; || \
-			 die "Failed remove build files"
-
-		dodir /usr/share/${MY_PN}/examples
-
-		pushd "${S}"
-
-		cp -pPR "Examples" "${D}/usr/share/${MY_PN}/examples/src" || \
-			die "Failed to copy example files"
-
-		popd
-
-		# copy binary examples
-		insinto /usr/share/${MY_PN}/examples
-		doins -r bin
-
-		rm -rf "${D}"/usr/share/"${MY_PN}"/examples/bin/*.so* || \
-			die "Failed to remove libraries from examples directory"
-
-		# fix examples permissions
-		find "${D}/usr/share/${MY_PN}/examples/src" -type d -exec	\
-			chmod 0755 {} \; ||				\
-			die "Failed to fix example directories permissions"
-		find "${D}/usr/share/${MY_PN}/examples/src" -type f -exec	\
-			chmod 0644 {} \; ||				\
-			die "Failed to fix example files permissions"
-	fi
-	popd
-
-	echo "ITK_DATA_ROOT=${EPREFIX}/usr/share/${PN}/data" > ${T}/40${PN}
-
-	LDPATH="/usr/$(get_libdir)/InsightToolkit"
-
-	if use python; then
-		echo "PYTHONPATH=/usr/lib/InsightToolkit/WrapITK/Python" >> ${T}/40${PN}
-		LDPATH="${LDPATH}:/usr/lib/InsightToolkit/WrapITK/lib"
-	fi
-	echo "LDPATH=${LDPATH}" >> $T/40${PN}
-
-	doenvd "${T}/40${PN}"
-}
diff --git a/sci-libs/itk/itk-4.4.2.ebuild b/sci-libs/itk/itk-4.4.2.ebuild
new file mode 100644
index 000000000..542216b7e
--- /dev/null
+++ b/sci-libs/itk/itk-4.4.2.ebuild
@@ -0,0 +1,116 @@
+# Copyright 2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+
+inherit eutils toolchain-funcs cmake-utils python-single-r1
+
+MYP=InsightToolkit-${PV}
+
+DESCRIPTION="NLM Insight Segmentation and Registration Toolkit"
+HOMEPAGE="http://www.itk.org"
+SRC_URI="mirror://sourceforge/${PN}/${MYP}.tar.gz"
+
+RESTRICT="primaryuri"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug examples fftw itkv3compat python review sse2 test"
+
+RDEPEND="
+	sci-libs/hdf5[cxx]
+	virtual/jpeg
+	media-libs/libpng
+	media-libs/tiff:0
+	sys-libs/zlib
+	fftw? ( sci-libs/fftw:3.0 )
+"
+DEPEND="${RDEPEND}
+	python? ( ${PYTHON_DEPS}
+			  >=dev-lang/swig-2.0
+			  >=dev-cpp/gccxml-0.9.0_pre20120309 )
+"
+
+S="${WORKDIR}/${MYP}"
+
+pkg_pretend() {
+	if [[ -z ${ITK_COMPUTER_MEMORY_SIZE} ]]; then
+		elog "To tune ITK to make the best use ouf working memory you can set"
+		elog "    ITK_COMPUTER_MEMORY_SIZE=XX"
+		elog "in make.conf, default is 1 (unit is GB)"
+	fi
+	if use python && [[ -z ${ITK_WRAP_DIMS} ]]; then
+		elog "For Python language bindings, you can define the dimensions"
+		elog "you want to create bindings for by setting"
+		elog "    ITK_WRAP_DIMS=X;Y;Z..."
+		elog "in make.conf, default is 2;3 for 2D and 3D data"
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWRAP_ITK_JAVA=OFF
+		-DWRAP_ITK_TCL=OFF
+		-DITK_USE_SYSTEM_HDF5=ON
+		-DITK_USE_SYSTEM_JPEG=ON
+		-DITK_USE_SYSTEM_PNG=ON
+		-DITK_USE_SYSTEM_TIFF=ON
+		-DITK_USE_SYSTEM_ZLIB=ON
+		-DITK_USE_SYSTEM_GCCXML=ON
+		-DITK_USE_SYSTEM_SWIG=ON
+		-DITK_BUILD_ALL_MODULES=ON
+		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_EXAMPLES=OFF
+		-DITK_COMPUTER_MEMORY_SIZE="${ITK_COMPUTER_MEMORY_SIZE:-1}"
+		$(cmake-utils_use_build test TESTING)
+		$(cmake-utils_use review ITK_USE_REVIEW)
+		$(cmake-utils_use itkv3compat ITKV3_COMPATIBILITY)
+		$(cmake-utils_use sse2 VNL_CONFIG_ENABLE_SSE2)
+	)
+	if use fftw; then
+		mycmakeargs+=(
+			-DUSE_FFTWD=ON
+			-DUSE_FFTWF=ON
+			-DUSE_SYSTEM_FFTW=ON
+			-DITK_WRAP_double=ON
+			-DITK_WRAP_vector_double=ON
+			-DITK_WRAP_covariant_vector_double=ON
+			-DITK_WRAP_complex_double=ON
+		)
+	fi
+	if use python; then
+		mycmakeargs+=(
+			-DITK_WRAP_PYTHON=ON
+			-DITK_WRAP_DIMS="${ITK_WRAP_DIMS:-2;3}"
+		)
+	else
+		mycmakeargs+=(
+			-DITK_WRAP_PYTHON=OFF
+		)
+	fi
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		docompress -x /usr/share/doc/${PF}/examples
+		doins -r "${S}"/Examples/*
+	fi
+
+	echo "ITK_DATA_ROOT=${EROOT}/usr/share/${PN}/data" > ${T}/40${PN}
+	local ldpath="${EROOT}/usr/$(get_libdir)/InsightToolkit"
+	if use python; then
+		echo "PYTHONPATH=${EROOT}/usr/$(get_libdir)/InsightToolkit/WrapITK/Python" >> ${T}/40${PN}
+		ldpath="${ldpath}:${EROOT}/usr/$(get_libdir)/InsightToolkit/WrapITK/lib"
+	fi
+	echo "LDPATH=${ldpath}" >> ${T}/40${PN}
+
+	doenvd "${T}"/40${PN}
+}
diff --git a/sci-libs/itk/metadata.xml b/sci-libs/itk/metadata.xml
index 66b586cc9..e941d4802 100644
--- a/sci-libs/itk/metadata.xml
+++ b/sci-libs/itk/metadata.xml
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<herd>sci-biology</herd>
 <maintainer>
   <email>maintainer-wanted@gentoo.org</email>
 </maintainer>
 <longdescription lang="en">
-  ITK is a library that provides developers with an extensive suite 
-  of tools for image analysis.
+  Insight Segmentation and Registration Toolkit (ITK) is a library
+  that provides developers with an extensive suite of tools for image
+  analysis.
 </longdescription>
 <use>
-	<flag name="itkv3compat">Enable compatibility with ITK version 3</flag>
-	<flag name="review">Enable compilation of methods under review</flag>
+  <flag name="itkv3compat">Enable compatibility with ITK version 3</flag>
+  <flag name="review">Enable compilation of methods under review</flag>
 </use>
 </pkgmetadata>