[gentoo-commits] gentoo-x86 commit in sci-libs/mathgl: metadata.xml ChangeLog mathgl-1.11.2.ebuild

[Justin Lecher (jlec)]

jlec        12/03/01 07:41:06

  Modified:             metadata.xml ChangeLog mathgl-1.11.2.ebuild
  Log:
  Add patch to compile with latest gcc, #406277, provided by Helmut Jarausch; moved to eapi=4 and autotools-utils.eclass
  
  (Portage version: 2.2.0_alpha89/cvs/Linux x86_64)

Revision  Changes    Path
1.6                  sci-libs/mathgl/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/mathgl/metadata.xml?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/mathgl/metadata.xml?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/mathgl/metadata.xml?r1=1.5&r2=1.6

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/mathgl/metadata.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- metadata.xml	12 Feb 2010 04:20:46 -0000	1.5
+++ metadata.xml	1 Mar 2012 07:41:06 -0000	1.6
@@ -8,6 +8,6 @@
 	</maintainer>
 	<longdescription>Math Graphics Library</longdescription>
 	<use>
-		<flag name='octave'>Add bindings for <pkg>sci-mathematics/octave</pkg></flag>
+		<flag name="octave">Add bindings for <pkg>sci-mathematics/octave</pkg></flag>
 	</use>
 </pkgmetadata>



1.27                 sci-libs/mathgl/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/mathgl/ChangeLog?rev=1.27&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/mathgl/ChangeLog?rev=1.27&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/mathgl/ChangeLog?r1=1.26&r2=1.27

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/mathgl/ChangeLog,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- ChangeLog	28 Feb 2012 00:56:32 -0000	1.26
+++ ChangeLog	1 Mar 2012 07:41:06 -0000	1.27
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/mathgl
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/mathgl/ChangeLog,v 1.26 2012/02/28 00:56:32 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/mathgl/ChangeLog,v 1.27 2012/03/01 07:41:06 jlec Exp $
+
+  01 Mar 2012; Justin Lecher <jlec@g.o> mathgl-1.11.2.ebuild,
+  +files/mathgl-1.11.2-cast.patch, metadata.xml:
+  Add patch to compile with latest gcc, #406277, provided by Helmut Jarausch;
+  moved to eapi=4 and autotools-utils.eclass
 
   28 Feb 2012; Patrick Lauer <patrick@g.o> mathgl-1.11.1.1.ebuild,
   mathgl-1.11.2.ebuild:



1.4                  sci-libs/mathgl/mathgl-1.11.2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/mathgl/mathgl-1.11.2.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/mathgl/mathgl-1.11.2.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/mathgl/mathgl-1.11.2.ebuild?r1=1.3&r2=1.4

Index: mathgl-1.11.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/mathgl/mathgl-1.11.2.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mathgl-1.11.2.ebuild	28 Feb 2012 00:56:32 -0000	1.3
+++ mathgl-1.11.2.ebuild	1 Mar 2012 07:41:06 -0000	1.4
@@ -1,15 +1,18 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/mathgl/mathgl-1.11.2.ebuild,v 1.3 2012/02/28 00:56:32 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/mathgl/mathgl-1.11.2.ebuild,v 1.4 2012/03/01 07:41:06 jlec Exp $
 
-EAPI=3
+EAPI=4
 
 WX_GTK_VER=2.8
-PYTHON_DEPEND="2"
+
+PYTHON_DEPEND="python? 2"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="3.* 2.7-pypy-* *-jython"
 
-inherit autotools eutils wxwidgets python versionator toolchain-funcs
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils eutils python toolchain-funcs versionator wxwidgets
 
 DESCRIPTION="Math Graphics Library"
 HOMEPAGE="http://mathgl.sourceforge.net/"
@@ -18,33 +21,45 @@
 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 static-libs"
 
-RDEPEND="media-libs/libpng
+RDEPEND="
+	media-libs/libpng
 	sys-libs/zlib
 	virtual/opengl
-	python? ( dev-python/numpy )
-	glut? ( media-libs/freeglut )
 	fltk? ( x11-libs/fltk:1 )
 	gif? ( media-libs/giflib )
-	jpeg? ( virtual/jpeg )
-	hdf5? ( >=sci-libs/hdf5-1.8 )
+	glut? ( media-libs/freeglut )
 	gsl? ( sci-libs/gsl )
+	hdf5? ( >=sci-libs/hdf5-1.8[mpi=] )
+	jpeg? ( virtual/jpeg )
 	octave? ( >=sci-mathematics/octave-3.4.0 )
+	python? ( dev-python/numpy )
 	qt4? ( x11-libs/qt-gui:4 )
 	wxwidgets? ( x11-libs/wxGTK:2.8 )"
 DEPEND="${RDEPEND}
-	>=sys-devel/libtool-2.2.4
+	sys-devel/libtool:2
 	doc? ( app-text/texi2html virtual/texi2dvi )
-	python? ( dev-lang/swig )
-	octave? ( dev-lang/swig )"
+	octave? ( dev-lang/swig )
+	python? ( dev-lang/swig )"
+
+REQUIRED_USE="mpi? ( hdf5 ) "
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.10.2-gcc43.patch
+	"${FILESDIR}"/${PN}-octave-3.4.patch
+	"${FILESDIR}"/${P}-zlib.patch
+	"${FILESDIR}"/${P}-cast.patch
+	)
 
 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
-	if use hdf5 && has_version sci-libs/hdf5[mpi]; then
+	if use mpi; then
 		export CC=mpicc
 		export CXX=mpicxx
 	fi
@@ -54,21 +69,12 @@
 
 src_unpack() {
 	unpack ${A}
-	mkdir "${S}"/fonts
+	[[ -d "${S}"/fonts ]] || mkdir "${S}"/fonts
 	cd "${S}"/fonts
 	unpack STIX_font.tgz
 }
 
 src_prepare() {
-	# bug #267061
-	epatch "${FILESDIR}"/${PN}-1.10.2-gcc43.patch
-
-	# bug #358245
-	epatch "${FILESDIR}"/${PN}-octave-3.4.patch
-
-	# bug #378255
-	epatch "${FILESDIR}"/${PN}-1.11.2-zlib.patch
-
 	# correct location of numpy/arrayobject.h
 	if use python; then
 		sed \
@@ -78,29 +84,33 @@
 
 	echo "#!${EPREFIX}/bin/sh" > config/py-compile
 
-	eautoreconf
+	autotools-utils_src_prepare
 }
 
 src_configure() {
-	econf --docdir="${ROOT}"usr/share/doc/${PF} \
-		$(use_enable glut) \
-		$(use_enable qt4 qt) \
-		$(use_enable wxwidgets wx) \
-		$(use_enable fltk) \
-		$(use_enable gif) \
-		$(use_enable jpeg) \
-		$(use_enable hdf5 hdf5_18) \
-		$(use_enable python) \
-		$(use_enable octave) \
-		$(use_enable gsl) \
+	local myeconfargs=(
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+		$(use_enable glut)
+		$(use_enable qt4 qt)
+		$(use_enable wxwidgets wx)
+		$(use_enable fltk)
+		$(use_enable gif)
+		$(use_enable jpeg)
+		$(use_enable hdf5 hdf5_18)
+		$(use_enable python)
+		$(use_enable octave)
+		$(use_enable gsl)
 		$(use_enable doc docs)
+		)
+	autotools-utils_src_configure
 }
 
 src_compile() {
 	# see bug #249627
 	local JOBS
-	use doc && JOBS=-j1
-	emake ${JOBS} || die "emake failed"
+	use doc && MAKEOPTS+=" -j1"
+
+	autotools-utils_src_compile
 
 	if use python; then
 		python_copy_sources lang
@@ -118,7 +128,7 @@
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	autotools-utils_src_install
 
 	if use python; then
 		installation() {
@@ -127,7 +137,6 @@
 		python_execute_function -s --source-dir lang installation
 		python_clean_installation_image
 	fi
-	dodoc README AUTHORS || die "dodoc failed"
 }
 
 pkg_postinst() {