From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 009F21381F3 for ; Wed, 11 Sep 2013 17:27:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BAAF3E0BEC; Wed, 11 Sep 2013 17:27:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 326C2E0BE4 for ; Wed, 11 Sep 2013 17:27:21 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0A6D133EB36 for ; Wed, 11 Sep 2013 17:27:10 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 4F988E5467 for ; Wed, 11 Sep 2013 17:27:08 +0000 (UTC) From: "Nicolas Bock" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nicolas Bock" Message-ID: <1370992434.af6f650de9f95b3d10549adf070e4c8c0accd9a8.nicolasbock@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/itk/ X-VCS-Repository: proj/sci X-VCS-Files: sci-libs/itk/itk-4.4.0.ebuild sci-libs/itk/metadata.xml X-VCS-Directories: sci-libs/itk/ X-VCS-Committer: nicolasbock X-VCS-Committer-Name: Nicolas Bock X-VCS-Revision: af6f650de9f95b3d10549adf070e4c8c0accd9a8 X-VCS-Branch: master Date: Wed, 11 Sep 2013 17:27:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 1a7dd5b0-c1fc-46a2-b3eb-c6a4f74ddb6c X-Archives-Hash: fdc2d040acf3a133b5a6f72b10c728ef commit: af6f650de9f95b3d10549adf070e4c8c0accd9a8 Author: Gert Wollny gmail com> AuthorDate: Tue Jun 11 23:09:13 2013 +0000 Commit: Nicolas Bock gmail com> CommitDate: Tue Jun 11 23:13:54 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=af6f650d Further cleaup the ebuild: - correct indentions - remove patented use flag since it is an unused leftover from the itk-3.X times - remove some out-commented lines --- sci-libs/itk/itk-4.4.0.ebuild | 45 ++++++++++++++----------------------------- sci-libs/itk/metadata.xml | 1 - 2 files changed, 14 insertions(+), 32 deletions(-) diff --git a/sci-libs/itk/itk-4.4.0.ebuild b/sci-libs/itk/itk-4.4.0.ebuild index dfa9489..8e522b6 100644 --- a/sci-libs/itk/itk-4.4.0.ebuild +++ b/sci-libs/itk/itk-4.4.0.ebuild @@ -16,7 +16,7 @@ RESTRICT="primaryuri" LICENSE="Apache-2.0" SLOT="0" KEYWORDS="~x86 ~amd64" -IUSE="debug examples fftw hdf5 itkv3compat patented python review test" +IUSE="debug examples fftw hdf5 itkv3compat python review test" RDEPEND="fftw? ( sci-libs/fftw:3.0 ) hdf5? ( sci-libs/hdf5[cxx] ) @@ -27,7 +27,7 @@ RDEPEND="fftw? ( sci-libs/fftw:3.0 ) " DEPEND="${RDEPEND} >=dev-util/cmake-2.8 - python? ( >=dev-lang/python-2.5 >=dev-lang/swig-2.0 >=dev-cpp/gccxml-0.9.0_pre20120309 ) + python? ( ${PYTHON_DEPS} >=dev-lang/swig-2.0 >=dev-cpp/gccxml-0.9.0_pre20120309 ) " MY_PN=InsightToolkit @@ -75,23 +75,22 @@ src_configure() { fi 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_COMPUTER_MEMORY_SIZE="$ITK_COMPUTER_MEMORY_SIZE" + -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_COMPUTER_MEMORY_SIZE="$ITK_COMPUTER_MEMORY_SIZE" $(cmake-utils_use_build examples) $(cmake-utils_use_build test TESTING) $(cmake-utils_use hdf5 ITK_USE_SYSTEM_HDF5) $(cmake-utils_use review ITK_USE_REVIEW) - $(cmake-utils_use patented ITK_USE_PATENTED) ) if use itkv3compat; then @@ -120,11 +119,6 @@ src_configure() { cmake-utils_src_configure } -#src_compile() { -# cd "${WORKDIR}/${PN}-${PV}_build" -# emake || die "emake failed" -#} - src_install() { cmake-utils_src_install @@ -176,14 +170,3 @@ src_install() { doenvd "${T}/40${PN}" } - -pkg_postinst() { - - if use patented; then - ewarn "Using patented code in ITK may require a license." - ewarn "For more information, please read:" - ewarn "http://www.itk.org/HTML/Copyright.htm" - ewarn "http://www.itk.org/Wiki/ITK_Patent_Bazaar" - fi - -} diff --git a/sci-libs/itk/metadata.xml b/sci-libs/itk/metadata.xml index 632be3d..25bf3dd 100644 --- a/sci-libs/itk/metadata.xml +++ b/sci-libs/itk/metadata.xml @@ -11,7 +11,6 @@ Use review statistics - Compile patented algorithms Enable compilation of mehods under review