[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

["Michał Górny" <mgorny@gentoo.org>]

commit:     8672d31fc9e433cb154239c22a0672e7cae80788
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  5 08:15:35 2016 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jun  5 11:47:40 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8672d31f

sci-mathematics/octave: Nuke 3.8.1

 sci-mathematics/octave/Manifest               |   1 -
 sci-mathematics/octave/octave-3.8.1-r1.ebuild | 163 ---------------------
 sci-mathematics/octave/octave-3.8.1.ebuild    | 202 --------------------------
 3 files changed, 366 deletions(-)

diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index 650d367..30a329a 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -1,5 +1,4 @@
 DIST octave-3.6.4.tar.bz2 15627315 SHA256 fa185df9591f5d740f4d37ff6eaf06db576fdd3e0ddd9d0737365799e5d1c962 SHA512 a49ef50161272618c9543057be5903e1e50b7f4ecb929777f6715d4b3a07a92c36a5b13958c52d8b942b6c7e7e3f7844409d0062eb02bdb3972d7194312b7a81 WHIRLPOOL f51c764ce1ed911661bb3dd1d31a2321f09c0d887ead7bbe8c1f4ad1ebe05137223afb5ff18fc57b83d631936975964a85e4fed9a087760935acb5a35050cda0
-DIST octave-3.8.1.tar.bz2 17664241 SHA256 d6762ed2ad4a042243a095fb44c7a1d3a91c635b6dca37fcef15a5efdffa9bbd SHA512 673ff37692d2ef1116a10afb36448494e69cb01de609017af1a72c3258a1fe71012e9986aafc29127509f7e6664127b4e9b7f269322820b3464eb30ab4b4ef7f WHIRLPOOL 85729283a65051159245f31ab53951c756ea55d1cc93518dbb55b740329a89cffbdf3679ae8d2b957e1a4b47dbf5f2dd9d60f51acf32e159d821979661a5fa54
 DIST octave-3.8.2.tar.bz2 17834980 SHA256 83bbd701aab04e7e57d0d5b8373dd54719bebb64ce0a850e69bf3d7454f33bae SHA512 c2bf4cc844a5b8dbabf2b54d2458ee7573f87dc92ca8cd7829e8c057591387b3a0995b5b48c6e50ff2944411f2b28521de26e438ed431f68ab5b49b8ce1d94cc WHIRLPOOL c117b935a060572577b3506a508d558a2af85b2785af02647e9edc47c5df97e357d954449edc90cc40a6af3230f99faccf6c7cf1b9b2bc6044f35749d3ae1af0
 DIST octave-4.0.0.tar.xz 15759196 SHA256 cf6be2fac6796fda68971e249c96d026ce4a1b0ed074ce49a5791365a958c474 SHA512 54559686d017b7fe731a89a24e74d08781365028d2799a86f25ebf4c433013eab03e5b4381a992b79e40bce1827a6eee2aefd0798b739128dd8dd7b41d936b89 WHIRLPOOL 0e0154dac5ac76268d99533186a88f54bc811817cdf2222c3c0bc22ff456fd23829f7015eebcb9d441665c1d2782ed57c06ab00880f64d63b22ef4aad43f132a
 DIST octave-4.0.1.tar.xz 15637340 SHA256 d58f4861f93dbf4c98f3574d6066cfa25001349bd58ce063cf443efba4e1c287 SHA512 7fa22b50c9116c917b2a2bd63d81a8106eba95842a5de736fbf89ee6ea3dbd5542c183ab6229b62f548ad07abbf67514152a8e553e8fbdf86036d44ced669798 WHIRLPOOL 7bcc16a1e01543dc0baab92993a305c6fea7fc9eb9d806004a1b3e11479c34d8a40000de60e2291a27c846d54abc35883a16583bc324681d7897624fa40d98bb

diff --git a/sci-mathematics/octave/octave-3.8.1-r1.ebuild b/sci-mathematics/octave/octave-3.8.1-r1.ebuild
deleted file mode 100644
index e5f5569..0000000
--- a/sci-mathematics/octave/octave-3.8.1-r1.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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
-
-DESCRIPTION="High-level interactive language for numerical computations"
-LICENSE="GPL-3"
-HOMEPAGE="http://www.octave.org/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
-
-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:3=
-	sys-libs/ncurses:0=
-	virtual/lapack
-	curl? ( net-misc/curl:0= )
-	fftw? ( sci-libs/fftw:3.0= )
-	glpk? ( sci-mathematics/glpk:0= )
-	gnuplot? ( sci-visualization/gnuplot )
-	gui? ( x11-libs/qscintilla:0= )
-	hdf5? ( sci-libs/hdf5:0= )
-	imagemagick? ( || (
-			media-gfx/graphicsmagick[cxx]
-			media-gfx/imagemagick[cxx] ) )
-	java? ( >=virtual/jre-1.6.0:* )
-	jit? ( <sys-devel/llvm-3.5 )
-	opengl? (
-		media-libs/freetype:2=
-		media-libs/fontconfig:1.0=
-		>=x11-libs/fltk-1.3:1=[opengl]
-		x11-libs/gl2ps:0=
-		virtual/glu )
-	postscript? (
-		app-text/epstool
-		media-gfx/pstoedit
-		media-gfx/transfig )
-	qhull? ( media-libs/qhull:0= )
-	qrupdate? ( sci-libs/qrupdate:0= )
-	readline? ( sys-libs/readline:0= )
-	sparse? (
-		sci-libs/arpack:0=
-		sci-libs/camd:0=
-		sci-libs/ccolamd:0=
-		sci-libs/cholmod:0=
-		sci-libs/colamd:0=
-		sci-libs/cxsparse:0=
-		sci-libs/umfpack:0= )
-	X? ( x11-libs/libX11:0= )
-	zlib? ( sys-libs/zlib:0= )"
-
-DEPEND="${RDEPEND}
-	qrupdate? ( app-misc/pax-utils )
-	sparse? ( app-misc/pax-utils )
-	java? ( >=virtual/jdk-1.6.0 )
-	doc? (
-		virtual/latex-base
-		dev-texlive/texlive-genericrecommended
-		dev-texlive/texlive-metapost
-		sys-apps/texinfo )
-	dev-util/gperf
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.4.3-texi.patch
-	"${FILESDIR}"/${PN}-3.8.0-disable-getcwd-path-max-test-as-it-is-too-slow.patch
-	"${FILESDIR}"/${PN}-3.8.0-imagemagick-configure.patch
-	"${FILESDIR}"/${PN}-3.8.0-llvm-configure.patch
-	"${FILESDIR}"/${PN}-3.8.1-imagemagick.patch
-	"${FILESDIR}"/${PN}-3.8.1-pkgbuilddir.patch
-)
-
-src_prepare() {
-	# nasty prefix hacks for fltk:1 and qt4 linking
-	if use prefix; then
-		use opengl && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/fltk-1"
-		use gui && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/qt4"
-	fi
-
-	has_version ">=sys-devel/llvm-3.4" && \
-		epatch "${FILESDIR}"/${PN}-3.8.0-llvm-3.4.patch
-
-	# Fix bug 501756
-	sed -i \
-		-e 's@A-Za-z0-9@[:alnum:]@g' \
-		-e 's@A-Za-z@[:alpha:]@g' \
-		libinterp/mkbuiltins || die
-	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)
-		$(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}/${PV}/m/java/octave.jar"
-	echo "LDPATH=${EROOT}usr/$(get_libdir)/${PN}/${PV}" > 99octave
-	doenvd 99octave
-}

diff --git a/sci-mathematics/octave/octave-3.8.1.ebuild b/sci-mathematics/octave/octave-3.8.1.ebuild
deleted file mode 100644
index 667ad0c..0000000
--- a/sci-mathematics/octave/octave-3.8.1.ebuild
+++ /dev/null
@@ -1,202 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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
-
-DESCRIPTION="High-level interactive language for numerical computations"
-LICENSE="GPL-3"
-HOMEPAGE="http://www.octave.org/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
-
-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 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	app-text/ghostscript-gpl
-	dev-libs/libpcre
-	sys-libs/ncurses:0=
-	jit? ( <sys-devel/llvm-3.5 )
-	virtual/lapack
-	curl? ( net-misc/curl )
-	fftw? ( sci-libs/fftw:3.0 )
-	glpk? ( sci-mathematics/glpk )
-	gnuplot? ( sci-visualization/gnuplot )
-	gui? ( 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]
-		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:0 )
-	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.1-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
-)
-
-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
-	# 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}/${PV}/m/java/octave.jar"
-	echo "LDPATH=${EROOT}usr/$(get_libdir)/${PN}/${PV}" > 99octave
-	doenvd 99octave
-}