[gentoo-commits] repo/gentoo:master commit in: dev-lisp/c2ffi/, dev-lisp/c2ffi/files/

2020-06-24 Thread Joonas Niilola
commit: efc535dcdf688b8edd00c932dca80cd71a323e0f
Author: Harald Judt  gmx  at>
AuthorDate: Thu Jun  4 22:43:06 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Jun 24 16:29:42 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efc535dc

dev-lisp/c2ffi: Remove c2ffi-9.0.0

Signed-off-by: Harald Judt  gmx.at>
Closes: https://github.com/gentoo/gentoo/pull/16072
Signed-off-by: Joonas Niilola  gentoo.org>

 dev-lisp/c2ffi/Manifest|  1 -
 dev-lisp/c2ffi/c2ffi-9.0.0.20191017.ebuild | 26 
 dev-lisp/c2ffi/c2ffi-9.0.0..ebuild | 22 --
 .../c2ffi-9.0.0.20191017-fix-lib-location.patch| 49 --
 4 files changed, 98 deletions(-)

diff --git a/dev-lisp/c2ffi/Manifest b/dev-lisp/c2ffi/Manifest
index a4c1cd2460c..35af3e0ca0a 100644
--- a/dev-lisp/c2ffi/Manifest
+++ b/dev-lisp/c2ffi/Manifest
@@ -1,2 +1 @@
 DIST c2ffi-10.0.0.20200527.tar.gz 37554 BLAKE2B 
b1ebef370083d08513d0f02f8662ba1b090cba991864530c2304ac45e5c74d092f47e9d75a0646ae2f045d346585f371243d8a82bc37fe35f36dee1a75c0812b
 SHA512 
452f2e8d3c81207e74334bc48dcea9bdf2770b4c77884c96abffc69ede20cc770183f363655ae853cddaee95d0512571426c6737d5db0324f7ceebbdf554cdf3
-DIST c2ffi-9.0.0.20191017.tar.gz 35139 BLAKE2B 
a080f2cf7743aab630365fd305c106ada0318afb24093508c7667d8d702ec8dfd95a0ea9f54233a3a4b4c9b411e2f4aba5dacf7b2f35f1545b7ca63e765a7e55
 SHA512 
7a4743d89f431fd9ca42808358bdde03bbd85fc56f3350fddc94532c524ce373989671e706fadeb03eb240a81fb3f418176169acbf3ccd0f0f0c595d0f697832

diff --git a/dev-lisp/c2ffi/c2ffi-9.0.0.20191017.ebuild 
b/dev-lisp/c2ffi/c2ffi-9.0.0.20191017.ebuild
deleted file mode 100644
index 53c06c02177..000
--- a/dev-lisp/c2ffi/c2ffi-9.0.0.20191017.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake llvm
-
-MY_COMMIT="15fda06de0bad97bf91f5590f7f24623eab2f580"
-
-DESCRIPTION="Clang-based FFI wrapper generator for Common Lisp"
-HOMEPAGE="https://github.com/rpav/c2ffi;
-SRC_URI="https://github.com/rpav/c2ffi/archive/${MY_COMMIT}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="sys-devel/clang:9=
-   sys-devel/llvm:9=
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/c2ffi-${MY_COMMIT}"
-
-PATCHES=( "${FILESDIR}"/${PN}-9.0.0.20191017-fix-lib-location.patch )

diff --git a/dev-lisp/c2ffi/c2ffi-9.0.0..ebuild 
b/dev-lisp/c2ffi/c2ffi-9.0.0..ebuild
deleted file mode 100644
index 6a2256dee41..000
--- a/dev-lisp/c2ffi/c2ffi-9.0.0..ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE=""
-
-DEPEND="sys-devel/clang:9=
-   sys-devel/llvm:9=
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PN}-9.0.0.20191017-fix-lib-location.patch )

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 8b09b25aa73..000
--- 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 
-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
-



[gentoo-commits] repo/gentoo:master commit in: dev-lisp/c2ffi/, dev-lisp/c2ffi/files/

2020-06-24 Thread Joonas Niilola
commit: fa0cbe2e00fc7c43ff5fceee213b89254f54cdc1
Author: Harald Judt  gmx  at>
AuthorDate: Thu Jun  4 22:39:28 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Jun 24 16:29:37 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa0cbe2e

dev-lisp/c2ffi: Bump version to c2ffi-10.0.0

Update to c2ffi-10, using clang-10. This time, it was only necessary
to add a target_link_directories directive to CMakeLists.txt.

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Harald Judt  gmx.at>
Signed-off-by: Joonas Niilola  gentoo.org>

 dev-lisp/c2ffi/Manifest|  1 +
 dev-lisp/c2ffi/c2ffi-10.0.0.20200527.ebuild| 26 ++
 dev-lisp/c2ffi/c2ffi-10.0.0..ebuild| 22 ++
 0.0.20200527-add-target-link-directories.patch | 11 +
 4 files changed, 60 insertions(+)

diff --git a/dev-lisp/c2ffi/Manifest b/dev-lisp/c2ffi/Manifest
index 03b798a30b3..a4c1cd2460c 100644
--- a/dev-lisp/c2ffi/Manifest
+++ b/dev-lisp/c2ffi/Manifest
@@ -1 +1,2 @@
+DIST c2ffi-10.0.0.20200527.tar.gz 37554 BLAKE2B 
b1ebef370083d08513d0f02f8662ba1b090cba991864530c2304ac45e5c74d092f47e9d75a0646ae2f045d346585f371243d8a82bc37fe35f36dee1a75c0812b
 SHA512 
452f2e8d3c81207e74334bc48dcea9bdf2770b4c77884c96abffc69ede20cc770183f363655ae853cddaee95d0512571426c6737d5db0324f7ceebbdf554cdf3
 DIST c2ffi-9.0.0.20191017.tar.gz 35139 BLAKE2B 
a080f2cf7743aab630365fd305c106ada0318afb24093508c7667d8d702ec8dfd95a0ea9f54233a3a4b4c9b411e2f4aba5dacf7b2f35f1545b7ca63e765a7e55
 SHA512 
7a4743d89f431fd9ca42808358bdde03bbd85fc56f3350fddc94532c524ce373989671e706fadeb03eb240a81fb3f418176169acbf3ccd0f0f0c595d0f697832

diff --git a/dev-lisp/c2ffi/c2ffi-10.0.0.20200527.ebuild 
b/dev-lisp/c2ffi/c2ffi-10.0.0.20200527.ebuild
new file mode 100644
index 000..56aaeae6185
--- /dev/null
+++ b/dev-lisp/c2ffi/c2ffi-10.0.0.20200527.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake llvm
+
+MY_COMMIT="a2d1f667b707fb413fc8ab2413446f15cb23de51"
+
+DESCRIPTION="Clang-based FFI wrapper generator for Common Lisp"
+HOMEPAGE="https://github.com/rpav/c2ffi;
+SRC_URI="https://github.com/rpav/c2ffi/archive/${MY_COMMIT}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="sys-devel/clang:10=
+   sys-devel/llvm:10=
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/c2ffi-${MY_COMMIT}"
+
+PATCHES=( 
"${FILESDIR}"/${PN}-10.0.0.20200527-add-target-link-directories.patch )

diff --git a/dev-lisp/c2ffi/c2ffi-10.0.0..ebuild 
b/dev-lisp/c2ffi/c2ffi-10.0.0..ebuild
new file mode 100644
index 000..dac9e0eb3d3
--- /dev/null
+++ b/dev-lisp/c2ffi/c2ffi-10.0.0..ebuild
@@ -0,0 +1,22 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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-10.0.0"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE=""
+
+DEPEND="sys-devel/clang:10=
+   sys-devel/llvm:10=
+"
+RDEPEND="${DEPEND}"
+
+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 000..2dc4a82413b
--- /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")