[gentoo-commits] gentoo-x86 commit in sci-mathematics/octave: metadata.xml octave-3.8.1_rc4-r1.ebuild ChangeLog octave-3.8.1_rc3.ebuild

[Mark Wright (gienah)]

gienah      14/03/01 15:17:35

  Modified:             metadata.xml ChangeLog
  Added:                octave-3.8.1_rc4-r1.ebuild
  Removed:              octave-3.8.1_rc3.ebuild
  Log:
  Thanks to David Kredba for reporting, add gui USE flag to add x11-libs/qscintilla dependency. Remove 3.8.1-rc3 at it is obsoleted by 3.8.1-rc4.
  
  (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 618E971F)

Revision  Changes    Path
1.10                 sci-mathematics/octave/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/metadata.xml?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/metadata.xml?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/metadata.xml?r1=1.9&r2=1.10

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/octave/metadata.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- metadata.xml	19 Feb 2014 00:52:33 -0000	1.9
+++ metadata.xml	1 Mar 2014 15:17:35 -0000	1.10
@@ -11,6 +11,7 @@
 </longdescription>
   <use>
     <flag name="glpk">Add support for <pkg>sci-libs/glpk</pkg> for linear programming</flag>
+    <flag name="gui">Enable the graphical user interface</flag>
     <flag name="jit">(EXPERIMENTAL) enable JIT compiler</flag>
     <flag name="qhull">Add support for <pkg>sci-libs/qhull</pkg>, to allow `delaunay', `convhull', and related functions</flag>
     <flag name="qrupdate">Add support for <pkg>sci-libs/qrupdate</pkg>for QR and Cholesky update functions</flag>



1.159                sci-mathematics/octave/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/ChangeLog?rev=1.159&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/ChangeLog?rev=1.159&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/ChangeLog?r1=1.158&r2=1.159

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -r1.158 -r1.159
--- ChangeLog	1 Mar 2014 02:46:54 -0000	1.158
+++ ChangeLog	1 Mar 2014 15:17:35 -0000	1.159
@@ -1,6 +1,14 @@
 # ChangeLog for sci-mathematics/octave
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.158 2014/03/01 02:46:54 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.159 2014/03/01 15:17:35 gienah Exp $
+
+*octave-3.8.1_rc4-r1 (01 Mar 2014)
+
+  01 Mar 2014; Mark Wright <gienah@g.o> +octave-3.8.1_rc4-r1.ebuild,
+  -octave-3.8.1_rc3.ebuild, metadata.xml:
+  Thanks to David Kredba for reporting, add gui USE flag to add
+  x11-libs/qscintilla dependency. Remove 3.8.1-rc3 at it is obsoleted by
+  3.8.1-rc4.
 
 *octave-3.8.1_rc4 (01 Mar 2014)
 



1.1                  sci-mathematics/octave/octave-3.8.1_rc4-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/octave-3.8.1_rc4-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/octave-3.8.1_rc4-r1.ebuild?rev=1.1&content-type=text/plain

Index: octave-3.8.1_rc4-r1.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.8.1_rc4-r1.ebuild,v 1.1 2014/03/01 15:17:35 gienah Exp $

EAPI=5

AUTOTOOLS_AUTORECONF=1
AUTOTOOLS_IN_SOURCE_BUILD=1

inherit autotools-utils multilib toolchain-funcs fortran-2 flag-o-matic java-pkg-opt-2 pax-utils

MY_PV="${PV/_/-}"
MY_P="${PN}-${MY_PV}"

DESCRIPTION="High-level interactive language for numerical computations"
LICENSE="GPL-3"
HOMEPAGE="http://www.octave.org/"
SRC_URI="mirror://gnu-alpha/octave/${MY_P}.tar.gz"

SLOT="0/${PV}"
IUSE="curl doc fftw +glpk gnuplot gui hdf5 +imagemagick java jit opengl postscript
	+qhull +qrupdate readline +sparse static-libs X zlib"
KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"

RDEPEND="
	app-text/ghostscript-gpl
	dev-libs/libpcre
	sys-libs/ncurses
	jit? ( !hppa? ( sys-devel/llvm ) )
	virtual/lapack
	curl? ( net-misc/curl )
	fftw? ( sci-libs/fftw:3.0 )
	glpk? ( sci-mathematics/glpk )
	gnuplot? ( sci-visualization/gnuplot )
	gui? ( !hppa? ( !arm? ( x11-libs/qscintilla ) ) )
	hdf5? ( sci-libs/hdf5 )
	imagemagick? ( || (
			media-gfx/graphicsmagick[cxx]
			media-gfx/imagemagick[cxx] ) )
	opengl? (
		media-libs/freetype:2
		media-libs/fontconfig
		>=x11-libs/fltk-1.3:1[opengl]
		!hppa? ( x11-libs/gl2ps )
		virtual/glu )
	postscript? (
		app-text/epstool
		media-gfx/pstoedit
		media-gfx/transfig )
	qhull? ( media-libs/qhull )
	qrupdate? ( sci-libs/qrupdate )
	readline? ( sys-libs/readline )
	sparse? (
		sci-libs/arpack
		sci-libs/camd
		sci-libs/ccolamd
		sci-libs/cholmod
		sci-libs/colamd
		sci-libs/cxsparse
		sci-libs/umfpack )
	X? ( x11-libs/libX11 )
	zlib? ( sys-libs/zlib )"

DEPEND="${RDEPEND}
	qrupdate? ( app-misc/pax-utils )
	sparse? ( app-misc/pax-utils )
	doc? (
		virtual/latex-base
		dev-texlive/texlive-genericrecommended
		dev-texlive/texlive-metapost
		sys-apps/texinfo )
	dev-util/gperf
	virtual/pkgconfig"

PATCHES=(
	"${FILESDIR}"/${PN}-3.8.0-pkgbuilddir.patch
	"${FILESDIR}"/${PN}-3.4.3-texi.patch
	"${FILESDIR}"/${PN}-3.8.0-imagemagick-configure.patch
	"${FILESDIR}"/${PN}-3.8.0-imagemagick.patch
	"${FILESDIR}"/${PN}-3.8.0-llvm-configure.patch
	"${FILESDIR}"/${PN}-3.8.0-disable-getcwd-path-max-test-as-it-is-too-slow.patch
)

S="${WORKDIR}/${MY_P}"

pkg_pretend() {
	if use qrupdate || use sparse; then
		local blaslib=$($(tc-getPKG_CONFIG) --libs-only-l blas | sed -e 's@-l\([^ \t]*\)@lib\1@' | cut -d' ' -f 1)
		einfo "Checking dependencies are built with the same blas lib = ${blaslib}"
		local usr_lib="${ROOT}usr/$(get_libdir)"
		local libs=( )
		use qrupdate && libs+=( "${usr_lib}"/libqrupdate.so )
		use sparse && libs+=(
			"${usr_lib}"/libarpack.so
			"${usr_lib}"/libcholmod.so
			"${usr_lib}"/libspqr.so
			"${usr_lib}"/libumfpack.so
		)
		for i in ${libs[*]}
		do
			# Is it not linked with the current blas?  This check is not enough though, as
			# earlier versions of sci-libs/cholmod were not linked with blas, while as later
			# versions are if built with the lapack use flag.
			scanelf -n ${i} | grep -q "${blaslib}"
			if [[ $? -ne 0 ]]; then
				# Does it appear to be linked with some blas or lapack library?
				scanelf -n ${i} | egrep -q "blas|lapack"
				if [[ $? -eq 0 ]]; then
					eerror "*******************************************************************************"
					eerror "${i} must be rebuilt with ${blaslib}"
					eerror ""
					eerror "To check the libaries ${i} is currently built with:"
					eerror ""
					eerror "scanelf -n ${i}"
					eerror ""
					eerror "To find the package that needs to be rebuilt:"
					eerror ""
					eerror "equery belongs ${i}"
					eerror "*******************************************************************************"
					die
				fi
			fi
		done
	fi
}

src_prepare() {
	# nasty prefix hack for fltk:1 linking
	if use prefix && use opengl; then
		sed -i \
			-e "s:ldflags\`:ldflags\` -Wl,-rpath,${EPREFIX}/usr/$(get_libdir)/fltk-1:" \
			configure.ac
	fi
	if has_version ">=sys-devel/llvm-3.4"; then
		epatch "${FILESDIR}"/${PN}-3.8.0-llvm-3.4.patch
	fi
	if use hppa && use opengl; then
		ewarn "http://www.gnu.org/software/octave/NEWS-3.8.html says Printing or saving figures"
		ewarn "with OpenGL graphics requires the gl2ps - but at the time of writing x11-libs/gl2ps"
		ewarn "does not have the hppa keyword"
	fi
	# Fix bug 501756 - sci-mathematics/octave-3.8.0 LC_ALL=et_EE - octave.cc:485:56:
	# error: 'Fallow_noninteger_range_as_index' was not declared in this scope
	sed -e 's@A-Za-z0-9@[:alnum:]@g' \
		-e 's@A-Za-z@[:alpha:]@g' \
		-i "${S}/libinterp/mkbuiltins" \
		|| die "Could not patch ${S}/libinterp/mkbuiltins for some non-English locales"
	autotools-utils_src_prepare
}

src_configure() {
	# occasional fail on install, force regeneration (bug #401189)
	rm doc/interpreter/contributors.texi || die

	# unfortunate dependency on mpi from hdf5 (bug #302621)
	use hdf5 && has_version sci-libs/hdf5[mpi] && \
		export CXX=mpicxx CC=mpicc FC=mpif77 F77=mpif77

	local myeconfargs=(
		--localstatedir="${EPREFIX}/var/state/octave"
		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
		$(use_enable doc docs)
		$(use_enable java)
		$(use_enable gui gui)
		$(use_enable jit)
		$(use_enable readline)
		$(use_with curl)
		$(use_with fftw fftw3)
		$(use_with fftw fftw3f)
		$(use_enable fftw fftw-threads)
		$(use_with glpk)
		$(use_with hdf5)
		$(use_with opengl)
		$(use_with qhull)
		$(use_with qrupdate)
		$(use_with sparse arpack)
		$(use_with sparse umfpack)
		$(use_with sparse colamd)
		$(use_with sparse ccolamd)
		$(use_with sparse cholmod)
		$(use_with sparse cxsparse)
		$(use_with X x)
		$(use_with zlib z)
	)
	if use imagemagick; then
		if has_version media-gfx/graphicsmagick[cxx]; then
			myeconfargs+=( "--with-magick=GraphicsMagick" )
		else
			myeconfargs+=( "--with-magick=ImageMagick" )
		fi
	else
		myeconfargs+=( "--without-magick" )
	fi
	autotools-utils_src_configure
}

src_compile() {
	emake
	if use java || use jit ; then
		pax-mark m "${S}/src/.libs/octave-cli"
	fi
}

src_install() {
	autotools-utils_src_install
	use doc && dodoc $(find doc -name \*.pdf)
	[[ -e test/fntests.log ]] && dodoc test/fntests.log
	use java && java-pkg_regjar "${ED}/usr/share/${PN}/${MY_PV}/m/java/octave.jar"
	echo "LDPATH=${EROOT}usr/$(get_libdir)/${PN}/${MY_PV}" > 99octave
	doenvd 99octave
}