gentoo auto-resync : 10:05:2024 - 00:01:13

4 files changed, 4 insertions, 185 deletions

diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index b2d63555dd85..24285c9c82eb 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -5,7 +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-r3.ebuild 4154 BLAKE2B 8029a67867a813b16eb13accbbaafe02cf3234ba010e1071b5e3f00cde262f76f1ee6e4d857f10ec4467d926d8bc7e3ae2d1cee39a57537ca9121280dac54275 SHA512 b2e1e21b7a9d8819b85b1711a84034fc767e5e17a0f16c626b3e43338c1200bcda3017b9ecf3077a84db50a82eacf9aac997b8e2c1ded9461c42b45124642c9c
-EBUILD file-5.45-r4.ebuild 4101 BLAKE2B 3bd216823752a8ef80a64e6e5e8912f0b618a3f79185284ca505d40f52b7b4f8f59437419a2a3c6e673359a81aae4d3817e48d53d3d9ab5ca04dd2198e373337 SHA512 2ece7f436f94306ff429b34a062f720d45a1415453244dd11d120906a0b582849f1e1cc4e37de2b321037f145a4d843dbe14147f0c4d5d4d383949f0372d0d99
-EBUILD file-9999.ebuild 3900 BLAKE2B 2e69d6d3f97891ae509d7efd1fad5fbf9162316bb9a4c415db19904d6432971d513df284bab4a28509dfa02b11ed2f2e2392e23ac58bf0290b595d7ef02e6d77 SHA512 81cc6b152667c0f72773b28f4692892c7fb414bc045bf2e8f9f5491cbd4d801b6fe96ef4b0f307bd9d0bf1d48d485e27ae74f7e6a25b91686166c60219d268c1
+EBUILD file-5.45-r4.ebuild 4101 BLAKE2B f6ce0947658490eb57503791d7eab1c02d523bd7343ba20f87962e339c1446e7d9493bc3cfdbce6c29011403c84bbcdbd125f51da478bdfef2cb8a7f4062a506 SHA512 26171e1d48e8567d613b02e468e48ee49765f7bac300b77b7f22d4991f17e352b1132b1d90e872c5ba7ef5b29dc83056afeff2430d7d69f7b89b023e6fabc6e4
+EBUILD file-9999.ebuild 3900 BLAKE2B 9edf056e1c03aab76563378692b10ea2ee557cc785d45b80fd5549444f2b15e2eb502bd5b46bb03b2834ab3078f9760e383b9c5d7a8a3dd7e89c076822b9efef SHA512 801ee34ac4a26fe619517239529daf491c3304aa127f74d5d4fe6ae3950f9240c5f2131706ce2d0e6a2bbe08dc6101f6ac4f85b0255e5be32177048abd2b76ef
 MISC metadata.xml 439 BLAKE2B d937d412b733516f49ca24a5de5238688ba56c06872cec060608139cb551f78e165e05990bcf6ea5bb1e98d27eb2650f5a972a4cded85eb67dbe9218d5d705b8 SHA512 20ff0c1b94dae95c3b277cfcc10da2b6ff31582cfe8f4e2ae60a74ec45db2a854eef40950f354465a45563ee6333f327566565e40cb16249d191bde585c5b1f2
diff --git a/sys-apps/file/file-5.45-r3.ebuild b/sys-apps/file/file-5.45-r3.ebuild
deleted file mode 100644
index 4bad50bf1169..000000000000
--- a/sys-apps/file/file-5.45-r3.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{10..11} )
-
-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 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 ~ia64 ~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
-
-DESCRIPTION="Identify a file's format by scanning binary data for patterns"
-HOMEPAGE="https://www.darwinsys.com/file/"
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="bzip2 lzip lzma python seccomp static-libs zlib zstd"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="
-	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
-	lzip? ( app-arch/lzlib )
-	lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	)
-	seccomp? ( >=sys-libs/libseccomp-2.5.4[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-RDEPEND="
-	${DEPEND}
-	python? ( !dev-python/python-magic )
-	seccomp? ( >=sys-libs/libseccomp-2.5.4[${MULTILIB_USEDEP}] )
-"
-BDEPEND+="
-	python? (
-		${PYTHON_DEPS}
-		${DISTUTILS_DEPS}
-	)
-"
-
-# https://bugs.gentoo.org/898676
-QA_CONFIG_IMPL_DECL_SKIP=( makedev )
-
-PATCHES=(
-	"${FILESDIR}/file-5.43-seccomp-fstatat64-musl.patch" #789336, not upstream yet
-	"${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
-	# 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
-
-	# bug #662090
-	sed -i 's@README.md@README.python.md@' python/setup.py || die
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--enable-fsect-man5
-		$(use_enable bzip2 bzlib)
-		$(multilib_native_use_enable lzip lzlib)
-		$(use_enable lzma xzlib)
-		$(use_enable seccomp libseccomp)
-		$(use_enable static-libs static)
-		$(use_enable zlib)
-		$(use_enable zstd zstdlib)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-build_src_configure() {
-	local myeconfargs=(
-		--disable-shared
-		--disable-libseccomp
-		--disable-bzlib
-		--disable-xzlib
-		--disable-zlib
-	)
-
-	econf_build "${myeconfargs[@]}"
-}
-
-need_build_file() {
-	# When cross-compiling, we need to build up our own file
-	# because people often don't keep matching host/target
-	# file versions, bug #362941
-	tc-is-cross-compiler && ! has_version -b "~${CATEGORY}/${P}"
-}
-
-src_configure() {
-	local ECONF_SOURCE="${S}"
-
-	if need_build_file ; then
-		mkdir -p "${WORKDIR}"/build || die
-		cd "${WORKDIR}"/build || die
-		build_src_configure
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi ; then
-		emake
-	else
-		# bug #586444
-		emake -C src magic.h
-		emake -C src libmagic.la
-	fi
-}
-
-src_compile() {
-	if need_build_file ; then
-		# bug #586444
-		emake -C "${WORKDIR}"/build/src magic.h
-		emake -C "${WORKDIR}"/build/src file
-		local -x PATH="${WORKDIR}/build/src:${PATH}"
-	fi
-
-	multilib-minimal_src_compile
-
-	if use python ; then
-		cd python || die
-		distutils-r1_src_compile
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi ; then
-		default
-	else
-		emake -C src install-{nodist_includeHEADERS,libLTLIBRARIES} DESTDIR="${D}"
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc ChangeLog MAINT # README
-
-	# Required for `file -C`
-	insinto /usr/share/misc/magic
-	doins -r magic/Magdir/*
-
-	if use python ; then
-		cd python || die
-		distutils-r1_src_install
-	fi
-
-	find "${ED}" -type f -name "*.la" -delete || die
-}
diff --git a/sys-apps/file/file-5.45-r4.ebuild b/sys-apps/file/file-5.45-r4.ebuild
index f822d863338e..6a112ffecb4a 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..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit distutils-r1 toolchain-funcs multilib-minimal
 
diff --git a/sys-apps/file/file-9999.ebuild b/sys-apps/file/file-9999.ebuild
index 19c650b61358..c909db1c6e81 100644
--- a/sys-apps/file/file-9999.ebuild
+++ b/sys-apps/file/file-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit distutils-r1 libtool toolchain-funcs multilib-minimal