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 8CC241382C5 for ; Sat, 19 Jun 2021 19:37:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D32CDE081A; Sat, 19 Jun 2021 19:37:34 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 A710FE081A for ; Sat, 19 Jun 2021 19:37:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 440DA335D35 for ; Sat, 19 Jun 2021 19:37:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9FDE8581 for ; Sat, 19 Jun 2021 19:37:31 +0000 (UTC) From: "Davide Pesavento" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" Message-ID: <1624131426.3b5cdd5604f885c8b0b68be0dc00fddaa5cfe8ac.pesa@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/sip/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/sip/sip-4.19.25-r1.ebuild dev-python/sip/sip-5.5.0-r1.ebuild dev-python/sip/sip-5.5.0-r2.ebuild dev-python/sip/sip-6.1.1.ebuild X-VCS-Directories: dev-python/sip/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: 3b5cdd5604f885c8b0b68be0dc00fddaa5cfe8ac X-VCS-Branch: master Date: Sat, 19 Jun 2021 19:37:31 +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: 4c86b857-1d4e-43bd-aa37-064a7d148554 X-Archives-Hash: cb01815ae3724b79eebed275634fcd82 commit: 3b5cdd5604f885c8b0b68be0dc00fddaa5cfe8ac Author: Davide Pesavento gentoo org> AuthorDate: Sat Jun 19 19:37:06 2021 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Sat Jun 19 19:37:06 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b5cdd56 dev-python/sip: stop installing .dist-info Closes: https://bugs.gentoo.org/796251 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Davide Pesavento gentoo.org> dev-python/sip/sip-4.19.25-r1.ebuild | 93 ++++++++++++++++++++++ .../{sip-5.5.0-r1.ebuild => sip-5.5.0-r2.ebuild} | 3 +- dev-python/sip/sip-6.1.1.ebuild | 3 +- 3 files changed, 97 insertions(+), 2 deletions(-) diff --git a/dev-python/sip/sip-4.19.25-r1.ebuild b/dev-python/sip/sip-4.19.25-r1.ebuild new file mode 100644 index 00000000000..6c1abd79157 --- /dev/null +++ b/dev-python/sip/sip-4.19.25-r1.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..10} ) +inherit python-r1 toolchain-funcs + +DESCRIPTION="Python bindings generator for C/C++ libraries" +HOMEPAGE="https://www.riverbankcomputing.com/software/sip/" + +MY_P=${PN}-${PV/_pre/.dev} +if [[ ${PV} == *_pre* ]]; then + SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz" +else + SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${PN}/${PV}/${MY_P}.tar.gz" +fi +S=${WORKDIR}/${MY_P} + +# Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h +SLOT="0/12" +LICENSE="|| ( GPL-2 GPL-3 SIP )" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="doc" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +DEPEND="${PYTHON_DEPS}" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}"/${PN}-4.18-darwin.patch ) + +src_prepare() { + # Sub-slot sanity check + local sub_slot=${SLOT#*/} + local sip_api_major_nr=$(sed -nre 's:^#define SIP_API_MAJOR_NR\s+([0-9]+):\1:p' siplib/sip.h || die) + if [[ ${sub_slot} != ${sip_api_major_nr} ]]; then + eerror + eerror "Ebuild sub-slot (${sub_slot}) does not match SIP_API_MAJOR_NR (${sip_api_major_nr})" + eerror "Please update SLOT variable as follows:" + eerror " SLOT=\"${SLOT%%/*}/${sip_api_major_nr}\"" + eerror + die "sub-slot sanity check failed" + fi + + default +} + +src_configure() { + configuration() { + local incdir=$(python_get_includedir) + local myconf=( + "${EPYTHON}" + "${S}"/configure.py + --sysroot="${ESYSROOT}/usr" + --bindir="${EPREFIX}/usr/bin" + --destdir="$(python_get_sitedir)" + --incdir="${incdir#${SYSROOT}}" + --no-dist-info + AR="$(tc-getAR) cqs" + CC="$(tc-getCC)" + CFLAGS="${CFLAGS}" + CFLAGS_RELEASE= + CXX="$(tc-getCXX)" + CXXFLAGS="${CXXFLAGS}" + CXXFLAGS_RELEASE= + LINK="$(tc-getCXX)" + LINK_SHLIB="$(tc-getCXX)" + LFLAGS="${LDFLAGS}" + LFLAGS_RELEASE= + RANLIB= + STRIP= + ) + echo "${myconf[@]}" + "${myconf[@]}" || die + } + python_foreach_impl run_in_build_dir configuration +} + +src_compile() { + python_foreach_impl run_in_build_dir default +} + +src_install() { + installation() { + emake DESTDIR="${D}" install + python_optimize + } + python_foreach_impl run_in_build_dir installation + + einstalldocs + use doc && dodoc -r doc/html +} diff --git a/dev-python/sip/sip-5.5.0-r1.ebuild b/dev-python/sip/sip-5.5.0-r2.ebuild similarity index 90% rename from dev-python/sip/sip-5.5.0-r1.ebuild rename to dev-python/sip/sip-5.5.0-r2.ebuild index 26eee4168c3..3fef4177058 100644 --- a/dev-python/sip/sip-5.5.0-r1.ebuild +++ b/dev-python/sip/sip-5.5.0-r2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7..10} ) +PYTHON_COMPAT=( python3_{8..10} ) inherit distutils-r1 DESCRIPTION="Python bindings generator for C/C++ libraries" @@ -21,6 +21,7 @@ LICENSE="|| ( GPL-2 GPL-3 SIP )" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" RDEPEND=" + !