From c5283d322accc6097afec74eab24550829788bab Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 23 Mar 2018 04:19:44 +0000 Subject: gentoo resync : 23.03.2018 --- sci-mathematics/octave/Manifest | 5 + .../octave-4.2.2-fix-qscintilla-detection.patch | 14 ++ .../files/octave-4.2.2-imagemagick-configure.patch | 16 ++ .../files/octave-4.2.2-ncurses-pkgconfig.patch | 37 ++++ sci-mathematics/octave/octave-4.2.2.ebuild | 187 +++++++++++++++++++++ 5 files changed, 259 insertions(+) create mode 100644 sci-mathematics/octave/files/octave-4.2.2-fix-qscintilla-detection.patch create mode 100644 sci-mathematics/octave/files/octave-4.2.2-imagemagick-configure.patch create mode 100644 sci-mathematics/octave/files/octave-4.2.2-ncurses-pkgconfig.patch create mode 100644 sci-mathematics/octave/octave-4.2.2.ebuild (limited to 'sci-mathematics/octave') diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest index fd05871519af..c1c29a90d563 100644 --- a/sci-mathematics/octave/Manifest +++ b/sci-mathematics/octave/Manifest @@ -6,6 +6,11 @@ AUX octave-4.2.0-ncurses-pkgconfig.patch 1034 BLAKE2B dc21406651de72c8146862e0e8 AUX octave-4.2.0-pkgbuilddir.patch 1346 BLAKE2B 38b3e3ea90e7e5f381cf75e7becad83c92dd4d8be07e30ca82e54f7811fbf42d83872059c5bab1af884d5f5e70c4826c119ed69286d07338d017335e68922969 SHA512 7dc10b4d27aa0fb4443dffaa28c84843d9c233172eb1c7b7d93d196434ea7db9c330b3152def21829e483ab3765423927e70718ca0662ae7aeba3a1a8540fa19 AUX octave-4.2.0-texi.patch 557 BLAKE2B bb79b2b56975feaa60e1dd0f6811cf7e11ab7080c88cc9103373a6bb0066c99e09a02b9651cf0317c0c19c31584fe68ba9c8796217c8e3aad316cda9ef3fb745 SHA512 1d4a6ce92ffde0945858b605cb37ed7c91abca201dd2c7f0d974852ef65c59e638a91aa219612c7acf9b46a0743a4a5e0ccbe590a8a056efd0d9d3293928c56a AUX octave-4.2.0-zlib-underlinking.patch 275 BLAKE2B a6353807c2c672b80ce5a015c5650cf017443bd92256ceb39d855e22bb9f20431c1837fa1e4fff1b4f547ff12da4fa85e6e1e49e5c350a9e5e7910de73c63b6b SHA512 093b13ad457e290d746908a5de1855071b2cd27b4c08101826d32fcf63398e863c3b72bb81f19255a04a880a2bf49e3ced1141bf7d0044db1328c6f2c9492f66 +AUX octave-4.2.2-fix-qscintilla-detection.patch 452 BLAKE2B bed48bf923cbfba50c50fdadfc807da0e199e2e7160f2a3078ba13fb58c123ecada0510ba8dd101f7772c7164533ff2aeb0841484ce41a86d27761b2e39e7fb0 SHA512 f5dd5a349dbdb36cba718ed378609f73090a32ce40240f002312539820538a30039c550c8b78493f3dca9e5f5eda8858c2e97afd313052d40d47d3edf08f1e80 +AUX octave-4.2.2-imagemagick-configure.patch 873 BLAKE2B 9de92c88f83c56d521f83df7672e71bc9398ad782004339c737d2991d85154cc1cf2c3d5fe912892c87b18f51af6b11d4b8fadcc5ed058b76cfa604b93aaa720 SHA512 582df053f6c14790461408a180ce66589bd6501e3f9ecdc126b2cf12e8044198dff6eb66904b7704f87cba46adaabbac3126e46c61e406debe8cca49b935f93d +AUX octave-4.2.2-ncurses-pkgconfig.patch 1034 BLAKE2B 244a96ab7cfd47203e7d23774c52f54e105f209edf79c869e6ce253a9cec7a3373a8dd0c98196ba3271f9b2b066ad3de3784151072055f2319ebbb4d1b68a475 SHA512 d2d6fe57a11f0493f86378bc4e1fc71378ae6d1878d17a367b77aa16a29880e37134e61343ba081f7ab2c4d127d93611491bef1320d6cd202eff0d78681cd4cc DIST octave-4.2.1.tar.gz 25409651 BLAKE2B c53dd025cbad023d4d343d47ff13051f6f66bc8cfeece6c56eda83a80c92d2256fd1e75d5574ae024e42d707eb22b60420269f91a4930642aec8e3391a17b035 SHA512 c437c57eb145ddea7b97124dc6406d130fd91c9141198b93bc756bb05cb3f7645a7c591443faeb65e69edf6abc2b8d5612e515f7703a04eed27213a2133009b7 +DIST octave-4.2.2.tar.gz 25624087 BLAKE2B c46de90d9a985c2b6b4f87b94b56f2ba4fb648ca0a0aff1f64e9b9d27a6d791e8657c2bff0c4daa3de5ac3622c23b34724e740ec1fe0f1a71d8f416c9f58d88a SHA512 b94edd79adc0e19229bb654037910201b51b6cfa373d63de5e3aa69e9b659b2e2790e2d2b4b5e8d2f12b26846c20ba5c12eae657155c8329e85e970f738d08c2 EBUILD octave-4.2.1.ebuild 4971 BLAKE2B 41099313b75cddf9153d4e1f1bacd05c239afa2c0cbfcc151162e09f4da677539bf38494f2c97a544b4cbeaa0f8a1c0ad9bbd0f9a2b158144e8adbd1b4735cfe SHA512 0f87f0a29c8810cf6a5b70fbb661dcab35003099ac02ee2ae2637b02fa018adfd24a5379fc64ebcc6dff84f535fcc4e90dbcf3b438886d6521045d03d24668f4 +EBUILD octave-4.2.2.ebuild 4950 BLAKE2B 0bf5d2fe8ba3bb656a57a3e887bbd9d916a3a59fc9cf1fe965905c794c6d20c2ea42f31347a682dc3aafa010c0943cf9d389da347a9c8c36d28ced4b68d269f3 SHA512 37420732ecad2efb09663c2f5fdfcf21135d91092a2f8f5b8653cc17ccd6c14aa37a70397bd73b829b687ff667334201cf1c3a846e3a33b38f61eb66ecc9b21d MISC metadata.xml 1199 BLAKE2B f1daa0330bdc0362c68458ce6e7145118dd8a9d1a3bcbcc76c04ccdffe700c9d6f71b5e8b7f05b5ed0154352a213ce7b5177284919362585fedb0dbd8b68cbca SHA512 aebb1728f0ca59ba83b649eea72c267c530efc0b97b12f0d7958ba8de0f482fcb37245cf93bc188c9368686e0feafc44da4a7dd97d6bab8246309945fee8f7a4 diff --git a/sci-mathematics/octave/files/octave-4.2.2-fix-qscintilla-detection.patch b/sci-mathematics/octave/files/octave-4.2.2-fix-qscintilla-detection.patch new file mode 100644 index 000000000000..80fc28013239 --- /dev/null +++ b/sci-mathematics/octave/files/octave-4.2.2-fix-qscintilla-detection.patch @@ -0,0 +1,14 @@ +In Gentoo, QScintilla for Qt5 has the same library name +as its Qt4 variant. + +--- a/m4/acinclude.m4 ++++ b/m4/acinclude.m4 +@@ -1460,7 +1460,7 @@ + ;; + 5) + QT_MODULES="Qt5Core Qt5Gui Qt5Network Qt5OpenGL Qt5PrintSupport" +- octave_qscintilla_libnames="qscintilla2-qt5 qscintilla2_qt5 qt5scintilla2" ++ octave_qscintilla_libnames="qscintilla2_qt5 qscintilla2" + ;; + *) + AC_MSG_ERROR([Unrecognized Qt version $qt_version]) diff --git a/sci-mathematics/octave/files/octave-4.2.2-imagemagick-configure.patch b/sci-mathematics/octave/files/octave-4.2.2-imagemagick-configure.patch new file mode 100644 index 000000000000..d80c23ec4224 --- /dev/null +++ b/sci-mathematics/octave/files/octave-4.2.2-imagemagick-configure.patch @@ -0,0 +1,16 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -1560,11 +1560,11 @@ if test $check_magick = yes; then + MAGICK_LIBS= + + PKG_CHECK_EXISTS([$magick++], [ +- ## Make sure we only get -I, -L, and -l flags. Some Graphics/ImageMagick++ ++ ## Make sure we only get -I, -D, -L, and -l flags. Some Graphics/ImageMagick++ + ## packages add extra flags that are useful when building + ## Graphics/ImageMagick++ extentions. These extra flags break the + ## Octave build. +- MAGICK_CPPFLAGS="$($PKG_CONFIG --cflags-only-I $magick++ | $SED -e 's/^ *$//')" ++ MAGICK_CPPFLAGS="$($PKG_CONFIG --cflags-only-I $magick++ | $SED -e 's/^ *$//' | $SED -e 's/\(-@<:@DI@:>@@<:@^ \t@:>@*\)\|\(-@<:@^ \t@:>@*\)/\1/g')" + MAGICK_LDFLAGS="$($PKG_CONFIG --libs-only-L $magick++ | $SED -e 's/^ *$//')" + MAGICK_LIBS="$($PKG_CONFIG --libs-only-l $magick++ | $SED -e 's/^ *$//')" + diff --git a/sci-mathematics/octave/files/octave-4.2.2-ncurses-pkgconfig.patch b/sci-mathematics/octave/files/octave-4.2.2-ncurses-pkgconfig.patch new file mode 100644 index 000000000000..d20fef5c56e9 --- /dev/null +++ b/sci-mathematics/octave/files/octave-4.2.2-ncurses-pkgconfig.patch @@ -0,0 +1,37 @@ +--- a/m4/acinclude.m4 ++++ b/m4/acinclude.m4 +@@ -1327,32 +1327,8 @@ + dnl Find a suitable termlib to use. + dnl + AC_DEFUN([OCTAVE_CHECK_LIB_TERMLIB], [ +- TERM_LIBS= +- ac_octave_save_LIBS="$LIBS" +- AC_SEARCH_LIBS([tputs], +- [ncurses curses termcap terminfo termlib], +- [], []) +- LIBS="$ac_octave_save_LIBS" +- case "$ac_cv_search_tputs" in +- -l*) +- TERM_LIBS="$ac_cv_search_tputs" +- ;; +- no) +- warn_termlibs="I couldn't find -ltermcap, -lterminfo, -lncurses, -lcurses, or -ltermlib!" +- AC_MSG_WARN([$warn_termlibs]) +- ;; +- esac +- +-dnl Old code (9/9/2012). Delete when new code is definitely proven. +-dnl +-dnl for _termlib in ncurses curses termcap terminfo termlib; do +-dnl AC_CHECK_LIB([${_termlib}], [tputs], [ +-dnl TERM_LIBS="-l${termlib}" +-dnl octave_cv_lib_found_termlib=yes +-dnl break]) +-dnl done +- +- AC_SUBST(TERM_LIBS) ++ PKG_CHECK_MODULES([TERM], [ncurses]) ++ CPPFLAGS="${CPPFLAGS} ${TERM_CFLAGS}" + ]) + dnl + dnl Check for the Qhull version. diff --git a/sci-mathematics/octave/octave-4.2.2.ebuild b/sci-mathematics/octave/octave-4.2.2.ebuild new file mode 100644 index 000000000000..f120643f0170 --- /dev/null +++ b/sci-mathematics/octave/octave-4.2.2.ebuild @@ -0,0 +1,187 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools flag-o-matic fortran-2 java-pkg-opt-2 pax-utils toolchain-funcs xdg-utils + +DESCRIPTION="High-level interactive language for numerical computations" +LICENSE="GPL-3" +HOMEPAGE="http://www.octave.org/" +SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" + +SLOT="0/${PV}" +IUSE="curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java opengl openssl + portaudio postscript +qhull +qrupdate readline sndfile +sparse static-libs X zlib" +KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux" + +RDEPEND=" + app-arch/bzip2 + app-text/ghostscript-gpl + dev-libs/libpcre:3= + sys-libs/ncurses:0= + sys-libs/zlib + virtual/blas + virtual/lapack + curl? ( net-misc/curl:0= ) + fftw? ( sci-libs/fftw:3.0= ) + glpk? ( sci-mathematics/glpk:0= ) + gnuplot? ( sci-visualization/gnuplot ) + hdf5? ( sci-libs/hdf5:0= ) + imagemagick? ( + !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) + graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) + ) + java? ( >=virtual/jre-1.6.0:* ) + opengl? ( + media-libs/freetype:2= + media-libs/fontconfig:1.0= + >=x11-libs/fltk-1.3:1=[opengl,xft] + x11-libs/gl2ps:0= + virtual/glu + ) + openssl? ( dev-libs/openssl:0= ) + portaudio? ( media-libs/portaudio ) + postscript? ( + app-text/epstool + media-gfx/pstoedit + media-gfx/transfig + ) + qhull? ( media-libs/qhull:0= ) + qrupdate? ( sci-libs/qrupdate:0= ) + gui? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtopengl:5 + >=x11-libs/qscintilla-2.9.3-r2:=[qt5(+)] + ) + readline? ( sys-libs/readline:0= ) + sndfile? ( media-libs/libsndfile ) + 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= )" +DEPEND="${RDEPEND} + gui? ( dev-qt/linguist-tools:5 ) + qrupdate? ( app-misc/pax-utils ) + sparse? ( app-misc/pax-utils ) + java? ( >=virtual/jdk-1.6.0 ) + doc? ( + virtual/latex-base + dev-texlive/texlive-fontsrecommended + || ( dev-texlive/texlive-plaingeneric dev-texlive/texlive-genericrecommended ) + dev-texlive/texlive-metapost + ) + sys-apps/texinfo + dev-util/gperf + virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-4.2.0-texi.patch + "${FILESDIR}"/${PN}-4.2.0-disable-getcwd-path-max-test-as-it-is-too-slow.patch + "${FILESDIR}"/${P}-imagemagick-configure.patch + "${FILESDIR}"/${PN}-4.2.0-imagemagick.patch + "${FILESDIR}"/${PN}-4.2.0-pkgbuilddir.patch + "${FILESDIR}"/${P}-ncurses-pkgconfig.patch + "${FILESDIR}"/${PN}-4.2.0-zlib-underlinking.patch + "${FILESDIR}"/${P}-fix-qscintilla-detection.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" + fi + + # occasional fail on install, force regeneration (bug #401189) + rm doc/interpreter/contributors.texi || die + + default + eautoreconf +} + +src_configure() { + # [QA] detect underlinking #593670 + append-ldflags $(test-flags-CXX -Wl,-z,defs) + + # 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 + + econf \ + --localstatedir="${EPREFIX}/var/state/octave" \ + --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \ + --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" \ + --disable-64 \ + --disable-jit \ + --enable-shared \ + --with-z \ + --with-bz2 \ + --without-OSMesa \ + $(use_enable static-libs static) \ + $(use_enable doc docs) \ + $(use_enable java) \ + $(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 imagemagick magick $(usex graphicsmagick GraphicsMagick ImageMagick)) \ + $(use_with opengl) \ + $(use_with opengl fltk) \ + $(use_with openssl) \ + $(use_with portaudio) \ + $(use_with qhull) \ + $(use_with qrupdate) \ + $(use_with gui qt 5) \ + $(use_with sndfile) \ + $(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) +} + +src_compile() { + default + if use java; then + pax-mark m "${S}/src/.libs/octave-cli" + fi +} + +src_install() { + default + if use doc; then + dodoc $(find doc -name '*.pdf') + else + # bug 566134, macros.texi is installed by make install if use doc + insinto /usr/share/${PN}/${PV}/etc + doins doc/interpreter/macros.texi + fi + [[ -e test/fntests.log ]] && dodoc test/fntests.log + use java && \ + java-pkg_regjar "${ED%/}/usr/share/${PN}/${PV}/m/java/octave.jar" + echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/${PN}/${PV}" > 99octave || die + doenvd 99octave +} + +pkg_postinst() { + xdg_mimeinfo_database_update + xdg_desktop_database_update +} + +pkg_postrm() { + xdg_mimeinfo_database_update + xdg_desktop_database_update +} -- cgit v1.2.3