gentoo auto-resync : 11:07:2022 - 01:28:44

3 files changed, 46 insertions, 1 deletions

diff --git a/dev-libs/libprelude/Manifest b/dev-libs/libprelude/Manifest
index 18f3cb09a382..d615004e0eae 100644
--- a/dev-libs/libprelude/Manifest
+++ b/dev-libs/libprelude/Manifest
@@ -1,6 +1,7 @@
 AUX libprelude-4.0.0-fix-python-bindings.patch 1136 BLAKE2B 287f5e3c049ef4d3af54932f968f1973aebe0541e50403e4154512772e9d625324e879a06ff4c5810bb90f3d2c968c09fa361067435e7e4bc6131ea78f6ad794 SHA512 6990cd9e79d6e9e42c9f377f1c9a9f48920310aaf47d9bc731fc133c743256874a613ad5740eb4bc25825b341e313f79c8cfa1160a58e6eda228b9ca6bfef2b2
 AUX libprelude-5.1.0-fix_gtkdoc_1.32.patch 416 BLAKE2B 9717541a0d57a0fb97a7f4f2b9d466d65f8091e96707cb7a20e61ce3aef925d44b93a71f03d90c074592e0bf91a133c7a2b87996ceabb10810a3795a595d874c SHA512 1b35a8b5af4701c51e3d9a20eaf501cf81f429b2f2f16c0d8fecefa51a3438b35cf237db3c4696c56e53a2a87b0663a08a73d72edac207ae04b067ef2c4dc6fe
 AUX libprelude-5.2.0-luabindings_liblua.patch 611 BLAKE2B 8541a59228a9e8d0b35cc22ec2d26f3f01a91348fd7eb293f68c637b1ca176c86cfa28578d28b8c290f76bf8b4adba2ff5f7da7a8fd16ee4b846730c4cd04b56 SHA512 1a45fc0fb71850769e0b23c0b1ce8eae0912bdb3398baaef91b631b622fbd7166a11cc1f501d8dfa063b8dc5230c41b3e521b57792d8c865b94d9a6efea2c995
+AUX libprelude-5.2.0-slibtool.patch 2276 BLAKE2B 434b6e5ef887dcc086812a6ceffc5830bd572cc4c87481f960f0fa3e9395979ea8338759c73f7376337ffb99e7a6f7a37587582d4fd300f5fcc74aba5ee8ccb0 SHA512 eb1cd21a7c91e49315720be68b7f2e25ce91b81d2591b6ca05aa37e428503a272f1bbb833039857788d2007a3e1b5e9f04947478ed909c43a7593218084811f8
 DIST libprelude-5.2.0.tar.gz 2902019 BLAKE2B f4caecdc4d34a075fecef73e043e653943fb4af91f4ae5ec5bfdd2d00acccd2095087ba2e6e98aef786e801ba4396f7a66af2de64b5ab8de50921e078614e1a3 SHA512 e0dc0d7c06a4c250a5a12c5cddd8aa8db33d94f8afd85b1afdb264717d674e0dc0b4dc8a5336860df74ffe408023cc7a5356e3acc3c96876099659e33ce04dd0
-EBUILD libprelude-5.2.0-r10.ebuild 2063 BLAKE2B 859bff279c0f3c110fe3dc3b99e8d00456f26a2f4237b714e94150c206def08dbbb62bdf64072bfa5340e48bbb9cd519aeb81b20a47e8a7c3b8115babcff965b SHA512 3cc3df6a72e57c314587e7198efa4184dccd7976fa63a9411d281bc1905185a47b99c85bb8a71a5e511b62c50c7d7a2344b7d60772c758c353470a8af00f7f16
+EBUILD libprelude-5.2.0-r10.ebuild 2114 BLAKE2B ec144113db928c2da2ebd7c9cd7cc751837b462e0d67384c034e033a07394ec136c09293ebba58663a80aacc5e61956c1847d6e4b507f4e1adbc57615c5ed50d SHA512 c4c6afbd178aa46317d413fdb78483cf6693545d73f8eb172efba96c63e7481c287ebbc0728275142e770126cf3780ca933831cfeb100442c85e2680b74df60c
 MISC metadata.xml 666 BLAKE2B c133e5679e6a366f65f627ce547abd85393a9e17be6fada179b78a8ecfe85700291f688ad93c2afc9cc08a1554c0a0b783e53835fd3d62a65e21a01024d25042 SHA512 65a571f4f6602982484f9ce258bf684cec128c0460e9df37153e0647370beb3304404534f909cc72c775e05f04aea3ff8e2d0a1b3e19edfcb004789b35d60313
diff --git a/dev-libs/libprelude/files/libprelude-5.2.0-slibtool.patch b/dev-libs/libprelude/files/libprelude-5.2.0-slibtool.patch
new file mode 100644
index 000000000000..6a1bed0d5c0a
--- /dev/null
+++ b/dev-libs/libprelude/files/libprelude-5.2.0-slibtool.patch
@@ -0,0 +1,43 @@
+Bug: https://bugs.gentoo.org/790647
+
+From: orbea <orbea@riseup.net>
+Date: Sun, 10 Jul 2022 09:26:59 -0700
+Subject: [PATCH] Fix the build with slibtool
+
+The build system should not use the .libs directory which is for
+internal use by the libtool implementation only. GNU libtool is far less
+strict than slibtool in these cases.
+
+--- a/bindings/c++/Makefile.am
++++ b/bindings/c++/Makefile.am
+@@ -21,7 +21,7 @@ libpreludecpp_la_SOURCES = \
+ 	prelude-log.cxx
+ 
+ libpreludecpp_la_LDFLAGS = -no-undefined -version-info @LIBPRELUDECPP_SONAME@
+-libpreludecpp_la_LIBADD  = $(top_builddir)/src/.libs/libprelude.la
++libpreludecpp_la_LIBADD  = $(top_builddir)/src/libprelude.la
+ libpreludecpp_la_CPPFLAGS = -I$(top_builddir) -I$(top_builddir)/src/include -I$(top_srcdir)/src/include -I$(top_builddir)/src/libprelude-error -I$(top_builddir)/bindings/c++/include -I$(top_srcdir)/bindings/c++/include 
+ 
+ endif
+--- a/bindings/lua/Makefile.am
++++ b/bindings/lua/Makefile.am
+@@ -10,7 +10,7 @@ dist_swigdata_DATA = libpreludecpp-lua.i
+ AM_CPPFLAGS = -I@top_srcdir@ -I@top_builddir@/src/include -I@top_srcdir@/src/include -I@top_builddir@/src/libprelude-error -I@top_srcdir@/bindings/c++/include @LUA_CFLAGS@ -I@top_srcdir@/libmissing -I@top_builddir@/libmissing
+ 
+ prelude_la_LDFLAGS = -module -avoid-version
+-prelude_la_LIBADD = $(top_builddir)/bindings/c++/.libs/libpreludecpp.la
++prelude_la_LIBADD = $(top_builddir)/bindings/c++/libpreludecpp.la
+ prelude_la_SOURCES = prelude.cxx
+ preludedir = $(libdir)/lua/@LUA_VERSION@
+ prelude_LTLIBRARIES = prelude.la
+--- a/bindings/ruby/Makefile.am
++++ b/bindings/ruby/Makefile.am
+@@ -9,7 +9,7 @@ EXTRA_DIST = libpreludecpp-ruby.i Prelude.cxx
+ rbexec_LTLIBRARIES = Prelude.la
+ Prelude_la_CPPFLAGS = $(RUBY_INCLUDES) $(RUBY_CCFLAGS) -I@top_builddir@ -I$(top_srcdir)/src/include -I$(top_builddir)/src/include -I@top_builddir@/src/libprelude-error -I$(top_srcdir)/bindings/c++/include
+ Prelude_la_LDFLAGS = -module -avoid-version
+-Prelude_la_LIBADD = $(top_builddir)/bindings/c++/.libs/libpreludecpp.la $(RUBY_LIBS)
++Prelude_la_LIBADD = $(top_builddir)/bindings/c++/libpreludecpp.la $(RUBY_LIBS)
+ nodist_Prelude_la_SOURCES = Prelude.cxx
+ 
+ Prelude.cxx: $(top_srcdir)/bindings/c++/include/*.hxx $(top_srcdir)/bindings/libpreludecpp.i libpreludecpp-ruby.i 
diff --git a/dev-libs/libprelude/libprelude-5.2.0-r10.ebuild b/dev-libs/libprelude/libprelude-5.2.0-r10.ebuild
index 161d051dc157..aabb447f64d2 100644
--- a/dev-libs/libprelude/libprelude-5.2.0-r10.ebuild
+++ b/dev-libs/libprelude/libprelude-5.2.0-r10.ebuild
@@ -44,6 +44,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.0.0-fix-python-bindings.patch"
 	"${FILESDIR}/${PN}-5.1.0-fix_gtkdoc_1.32.patch"
 	"${FILESDIR}/${PN}-5.2.0-luabindings_liblua.patch"
+	"${FILESDIR}/${PN}-5.2.0-slibtool.patch" # 790647
 )
 
 src_prepare() {