Added USE flag mpi end fixed dependency on hdf5[mpi=], closing bug #302715, thanks to Kacper Kowalik <xarthisius.kk@gmail.com>

Package-Manager: portage-2.2_rc62/cvs/Linux i686

5 files changed, 18 insertions, 119 deletions

diff --git a/sci-libs/mathgl/ChangeLog b/sci-libs/mathgl/ChangeLog
index b0a125301a68..02e8c6418253 100644
--- a/sci-libs/mathgl/ChangeLog
+++ b/sci-libs/mathgl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/mathgl
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/mathgl/ChangeLog,v 1.9 2010/01/04 12:02:51 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/mathgl/ChangeLog,v 1.10 2010/01/30 09:36:07 grozin Exp $
+
+  30 Jan 2010; Andrey Grozin <grozin@gentoo.org> -mathgl-1.9.0.1.ebuild,
+  mathgl-1.10.ebuild, metadata.xml:
+  Added USE flag mpi end fixed dependency on hdf5[mpi=], closing bug
+  #302715, thanks to Kacper Kowalik <xarthisius.kk@gmail.com>
 
 *mathgl-1.10 (04 Jan 2010)
 
diff --git a/sci-libs/mathgl/Manifest b/sci-libs/mathgl/Manifest
index c0e2cffd6454..adc2d5669d00 100644
--- a/sci-libs/mathgl/Manifest
+++ b/sci-libs/mathgl/Manifest
@@ -1,10 +1,7 @@
 AUX mathgl-1.10-gcc43.patch 345 RMD160 81d76baed06d779853dd96ce169f5bef620629b2 SHA1 e50c8e600cb243c809d3a6648344bbe29146666d SHA256 2165125d4677b882548530dc21a0368bf7ed27cab516ee6f78604f98b3b60ac9
 AUX mathgl-1.9.0.1-gcc43.patch 345 RMD160 81d76baed06d779853dd96ce169f5bef620629b2 SHA1 e50c8e600cb243c809d3a6648344bbe29146666d SHA256 2165125d4677b882548530dc21a0368bf7ed27cab516ee6f78604f98b3b60ac9
 AUX mathgl-1.9.0.1-hdf5.patch 2232 RMD160 73826c20a1e6504d6d510b9895f2bf8dc2c29e3d SHA1 bc87b61d9f113642a862d0b63e48aa984db32d2c SHA256 e7dc51c67e673ee1abd38bef980ccb929c6f787493e496a9c0ea7658d10be830
-DIST STIX_font.tgz 2450541 RMD160 7595c2b99c5982d72b1ef551ab8f9d65237e5466 SHA1 3cbc4f5090cd37d1b35d594150357550d2639f81 SHA256 6408290fd4a5267637a88507344a8f07b908ce72f46ef93d09e068fedb67e8fe
 DIST mathgl-1.10.tgz 4474028 RMD160 8a9f938c921e287bb968fbb163e404d00e520f2e SHA1 f0a541c66fefd44336fea183c6ed97346eb15d03 SHA256 a3fdef1f035bfb7769ba8b9316279171ca0c19e20e238671dfabe4b17be3996f
-DIST mathgl-1.9.0.1.tgz 1897707 RMD160 a49e731dd432e83a63a53f6a1840cd2b7611773b SHA1 1fc6f0e0ac3ce951973ce595f939ad20730d2130 SHA256 34c84aa7b7d6fb98c4a95a72b9b04d0a69944279ee685980985138862120e493
-EBUILD mathgl-1.10.ebuild 2327 RMD160 e20a0a696c4df31ebed762d478722a877d8e516d SHA1 b3f5adeb966ccbbd3ba48c5f68a8bdbe30c8d32e SHA256 a7e144652e51518b5fd06df536925c11277ef08047d1727ed407f6808123d8c5
-EBUILD mathgl-1.9.0.1.ebuild 2484 RMD160 5dfdaf60c3dcc7e1136a75bf60bf197cfdc22060 SHA1 75d840c3c05273654ec63f5b1f10445cc7ad8b03 SHA256 02666517753322ffdee94d899525a96f8e1b3a592b58e7382beaab55c86cf0b8
-MISC ChangeLog 1954 RMD160 5fad630bc0e9456ccf0b4fb17c04a44cb2d69f86 SHA1 ad4057f9649457d878738d4c9a8569455f32a3dd SHA256 f4bf15a3d5715aac1c12cedde1a24d5e8ca064d7430ef0a0449615928b29450f
-MISC metadata.xml 403 RMD160 58842b16ab72ab3b23b8d29eaf00dd2c05da11c9 SHA1 de3dde83893663018de696e3e07010a276db0fff SHA256 2e033d0243bbbafcb9397978f74e7bf0edcb03cfb6f2d2d5ff9e22cdf5e77a42
+EBUILD mathgl-1.10.ebuild 2424 RMD160 02bb12964d92859f46797f073e39a7b0433d1960 SHA1 f28dc3519c4c9a0d5bfbf4918c1009f057a9b6bb SHA256 f547f5ba60c5c175133dd4c36f2f2f1198001d6500d0a9723570b40b088a7e88
+MISC ChangeLog 2196 RMD160 0ece16fd53fd00e47563612eab43e823109d7557 SHA1 b70ea6a90b167acfe1a5f8f122ee0dedf4edc031 SHA256 d56d859ab8327d5a6e04a1429c603a063b316ac0e45ff5e550ea8e8dda19918e
+MISC metadata.xml 509 RMD160 0562451c482fb493f662a217d5c2887d0bd3b3ef SHA1 bccd8f044adfd935ac1e680903dc1967cd54b73c SHA256 aa4007213e326aa4f802f12495ffc6794ac5affa088f6e13f50a52a8317e5b72
diff --git a/sci-libs/mathgl/mathgl-1.10.ebuild b/sci-libs/mathgl/mathgl-1.10.ebuild
index 145e6cf1af05..87850d5b2bf0 100644
--- a/sci-libs/mathgl/mathgl-1.10.ebuild
+++ b/sci-libs/mathgl/mathgl-1.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/mathgl/mathgl-1.10.ebuild,v 1.1 2010/01/04 12:02:51 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/mathgl/mathgl-1.10.ebuild,v 1.2 2010/01/30 09:36:07 grozin Exp $
 
 EAPI=2
 WX_GTK_VER=2.8
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc fltk gif glut gsl hdf5 jpeg octave python qt4 wxwidgets"
+IUSE="doc fltk gif glut gsl hdf5 jpeg mpi octave python qt4 wxwidgets"
 
 RDEPEND="media-libs/libpng
 	virtual/glu
@@ -22,8 +22,9 @@ RDEPEND="media-libs/libpng
 	fltk? ( x11-libs/fltk:1.1 )
 	gif? ( media-libs/giflib )
 	jpeg? ( media-libs/jpeg )
-	hdf5? ( >=sci-libs/hdf5-1.8 )
+	hdf5? ( >=sci-libs/hdf5-1.8[mpi=] )
 	gsl? ( sci-libs/gsl )
+	mpi? ( virtual/mpi[cxx] )
 	octave? ( sci-mathematics/octave )
 	qt4? ( x11-libs/qt-gui:4 )
 	wxwidgets? ( x11-libs/wxGTK:2.8 )"
@@ -38,6 +39,10 @@ pkg_setup() {
 		eerror "You need >=gcc-4.3.0 to compile this package"
 		die "Wrong gcc version"
 	fi
+	if use mpi; then
+		export CC=mpicc
+		export CXX=mpicxx
+	fi
 }
 
 src_prepare() {
diff --git a/sci-libs/mathgl/mathgl-1.9.0.1.ebuild b/sci-libs/mathgl/mathgl-1.9.0.1.ebuild
deleted file mode 100644
index 545de02ce54f..000000000000
--- a/sci-libs/mathgl/mathgl-1.9.0.1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/mathgl/mathgl-1.9.0.1.ebuild,v 1.2 2009/09/15 04:37:30 grozin Exp $
-
-EAPI=2
-WX_GTK_VER=2.8
-inherit autotools wxwidgets python versionator toolchain-funcs
-
-DESCRIPTION="Math Graphics Library"
-HOMEPAGE="http://mathgl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz mirror://sourceforge/${PN}/STIX_font.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc fltk gif glut gsl hdf5 jpeg octave python qt4 wxwindows"
-
-RDEPEND="media-libs/libpng
-	virtual/glu
-	python? ( dev-python/numpy )
-	glut? ( virtual/glut )
-	fltk? ( x11-libs/fltk:1.1 )
-	gif? ( media-libs/giflib )
-	jpeg? ( media-libs/jpeg )
-	hdf5? ( sci-libs/hdf5 )
-	gsl? ( sci-libs/gsl )
-	octave? ( sci-mathematics/octave )
-	qt4? ( x11-libs/qt-gui:4 )
-	wxwindows? ( x11-libs/wxGTK:2.8 )"
-DEPEND="${RDEPEND}
-	>=sys-devel/libtool-2.2.4
-	doc? ( app-text/texi2html virtual/texi2dvi )
-	python? ( dev-lang/swig )
-	octave? ( dev-lang/swig )"
-
-pkg_setup() {
-	if ! version_is_at_least "4.3.0" "$(gcc-version)"; then
-		eerror "You need >=gcc-4.3.0 to compile this package"
-		die "Wrong gcc version"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	mkdir "${S}"/fonts
-	cd "${S}"/fonts
-	unpack STIX_font.tgz
-}
-
-src_prepare() {
-	# bug #267061
-	epatch "${FILESDIR}"/${P}-gcc43.patch
-	epatch "${FILESDIR}"/${P}-hdf5.patch
-
-	# correct location of numpy/arrayobject.h
-	if use python; then
-		local numpy_h
-		numpy_h=$(python_get_sitedir)/numpy/core/include/numpy/arrayobject.h
-		einfo "fixing numpy.i"
-		sed -e "s|<numpy/arrayobject.h>|\"${numpy_h}\"|" \
-			-i lang/numpy.i \
-			|| die "sed failed"
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	econf --docdir="${ROOT}"usr/share/doc/${PF} \
-		$(use_enable glut) \
-		$(use_enable qt4 qt) \
-		$(use_enable wxwindows wx) \
-		$(use_enable fltk) \
-		$(use_enable gif) \
-		$(use_enable jpeg) \
-		$(use_enable hdf5) \
-		$(use_enable python) \
-		$(use_enable octave) \
-		$(use_enable gsl) \
-		$(use_enable doc docs)
-}
-
-src_compile() {
-	# see bug #249627
-	local JOBS
-	use doc && JOBS=-j1
-	emake ${JOBS} || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc README AUTHORS || die "dodoc failed"
-}
-
-pkg_postinst() {
-	if use octave; then
-		octave <<-EOF
-		pkg install /usr/share/${PN}/octave/${PN}.tar.gz
-		EOF
-	fi
-}
-
-pkg_prerm() {
-	if use octave; then
-		octave <<-EOF
-		pkg uninstall ${PN}
-		EOF
-	fi
-}
diff --git a/sci-libs/mathgl/metadata.xml b/sci-libs/mathgl/metadata.xml
index d0e39e80724a..d4c35619bd85 100644
--- a/sci-libs/mathgl/metadata.xml
+++ b/sci-libs/mathgl/metadata.xml
@@ -9,5 +9,6 @@
 	<longdescription>Math Graphics Library</longdescription>
 	<use>
 		<flag name='octave'>Add bindings for <pkg>sci-mathematics/octave</pkg></flag>
+		<flag name='mpi'>Use mpi wrappers for compilation. Requirement for <pkg>sci-libs/hdf5</pkg>[mpi]</flag>
 	</use>
 </pkgmetadata>