gentoo auto-resync : 08:10:2024 - 04:26:34

3 files changed, 44 insertions, 13 deletions

diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index 937a3d19e05f..37371585e8c9 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -5,6 +5,6 @@ AUX file-5.45-seccomp-sandbox.patch 1354 BLAKE2B 5b84be7d9a8ac3a99a6414895afab07
 AUX file-5.45-weak-magic-shell.patch 1166 BLAKE2B 715d220e472a6ea1c6374f8b0f789699f0cb4292c25768808d23503104e660ad07946e5e6466cc391eb7ffd87fbca1966e13da39440046576183f56b8c013bc9 SHA512 532bbd9d643badb50977b3ff168a77dbd282f9e83f11716d1f863bcf2ef29402a2e6d488a79e175d24a36bdcad68f9ef940478bc658bad0bc2ddcdc34f26148d
 DIST file-5.45.tar.gz 1246503 BLAKE2B 30fc77c091e6624f2e9a950f4c6fe69ea6aa46d4a8ad9f20d49320a3675617c5bfbc9ff1ebba5eeb2cf4435c38d71b47b8beeb5146c9f55fe3bac11fe65e89bd SHA512 12611a59ff766c22a55db4b4a9f80f95a0a2e916a1d8593612c6ead32c247102a8fdc23693c6bf81bda9b604d951a62c0051e91580b1b79e190a3504c0efc20a
 DIST file-5.45.tar.gz.asc 163 BLAKE2B 1405080c63412e9c66bfe06086ecee28b276b77cc2ddacb20cfd370c539a0d983812fd29dcf7a33bad69d6490cd439ef8d1219bfaf3928fb835a38da85013af3 SHA512 56bf131b2f35e896788be19b4d8cd1c7ec942c794fb584d5e589375d22fbccebdd04c03e779fafc0c10840586dc41e64251b3de1767ae9ab95f5d3300f9af254
-EBUILD file-5.45-r4.ebuild 4095 BLAKE2B f0d15c46af49250899eaba3580ed1fe474ba88b8a702828c0c9557efecd3de65e57ca6629b0c4d97f5f00f10e60286aa62e78445b2c3afca99c7527e9d2acdf6 SHA512 6e17ffdfb5dde956e36ac6f9b878d0e0c2e6e71b1e81aa734fe98ef2283314d2c8a1ba4d9bb4b20edbb7fff9f2adf43b8fe44e1e1caf6301912fa1abc678f92e
-EBUILD file-9999.ebuild 3894 BLAKE2B df2dc5ee931cf9d224b3273ba258b5441ee5438fc965d2f45a9f7ceb5f3d19cfa721e4f09407ee1e7d8922ccc5ef6b522c24dc07fcb9826102b78bdb0386b75b SHA512 e30457d61cf106543b5d4e44b426218f0d0309124e86b3a5e6fe2e14eb57bae2637ba4fac886ba963c20bcb92313d223bc96b0a040467f24d426ad7bf43ec29d
+EBUILD file-5.45-r4.ebuild 4238 BLAKE2B 6e5a129ed8fe1795bf2c545cc994aac6d3f81f1c519bd481fa30578a7906a48a536f9ad9be46408de7d7685416cfea1e00b247aa1e75292a85259f31b8860aaf SHA512 ca51f4d086d211c04165e91c6156997f5906b153f67cda76471986d3e47a44dff0e908f26a53794987e631659a7cdc0b1f3daef0d5d653f50d9219336ee0e794
+EBUILD file-9999.ebuild 4238 BLAKE2B 6e5a129ed8fe1795bf2c545cc994aac6d3f81f1c519bd481fa30578a7906a48a536f9ad9be46408de7d7685416cfea1e00b247aa1e75292a85259f31b8860aaf SHA512 ca51f4d086d211c04165e91c6156997f5906b153f67cda76471986d3e47a44dff0e908f26a53794987e631659a7cdc0b1f3daef0d5d653f50d9219336ee0e794
 MISC metadata.xml 439 BLAKE2B d937d412b733516f49ca24a5de5238688ba56c06872cec060608139cb551f78e165e05990bcf6ea5bb1e98d27eb2650f5a972a4cded85eb67dbe9218d5d705b8 SHA512 20ff0c1b94dae95c3b277cfcc10da2b6ff31582cfe8f4e2ae60a74ec45db2a854eef40950f354465a45563ee6333f327566565e40cb16249d191bde585c5b1f2
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