gentoo auto-resync : 01:12:2023 - 17:03:56

6 files changed, 37 insertions, 34 deletions

diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index e049687b7bab..d1e178be74f7 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/esco/Manifest b/dev-lang/esco/Manifest
index f95a85ce760d..34c990c298ed 100644
--- a/dev-lang/esco/Manifest
+++ b/dev-lang/esco/Manifest
@@ -1,5 +1,3 @@
-DIST esco-src-0.512.tar.gz 382056 BLAKE2B d68440b57987fbb0c73f4ecae31c08818580ddd0403a6cd9821fc2ff9d25f12d8a8bb766a1bf760379ce8e667ffb3b817d88b5600309cacbd2cab1276860d51b SHA512 4d02af7097abbd6770a891065ea9d7d3f9acdd9c7c9164f726dba2385db48993e7fe9baa4fc57aac2d998544788416700933d473f1e9467c9f94e240f80ccf97
 DIST esco-srv-0.513.tar.gz 382658 BLAKE2B 323b4690c5e3537fe9c6b765ab644ae18122c81aa334c10a6b131db727d3b8d3f61d15eece5d6c205fd439c0858d10f1e9f97c74545248a92b6cfa9b5386a354 SHA512 4148a39f1cc4cacbbca1b1e5504530e945cba04acca8cf9b28b47eaf88860dbaea0c1ff7e46c59ea6a57b57a796437eb9577e38f8a06fa4bd34fdb543e4e5909
-EBUILD esco-0.512.ebuild 598 BLAKE2B 3311190cb66627bc74288f0c37b2b6658018a76cf09713e0c4e8af008922f9e31b6bf616efe95c1ac1fad286dc32a1f9465ff75f105aa82a40c4d77de1a1b58c SHA512 5b77b714b5a17e47fe6a8d900b1088008516522e23bdb1008b204b91928470dd160cd7144a2d6cb535b0e3ffee6f24946c3b22b1b76de006bf739855768b3b28
 EBUILD esco-0.513.ebuild 596 BLAKE2B 8f4c719ad78c4125a6feba23e82ea89efb8c192f2ac337a25194222c84ba2e99a82440bde07c476bfdf2bf4d9933db88c5f831698e4d4b65476183bd7b9c4cd0 SHA512 a17dd1788c092f7318ee356c7f49573cf026580db98a15720d031bb51452ce7157ba9b24a79a32d08a71fc2237677204c174789f166c7484deaf7a807d279f6a
 MISC metadata.xml 242 BLAKE2B 662512d253351a3419022c5761ddb18179a5ee272a8e3d80d7c974eb88da6703b3d2ced5d560999c8510d985ab6f298de4b460b4a6aec15d81e3fd939637ec5d SHA512 6ad7f1d7a90e0acdc9acee06082341ba81d6074767253711930fc9e3dc98dfd02921f1304ee9a1e9b0cc7fffaa6d680abf2714302ffac09013f4c23c8244d542
diff --git a/dev-lang/esco/esco-0.512.ebuild b/dev-lang/esco/esco-0.512.ebuild
deleted file mode 100644
index 98743c402a65..000000000000
--- a/dev-lang/esco/esco-0.512.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="${PN}-src"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Combine interpreter of esoteric languages"
-HOMEPAGE="http://esco.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="gmp l10n_ru"
-
-DEPEND="gmp? ( dev-libs/gmp:0 )"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS ChangeLog README TODO docs/basics.txt )
-
-src_configure() {
-	econf $(use_with gmp)
-}
-
-src_install() {
-	default
-	use l10n_ru && dodoc docs/README_RU.utf8
-}
diff --git a/dev-lang/souffle/Manifest b/dev-lang/souffle/Manifest
index b5f7884aa189..8bfc1aee96d5 100644
--- a/dev-lang/souffle/Manifest
+++ b/dev-lang/souffle/Manifest
@@ -1,4 +1,5 @@
 AUX souffle-2.4.1-ncurses.patch 513 BLAKE2B 4ca9241abcc17691c12004b3632efcfb0438e6dd66753cbb40e34fa53338aacc3dfe80d3912989fee2a1694b5537627037df6052ea909385c8fa62e4ba122080 SHA512 0cf585e60e040f5b62f1511e55d97ee8831b5496e5ba431301380b454874b9720cb4c96a429122cc527aeb0d4a160f4937e1aeff7a9e57a21c5e6be1a1e27710
+AUX souffle-2.4.1-threads.patch 1352 BLAKE2B 2805c6a6579ee55f57e9335162427fb860a12f9bb0b6418dd3705efbe0ca93c6042aa2e83260e0eb95b7f8df9761db90b8f118ba0c264a5ce0f8ae29b4d28490 SHA512 05f057c54b6b070b1f9e79eeccffa4c38f47af810bd14d5ec16c75f3c331386debfe21cd6d16f2d8675bb1f2c2e1ebd74e956b014d8e6eda9650097e44bc9db9
 DIST souffle-2.4.1.tar.gz 9668253 BLAKE2B b101a6f24df7d5bd86854d5d19c166bfe8266a9f6e8c8391fdbb79afddec7bd2297bb7af472ebc01ff2d6b0c1516820d96ec47dbf1042167b1435c22f9671ea3 SHA512 5dd321a2b025f2120d7867fa7317b4784a0f0fcc109250721cdb0918009ca218c63cdad004282046885f7096b287bc111e09057311603828ecce53f9cc532319
-EBUILD souffle-2.4.1.ebuild 2570 BLAKE2B d56517c3e754f68b4b1d6ec347107c5d1cf7386b07ab75696190b6ff9ced99d755fb7167fdc37dcf46730aecb5976da251e33f72423851b3a58b80688725c0f5 SHA512 45effdc17500672bede3ba8f517401fc05ab2b01f2e95df11dd69029d4f94a6165964e4e4e10c09f00b0678787d8d462527a2dee5ce8315f6433f5252cc2ea30
+EBUILD souffle-2.4.1.ebuild 2611 BLAKE2B 4780986b97265ef8a965a4770836ff6520cbfe5db4a3466f6c74a523afb715bf587944f0d7035cf36e5996d26bc825e9cec769063163e65ee905f81ec74caf2c SHA512 c7cb712fe7e76c0950307ccd4ecc8a017fd145c3e14ee2dd82233aceba5b743494755303e987743eaeac8d7881604fe76ec6f9064660af7203738c6d9b614bdf
 MISC metadata.xml 815 BLAKE2B 6685650f4fe61a45d10eafe2ed7d328638b0fb3d2dd23811e77c481d0b9f1d68074d3d29cb386b0060de5e193deb2abf9f8a33634f122cec54fb1c77966bfff3 SHA512 f42d5bbf5e9e8ffb311cb304e99a6b8e6b580e78312b18cdf450998ddda6da56c035a8fea41c5e9df5eb6e7c0b5b2187097eb13a6f54bf3604d9736ee6ea98d7
diff --git a/dev-lang/souffle/files/souffle-2.4.1-threads.patch b/dev-lang/souffle/files/souffle-2.4.1-threads.patch
new file mode 100644
index 000000000000..92e2ce79b409
--- /dev/null
+++ b/dev-lang/souffle/files/souffle-2.4.1-threads.patch
@@ -0,0 +1,34 @@
+Stolen from NixOS packages... later they removed the patch but looks 
+like this is what should fix bug https://bugs.gentoo.org/918956
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 73d5c3c84..e4b0dbfd1 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -104,13 +104,6 @@ option(SOUFFLE_CUSTOM_GETOPTLONG "Enable/Disable custom getopt_long implementati
+ cmake_dependent_option(SOUFFLE_USE_LIBCPP "Link to libc++ instead of libstdc++" ON
+     "CMAKE_CXX_COMPILER_ID STREQUAL Clang" OFF)
+ 
+-# Using Clang? Likely want to use `lld` too.
+-if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=lld")
+-    set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -fuse-ld=lld")
+-    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fuse-ld=lld")
+-endif()
+-
+ # Add aditional modules to CMake
+ set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
+ 
+@@ -247,7 +240,11 @@ endif()
+ # pthreads
+ # --------------------------------------------------
+ set(THREADS_PREFER_PTHREAD_FLAG ON)
+-find_package(Threads REQUIRED)
++set(CMAKE_THREAD_LIBS_INIT "-lpthread")
++set(CMAKE_HAVE_THREADS_LIBRARY 1)
++set(CMAKE_USE_WIN32_THREADS_INIT 0)
++set(CMAKE_USE_PTHREADS_INIT 1)
++set(THREADS_PREFER_PTHREAD_FLAG ON)
+ 
+ # --------------------------------------------------
+ # OpenMP
diff --git a/dev-lang/souffle/souffle-2.4.1.ebuild b/dev-lang/souffle/souffle-2.4.1.ebuild
index 5bf3f618cb58..9e2e1af841fc 100644
--- a/dev-lang/souffle/souffle-2.4.1.ebuild
+++ b/dev-lang/souffle/souffle-2.4.1.ebuild
@@ -52,6 +52,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2.4.1-ncurses.patch"
+	"${FILESDIR}/${PN}-2.4.1-threads.patch"
 )
 
 pkg_pretend() {