From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E2736158094 for ; Wed, 3 Aug 2022 02:54:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 817CDE0EEA; Wed, 3 Aug 2022 02:54:24 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 533B5E0EEA for ; Wed, 3 Aug 2022 02:54:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3245D3410F1 for ; Wed, 3 Aug 2022 02:54:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7B3EF55F for ; Wed, 3 Aug 2022 02:54:21 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1659495235.5f7f22be582175d2fdf731123da9805c69a131ec.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-mathematics/octave/Manifest sci-mathematics/octave/octave-7.1.0.ebuild X-VCS-Directories: sci-mathematics/octave/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 5f7f22be582175d2fdf731123da9805c69a131ec X-VCS-Branch: master Date: Wed, 3 Aug 2022 02:54:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d245aaf7-2e21-4c0f-b3f8-081686b9ba28 X-Archives-Hash: 2d1936c5b2761c798095543e3716453f commit: 5f7f22be582175d2fdf731123da9805c69a131ec Author: Sam James gentoo org> AuthorDate: Wed Aug 3 02:53:55 2022 +0000 Commit: Sam James gentoo org> CommitDate: Wed Aug 3 02:53:55 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f7f22be sci-mathematics/octave: drop 7.1.0 Bug: https://bugs.gentoo.org/842645 Signed-off-by: Sam James gentoo.org> sci-mathematics/octave/Manifest | 1 - sci-mathematics/octave/octave-7.1.0.ebuild | 212 ----------------------------- 2 files changed, 213 deletions(-) diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest index 1bc20321a5e6..5ce57ee4f2a9 100644 --- a/sci-mathematics/octave/Manifest +++ b/sci-mathematics/octave/Manifest @@ -1,4 +1,3 @@ DIST octave-5.2.0.tar.gz 33360285 BLAKE2B 6d53a48a7fbe929e372fd51d084c0269befd3140341f3f3a1f2cae02f9f085ed434c3336c770c9a856081197c93ee306f481dd116b958685175bc294e4db62ae SHA512 fa2076fb22415e0797964c66cfb8d24643f178f45eb9c14ebb4c082767e0a53509fde550f579fa4a816348bd0f7cbc74f24144f9a30a5b9c09ebe1b3949db498 DIST octave-6.4.0.tar.gz 32873157 BLAKE2B afa729c3c9917f724e7d97fe3af42986f323d3ff849e0a33ac9f183237e68d989d4f3dacd644405b648ec050ad07d8973abddbd8657b810de6f65d5b5ae37c02 SHA512 91ff031f6dfff8506fa738fd4f1f07276501fdfe003f8ed992cccf91da14d9d33da6d08923322b0dae5f5b696b49856b0f5c5065e26b0701b0d1630173807435 -DIST octave-7.1.0.tar.gz 34187598 BLAKE2B da4c1b47e0d71f05edc47036b9b10fb83aa6edb8aa911ff22f77a013935ea37295f776f5c478e198c38102b8d1ad68edada818c9b46ad1061a466b5c77eeed58 SHA512 042a68bd2c5c873ccc846c6de13743c6fddd166e8b062948daf184133eb774a05e29ab6132829886411a5ba330126d20a3d0700a606819a424c3db6e57471888 DIST octave-7.2.0.tar.gz 34180572 BLAKE2B 311021c339b92b3a94b0272f0fb7c788b78ae18fa7a4bddf8302c181401854f35ea7b8e6738d1a294c9baa343c7e8ec365d33f5af2d984ac6ea6853f5d53cf23 SHA512 b1f484fb97ca9270c3090f73b01f1ec0dcd6d3f838ecf7f46c50eb6245a1fa454fbc15dcf87b462a71532ba324cccd4d547b8a5b6a8e7a0914ea14981386b024 diff --git a/sci-mathematics/octave/octave-7.1.0.ebuild b/sci-mathematics/octave/octave-7.1.0.ebuild deleted file mode 100644 index 91df3f2a06d3..000000000000 --- a/sci-mathematics/octave/octave-7.1.0.ebuild +++ /dev/null @@ -1,212 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools flag-o-matic fortran-2 java-pkg-opt-2 pax-utils qmake-utils toolchain-funcs xdg - -DESCRIPTION="High-level interactive language for numerical computations" -HOMEPAGE="https://www.gnu.org/software/octave/" -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0/${PV}" -IUSE="curl doc fftw +glpk gnuplot gui hdf5 java json opengl - portaudio postscript +qhull +qrupdate readline sndfile +sparse - ssl static-libs sundials X zlib" -# Issue when building w/ SSL needs investigation -#KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" - -# Although it is listed in INSTALL.OCTAVE as a build tool, Octave runs -# "makeinfo" from sys-apps/texinfo at runtime to convert its texinfo -# documentation to text (see scripts/help/help.m). -# -# (un)zip isn't mentioned, but there's a test that uses it (bug 775254). -# -RDEPEND=" - app-arch/bzip2 - app-arch/unzip - app-arch/zip - app-text/ghostscript-gpl - sys-apps/texinfo - 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 ) - gui? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qthelp:5 - dev-qt/qtnetwork:5 - dev-qt/qtopengl:5 - dev-qt/qtprintsupport:5 - dev-qt/qtwidgets:5 - x11-libs/qscintilla:= - ) - hdf5? ( sci-libs/hdf5:0= ) - java? ( >=virtual/jre-1.8:* ) - json? ( dev-libs/rapidjson ) - opengl? ( - media-libs/freetype:2= - media-libs/fontconfig:1.0= - virtual/glu - >=x11-libs/fltk-1.3:1=[opengl,xft] - x11-libs/gl2ps: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= ) - 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= - ) - ssl? ( - dev-libs/openssl:0= - ) - sundials? ( >=sci-libs/sundials-4:0= ) - X? ( x11-libs/libX11:0= )" -DEPEND="${RDEPEND} - dev-util/gperf - virtual/imagemagick-tools - doc? ( - dev-texlive/texlive-fontsrecommended - dev-texlive/texlive-plaingeneric - dev-texlive/texlive-metapost - virtual/latex-base - ) - java? ( >=virtual/jdk-1.8:* ) - qrupdate? ( app-misc/pax-utils ) - sparse? ( app-misc/pax-utils )" -BDEPEND=" - virtual/pkgconfig - gui? ( dev-qt/linguist-tools:5 )" - -PATCHES=( - "${FILESDIR}"/${PN}-5.1.0-pkgbuilddir.patch - "${FILESDIR}"/${PN}-4.2.2-ncurses-pkgconfig.patch - "${FILESDIR}"/${PN}-6.4.0-slibtool.patch - "${FILESDIR}"/${PN}-6.4.0-omit-qtchooser-qtver.patch -) - -src_prepare() { - default - - # nasty prefix hacks for fltk:1 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 - - eautoreconf -} - -src_configure() { - # 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 - - # tell autoconf where to find qt binaries, fix bug #837752 - export MOC="$(qt5_get_bindir)/moc" UIC="$(qt5_get_bindir)/uic" RCC="$(qt5_get_bindir)/rcc" \ - LRELEASE="$(qt5_get_bindir)/lrelease" QCOLLECTIONGENERATOR="$(qt5_get_bindir)/qcollectiongenerator" \ - QHELPGENERATOR="$(qt5_get_bindir)/qhelpgenerator" - - # Some of these use_with flags are a bit mismatched. The configure - # script offers only --without-foo, and detects "foo" automatically - # unless --without-foo is specified. Passing --with-foo is not an - # error, however, so it kind of works. We wind up with, for example, - # - # --with-sundials_ida (no-op) with USE="sundials" - # --without-sundials_ida (disables it) with USE="-sundials" - # - # The --enable-link-all-dependencies flag is needed because - # otherwise, the build system appends --no-undefined to LDFLAGS and - # then proceeds to undefine things. GNU libtool ignores this, but - # slibtool (for example) does not (bug #776583). - econf \ - --localstatedir="${EPREFIX}/var/state/octave" \ - --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \ - --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" \ - --disable-64 \ - --enable-link-all-dependencies \ - --enable-shared \ - --with-z \ - --with-bz2 \ - $(use_enable static-libs static) \ - $(use_enable doc docs) \ - $(use_enable java) \ - $(use_enable json rapidjson) \ - $(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 opengl fltk) \ - $(use_with ssl openssl) \ - $(use_with portaudio) \ - $(use_with qhull qhull_r) \ - $(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 sundials sundials_ida) \ - $(use_with X x) -} - -src_compile() { - export VARTEXFONTS="${T}/fonts" # otherwise it will write to /var/cache/fonts/ and trip sandbox - - 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 - - find "${ED}" -type f -name '*.la' -delete || die -}