diff --git a/dev-libs/lief/Manifest b/dev-libs/lief/Manifest index 16c730fff0c..561148f6488 100644 --- a/dev-libs/lief/Manifest +++ b/dev-libs/lief/Manifest @@ -1 +1 @@ -DIST lief-0.11.5.tar.gz 15519537 BLAKE2B 87f16a62df6290652ee1d301b7b067e11882c12066a3abaa4eff750c3a7fd19353001fec6a7d7e70273815064b401707f1afcad9a2006a81c2f1d118fb448d17 SHA512 fa215e6193eadd6be3f8cff92b304ca5a03db24fcb7f48b258318b8f674527fc45f6e3765ca3d6055e7a4e9f2672b2d198df02bbfcc4fa96cb36b9255df7c0c4 +DIST lief-0.12.3.tar.gz 15570645 BLAKE2B d8714d73268c1156c7443725acacc01fee0b4d442dc988b082efcd56b6e29a0d5e17f10a8791c1397df7df8c1fb4b931603aa66a9bac3c82676e8bcf6e483ec6 SHA512 3f48978af2d96e9e469aca1fc4adcfd3475576ba32273d451f881e33b0fc062b0c2b625af10c54c2a0b6a9678e5ce7666499c1c36f578250dab217352f4717e0 diff --git a/dev-libs/lief/files/00-fix-install-destination.patch b/dev-libs/lief/files/00-fix-install-destination.patch new file mode 100644 index 00000000000..51ab56c675d --- /dev/null +++ b/dev-libs/lief/files/00-fix-install-destination.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index eadac9a6..10f1396e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -674,7 +674,6 @@ endif() + + if(UNIX) + include(GNUInstallDirs) +- set(CMAKE_INSTALL_LIBDIR "lib") + else() + if(WIN32) + set(CMAKE_INSTALL_LIBDIR "lib") diff --git a/dev-libs/lief/lief-0.11.5.ebuild b/dev-libs/lief/lief-0.12.3.ebuild similarity index 87% rename from dev-libs/lief/lief-0.11.5.ebuild rename to dev-libs/lief/lief-0.12.3.ebuild index c2c38e5ba9f..f443563783d 100644 --- a/dev-libs/lief/lief-0.11.5.ebuild +++ b/dev-libs/lief/lief-0.12.3.ebuild @@ -4,7 +4,7 @@ EAPI=7 CMAKE_ECLASS=cmake -PYTHON_COMPAT=( python3_10 pypy3 ) +PYTHON_COMPAT=( python3_11 pypy3 ) # Upstream has two alternate approaches to building its Python API: # 1. A working "CMakeList.txt" only supporting a single Python target. @@ -27,6 +27,8 @@ KEYWORDS="~amd64 ~x86" IUSE="c examples +python static-libs" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} !abi_x86_32 !abi_x86_x32 )" +PATCHES=( "${FILESDIR}" ) + # See "cmake/LIEFDependencies.cmake" for C and C++ dependencies. BDEPEND=" python? ( @@ -37,7 +39,11 @@ BDEPEND=" " #FIXME: Add after bumping to the next stable release: # >=dev-libs/spdlog-1.8.5[${MULTILIB_USEDEP}] -RDEPEND="python? ( ${PYTHON_DEPS} )" +RDEPEND=" + dev-cpp/nlohmann_json + >=dev-libs/utfcpp-3.2.1 + python? ( ${PYTHON_DEPS} ) +" DEPEND="${RDEPEND}" # LIEF tests are non-trivial (if not infeasible) to run in the general case. @@ -58,10 +64,6 @@ pkg_setup() { #vendored dependency resembling the existing "LIEF_EXTERNAL_SPDLOG" option. #Note that LIEF patches the vendored "Boost leaf" and "utfcpp" dependencies. src_prepare() { - # Respect "multilib"-based lib dirnames. - sed -i -e 's~\bDESTINATION lib\(64\)\{0,1\}\b~DESTINATION ${CMAKE_INSTALL_LIBDIR}~' \ - CMakeLists.txt || die - # Respect "python"-based installation of Python bindings. Upstream # currently fails to install these bindings, resulting in Gentoo "RUNPATH" # QA notices at installation time. See also: @@ -91,16 +93,8 @@ multilib_src_configure() { -DLIEF_PROFILING=OFF -DLIEF_SUPPORT_CXX14=ON -DLIEF_USE_CCACHE=OFF # Defer to Portage itself for "ccache" support. - - # Disabling LIEF's format options causes build failures. See also: - # https://github.com/lief-project/LIEF/issues/599 - -DLIEF_ELF=ON - -DLIEF_PE=ON - -DLIEF_MACHO=ON - -DLIEF_ART=ON - -DLIEF_DEX=ON - -DLIEF_OAT=ON - -DLIEF_VDEX=ON + -DLIEF_OPT_NLOHMANN_JSON_EXTERNAL=ON + -DLIEF_OPT_UTFCPP_EXTERNAL=ON -DBUILD_SHARED_LIBS="$(usex static-libs OFF ON)" -DLIEF_C_API="$(usex c ON OFF)" @@ -110,11 +104,9 @@ multilib_src_configure() { -DLIEF_INSTALL_PYTHON="$(usex python ON OFF)" #FIXME: Add USE flags governing most or all of these options. - -DLIEF_ENABLE_JSON=OFF -DLIEF_DOC=OFF -DLIEF_FUZZING=OFF -DLIEF_INSTALL_COMPILED_EXAMPLES=OFF - -DLIEF_LOGGING=OFF -DLIEF_LOGGING_DEBUG=OFF -DLIEF_TESTS=OFF -DLIEF_ASAN=OFF diff --git a/dev-python/cymbal/cymbal-1.0.0.ebuild b/dev-python/cymbal/cymbal-1.0.0-r1.ebuild similarity index 96% rename from dev-python/cymbal/cymbal-1.0.0.ebuild rename to dev-python/cymbal/cymbal-1.0.0-r1.ebuild index c5d9eec8e5b..86252504759 100644 --- a/dev-python/cymbal/cymbal-1.0.0.ebuild +++ b/dev-python/cymbal/cymbal-1.0.0-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_10 ) +PYTHON_COMPAT=( python3_11 ) inherit distutils-r1 pypi DESCRIPTION="Add functionality missing from the python libclang bindings" diff --git a/dev-python/ezdxf/ezdxf-0.16.5.ebuild b/dev-python/ezdxf/ezdxf-0.16.5-r1.ebuild similarity index 96% rename from dev-python/ezdxf/ezdxf-0.16.5.ebuild rename to dev-python/ezdxf/ezdxf-0.16.5-r1.ebuild index b3a0148f7f1..15d1b6ce584 100644 --- a/dev-python/ezdxf/ezdxf-0.16.5.ebuild +++ b/dev-python/ezdxf/ezdxf-0.16.5-r1.ebuild @@ -4,7 +4,7 @@ EAPI=8 #FIXME: Upstream explicitly supports "pypy3", but Gentoo dependencies do not. -PYTHON_COMPAT=( python3_10 ) +PYTHON_COMPAT=( python3_11 ) inherit distutils-r1 pypi DESCRIPTION="Python interface to DXF" diff --git a/dev-python/logzero/logzero-1.7.0.ebuild b/dev-python/logzero/logzero-1.7.0-r1.ebuild similarity index 90% rename from dev-python/logzero/logzero-1.7.0.ebuild rename to dev-python/logzero/logzero-1.7.0-r1.ebuild index 2c3f44eb14f..fb2959e6647 100644 --- a/dev-python/logzero/logzero-1.7.0.ebuild +++ b/dev-python/logzero/logzero-1.7.0-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_10 pypy3 ) +PYTHON_COMPAT=( python3_11 pypy3 ) inherit distutils-r1 pypi DESCRIPTION="Robust and effective logging for Python 2 and 3" diff --git a/dev-python/multimethod/multimethod-1.8.ebuild b/dev-python/multimethod/multimethod-1.8-r1.ebuild similarity index 94% rename from dev-python/multimethod/multimethod-1.8.ebuild rename to dev-python/multimethod/multimethod-1.8-r1.ebuild index 595a728a468..2cd11917278 100644 --- a/dev-python/multimethod/multimethod-1.8.ebuild +++ b/dev-python/multimethod/multimethod-1.8-r1.ebuild @@ -4,7 +4,7 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_10 ) +PYTHON_COMPAT=( python3_11 ) inherit distutils-r1 diff --git a/dev-python/schema/schema-0.7.4.ebuild b/dev-python/schema/schema-0.7.4-r1.ebuild similarity index 94% rename from dev-python/schema/schema-0.7.4.ebuild rename to dev-python/schema/schema-0.7.4-r1.ebuild index faa082e582f..76c9dcf8922 100644 --- a/dev-python/schema/schema-0.7.4.ebuild +++ b/dev-python/schema/schema-0.7.4-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_10 pypy3 ) +PYTHON_COMPAT=( python3_11 pypy3 ) inherit distutils-r1 pypi DESCRIPTION="Schema validation just got Pythonic" diff --git a/dev-python/typish/typish-1.9.3.ebuild b/dev-python/typish/typish-1.9.3-r1.ebuild similarity index 95% rename from dev-python/typish/typish-1.9.3.ebuild rename to dev-python/typish/typish-1.9.3-r1.ebuild index f597d017516..31cb1ee5c2f 100644 --- a/dev-python/typish/typish-1.9.3.ebuild +++ b/dev-python/typish/typish-1.9.3-r1.ebuild @@ -4,7 +4,7 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_10 ) +PYTHON_COMPAT=( python3_11 ) inherit distutils-r1 DESCRIPTION="Functionality for types"