From 5e819f047c75627059e347c7aaa611502685a9b9 Mon Sep 17 00:00:00 2001 From: blshkv Date: Thu, 10 Jan 2019 08:37:25 +0800 Subject: [PATCH] libuna: remove libcfile, it will be using a local copy if libcfile not installed --- dev-libs/libuna/libuna-20190102.ebuild | 5 +- dev-util/lief/lief-0.9.0_p20181231-r1.ebuild | 48 ++++++++++++++++++++ profiles/pentoo/base/package.mask | 3 -- 3 files changed, 51 insertions(+), 5 deletions(-) create mode 100644 dev-util/lief/lief-0.9.0_p20181231-r1.ebuild diff --git a/dev-libs/libuna/libuna-20190102.ebuild b/dev-libs/libuna/libuna-20190102.ebuild index faf6858f5..5223c754e 100644 --- a/dev-libs/libuna/libuna-20190102.ebuild +++ b/dev-libs/libuna/libuna-20190102.ebuild @@ -12,9 +12,10 @@ SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~x86" IUSE="nls unicode" +#circle dependence on libcfile #https://github.com/libyal/libuna/issues/7 -DEPEND="dev-libs/libcfile - dev-libs/libcdatetime +#dev-libs/libcfile +DEPEND="dev-libs/libcdatetime dev-libs/libcerror dev-libs/libclocale dev-libs/libcnotify diff --git a/dev-util/lief/lief-0.9.0_p20181231-r1.ebuild b/dev-util/lief/lief-0.9.0_p20181231-r1.ebuild new file mode 100644 index 000000000..9a033102d --- /dev/null +++ b/dev-util/lief/lief-0.9.0_p20181231-r1.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2019 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python{3_5,3_6,3_7} ) + +inherit cmake-utils python-r1 flag-o-matic + +HASH_COMMIT="8d7ec26a93800b0729c2c05be8c55c8318ba3b20" + +DESCRIPTION="Library to instrument executable formats" +HOMEPAGE="https://lief.quarkslab.com/" +SRC_URI="https://github.com/lief-project/LIEF/archive/${HASH_COMMIT}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +#https://github.com/lief-project/LIEF/issues/251 +KEYWORDS="~amd64 ~x86" + +IUSE="+python" + +RDEPEND="python? ( ${PYTHON_DEPS} )" +DEPEND="${RDEPEND} + python? ( dev-python/setuptools[${PYTHON_USEDEP}] )" + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +S=${WORKDIR}/LIEF-${HASH_COMMIT} + +CMAKE_BUILD_TYPE= +#Release + +src_configure(){ +#if(NOT PYBIND11_CPP_STANDARD AND NOT CMAKE_CXX_STANDARD) + + #cmake/LIEFOptions.cmake + local FORCE32=NO + use x86 && FORCE32=YES + + #examples fail to compile + #https://github.com/lief-project/LIEF/issues/251 + local mycmakeargs=( + -DLIEF_INSTALL_PYTHON="$(usex python)" + -DLIEF_FORCE32="$FORCE32" + ) + cmake-utils_src_configure +} diff --git a/profiles/pentoo/base/package.mask b/profiles/pentoo/base/package.mask index d445e90fa..f3663b230 100644 --- a/profiles/pentoo/base/package.mask +++ b/profiles/pentoo/base/package.mask @@ -1,6 +1,3 @@ -#circular deps with libcfile, don't unmask unless you can unmerge them both and cleanly re-merge them -=dev-libs/libuna-20190102 - #xf86-video-intel is deprecated and replaced by modesetting driver #hold it until acceleration works #x11-drivers/xf86-video-intel