gentoo resync : 29.06.2020

6 files changed, 23 insertions, 61 deletions

diff --git a/dev-lisp/Manifest.gz b/dev-lisp/Manifest.gz
index 7dbcbbbff3be..2f795b93b4c4 100644
--- a/dev-lisp/Manifest.gz
+++ b/dev-lisp/Manifest.gz
diff --git a/dev-lisp/c2ffi/Manifest b/dev-lisp/c2ffi/Manifest
index 650f9859e4b4..ed09896cb586 100644
--- a/dev-lisp/c2ffi/Manifest
+++ b/dev-lisp/c2ffi/Manifest
@@ -1,5 +1,5 @@
-AUX c2ffi-9.0.0.20191017-fix-lib-location.patch 1382 BLAKE2B 93f11c43da622cf4bf9e5ee495117ff8613720af543bbfe9ff2e70b4893f86c26aaa5880c8cdba1ee283b3a7e81a5584218427129dce1debd9a58879f56d65e6 SHA512 21556242a0efdbf7bad98ac624ae5854aa7527cfa00a6ccb7cae4af08d2ead7328aa637bdfb8d3637d133b7de2d6110e6096d7766010f039b017d63b7994f46d
-DIST c2ffi-9.0.0.20191017.tar.gz 35139 BLAKE2B a080f2cf7743aab630365fd305c106ada0318afb24093508c7667d8d702ec8dfd95a0ea9f54233a3a4b4c9b411e2f4aba5dacf7b2f35f1545b7ca63e765a7e55 SHA512 7a4743d89f431fd9ca42808358bdde03bbd85fc56f3350fddc94532c524ce373989671e706fadeb03eb240a81fb3f418176169acbf3ccd0f0f0c595d0f697832
-EBUILD c2ffi-9.0.0.20191017.ebuild 605 BLAKE2B 467dfc5ab92699dd228aaa9a7f2f118ebcc968b7a6711407f311bede71b805d666e5d8881ddfe598751947c3b17d57ae321a20312fd58cac1d0faf2874dc7dcf SHA512 df33a7090a6da973113c0fd62067e102ed87b1deea3cd7098cce682cb92352b784531c88f6f83bfacd5cc5b5ff505da0e46a43f586bf215d96682d9935c0958d
-EBUILD c2ffi-9.0.0.9999.ebuild 497 BLAKE2B 7d4c7980e3cb1ccf4e7d27d6d83d6254eeef90053928c7016a1f48d2378c310bebef9ae1fd2f745f8bef27f370811150e326abe3f2d62e7ae5bd4398a69ff5ee SHA512 8ad098a2cb9714875358712e13f5ff41a5b9f57e295793d7148c17340feafad9ec3bd8725fd7d833a29d809126b50382f8756369ce1414e249d93074d3c8ef8a
+AUX c2ffi-10.0.0.20200527-add-target-link-directories.patch 394 BLAKE2B afc5089d594af74d9bf2707d22c120d17bc6a195756bdc89773369a29a3e727e96806392b7620dc9df60bb34546f60f2db1b0be2cb6a70577c69ccad52092918 SHA512 ad72f333e96947aa0ad660ccf683d64d17e377446001a7403cf1ab2ca7a9c05aaa5b28303ad616fb9b7e77044b5a971374c695220cc731b078ccc5198eb0c192
+DIST c2ffi-10.0.0.20200527.tar.gz 37554 BLAKE2B b1ebef370083d08513d0f02f8662ba1b090cba991864530c2304ac45e5c74d092f47e9d75a0646ae2f045d346585f371243d8a82bc37fe35f36dee1a75c0812b SHA512 452f2e8d3c81207e74334bc48dcea9bdf2770b4c77884c96abffc69ede20cc770183f363655ae853cddaee95d0512571426c6737d5db0324f7ceebbdf554cdf3
+EBUILD c2ffi-10.0.0.20200527.ebuild 619 BLAKE2B bce4f254a1ddc03e6e9b6ed46ee92d4cfadd817b2a5bc02ba5bb02cbcb21e7589ffcde6b859450a25399510b5104da97c751e741abf8fe8aba367b90ac87b5b7 SHA512 d25fe8a16b5ca4d595ef8e4db172e0562528a916d7cb542b10c45a4ea43006b0538e4e2a9b459c015fccac5c5a4fec2e97e7cbdea1cd55466ec1ac5a864003d2
+EBUILD c2ffi-10.0.0.9999.ebuild 512 BLAKE2B e95327514927fe23a58f75b9ff9e059f7b6db22d2507199ee53d465e5798e7063f2ecf873903ba38a7e4f72e557909be2dd924120898341042a38f72be8bf134 SHA512 681682bba4cc805e03a1e7fd24eedb75ce59c46b43392f9ca7583edf230375bd56967d69fd4faa17459fd354c0aa744fe7d4083c1c733df1066d5b1c8bd66670
 MISC metadata.xml 421 BLAKE2B 2df9693805f6968df30c8df0dbb1578c11b064b5f3b23f96321832c7551dbc751ebaeb81845147a7526f891b658aaaff8efeea185b239576e2885d3606944e87 SHA512 7bf517258ecbdf98192c055c451fe16315b34ac8875528b0fac4e844c15f2a4656d2252a88bbb642b54bc608a21d83af158cb5e6872b46e70d7c32f557b83de1
diff --git a/dev-lisp/c2ffi/c2ffi-9.0.0.20191017.ebuild b/dev-lisp/c2ffi/c2ffi-10.0.0.20200527.ebuild
index 53c06c021779..56aaeae61858 100644
--- a/dev-lisp/c2ffi/c2ffi-9.0.0.20191017.ebuild
+++ b/dev-lisp/c2ffi/c2ffi-10.0.0.20200527.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit cmake llvm
 
-MY_COMMIT="15fda06de0bad97bf91f5590f7f24623eab2f580"
+MY_COMMIT="a2d1f667b707fb413fc8ab2413446f15cb23de51"
 
 DESCRIPTION="Clang-based FFI wrapper generator for Common Lisp"
 HOMEPAGE="https://github.com/rpav/c2ffi"
@@ -16,11 +16,11 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
-DEPEND="sys-devel/clang:9=
-	sys-devel/llvm:9=
+DEPEND="sys-devel/clang:10=
+	sys-devel/llvm:10=
 "
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/c2ffi-${MY_COMMIT}"
 
-PATCHES=( "${FILESDIR}"/${PN}-9.0.0.20191017-fix-lib-location.patch )
+PATCHES=( "${FILESDIR}"/${PN}-10.0.0.20200527-add-target-link-directories.patch )
diff --git a/dev-lisp/c2ffi/c2ffi-9.0.0.9999.ebuild b/dev-lisp/c2ffi/c2ffi-10.0.0.9999.ebuild
index 6a2256dee41f..dac9e0eb3d31 100644
--- a/dev-lisp/c2ffi/c2ffi-9.0.0.9999.ebuild
+++ b/dev-lisp/c2ffi/c2ffi-10.0.0.9999.ebuild
@@ -8,15 +8,15 @@ inherit cmake git-r3 llvm
 DESCRIPTION="Clang-based FFI wrapper generator for Common Lisp"
 HOMEPAGE="https://github.com/rpav/c2ffi"
 EGIT_REPO_URI="https://github.com/rpav/c2ffi.git"
-EGIT_BRANCH="llvm-9.0.0"
+EGIT_BRANCH="llvm-10.0.0"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
 IUSE=""
 
-DEPEND="sys-devel/clang:9=
-	sys-devel/llvm:9=
+DEPEND="sys-devel/clang:10=
+	sys-devel/llvm:10=
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}"/${PN}-9.0.0.20191017-fix-lib-location.patch )
+PATCHES=( "${FILESDIR}"/${PN}-10.0.0.20200527-add-target-link-directories.patch )
diff --git a/dev-lisp/c2ffi/files/c2ffi-10.0.0.20200527-add-target-link-directories.patch b/dev-lisp/c2ffi/files/c2ffi-10.0.0.20200527-add-target-link-directories.patch
new file mode 100644
index 000000000000..2dc4a82413b2
--- /dev/null
+++ b/dev-lisp/c2ffi/files/c2ffi-10.0.0.20200527-add-target-link-directories.patch
@@ -0,0 +1,11 @@
+diff -Naur a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt	2020-06-05 00:21:43.509980270 +0200
++++ b/CMakeLists.txt	2020-06-05 00:22:08.679979968 +0200
+@@ -36,6 +36,7 @@
+   ${LLVM_INCLUDE_DIRS}
+   ${SOURCE_ROOT}/src/include
+   )
++target_link_directories(c2ffi PUBLIC ${LLVM_LIBRARY_DIRS})
+ target_link_libraries(c2ffi PUBLIC clang-cpp LLVM)
+ 
+ set(APP_BIN_DIR "${CMAKE_BINARY_DIR}/bin")
diff --git a/dev-lisp/c2ffi/files/c2ffi-9.0.0.20191017-fix-lib-location.patch b/dev-lisp/c2ffi/files/c2ffi-9.0.0.20191017-fix-lib-location.patch
deleted file mode 100644
index 8b09b25aa739..000000000000
--- a/dev-lisp/c2ffi/files/c2ffi-9.0.0.20191017-fix-lib-location.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 3a496f89064de85af04ce101918c2ec5cebf7846 Mon Sep 17 00:00:00 2001
-From: Harald Judt <h.judt@gmx.at>
-Date: Fri, 8 Nov 2019 10:35:02 +0100
-Subject: Fix CLANG and LLVM libraries not found
-
-This commit gets the build working again here on Gentoo.
-
-Adding LLVM_LIBRARY_DIRS fixes the CLANG libs not found error.
-
-Adding llvm_map_components_to_libnames fixes LLMV not found error.
----
- CMakeLists.txt | 12 ++++++++++--
- 1 file changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 99dbe4b..f93b9b3 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -39,6 +39,15 @@ target_include_directories(c2ffi PUBLIC
-   ${LLVM_INCLUDE_DIRS}
-   ${SOURCE_ROOT}/src/include
-   )
-+target_link_directories(c2ffi PUBLIC
-+  ${LLVM_LIBRARY_DIRS}
-+)
-+message(STATUS "LLVM_LIBRARY_DIRS=${LLVM_LIBRARY_DIRS}")
-+
-+llvm_map_components_to_libnames(llvm_libs core support mcparser bitreader profiledata)
-+
-+message(STATUS "llvm_libs=${llvm_libs}")
-+
- target_link_libraries(c2ffi PUBLIC
-   clangFrontendTool
-   clangFrontend
-@@ -64,10 +73,9 @@ target_link_libraries(c2ffi PUBLIC
-   clangIndex
-   clangToolingCore
-   clangTooling
-+  ${llvm_libs}
-   )
- 
--llvm_config(c2ffi USE_SHARED core support mcparser bitreader profiledata)
--
- set(APP_BIN_DIR "${CMAKE_BINARY_DIR}/bin")
- set_target_properties(c2ffi PROPERTIES
-   RUNTIME_OUTPUT_DIRECTORY "${APP_BIN_DIR}"
--- 
-2.23.0
-