gentoo resync : 16.09.2020

7 files changed, 86 insertions, 153 deletions

diff --git a/gnustep-base/libobjc2/Manifest b/gnustep-base/libobjc2/Manifest
index 116e06e57cd3..ad47cb6b7ee5 100644
--- a/gnustep-base/libobjc2/Manifest
+++ b/gnustep-base/libobjc2/Manifest
@@ -1,8 +1,8 @@
-AUX libobjc2-1.7-fix_soname.patch 1827 BLAKE2B fa716ca39eaa0cb78214922ed5bfac139d1ba1f510791938ffcbad2c1a5c096b04056cda1f25baf3ade2b37d0757516c14a9ac2c77684438852ddf38b11d9e09 SHA512 d6ce4a6840e7f3ea22db3f63574a08fe9fad2fd3ebeaac764097935b322f038baa4ec9d0f19124dd84cb6ffe010e267bdb60f76f5d24dd508f520bdb38124ead
-DIST libobjc2-1.8.1.tar.gz 173635 BLAKE2B 1ed9df6ee934a56dd8565904f9a402f5687bac6f876bcef538fed60c4ebd34af8f35921bdabbdf1ad97fb371e591aea3e47170afaffe65056af07c88e01f0b37 SHA512 518f36e96a82a076fc67fe384226bd97310cd10a53c7b0951db9f3658aa534582b245d5cb97956fe91c38338c3fc8f1e569dd8af36f6d12e32bf1460251d02eb
-DIST libobjc2-1.8.tar.gz 173512 BLAKE2B ba494dd2db2bfdcc2cfce906014d75146368f049ebe4ea6b83024705af2b78f916252a084b95be43c245c5fd6574d00db75853d291193ea70cc48a6b5dbeab93 SHA512 1562e42dc43a24c1655d02db7aa101a48a7b026bec23252c8eec3893fbac0d67368685291df0954ee79f07b92ecc13c68ee7c7b0f351428a31e99ed05ed2230d
+AUX libobjc2-2.1-eh_trampoline.patch 1284 BLAKE2B baebdd162deaf18a1c4292064d6dfd8ac859e4f69e2d4b507d067b584f9b1178be3e2f58645927ce3796e4682d3906e1f0d4d04fa4d6968312ee89141b57d776 SHA512 2bf5a81a82eda517ed5d92df5a163a7ca46f4ff807aa285bb431bb5d8ea3f1dd8be318861d5c2c7859d50d5a403a9b4e8499452e86a6235a82b0d5baa0c99e1c
+AUX libobjc2-2.1-pthread_link.patch 489 BLAKE2B c1b44f5287977eed31385d0a1d442c45e13f1154666cf9074275a899627fad81c24af2b803b1d748eb546fd2f18b30a13cc3b87f1a7e738df77e3550e7ecacc2 SHA512 95840a68d56d7b7eeadfdea44bfaae9361829569e10c90aa6da6e38ee958951e83295a02f189084bc65b0eebdad2218a05cf350961b2f3bb3e7f2ec1350d0806
+DIST 757de82.tar.gz 63372 BLAKE2B 74078c6c16d7ac1891ce63b21ae2f06c8759f3a95db74a6acef2d51d605a7631ac37b8c8698752699e5c30d2e95876b1967e6c2c429403f1094b6b99dd4d272c SHA512 732e7f5b4ec0dc18c0c7b2b567e4fd65727918db76863aabb4433db22630e1e3c5ba3063de6dcf32f099c0d8cfd70b0d811d59f73a2cda362f6bd7054d14f999
 DIST libobjc2-2.0.tar.gz 191800 BLAKE2B 71f54b1410e20bb638dce4cae8c2cc48ea07acf31a97f1994587a9f6401b725ac393abaef355e9476ef6a0622d80fb6fbe4b3c7f39294e7bedbba17cd4108278 SHA512 2b72506204b8fea6a76688ee96611613c4b7cf98942acc89905c531f4dc997ae0482ff10fa819c2471df6c06d5ebcd251167d8903a4f18d47507cd42baec3748
-EBUILD libobjc2-1.8.1.ebuild 991 BLAKE2B 731a6ae3294d17314c6ff278eda383d4be97d5f53d4fe98241c7e3b03c0c21c8f4ac8e01de422689a56dfcdb1ceab8527949f008cdee874e6765ded86deb0007 SHA512 91cbf423552e9b15b689e3a8dbf4db9991f685714211d268a5f4bd98c04bccf401237568273b16c5154c547dea0f2154f7740f50324c23da69c1aa71e48d0b12
-EBUILD libobjc2-1.8.ebuild 991 BLAKE2B 731a6ae3294d17314c6ff278eda383d4be97d5f53d4fe98241c7e3b03c0c21c8f4ac8e01de422689a56dfcdb1ceab8527949f008cdee874e6765ded86deb0007 SHA512 91cbf423552e9b15b689e3a8dbf4db9991f685714211d268a5f4bd98c04bccf401237568273b16c5154c547dea0f2154f7740f50324c23da69c1aa71e48d0b12
+DIST libobjc2-2.1.tar.gz 200290 BLAKE2B 67cd78238afad9afa4311669403be06ec8d001978e997128acc67cdba9c2b18482f66af4597c4a484556ce38bbfc4416b1b1cb8cde1d8f27f3b4d744d4581309 SHA512 a93c385f9ad53fce0f736088c3a18e72119c0128690725e435a35fe4250830d13e18899f98c7d80e6ea41cbfe1404f055d9d6c3d891ad7c770d47dcd0244fc7f
 EBUILD libobjc2-2.0.ebuild 702 BLAKE2B b2211a476d52d87c286c01d29e25a625e420eb0ef5975246f25fcc28195a7a3e3d626b07978d4c919c205927727e66d76e125b2a2c86ac780941d16188e0c463 SHA512 c7254180eee7f72a953f5f58fe5ad3141d756752636c40fbaf6fd15ca2e0a3b80e91a4952b50ddf01c666c2c7b96d9d7b79513bcb8f8ba7d985e219c753c9ea0
+EBUILD libobjc2-2.1.ebuild 969 BLAKE2B 851fc23d0efdeb4ef4994e08e15552c4739dbf5718ea07c9e481aa78c77b28e7851c2ae6b64ccf3e95e83ac342706b867554585fa16d616d8d8a0382fe2733e8 SHA512 7f0031f9229b2bb1d0553600d9242c65a6721b9d646f07ae95d8145697bd4ad3e5078b53bb723f1824a8547337a4023329ee53717979cb7a7448578394f579df
 MISC metadata.xml 1348 BLAKE2B b5eec1f6af50d0a90d62c6dce21fe14b6c20ec7d534ac49030bbc89bb2f5665af7d40750386f84d3aedb67802807e25ad04f824c7b6908e41a3de256c07dead3 SHA512 5adcc9a3d5527c5e86da2ae7884f334d68ebd884b26e9f0d3329af7c877921c90bef4f77d8c535c82102e3bacb5a199e5fd940471036004f66858850040ee936
diff --git a/gnustep-base/libobjc2/files/libobjc2-1.7-fix_soname.patch b/gnustep-base/libobjc2/files/libobjc2-1.7-fix_soname.patch
deleted file mode 100644
index ba1aa8ecea91..000000000000
--- a/gnustep-base/libobjc2/files/libobjc2-1.7-fix_soname.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff -Naur libobjc2-1.7.orig/CMakeLists.txt libobjc2-1.7/CMakeLists.txt
---- libobjc2-1.7.orig/CMakeLists.txt	2013-06-27 13:30:41.000000000 +0200
-+++ libobjc2-1.7/CMakeLists.txt	2015-05-20 13:20:55.214244088 +0200
-@@ -8,7 +8,8 @@
- set(CMAKE_C_FLAGS_RELEASE "-O3 ${CMAKE_C_FLAGS_RELEASE}")
- set(CMAKE_C_FLAGS "-std=gnu99 ${CMAKE_C_FLAGS}")
- 
--set(libobjc_VERSION 4.6)
-+set(libobjc_SOVERSION 4)
-+set(libobjc_VERSION 4.6.0)
- 
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fexceptions")
- # Build configuration
-@@ -204,7 +205,8 @@
- 			add_library(objcxx SHARED ${libobjcxx_CXX_SRCS})
- 			set_target_properties(objcxx PROPERTIES
- 				LINKER_LANGUAGE C
--				SOVERSION ${libobjc_VERSION}
-+            SOVERSION ${libobjc_SOVERSION}
-+            VERSION ${libobjc_VERSION}
- 				)
- 			target_link_libraries(objcxx ${CXX_RUNTIME})
- 			set(CXX_RUNTIME "")
-@@ -220,7 +222,8 @@
- 		add_library(objcxx SHARED ${libobjcxx_CXX_SRCS})
- 		set_target_properties(objcxx PROPERTIES
- 			LINKER_LANGUAGE C
--			SOVERSION ${libobjc_VERSION}
-+         SOVERSION ${libobjc_SOVERSION}
-+         VERSION ${libobjc_VERSION}
- 			)
- 		set(CXX_RUNTIME "")
- 		list(APPEND INSTALL_TARGETS objcxx)
-@@ -241,7 +244,8 @@
- 
- set_target_properties(objc PROPERTIES
- 	LINKER_LANGUAGE C
--	SOVERSION ${libobjc_VERSION}
-+   SOVERSION ${libobjc_SOVERSION}
-+   VERSION ${libobjc_VERSION}
- 	OUTPUT_NAME ${LIBOBJC_NAME}
- 	LINK_FLAGS "${objc_LINK_FLAGS}"
- 	)
-@@ -349,3 +353,14 @@
- 	add_subdirectory(Test)
- endif (TESTS)
- 
-+
-+MESSAGE(STATUS "<<< Gentoo configuration >>>
-+Build type      ${CMAKE_BUILD_TYPE}
-+Install path    ${CMAKE_INSTALL_PREFIX}
-+Compiler flags:
-+C               ${CMAKE_C_FLAGS}
-+C++             ${CMAKE_CXX_FLAGS}
-+Linker flags:
-+Executable      ${CMAKE_EXE_LINKER_FLAGS}
-+Module          ${CMAKE_MODULE_LINKER_FLAGS}
-+Shared          ${CMAKE_SHARED_LINKER_FLAGS}\n")
diff --git a/gnustep-base/libobjc2/files/libobjc2-2.1-eh_trampoline.patch b/gnustep-base/libobjc2/files/libobjc2-2.1-eh_trampoline.patch
new file mode 100644
index 000000000000..c956d15fbd59
--- /dev/null
+++ b/gnustep-base/libobjc2/files/libobjc2-2.1-eh_trampoline.patch
@@ -0,0 +1,27 @@
+From 4e07fb8457266b76311b2bf3dc5dbe8db790c0b5 Mon Sep 17 00:00:00 2001
+From: David Chisnall <github@theravensnest.org>
+Date: Wed, 26 Aug 2020 16:37:06 +0100
+Subject: [PATCH] Don't use CXXFLAGS when compiling eh_trampoline.cc
+
+The way that we were doing this didn't handle multiple flags and we
+actually don't want the user to override these flags because that file
+needs to be compiled in a very specific way.
+
+Fixes #177
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e2746e9..80b7dfe 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -317,7 +317,7 @@ if (ENABLE_OBJCXX)
+ 			endif()
+ 		endif ()
+ 		add_custom_command(OUTPUT eh_trampoline.s
+-			COMMAND ${CMAKE_CXX_COMPILER} ${CMAKE_CXX_FLAGS} -fPIC -S "${CMAKE_SOURCE_DIR}/eh_trampoline.cc" -o - -fexceptions -fno-inline | sed "s/__gxx_personality_v0/test_eh_personality/g" > "${CMAKE_BINARY_DIR}/eh_trampoline.s"
++			COMMAND ${CMAKE_CXX_COMPILER} -fPIC -S "${CMAKE_SOURCE_DIR}/eh_trampoline.cc" -o - -fexceptions -fno-inline | sed "s/__gxx_personality_v0/test_eh_personality/g" > "${CMAKE_BINARY_DIR}/eh_trampoline.s"
+ 			MAIN_DEPENDENCY eh_trampoline.cc)
+ 		list(APPEND libobjc_ASM_SRCS eh_trampoline.s)
+ 		list(APPEND libobjc_CXX_SRCS objcxx_eh.cc)
diff --git a/gnustep-base/libobjc2/files/libobjc2-2.1-pthread_link.patch b/gnustep-base/libobjc2/files/libobjc2-2.1-pthread_link.patch
new file mode 100644
index 000000000000..4d6f1d517db1
--- /dev/null
+++ b/gnustep-base/libobjc2/files/libobjc2-2.1-pthread_link.patch
@@ -0,0 +1,12 @@
+diff -Naur libobjc2-2.1.orig/CMakeLists.txt libobjc2-2.1/CMakeLists.txt
+--- libobjc2-2.1.orig/CMakeLists.txt	2020-08-23 17:10:20.000000000 +0200
++++ libobjc2-2.1/CMakeLists.txt	2020-09-03 10:51:38.716078009 +0200
+@@ -344,7 +344,7 @@
+ # threading implementation (we do for everything except thread-local storage)
+ set(CMAKE_THREAD_PREFER_PTHREAD)
+ include(FindThreads)
+-set(objc_LINK_FLAGS "${objc_LINK_FLAGS} ${CMAKE_THREAD_LIBS_INIT}")
++target_link_libraries(objc Threads::Threads)
+ 
+ 
+ 
diff --git a/gnustep-base/libobjc2/libobjc2-1.8.1.ebuild b/gnustep-base/libobjc2/libobjc2-1.8.1.ebuild
deleted file mode 100644
index 5f701cd27c0f..000000000000
--- a/gnustep-base/libobjc2/libobjc2-1.8.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils eutils
-
-DESCRIPTION="GNUstep Objective-C runtime"
-HOMEPAGE="http://www.gnustep.org"
-SRC_URI="https://github.com/gnustep/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="boehm-gc cxx test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="boehm-gc? ( dev-libs/boehm-gc )
-	cxx? ( sys-libs/libcxx )"
-DEPEND="${DEPEND}
-	>=sys-devel/clang-2.9"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.7-fix_soname.patch )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	if ! use cxx;
-	then
-		sed -e 's/addtest_flags(CXXExceptions.*//' \
-			-i Test/CMakeLists.txt || die "test sed failed"
-	fi
-}
-
-src_configure() {
-	export CC=clang
-	export CXX=clang++
-
-	local mycmakeargs=(
-		-DGNUSTEP_CONFIG=GNUSTEP_CONFIG-NOTFOUND
-		$(cmake-utils_use boehm-gc BOEHM_GC)
-		$(cmake-utils_use_enable cxx OBJCXX)
-		$(cmake-utils_use test TESTS)
-	)
-	cmake-utils_src_configure
-}
diff --git a/gnustep-base/libobjc2/libobjc2-1.8.ebuild b/gnustep-base/libobjc2/libobjc2-1.8.ebuild
deleted file mode 100644
index 5f701cd27c0f..000000000000
--- a/gnustep-base/libobjc2/libobjc2-1.8.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils eutils
-
-DESCRIPTION="GNUstep Objective-C runtime"
-HOMEPAGE="http://www.gnustep.org"
-SRC_URI="https://github.com/gnustep/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="boehm-gc cxx test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="boehm-gc? ( dev-libs/boehm-gc )
-	cxx? ( sys-libs/libcxx )"
-DEPEND="${DEPEND}
-	>=sys-devel/clang-2.9"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.7-fix_soname.patch )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	if ! use cxx;
-	then
-		sed -e 's/addtest_flags(CXXExceptions.*//' \
-			-i Test/CMakeLists.txt || die "test sed failed"
-	fi
-}
-
-src_configure() {
-	export CC=clang
-	export CXX=clang++
-
-	local mycmakeargs=(
-		-DGNUSTEP_CONFIG=GNUSTEP_CONFIG-NOTFOUND
-		$(cmake-utils_use boehm-gc BOEHM_GC)
-		$(cmake-utils_use_enable cxx OBJCXX)
-		$(cmake-utils_use test TESTS)
-	)
-	cmake-utils_src_configure
-}
diff --git a/gnustep-base/libobjc2/libobjc2-2.1.ebuild b/gnustep-base/libobjc2/libobjc2-2.1.ebuild
new file mode 100644
index 000000000000..98b36a4a4fa1
--- /dev/null
+++ b/gnustep-base/libobjc2/libobjc2-2.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit cmake
+
+DESCRIPTION="GNUstep Objective-C runtime"
+HOMEPAGE="http://www.gnustep.org"
+SRC_URI="https://github.com/gnustep/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/Tessil/robin-map/archive/757de82.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="boehm-gc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="boehm-gc? ( dev-libs/boehm-gc )"
+BDEPEND="${RDEPEND}
+	sys-devel/clang"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-eh_trampoline.patch
+	"${FILESDIR}"/${P}-pthread_link.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+	cp -a "${WORKDIR}"/robin-map-757de829927489bee55ab02147484850c687b620/* \
+		"${S}"/third_party/robin-map || die
+}
+
+src_configure() {
+	export CC="clang"
+	export CXX="clang++"
+	local mycmakeargs=(
+		-DGNUSTEP_CONFIG=GNUSTEP_CONFIG-NOTFOUND
+		-DBOEHM_GC="$(usex boehm-gc)"
+		-DTESTS="$(usex test)"
+	)
+	cmake_src_configure
+}