* [gentoo-commits] proj/sci:master commit in: sci-visualization/mantid/files/, sci-visualization/mantid/
@ 2015-01-31 20:19 Christoph Junghans
0 siblings, 0 replies; 3+ messages in thread
From: Christoph Junghans @ 2015-01-31 20:19 UTC (permalink / raw
To: gentoo-commits
commit: fb7207a62d44b75adf86b98f8cfe103d2b858711
Author: Chris Kerr <debdepba <AT> dasganma <DOT> tk>
AuthorDate: Wed Jan 28 21:47:03 2015 +0000
Commit: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Wed Jan 28 21:48:07 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=fb7207a6
Adding a CMAKE_PREFIX_PATH rather than patching FindOpenCascade.cmake
---
.../files/mantid-3.3.0-FindOpenCascade.patch | 84 ----------------------
sci-visualization/mantid/mantid-3.3.0.ebuild | 6 +-
2 files changed, 3 insertions(+), 87 deletions(-)
diff --git a/sci-visualization/mantid/files/mantid-3.3.0-FindOpenCascade.patch b/sci-visualization/mantid/files/mantid-3.3.0-FindOpenCascade.patch
deleted file mode 100644
index 2c8f78d..0000000
--- a/sci-visualization/mantid/files/mantid-3.3.0-FindOpenCascade.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff --git a/Build/CMake/FindOpenCascade.cmake b/Build/CMake/FindOpenCascade.cmake
-index aefa011..346678d 100644
---- a/Build/CMake/FindOpenCascade.cmake
-+++ b/Build/CMake/FindOpenCascade.cmake
-@@ -4,13 +4,6 @@
- # OPENCASCADE_FOUND If false, do not try to use OPENCASCADE
-
- find_path ( OPENCASCADE_INCLUDE_DIR Standard.hxx PATHS
-- /usr/include/opencascade
-- /usr/include/oce
-- /usr/local/include/opencascade
-- /usr/local/include/oce
-- /usr/local/inc
-- /opt/OpenCASCADE/inc
-- ${CMAKE_INCLUDE_PATH}/OpenCascade
- $ENV{CASROOT}/inc
- )
-
-@@ -18,50 +11,56 @@ if ( WIN32 )
- add_definitions ( -DWNT )
- endif ( WIN32 )
-
--set ( OC_REDHAT_RPM /opt/OpenCASCADE/lib64 )
-+find_path ( OPENCASCADE_LIBRARY_DIR libTKernel.so PATHS
-+ $ENV{CASROOT}/lib64
-+)
-+
- find_library ( OPENCASCADE_LIB_TKERNEL
- NAMES TKernel
-- PATHS ${OC_REDHAT_RPM}
-+ PATHS ${OPENCASCADE_LIBRARY_DIR}
- )
- find_library ( OPENCASCADE_LIB_TKBO
- NAMES TKBO
-- PATHS ${OC_REDHAT_RPM}
-+ PATHS ${OPENCASCADE_LIBRARY_DIR}
- )
- find_library ( OPENCASCADE_LIB_TKPRIM
- NAMES TKPrim
-- PATHS ${OC_REDHAT_RPM}
-+ PATHS ${OPENCASCADE_LIBRARY_DIR}
- )
- find_library ( OPENCASCADE_LIB_TKMESH
- NAMES TKMesh
-- PATHS ${OC_REDHAT_RPM}
-+ PATHS ${OPENCASCADE_LIBRARY_DIR}
- )
- find_library ( OPENCASCADE_LIB_TKBREP
- NAMES TKBRep
-- PATHS ${OC_REDHAT_RPM}
-+ PATHS ${OPENCASCADE_LIBRARY_DIR}
- )
- find_library ( OPENCASCADE_LIB_TKTOPALGO
- NAMES TKTopAlgo
-- PATHS ${OC_REDHAT_RPM}
-+ PATHS ${OPENCASCADE_LIBRARY_DIR}
- )
- find_library ( OPENCASCADE_LIB_TKMATH
- NAMES TKMath
-- PATHS ${OC_REDHAT_RPM}
-+ PATHS ${OPENCASCADE_LIBRARY_DIR}
- )
- find_library ( OPENCASCADE_LIB_TKG2D
- NAMES TKG2d
-- PATHS ${OC_REDHAT_RPM}
-+ PATHS ${OPENCASCADE_LIBRARY_DIR}
- )
-
- find_library ( OPENCASCADE_LIB_TKG3D
- NAMES TKG3d
-+ PATHS ${OPENCASCADE_LIBRARY_DIR}
- )
-
- find_library ( OPENCASCADE_LIB_TKGEOMBASE
- NAMES TKGeomBase
-+ PATHS ${OPENCASCADE_LIBRARY_DIR}
- )
-
- find_library ( OPENCASCADE_LIB_TKGEOMAlgo
- NAMES TKGeomAlgo
-+ PATHS ${OPENCASCADE_LIBRARY_DIR}
- )
-
- set ( OPENCASCADE_LIBRARIES
diff --git a/sci-visualization/mantid/mantid-3.3.0.ebuild b/sci-visualization/mantid/mantid-3.3.0.ebuild
index 1c6abbb..52d953f 100644
--- a/sci-visualization/mantid/mantid-3.3.0.ebuild
+++ b/sci-visualization/mantid/mantid-3.3.0.ebuild
@@ -6,7 +6,7 @@ EAPI=5
FORTRAN_STANDARD=90
PYTHON_COMPAT=python2_7
-inherit eutils cmake-utils versionator python-single-r1
+inherit eutils cmake-utils versionator python-single-r1 multilib
MAJOR_PV=$(get_version_component_range 1-2)
@@ -55,8 +55,7 @@ DEPEND="${RDEPEND}
S="${WORKDIR}/${P}-Source"
src_prepare() {
- epatch "${FILESDIR}/${P}-FindOpenCascade.patch" \
- "${FILESDIR}/${P}-minigzip-OF.patch"
+ epatch "${FILESDIR}/${P}-minigzip-OF.patch"
}
src_configure() {
@@ -68,6 +67,7 @@ src_configure() {
$(cmake-utils_use_use tcmalloc TCMALLOC)
$(cmake-utils_use paraview MAKE_VATES)
$(cmake-utils_use_build test TESTING)
+ -DCMAKE_PREFIX_PATH="${CASROOT}"
)
cmake-utils_src_configure
}
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] proj/sci:master commit in: sci-visualization/mantid/files/, sci-visualization/mantid/
@ 2017-11-18 17:53 Justin Lecher
0 siblings, 0 replies; 3+ messages in thread
From: Justin Lecher @ 2017-11-18 17:53 UTC (permalink / raw
To: gentoo-commits
commit: c461eb3d7a12ec8da0184c04d998ddeaa16c37a2
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 18 17:53:22 2017 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Nov 18 17:53:22 2017 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=c461eb3d
sci-visualization/mantid: Dropped due to missing dependency
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
.../mantid/files/mantid-3.3.0-minigzip-OF.patch | 28 -------
sci-visualization/mantid/mantid-3.3.0.ebuild | 98 ----------------------
sci-visualization/mantid/metadata.xml | 29 -------
3 files changed, 155 deletions(-)
diff --git a/sci-visualization/mantid/files/mantid-3.3.0-minigzip-OF.patch b/sci-visualization/mantid/files/mantid-3.3.0-minigzip-OF.patch
deleted file mode 100644
index 6067ad7f7..000000000
--- a/sci-visualization/mantid/files/mantid-3.3.0-minigzip-OF.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-The minigzip code does the same thing as sys-libs/zlib[minizip] but for .gz files rather than .zip
-
-It uses a macro 'OF(args)' - this seems to be for compatibility with old C compilers.
-It is declared in zconf.h but newer versions of zlib use _Z_OF instead.
-
-This patch has been submitted upstream at:
-https://github.com/mantidproject/mantid/pull/149
-
-diff --git a/MantidPlot/src/zlib123/minigzip.c b/MantidPlot/src/zlib123/minigzip.c
-index 97fbae1..5f4612f 100644
---- a/MantidPlot/src/zlib123/minigzip.c
-+++ b/MantidPlot/src/zlib123/minigzip.c
-@@ -50,6 +50,15 @@
- # include <unix.h> /* for fileno */
- #endif
-
-+/* New versions of zlib use _Z_OF rather than OF */
-+#ifndef OF
-+# ifdef _Z_OF
-+# define OF _Z_OF
-+# else
-+# define OF(args) args
-+# endif
-+#endif
-+
- #ifndef WIN32 /* unlink already in stdio.h for WIN32 */
- extern int unlink OF((const char *));
- #else
diff --git a/sci-visualization/mantid/mantid-3.3.0.ebuild b/sci-visualization/mantid/mantid-3.3.0.ebuild
deleted file mode 100644
index 17048fb68..000000000
--- a/sci-visualization/mantid/mantid-3.3.0.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-FORTRAN_STANDARD=90
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils cmake-utils versionator python-single-r1 multilib flag-o-matic
-
-MAJOR_PV=$(get_version_component_range 1-2)
-
-DESCRIPTION="Utilities for processing and plotting neutron scattering data"
-HOMEPAGE="http://www.mantidproject.org/"
-SRC_URI="mirror://sourceforge/project/${PN}/${MAJOR_PV}/${P}-Source.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc +opencascade opencl paraview pch tcmalloc test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="test" # Testing requires sample data and X11 access
-
-# There is a list of dependencies on the Mantid website at:
-# http://www.mantidproject.org/Mantid_Prerequisites
-RDEPEND="
- ${PYTHON_DEPS}
- >=sci-libs/nexus-4.2
- >=dev-libs/poco-1.4.2
- dev-libs/boost[python,${PYTHON_USEDEP}]
- >=dev-qt/qthelp-4.6:4
- >=dev-qt/qtwebkit-4.6:4
- doc? ( >=dev-qt/assistant-4.6:4 )
- opencl? ( virtual/opencl )
- tcmalloc? ( dev-util/google-perftools )
- paraview? ( >=sci-visualization/paraview-4[python,${PYTHON_USEDEP}] )
- virtual/opengl
- x11-libs/qscintilla
- x11-libs/qwt:5
- x11-libs/qwtplot3d
- dev-python/PyQt4[${PYTHON_USEDEP}]
- sci-libs/gsl
- dev-python/sip[${PYTHON_USEDEP}]
- dev-python/ipython[qt4,${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- sci-libs/scipy[${PYTHON_USEDEP}]
- dev-cpp/muParser
- dev-libs/jsoncpp
- dev-libs/openssl:0
- opencascade? ( sci-libs/opencascade:=[qt4] )
-"
-
-DEPEND="${RDEPEND}
- dev-python/sphinx
- doc? (
- app-doc/doxygen[dot]
- dev-python/sphinx[${PYTHON_USEDEP}]
- dev-python/sphinx-bootstrap-theme[${PYTHON_USEDEP}]
- app-text/dvipng
- dev-texlive/texlive-latex
- dev-texlive/texlive-latexextra
- )
- test? ( dev-util/cppcheck )
-"
-
-S="${WORKDIR}/${P}-Source"
-
-PATCHES=( "${FILESDIR}"/${P}-minigzip-OF.patch )
-
-src_configure() {
- append-cppflags -DHAVE_IOSTREAM -DHAVE_LIMITS -DHAVE_IOMANIP
- mycmakeargs=(
- $(cmake-utils_use_enable doc QTASSISTANT)
- $(cmake-utils_use_use doc DOT)
- $(cmake-utils_use doc DOCS_HTML)
- $(cmake-utils_use_no opencascade)
- $(cmake-utils_use opencl OPENCL_BUILD)
- $(cmake-utils_use_use tcmalloc TCMALLOC)
- $(cmake-utils_use paraview MAKE_VATES)
- $(cmake-utils_use_use pch PRECOMPILED_HEADERS)
- $(cmake-utils_use_build test TESTING)
- )
- if use opencascade
- then
- [[ -z ${CASROOT} ]] && die "CASROOT environment variable not defined, that usually means you need to use 'eselect opencascade'."
- mycmakeargs+=( -DCMAKE_PREFIX_PATH="${CASROOT}" )
- fi
- cmake-utils_src_configure
-}
-
-src_test() {
- # Tests are not built by default
- emake AllTests
- cmake-utils_src_test
-}
diff --git a/sci-visualization/mantid/metadata.xml b/sci-visualization/mantid/metadata.xml
deleted file mode 100644
index b3d3b4618..000000000
--- a/sci-visualization/mantid/metadata.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>cjk34@cam.ac.uk</email>
- <name>Chris Kerr</name>
- <description>I don't develop this software, I'm just a Gentoo user who wanted to install it</description>
- </maintainer>
- <maintainer type="project">
- <email>sci@gentoo.org</email>
- <name>Gentoo Science Project</name>
- </maintainer>
- <longdescription>The Mantid project provides a framework that supports
- high-performance computing and visualisation of scientific data.
-
- Mantid has been created to manipulate and analyse neutron scattering and muon
- spectroscopy data, but could be applied to many other techniques.
- </longdescription>
- <use>
- <flag name="doc">Generate documentation with <pkg>app-doc/doxygen</pkg>, QT Assistant etc</flag>
- <flag name="opencascade">Use OpenCascade to show 3D models of instruments</flag>
- <flag name="opencl">Use OpenCL to accelerate calculations</flag>
- <flag name="paraview">Enable the Visualisation and Analysis Toolkit ExtensionS (VATES)</flag>
- <flag name="tcmalloc">Use thread-caching malloc</flag>
- </use>
- <upstream>
- <remote-id type="sourceforge">mantid</remote-id>
- </upstream>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] proj/sci:master commit in: sci-visualization/mantid/files/, sci-visualization/mantid/
@ 2015-01-31 20:19 Christoph Junghans
0 siblings, 0 replies; 3+ messages in thread
From: Christoph Junghans @ 2015-01-31 20:19 UTC (permalink / raw
To: gentoo-commits
commit: 4a1145abd4287f6a943e911ba81c53cfa83cfd38
Author: Chris Kerr <debdepba <AT> dasganma <DOT> tk>
AuthorDate: Wed Jan 28 21:23:51 2015 +0000
Commit: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Wed Jan 28 21:23:51 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=4a1145ab
use CPPFLAGS rather than patching the CMakeLists.txt
---
.../mantid/files/mantid-3.3.0-HAVE_IOSTREAM.patch | 17 -----------------
sci-visualization/mantid/mantid-3.3.0.ebuild | 4 ++--
2 files changed, 2 insertions(+), 19 deletions(-)
diff --git a/sci-visualization/mantid/files/mantid-3.3.0-HAVE_IOSTREAM.patch b/sci-visualization/mantid/files/mantid-3.3.0-HAVE_IOSTREAM.patch
deleted file mode 100644
index 905a701..0000000
--- a/sci-visualization/mantid/files/mantid-3.3.0-HAVE_IOSTREAM.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/Framework/Geometry/CMakeLists.txt b/Framework/Geometry/CMakeLists.txt
-index bb1d146..466b072 100644
---- a/Framework/Geometry/CMakeLists.txt
-+++ b/Framework/Geometry/CMakeLists.txt
-@@ -351,10 +351,8 @@ else ()
- add_definitions ( -DNO_OPENCASCADE )
- endif ()
-
--# A few defines needed for OpenCascade on the Mac
--if ( APPLE )
-- add_definitions ( -DHAVE_IOSTREAM -DHAVE_LIMITS -DHAVE_IOMANIP )
--endif ()
-+# A few defines needed for OpenCascade
-+add_definitions ( -DHAVE_IOSTREAM -DHAVE_LIMITS -DHAVE_IOMANIP )
-
- include_directories ( ${OPENGL_INCLUDE_DIR} )
- include_directories ( ${GSL_INCLUDE_DIR} )
diff --git a/sci-visualization/mantid/mantid-3.3.0.ebuild b/sci-visualization/mantid/mantid-3.3.0.ebuild
index af5fb3f..33ed01e 100644
--- a/sci-visualization/mantid/mantid-3.3.0.ebuild
+++ b/sci-visualization/mantid/mantid-3.3.0.ebuild
@@ -55,12 +55,12 @@ DEPEND="${RDEPEND}
S="${WORKDIR}/${P}-Source"
src_prepare() {
- epatch "${FILESDIR}/${P}-HAVE_IOSTREAM.patch" \
- "${FILESDIR}/${P}-FindOpenCascade.patch" \
+ epatch "${FILESDIR}/${P}-FindOpenCascade.patch" \
"${FILESDIR}/${P}-minigzip-OF.patch"
}
src_configure() {
+ export CPPFLAGS="-DHAVE_IOSTREAM -DHAVE_LIMITS -DHAVE_IOMANIP ${CPPFLAGS}"
mycmakeargs=( $(cmake-utils_use_enable doc QTASSISTANT)
$(cmake-utils_use_use doc DOT)
$(cmake-utils_use opencl OPENCL_BUILD)
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-11-18 17:53 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-01-31 20:19 [gentoo-commits] proj/sci:master commit in: sci-visualization/mantid/files/, sci-visualization/mantid/ Christoph Junghans
-- strict thread matches above, loose matches on Subject: below --
2017-11-18 17:53 Justin Lecher
2015-01-31 20:19 Christoph Junghans
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox