gentoo auto-resync : 03.08.2022 - 13:48:05

2 files changed, 42 insertions, 39 deletions

diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index 8100155978b4..d292fa6e3ca9 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -6,8 +6,8 @@ AUX octave-6.4.0-omit-qtchooser-qtver.patch 765 BLAKE2B 2f889e8278e48489f2eab1c3
 AUX octave-6.4.0-slibtool.patch 1416 BLAKE2B e4b487481490b41a4da499bb5eceff0f6a25a7e25d4f6c76088c3703259ab4899a354b0cf67eecb989bf4c4c05836be09881cce72145b3badca1393bd386a85f SHA512 cac0d183b3c555a25db37df250b2517ae4b762b7bc0d65ba0cb1093133f6f7ada42f6745b060d17f59c2177976841dafabcda61cf03d9cd14028399472f28ed7
 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
 EBUILD octave-5.2.0.ebuild 5403 BLAKE2B c84884673c5ae98b97e18f93763932b28c01945957a56b6b5b79ac2e194ebaf01194dc96d53d0cff2ec79da04aa888f0999dd9df448cda0a6bfe1de61bbfb340 SHA512 eca18c92da4e6a76639ba1d421e648f8ed6b2fb903be02bb466038746ced17ad2c1e0cd3cea6a6ce467ba23728b5df1eb5e6bd6c9bd37d112cc63183cbc0aeda
 EBUILD octave-6.4.0-r3.ebuild 6044 BLAKE2B a5e0e0acda2c545beb02b59ba6b11356de65bf9384c736db3b1d44d4961a2272184e451fbb37b8530a0b7bce73d07db821b5519b776a43f600cde3564ae2887d SHA512 bd08da458ea2a6a3eb5aa745b25b3c47b3eb5ff34332fd0387863e480805ff984f9872b970b0e0770edbd8adb233b8a4ac2b541218cd87eb9dbba4e8c8fedc0e
-EBUILD octave-7.1.0.ebuild 5922 BLAKE2B a8e6bf212db1071cb06b894919fc76d051a45594eaf3b60e271b8a5dfe37467169f3f03e2238f2c60e161426046459875cce13188b6ded765ac75d8359c5b3df SHA512 5b0f1d8e096a27c28236a2ee387d1b091c5bcff2a077a613d247d8d8b30030052b95340b51fc435506c4e52b5facb9a24c15c99cd298420d5936a27767ca358f
+EBUILD octave-7.2.0.ebuild 5863 BLAKE2B 9403f9d11353ebb2e7e0b8c644e94822c9ba332a6d0b8a54c213591241fa31d5d0dfc123aeb0ea9f205a2f268a95fe9a5b2dff956ca81f8d2bd56b42bed647f7 SHA512 8f6206155e8cfeee388237a2920c8102e954c22d2bfb8a86c9926d5c719d4bfb3546987149a5a6f2e5e0aa068b391c13711f3f17a766208e7c027a85b7f5eb85
 MISC metadata.xml 1262 BLAKE2B 39736c6913fb3241bed38c5dd9218190d570a3e914a01d1d06fff2cdd68c3c07296a19e2a35305a67aa776a12636445e523b3e349daeffbf67ab60b074a25fed SHA512 177539fd369e2eee0db21ef46d64f8e9f30b39eb4648c5224ff221465c55cd554ac142940f32171ec36b9561b68243761f4e3cbcfb6b06896d45986cbb568c82
diff --git a/sci-mathematics/octave/octave-7.1.0.ebuild b/sci-mathematics/octave/octave-7.2.0.ebuild
index 91df3f2a06d3..5ae855cdd7e0 100644
--- a/sci-mathematics/octave/octave-7.1.0.ebuild
+++ b/sci-mathematics/octave/octave-7.2.0.ebuild
@@ -11,17 +11,14 @@ 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"
+IUSE="curl doc fftw +glpk gnuplot gui hdf5 java json opengl portaudio postscript +qhull +qrupdate readline sndfile +sparse ssl static-libs sundials X zlib"
+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).
+# (un)zip isn't mentioned, but there's a test that uses it (bug #775254).
 #
 RDEPEND="
 	app-arch/bzip2
@@ -29,14 +26,14 @@ RDEPEND="
 	app-arch/zip
 	app-text/ghostscript-gpl
 	sys-apps/texinfo
-	dev-libs/libpcre:3=
-	sys-libs/ncurses:0=
+	dev-libs/libpcre:=
+	sys-libs/ncurses:=
 	sys-libs/zlib
 	virtual/blas
 	virtual/lapack
-	curl? ( net-misc/curl:0= )
+	curl? ( net-misc/curl:= )
 	fftw? ( sci-libs/fftw:3.0= )
-	glpk? ( sci-mathematics/glpk:0= )
+	glpk? ( sci-mathematics/glpk:= )
 	gnuplot? ( sci-visualization/gnuplot )
 	gui? (
 		dev-qt/qtcore:5
@@ -48,15 +45,15 @@ RDEPEND="
 		dev-qt/qtwidgets:5
 		x11-libs/qscintilla:=
 	)
-	hdf5? ( sci-libs/hdf5:0= )
+	hdf5? ( sci-libs/hdf5:= )
 	java? ( >=virtual/jre-1.8:* )
 	json? ( dev-libs/rapidjson )
 	opengl? (
-		media-libs/freetype:2=
-		media-libs/fontconfig:1.0=
+		media-libs/freetype:=
+		media-libs/fontconfig:=
 		virtual/glu
 		>=x11-libs/fltk-1.3:1=[opengl,xft]
-		x11-libs/gl2ps:0=
+		x11-libs/gl2ps:=
 	)
 	portaudio? ( media-libs/portaudio )
 	postscript? (
@@ -64,27 +61,30 @@ RDEPEND="
 		media-gfx/pstoedit
 		media-gfx/transfig
 	)
-	qhull? ( media-libs/qhull:0= )
-	qrupdate? ( sci-libs/qrupdate:0= )
-	readline? ( sys-libs/readline:0= )
+	qhull? ( media-libs/qhull:= )
+	qrupdate? ( sci-libs/qrupdate:= )
+	readline? ( sys-libs/readline:= )
 	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=
+		sci-libs/arpack:=
+		sci-libs/camd:=
+		sci-libs/ccolamd:=
+		sci-libs/cholmod:=
+		sci-libs/colamd:=
+		sci-libs/cxsparse:=
+		sci-libs/umfpack:=
 	)
 	ssl? (
-		dev-libs/openssl:0=
+		dev-libs/openssl:=
 	)
-	sundials? ( >=sci-libs/sundials-4:0= )
-	X? ( x11-libs/libX11:0= )"
-DEPEND="${RDEPEND}
+	sundials? ( >=sci-libs/sundials-4:= )
+	X? ( x11-libs/libX11:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-util/gperf
 	virtual/imagemagick-tools
+	virtual/pkgconfig
 	doc? (
 		dev-texlive/texlive-fontsrecommended
 		dev-texlive/texlive-plaingeneric
@@ -92,11 +92,10 @@ DEPEND="${RDEPEND}
 		virtual/latex-base
 	)
 	java? ( >=virtual/jdk-1.8:* )
+	gui? ( dev-qt/linguist-tools:5 )
 	qrupdate? ( app-misc/pax-utils )
-	sparse? ( app-misc/pax-utils )"
-BDEPEND="
-	virtual/pkgconfig
-	gui? ( dev-qt/linguist-tools:5 )"
+	sparse? ( app-misc/pax-utils )
+"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-5.1.0-pkgbuilddir.patch
@@ -120,13 +119,16 @@ src_prepare() {
 }
 
 src_configure() {
-	# unfortunate dependency on mpi from hdf5 (bug #302621)
+	# 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" \
+	# 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
@@ -180,7 +182,8 @@ src_configure() {
 }
 
 src_compile() {
-	export VARTEXFONTS="${T}/fonts" # otherwise it will write to /var/cache/fonts/ and trip sandbox
+	# Otherwise it will write to /var/cache/fonts/ and trip sandbox
+	export VARTEXFONTS="${T}/fonts"
 
 	default