gentoo resync : 20.03.2022

3 files changed, 40 insertions, 1 deletions

diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index b3cb166c15e3..e914e45678a0 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -2,8 +2,9 @@ AUX octave-4.2.0-disable-getcwd-path-max-test-as-it-is-too-slow.patch 199 BLAKE2
 AUX octave-4.2.2-ncurses-pkgconfig.patch 1034 BLAKE2B 244a96ab7cfd47203e7d23774c52f54e105f209edf79c869e6ce253a9cec7a3373a8dd0c98196ba3271f9b2b066ad3de3784151072055f2319ebbb4d1b68a475 SHA512 d2d6fe57a11f0493f86378bc4e1fc71378ae6d1878d17a367b77aa16a29880e37134e61343ba081f7ab2c4d127d93611491bef1320d6cd202eff0d78681cd4cc
 AUX octave-4.4.0-texi.patch 570 BLAKE2B 83863f20e995eb4512944d6766b09a648b0d00b434f98f25db214ef6b3bcfa504d316dad984e7330ed51d972e5caec69c42797f703595a39d6acab7128270313 SHA512 e2d0390e586e001182a31a840ed6a93b4fb6ce0dd581f64460dcf3947783dd4755a8bd277f4babb6328f04cf653f02ac681952610d7eb70165936a9d79998c3f
 AUX octave-5.1.0-pkgbuilddir.patch 1565 BLAKE2B 7b2968139e080aaa20b5372b400ac84c1754296767834011bcdda5258e7859c48ffaedcade17e8b23e2d23635a546c6a726061e8b4679913ff5b204a26cd0ef4 SHA512 28dcebc3a904cf048cb0568591c6c55616d40f6ca80982a232489a51ec92505dca186043ee3750d8a3f3782149ef1861332a8486466fba2898f0084adf0acb90
+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
 EBUILD octave-5.2.0.ebuild 5403 BLAKE2B c84884673c5ae98b97e18f93763932b28c01945957a56b6b5b79ac2e194ebaf01194dc96d53d0cff2ec79da04aa888f0999dd9df448cda0a6bfe1de61bbfb340 SHA512 eca18c92da4e6a76639ba1d421e648f8ed6b2fb903be02bb466038746ced17ad2c1e0cd3cea6a6ce467ba23728b5df1eb5e6bd6c9bd37d112cc63183cbc0aeda
-EBUILD octave-6.4.0.ebuild 5510 BLAKE2B b957e17fc89dbebc34b5ee7458d9583547fd3a7254a298e7e0ef0c7de2600f5984245783b31a557c3568422fa64d1e89b5e779c0c1dffef88b9b475cd8f8fb56 SHA512 57b761608a70315e79c910e66e287eb6316e153ff29780013938d90e03b3ef779f04aa259047ceecc03addea970b45a9c3d3e26ce012db12b94511b6522f9edd
+EBUILD octave-6.4.0.ebuild 5552 BLAKE2B 812230e7263273c4db7e2e0c928323aab58a030ce8563d7c14aed90478d48203244999bb5d102c07ff24015af8e7d52657837f5295601771b33e36d83da06bd0 SHA512 694e05ed20b2f3ce7e3df25c668d84869f99f7a4e771a7b0d997da700f561aec593f3af63d604e0749c61b7ada6b0555788933217659ab696ad85abe9ee5c1ee
 MISC metadata.xml 1154 BLAKE2B 34f491369b5ef047f0540be74994b9d6507310db475dc25868e2320e5c4474ebeaba2f80ba90759df53c15294c71ad9631e5f98ad81d2098d3e86e308d5c9eaf SHA512 9f73af69e5318693db98720836f0df25518c4bc3ac9ff72071aa04aaca1147e2c21d14a299b199689e926bff059c33c20f39b9f85062d1e1227e466b2b8b3446
diff --git a/sci-mathematics/octave/files/octave-6.4.0-slibtool.patch b/sci-mathematics/octave/files/octave-6.4.0-slibtool.patch
new file mode 100644
index 000000000000..1558b334d522
--- /dev/null
+++ b/sci-mathematics/octave/files/octave-6.4.0-slibtool.patch
@@ -0,0 +1,37 @@
+
+# HG changeset patch
+# User Markus Mützel <markus.muetzel@gmx.de>
+# Date 1647451226 -3600
+# Node ID 2d394460429ff8313004ddaeea31437e90d16799
+# Parent  d3123b682f63723c111a50b77716fe9349d8fb7d
+build: Parse .la files in build tree when installing .oct files (bug #61905).
+
+* Makefile.am (install-oct): Parse .la files in build tree when installing .oct
+files. That should improve compatibility with tools like `slibtool` that don't
+install .la files.
+
+diff --git a/Makefile.am b/Makefile.am
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -460,17 +460,18 @@
+ 	if [ -n "`cat $(OCT_FILE_PKG_ADD_FILES)`" ]; then \
+ 	  $(INSTALL_DATA) oct-file-pkg-add $(DESTDIR)$(octfiledir)/PKG_ADD; \
+ 	fi
++	top_build_dir=`pwd` && \
+ 	cd $(DESTDIR)$(octlibdir) && \
+ 	for ltlib in $(OCT_FILE_LIBS); do \
+ 	  f=`echo $$ltlib | $(SED) 's,.*/,,'`; \
+-	  dl=`$(SED) -n -e "s/dlname='\([^']*\)'/\1/p" < $$f`; \
++	  dl=`$(SED) -n -e "s/dlname='\([^']*\)'/\1/p" < $$top_build_dir/$$ltlib`; \
+ 	  if [ -n "$$dl" ]; then \
+ 	    $(INSTALL_PROGRAM) $$dl $(DESTDIR)$(octfiledir)/`echo $$f | $(SED) 's,^lib,,; s,\.la$$,.oct,'`; \
+ 	  else \
+ 	    echo "error: dlname is empty in $$ltlib!"; \
+ 	    exit 1; \
+ 	  fi; \
+-	  lnames=`$(SED) -n -e "s/library_names='\([^']*\)'/\1/p" < $$f`; \
++	  lnames=`$(SED) -n -e "s/library_names='\([^']*\)'/\1/p" < $$top_build_dir/$$ltlib`; \
+ 	  if [ -n "$$lnames" ]; then \
+ 	    rm -f $$f $$lnames $$dl; \
+ 	  fi \
+
diff --git a/sci-mathematics/octave/octave-6.4.0.ebuild b/sci-mathematics/octave/octave-6.4.0.ebuild
index 4b0b6832a769..bc0547dacdd3 100644
--- a/sci-mathematics/octave/octave-6.4.0.ebuild
+++ b/sci-mathematics/octave/octave-6.4.0.ebuild
@@ -97,6 +97,7 @@ DEPEND="${RDEPEND}
 PATCHES=(
 	"${FILESDIR}"/${PN}-5.1.0-pkgbuilddir.patch
 	"${FILESDIR}"/${PN}-4.2.2-ncurses-pkgconfig.patch
+	"${FILESDIR}/${PN}-6.4.0-slibtool.patch"
 )
 
 src_prepare() {