From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C5DBE1382C5 for ; Thu, 14 May 2020 23:20:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 00F19E0DC6; Thu, 14 May 2020 23:20:59 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CDB66E0DC6 for ; Thu, 14 May 2020 23:20:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 29694350BFB for ; Thu, 14 May 2020 23:20:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EF7C2211 for ; Thu, 14 May 2020 23:20:53 +0000 (UTC) From: "Aaron Bauman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Aaron Bauman" Message-ID: <1589498440.8ea48e596ac85a4216b159d9c045cf7d0bf3c633.bman@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/botan/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/botan/botan-2.14.0-r1.ebuild X-VCS-Directories: dev-libs/botan/ X-VCS-Committer: bman X-VCS-Committer-Name: Aaron Bauman X-VCS-Revision: 8ea48e596ac85a4216b159d9c045cf7d0bf3c633 X-VCS-Branch: master Date: Thu, 14 May 2020 23:20:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6e597748-a490-42c4-b0fc-fd614b29d0d8 X-Archives-Hash: 9660ed2f9b9effa7c77504688a8124c2 commit: 8ea48e596ac85a4216b159d9c045cf7d0bf3c633 Author: Sam James (sam_c) cmpct info> AuthorDate: Thu May 14 21:04:38 2020 +0000 Commit: Aaron Bauman gentoo org> CommitDate: Thu May 14 23:20:40 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ea48e59 dev-libs/botan: Fix installation of Python module It's not clear to me how this worked in the past, but that doesn't matter now. We now disable the autoinstall of the Python module and install it ourselves; previously the build system was trying to be smart and place it where the other libs go. Closes: https://bugs.gentoo.org/723096 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Sam James (sam_c) cmpct.info> Closes: https://github.com/gentoo/gentoo/pull/15796 Signed-off-by: Aaron Bauman gentoo.org> dev-libs/botan/botan-2.14.0-r1.ebuild | 105 ++++++++++++++++++++++++++++++++++ 1 file changed, 105 insertions(+) diff --git a/dev-libs/botan/botan-2.14.0-r1.ebuild b/dev-libs/botan/botan-2.14.0-r1.ebuild new file mode 100644 index 00000000000..1e33b401056 --- /dev/null +++ b/dev-libs/botan/botan-2.14.0-r1.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8} ) + +MY_P="Botan-${PV}" +inherit python-r1 toolchain-funcs + +DESCRIPTION="C++ crypto library" +HOMEPAGE="https://botan.randombit.net/" +SRC_URI="https://botan.randombit.net/releases/${MY_P}.tar.xz" + +LICENSE="BSD" +SLOT="2/$(ver_cut 1-2)" # soname version +KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos" +IUSE="bindist bzip2 boost doc libressl lzma python sqlite ssl static-libs zlib" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +S="${WORKDIR}/${MY_P}" + +DEPEND="python? ( ${PYTHON_DEPS} )" +RDEPEND="${DEPEND} + boost? ( >=dev-libs/boost-1.48:= ) + bzip2? ( >=app-arch/bzip2-1.0.5:= ) + lzma? ( app-arch/xz-utils:= ) + sqlite? ( dev-db/sqlite:3= ) + ssl? ( + !libressl? ( dev-libs/openssl:0=[bindist=] ) + libressl? ( dev-libs/libressl:0= ) + ) + zlib? ( >=sys-libs/zlib-1.2.3:= ) +" +BDEPEND=" + dev-lang/python:* + doc? ( dev-python/sphinx ) +" + +src_configure() { + local disable_modules=() + use boost || disable_modules+=( "boost" ) + use bindist && disable_modules+=( "ecdsa" ) + elog "Disabling modules: ${disable_modules[@]}" + + # Enable v9 instructions for sparc64 + if [[ "${PROFILE_ARCH}" = "sparc64" ]]; then + CHOSTARCH="sparc32-v9" + else + CHOSTARCH="${CHOST%%-*}" + fi + + local myos= + case ${CHOST} in + *-darwin*) myos=darwin ;; + *) myos=linux ;; + esac + + case ${CHOST} in + hppa*) CHOSTARCH=parisc ;; + esac + + local pythonvers=() + if use python; then + append() { + pythonvers+=( ${EPYTHON/python/} ) + } + python_foreach_impl append + fi + + # Don't install automatically, do it manually later in right place + # https://bugs.gentoo.org/723096 + CXX="$(tc-getCXX)" AR="$(tc-getAR)" ./configure.py \ + $(use_enable static-libs static-library) \ + $(use_with boost) \ + $(use_with bzip2) \ + $(use_with doc documentation) \ + $(use_with doc sphinx) \ + $(use_with lzma) \ + $(use_with sqlite sqlite3) \ + $(use_with ssl openssl) \ + $(use_with zlib) \ + $(usex hppa --without-stack-protector '') \ + --cc=gcc \ + --cpu=${CHOSTARCH} \ + --disable-modules=$(IFS=","; echo "${disable_modules[*]}" ) \ + --docdir=share/doc \ + --libdir=$(get_libdir) \ + --os=${myos} \ + --prefix="${EPREFIX}/usr" \ + --with-endian="$(tc-endian)" \ + --with-python-version=$(IFS=","; echo "${pythonvers[*]}" ) \ + --without-doxygen \ + --no-install-python-module \ + || die "configure.py failed" +} + +src_test() { + LD_LIBRARY_PATH="${S}" ./botan-test || die "Validation tests failed" +} + +src_install() { + default + use python && python_foreach_impl python_domodule src/python/botan2.py +}