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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7619815807A for ; Mon, 7 Oct 2024 07:07:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A2D2EE29A4; Mon, 7 Oct 2024 07:07:58 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 84D96E29A4 for ; Mon, 7 Oct 2024 07:07:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8B09034306C for ; Mon, 7 Oct 2024 07:07:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EBDB71293 for ; Mon, 7 Oct 2024 07:07:55 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1728284845.9264246a123d854b9251da9e9665a3edcbaf9c71.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/file/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/file/file-5.45-r4.ebuild sys-apps/file/file-9999.ebuild X-VCS-Directories: sys-apps/file/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 9264246a123d854b9251da9e9665a3edcbaf9c71 X-VCS-Branch: master Date: Mon, 7 Oct 2024 07:07:55 +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: 756c8f99-cf53-4f25-81f3-f8532cc8212f X-Archives-Hash: 8c64e40b312b7285a51cee5552e7b1e0 commit: 9264246a123d854b9251da9e9665a3edcbaf9c71 Author: Sam James gentoo org> AuthorDate: Mon Oct 7 07:06:53 2024 +0000 Commit: Sam James gentoo org> CommitDate: Mon Oct 7 07:07:25 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9264246a sys-apps/file: enable py3.13, wire up python tests Signed-off-by: Sam James gentoo.org> sys-apps/file/file-5.45-r4.ebuild | 15 ++++++++++++++- sys-apps/file/file-9999.ebuild | 38 ++++++++++++++++++++++++++++---------- 2 files changed, 42 insertions(+), 11 deletions(-) diff --git a/sys-apps/file/file-5.45-r4.ebuild b/sys-apps/file/file-5.45-r4.ebuild index 48a5067c2cd2..84ced37c5487 100644 --- a/sys-apps/file/file-5.45-r4.ebuild +++ b/sys-apps/file/file-5.45-r4.ebuild @@ -5,7 +5,7 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools DISTUTILS_OPTIONAL=1 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit distutils-r1 toolchain-funcs multilib-minimal @@ -155,6 +155,19 @@ src_compile() { fi } +src_test() { + multilib-minimal_src_test + + if use python ; then + cd python || die + distutils-r1_src_test + fi +} + +python_test() { + eunittest +} + multilib_src_install() { if multilib_is_native_abi ; then default diff --git a/sys-apps/file/file-9999.ebuild b/sys-apps/file/file-9999.ebuild index 9ea68ce9ec0c..84ced37c5487 100644 --- a/sys-apps/file/file-9999.ebuild +++ b/sys-apps/file/file-9999.ebuild @@ -5,20 +5,20 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools DISTUTILS_OPTIONAL=1 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) -inherit distutils-r1 libtool toolchain-funcs multilib-minimal +inherit distutils-r1 toolchain-funcs multilib-minimal if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://github.com/glensc/file.git" inherit autotools git-r3 else VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/file.asc - inherit verify-sig + inherit autotools verify-sig SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz" SRC_URI+=" verify-sig? ( ftp://ftp.astron.com/pub/file/${P}.tar.gz.asc )" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" BDEPEND="verify-sig? ( sec-keys/openpgp-keys-file )" fi @@ -59,17 +59,22 @@ QA_CONFIG_IMPL_DECL_SKIP=( makedev ) PATCHES=( "${FILESDIR}/file-5.43-seccomp-fstatat64-musl.patch" #789336, not upstream yet - "${FILESDIR}/file-5.43-portage-sandbox.patch" #889046 + "${FILESDIR}/file-5.45-seccomp-sandbox.patch" + "${FILESDIR}/${P}-32-bit-time_t.patch" + "${FILESDIR}/${P}-32-bit-time_t-deux.patch" + "${FILESDIR}/${P}-weak-magic-shell.patch" #908401 ) src_prepare() { default - if [[ ${PV} == 9999 ]] ; then - eautoreconf - else - elibtoolize - fi + #if [[ ${PV} == 9999 ]] ; then + # eautoreconf + #else + # elibtoolize + #fi + # Just for file-5.45-32-bit-time_t-deux.patch, drop in 5.46 + eautoreconf # Don't let python README kill main README, bug #60043 mv python/README.md python/README.python.md || die @@ -150,6 +155,19 @@ src_compile() { fi } +src_test() { + multilib-minimal_src_test + + if use python ; then + cd python || die + distutils-r1_src_test + fi +} + +python_test() { + eunittest +} + multilib_src_install() { if multilib_is_native_abi ; then default