aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Maier <tamiko@gentoo.org>2014-12-24 16:59:32 +0100
committerMatthias Maier <tamiko@gentoo.org>2014-12-24 16:59:32 +0100
commit7683d8ca3b693cbf57b7f7be013f9a5fe7705983 (patch)
treefbe27eef5e2f5215be2faa6dca081b559b8a3e65 /sci-libs
parentMerge pull request #305 from sargas/pywcsgrid2-py3.4 (diff)
downloadsci-7683d8ca3b693cbf57b7f7be013f9a5fe7705983.tar.gz
sci-7683d8ca3b693cbf57b7f7be013f9a5fe7705983.tar.bz2
sci-7683d8ca3b693cbf57b7f7be013f9a5fe7705983.zip
version bump; ebuild maintenance; fix SRC_URI
Package-Manager: portage-2.2.15
Diffstat (limited to 'sci-libs')
-rw-r--r--sci-libs/dealii/ChangeLog8
-rw-r--r--sci-libs/dealii/Manifest6
-rw-r--r--sci-libs/dealii/dealii-8.1.0-r2.ebuild (renamed from sci-libs/dealii/dealii-8.1.0-r1.ebuild)61
l---------sci-libs/dealii/dealii-8.2.0_rc2.ebuild1
-rw-r--r--sci-libs/dealii/dealii-9999.ebuild69
-rw-r--r--sci-libs/dealii/metadata.xml1
6 files changed, 85 insertions, 61 deletions
diff --git a/sci-libs/dealii/ChangeLog b/sci-libs/dealii/ChangeLog
index 9253cf714..fe63a385f 100644
--- a/sci-libs/dealii/ChangeLog
+++ b/sci-libs/dealii/ChangeLog
@@ -2,6 +2,14 @@
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*dealii-8.1.0-r2 (24 Dec 2014)
+*dealii-8.2.0_rc2 (24 Dec 2014)
+
+ 24 Dec 2014; Matthias Maier <tamiko@gentoo.org> +dealii-8.1.0-r2.ebuild,
+ +dealii-8.2.0_rc2.ebuild, -dealii-8.1.0-r1.ebuild, dealii-9999.ebuild,
+ metadata.xml:
+ version bump; ebuild maintenance; fix SRC_URI
+
*dealii-8.1.0-r1 (14 Oct 2014)
14 Oct 2014; Matthias Maier <tamiko@gentoo.org> +dealii-8.1.0-r1.ebuild,
diff --git a/sci-libs/dealii/Manifest b/sci-libs/dealii/Manifest
index 7e8d9e844..8b8f6c2f6 100644
--- a/sci-libs/dealii/Manifest
+++ b/sci-libs/dealii/Manifest
@@ -1,2 +1,4 @@
-DIST deal.II-8.1.0.tar.gz 13353502 SHA256 d666bbda2a17b41b80221d7029468246f2658051b8c00d9c5907cd6434c4df99 SHA512 9d6e913e7a8c54f386839d031f2931a74e8ac6e7db8693c201a11ec6ca34962626a42a57b727297c9f3d8b9efebddb4f2397c27bbee4212e726ce2714f1c3f70 WHIRLPOOL 8cd7aeb47c28bc473bb24d1632f6074de893b20d995d6077c80b88834693b8f9ad1aee181b7abda55a5567efa6c6d169da4c6061cd939b63351330f7e4b767c5
-DIST deal.offlinedoc-8.1.0.tar.gz 96129401 SHA256 cf40f7f231f47329069bc3046c144d7337efa7277d91af7b45eb5931de379b51 SHA512 0e5ac59727912dbd8cf228f93d8ab071b8f42c9a5c4393ffd44b9e7f4718a7cb50e93ebf19745f3ad6a37fc6f28c5a8906e3493488bc20a9492711b488119080 WHIRLPOOL 7e9c7a08cc81916664f4e093b6e31b2c519e7313badb5526277fb959386b3162fa57d6f1cf3dd8c0744aad46eb8ed54f308656a06e8efd97dd85ef8ea489b343
+DIST dealii-8.1.0-offline_documentation.tar.gz 96865280 SHA256 c39f309ff5296a05dfdc1b8e585ddcfe658794f16bbd9f235bdf7b5e00558b65 SHA512 9ff9ab5bcdbe3b1d127a6580f9b5d39dfc5b3840ff9278496c71b56bd5e2e33a781a0d555f08e46fdf96847510e58960ad2cf144e9d48aea31fc5080961a1e7b WHIRLPOOL e841c440899fc5a933501bfdf6c8694863678382cd223d0941af0649b6452218e53e912c53be9cee4588e0be657dad8cc521ad162189cbfb5a39fbf9f4fe71cf
+DIST dealii-8.1.0.tar.gz 13353502 SHA256 d666bbda2a17b41b80221d7029468246f2658051b8c00d9c5907cd6434c4df99 SHA512 9d6e913e7a8c54f386839d031f2931a74e8ac6e7db8693c201a11ec6ca34962626a42a57b727297c9f3d8b9efebddb4f2397c27bbee4212e726ce2714f1c3f70 WHIRLPOOL 8cd7aeb47c28bc473bb24d1632f6074de893b20d995d6077c80b88834693b8f9ad1aee181b7abda55a5567efa6c6d169da4c6061cd939b63351330f7e4b767c5
+DIST dealii-8.2.0_rc2-offline_documentation.tar.gz 100826997 SHA256 fbb159fc18c7e934741c2068d0b5bb59c0a4b0009a0cb86173becede0357cb13 SHA512 3852032c26ffe8d4a2c28870ee4bf12a3f9fc5de784b54c0d0189d2b43eadb2154b76e91144c4b099e60c4100f64ddc78b41b93dc7ec0dc6d1d60231bebf239a WHIRLPOOL d72542fe48e73d643772aa5decfcf6536ac23b52a6f6e01e48c3c52f27012f5c4a3439424b6e15bb42cf3d85c28b7931e33d97f479664a6e5fcc5a77f7342fc3
+DIST dealii-8.2.0_rc2.tar.gz 34914872 SHA256 939a5d6aa1137ab72f0624dc172c0854ed5fd72eb630965bef1899336d47a0f6 SHA512 d955758811a4515f1635865e6195ed831be39c9a3388591207013025a14aef59e48ac87a6afeb3e6f0fbe84491293316b03acdb3b610cddd936a02fc38a1dedb WHIRLPOOL 94c48dee5f46598e3fd00817d0860949d6b43dfec3acd4a83bc743cad4493675dacaeb6f882b4a4c77eba151c5cae21cffcb4d307142b932c2ea2b84150f62eb
diff --git a/sci-libs/dealii/dealii-8.1.0-r1.ebuild b/sci-libs/dealii/dealii-8.1.0-r2.ebuild
index 548ea8397..faf32b789 100644
--- a/sci-libs/dealii/dealii-8.1.0-r1.ebuild
+++ b/sci-libs/dealii/dealii-8.1.0-r2.ebuild
@@ -9,29 +9,35 @@ inherit cmake-utils eutils multilib
DESCRIPTION="Solving partial differential equations with the finite element method"
HOMEPAGE="http://www.dealii.org/"
-SRC_URI="
- https://dealii.googlecode.com/files/deal.II-${PV}.tar.gz
- doc? ( https://dealii.googlecode.com/files/deal.offlinedoc-${PV}.tar.gz )"
-S="${WORKDIR}/deal.II"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+if [[ ${PV} = *9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="git://github.com/dealii/dealii.git"
+ SRC_URI=""
+ KEYWORDS=""
+else
+ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz
+ doc? ( https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}-offline_documentation.tar.gz )"
+ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+ S="${WORKDIR}/deal.II"
+fi
LICENSE="LGPL-2.1+"
SLOT="0"
IUSE="
arpack avx +debug doc +examples hdf5 +lapack mesh_converter metis mpi
- mumps netcdf p4est parameter_gui petsc +sparse sse2 static-libs +tbb
- trilinos +zlib
+ mumps netcdf p4est parameter_gui petsc +sparse
+ sse2 static-libs +tbb trilinos
"
# TODO: add slepc use flag once slepc is packaged for gentoo-science
REQUIRED_USE="
mumps? ( mpi lapack )
p4est? ( mpi )
- trilinos? ( mpi )
-"
+ trilinos? ( mpi )"
-RDEPEND="
- dev-libs/boost
+RDEPEND="dev-libs/boost
+ app-arch/bzip2
+ sys-libs/zlib
arpack? ( sci-libs/arpack[mpi=] )
hdf5? ( sci-libs/hdf5[mpi=] )
lapack? ( virtual/lapack )
@@ -44,30 +50,17 @@ RDEPEND="
petsc? ( sci-mathematics/petsc[mpi=] )
sparse? ( sci-libs/umfpack )
tbb? ( dev-cpp/tbb )
- trilinos? ( sci-libs/trilinos )
- zlib? ( sys-libs/zlib )
-"
+ trilinos? ( sci-libs/trilinos )"
-DEPEND="
- ${RDEPEND}
+DEPEND="${RDEPEND}
virtual/pkgconfig
- doc? ( app-doc/doxygen[dot] dev-lang/perl )
-"
-
-src_prepare() {
- epatch "${FILESDIR}"/dealii-8.1.0-p4est1.0-support.patch
-}
+ doc? ( app-doc/doxygen[dot] dev-lang/perl )"
src_configure() {
-
- if use debug; then
- CMAKE_BUILD_TYPE="DebugRelease"
- else
- CMAKE_BUILD_TYPE="Release"
- fi
+ # deal.II needs a custom build type:
+ local CMAKE_BUILD_TYPE=$(usex debug DebugRelease Release)
local mycmakeargs=(
- ${live_version}
-DDEAL_II_ALLOW_AUTODETECTION=OFF
-DDEAL_II_ALLOW_BUNDLED=OFF
-DDEAL_II_ALLOW_PLATFORM_INTROSPECTION=OFF
@@ -78,6 +71,8 @@ src_configure() {
-DDEAL_II_DOCREADME_RELDIR=share/doc/${PF}/
-DDEAL_II_EXAMPLES_RELDIR=share/doc/${PF}/examples
-DDEAL_II_LIBRARY_RELDIR=$(get_libdir)
+ -DDEAL_II_WITH_BZIP2=ON
+ -DDEAL_II_WITH_ZLIB=ON
$(cmake-utils_use arpack DEAL_II_WITH_ARPACK)
$(cmake-utils_use avx DEAL_II_HAVE_AVX)
$(cmake-utils_use doc DEAL_II_COMPONENT_DOCUMENTATION)
@@ -98,7 +93,6 @@ src_configure() {
$(cmake-utils_use static-libs DEAL_II_PREFER_STATIC_LIBS)
$(cmake-utils_use tbb DEAL_II_WITH_THREADS)
$(cmake-utils_use trilinos DEAL_II_WITH_TRILINOS)
- $(cmake-utils_use zlib DEAL_II_WITH_ZLIB)
)
cmake-utils_src_configure
}
@@ -106,9 +100,10 @@ src_configure() {
src_install() {
DOCS=( README )
- if use doc; then
+ if use doc && [[ ${PV} != *9999* ]]; then
# copy missing images to the build directory:
- cp -r "${WORKDIR}"/doc/doxygen/deal.II/images "${BUILD_DIR}"/doc/doxygen/deal.II || die
+ cp -r "${WORKDIR}"/doc/doxygen/deal.II/images \
+ "${BUILD_DIR}"/doc/doxygen/deal.II || die
# replace links:
sed -i \
's#"http://www.dealii.org/images/steps/developer/\(step-.*\)"#"images/\1"#g' \
@@ -116,6 +111,6 @@ src_install() {
fi
cmake-utils_src_install
- # unpack the installed example sources:
+ # decompress the installed example sources:
use examples && docompress -x /usr/share/doc/${PF}/examples
}
diff --git a/sci-libs/dealii/dealii-8.2.0_rc2.ebuild b/sci-libs/dealii/dealii-8.2.0_rc2.ebuild
new file mode 120000
index 000000000..9860d7b9f
--- /dev/null
+++ b/sci-libs/dealii/dealii-8.2.0_rc2.ebuild
@@ -0,0 +1 @@
+dealii-9999.ebuild \ No newline at end of file
diff --git a/sci-libs/dealii/dealii-9999.ebuild b/sci-libs/dealii/dealii-9999.ebuild
index 30f3b70a8..654d0e680 100644
--- a/sci-libs/dealii/dealii-9999.ebuild
+++ b/sci-libs/dealii/dealii-9999.ebuild
@@ -4,31 +4,44 @@
EAPI=5
-inherit cmake-utils eutils multilib git-r3
+inherit cmake-utils eutils multilib
DESCRIPTION="Solving partial differential equations with the finite element method"
HOMEPAGE="http://www.dealii.org/"
-EGIT_REPO_URI="git://github.com/dealii/dealii.git"
-KEYWORDS=""
+if [[ ${PV} = *9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="git://github.com/dealii/dealii.git"
+ SRC_URI=""
+ KEYWORDS=""
+else
+ MY_PV="${PV//0_rc/rc}"
+ MY_P="${PN}-${MY_PV}"
+ SRC_URI="https://github.com/dealii/dealii/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
+ doc? (
+ https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/${MY_P}-offline_documentation.tar.gz
+ -> ${P}-offline_documentation.tar.gz )"
+ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+ S="${WORKDIR}/${PN}-${MY_PV}"
+fi
LICENSE="LGPL-2.1+"
SLOT="0"
IUSE="
arpack avx c++11 +debug doc +examples hdf5 +lapack mesh_converter metis
- mpi mumps muparser netcdf p4est parameter_gui petsc +sparse sse2
- static-libs +tbb trilinos +zlib
+ mpi mumps muparser opencascade netcdf p4est parameter_gui petsc +sparse
+ sse2 static-libs +tbb trilinos
"
# TODO: add slepc use flag once slepc is packaged for gentoo-science
REQUIRED_USE="
mumps? ( mpi lapack )
p4est? ( mpi )
- trilinos? ( mpi )
-"
+ trilinos? ( mpi )"
-RDEPEND="
- dev-libs/boost
+RDEPEND="dev-libs/boost
+ app-arch/bzip2
+ sys-libs/zlib
arpack? ( sci-libs/arpack[mpi=] )
hdf5? ( sci-libs/hdf5[mpi=] )
lapack? ( virtual/lapack )
@@ -37,31 +50,23 @@ RDEPEND="
mumps? ( sci-libs/mumps[mpi] )
muparser? ( dev-cpp/muParser )
netcdf? ( || ( <sci-libs/netcdf-4.2[cxx] sci-libs/netcdf-cxx ) )
+ opencascade? ( sci-libs/opencascade )
p4est? ( sci-libs/p4est[mpi] )
parameter_gui? ( dev-qt/qtgui )
petsc? ( sci-mathematics/petsc[mpi=] )
sparse? ( sci-libs/umfpack )
tbb? ( dev-cpp/tbb )
- trilinos? ( sci-libs/trilinos )
- zlib? ( sys-libs/zlib )
-"
+ trilinos? ( sci-libs/trilinos )"
-DEPEND="
- ${RDEPEND}
+DEPEND="${RDEPEND}
virtual/pkgconfig
- doc? ( app-doc/doxygen[dot] dev-lang/perl )
-"
+ doc? ( app-doc/doxygen[dot] dev-lang/perl )"
src_configure() {
-
- if use debug; then
- CMAKE_BUILD_TYPE="DebugRelease"
- else
- CMAKE_BUILD_TYPE="Release"
- fi
+ # deal.II needs a custom build type:
+ local CMAKE_BUILD_TYPE=$(usex debug DebugRelease Release)
local mycmakeargs=(
- -DDEAL_II_PACKAGE_VERSION=99.99
-DDEAL_II_ALLOW_AUTODETECTION=OFF
-DDEAL_II_ALLOW_BUNDLED=OFF
-DDEAL_II_ALLOW_PLATFORM_INTROSPECTION=OFF
@@ -72,6 +77,8 @@ src_configure() {
-DDEAL_II_DOCREADME_RELDIR=share/doc/${PF}/
-DDEAL_II_EXAMPLES_RELDIR=share/doc/${PF}/examples
-DDEAL_II_LIBRARY_RELDIR=$(get_libdir)
+ -DDEAL_II_WITH_BZIP2=ON
+ -DDEAL_II_WITH_ZLIB=ON
$(cmake-utils_use arpack DEAL_II_WITH_ARPACK)
$(cmake-utils_use avx DEAL_II_HAVE_AVX)
$(cmake-utils_use c++11 DEAL_II_WITH_CXX11)
@@ -85,6 +92,8 @@ src_configure() {
$(cmake-utils_use mumps DEAL_II_WITH_MUMPS)
$(cmake-utils_use muparser DEAL_II_WITH_MUPARSER)
$(cmake-utils_use netcdf DEAL_II_WITH_NETCDF)
+ -DOPENCASCADE_DIR="${CASROOT}"
+ $(cmake-utils_use opencascade DEAL_II_WITH_OPENCASCADE)
$(cmake-utils_use p4est DEAL_II_WITH_P4EST)
$(cmake-utils_use parameter_gui DEAL_II_COMPONENT_PARAMETER_GUI)
$(cmake-utils_use petsc DEAL_II_WITH_PETSC)
@@ -94,16 +103,24 @@ src_configure() {
$(cmake-utils_use static-libs DEAL_II_PREFER_STATIC_LIBS)
$(cmake-utils_use tbb DEAL_II_WITH_THREADS)
$(cmake-utils_use trilinos DEAL_II_WITH_TRILINOS)
- $(cmake-utils_use zlib DEAL_II_WITH_ZLIB)
)
cmake-utils_src_configure
}
src_install() {
- DOCS=( README.md )
+ DOCS=( README )
+ if use doc && [[ ${PV} != *9999* ]]; then
+ # copy missing images to the build directory:
+ cp -r "${WORKDIR}"/doc/doxygen/deal.II/images \
+ "${BUILD_DIR}"/doc/doxygen/deal.II || die
+ # replace links:
+ sed -i \
+ 's#"http://www.dealii.org/images/steps/developer/\(step-.*\)"#"images/\1"#g' \
+ "${BUILD_DIR}"/doc/doxygen/deal.II/step_*.html || die "sed failed"
+ fi
cmake-utils_src_install
- # unpack the installed example sources:
+ # decompress the installed example sources:
use examples && docompress -x /usr/share/doc/${PF}/examples
}
diff --git a/sci-libs/dealii/metadata.xml b/sci-libs/dealii/metadata.xml
index 6f21d087d..ac7226b4a 100644
--- a/sci-libs/dealii/metadata.xml
+++ b/sci-libs/dealii/metadata.xml
@@ -24,6 +24,7 @@ and extra output. If you want to get meaningful backtraces see
<flag name="metis">Add support for metis (<pkg>sci-libs/metis</pkg>)</flag>
<flag name="mumps">Add support for mumps (<pkg>sci-libs/mumps</pkg>)</flag>
<flag name="muparser">Add support for muparser (<pkg>dev-cpp/muParser</pkg>)</flag>
+ <flag name="opencascade">Add support for opencascade (<pkg>sci-libs/opencascade</pkg>)</flag>
<flag name="p4est">Add support for p4est (<pkg>sci-mathematics/p4est</pkg>)</flag>
<flag name="parameter_gui">Build and install the parameter_gui executable</flag>
<flag name="petsc">Add support for petsc (<pkg>sci-libs/petsc</pkg>)</flag>