[gentoo-commits] proj/sci:master commit in: sci-visualization/mantid/files/, sci-visualization/mantid/

["Christoph Junghans" <ottxor@gentoo.org>]

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)