gentoo auto-resync : 03:06:2024 - 00:07:25

5 files changed, 38 insertions, 81 deletions

diff --git a/app-forensics/Manifest.gz b/app-forensics/Manifest.gz
index 3cd07feed33e..91e877520cf2 100644
--- a/app-forensics/Manifest.gz
+++ b/app-forensics/Manifest.gz
diff --git a/app-forensics/afflib/Manifest b/app-forensics/afflib/Manifest
index 7d94b306696f..f1ab2b8f81a5 100644
--- a/app-forensics/afflib/Manifest
+++ b/app-forensics/afflib/Manifest
@@ -1,6 +1,5 @@
 AUX afflib-3.7.19-search-path.patch 1132 BLAKE2B 8314c7591277658c704f0e82105ecb2af7e70761aaab1e9329aa72f400a4b3774e2ba3ccc6e271b4a1be78b0935cbac058acb3e5dbc8e16123e9d3f21b4ef018 SHA512 80551435c89a7dbacfbce5c9d73a47e89d31600511abffab9a8235b60b0b398bc26d10a144676c99e5f11b680a994a2ffc8eab3409a332f708f5cdd5782985fb
-DIST afflib-3.7.19.tar.gz 540165 BLAKE2B dea0998741121d2c1ae0e42ced9652ec46816282128469af75e0a32f9e4e2d09ac4afb4888ee7925366a03a867932f2446bfcd3800ab4dc021939ab6c38c797b SHA512 6e0df7477bf7dbd3814099d94e3fce122e0cf9b714a425521b7458f4eedc6e8b8e7283fd37926b7c992cdf21d3adec620df29a79a6a5311bf1d1b5d4930768bc
+AUX afflib-3.7.20-c99.patch 876 BLAKE2B 6a1a1a601770f71eb8f6eed0f59756511a235fc053de4d706b97bcc7b013ca2349a1f52066f78bedd150034204672a059bb97920d4bb4228802d81c013225881 SHA512 2775e96628434397cead2c2390368157eaed0d05be4485177621dae5ca088d4f15bd51fc455b9e515e7196d9d949e945ef54031ab5887b40a107dd22f03dbf12
 DIST afflib-3.7.20.tar.gz 560441 BLAKE2B 6934efc30566b4b72e55e5727c46657362237872acae9d161f2625439d3d6e12da702b3ed82e3442b7015d8cb707097152cc73a6d0cc31d1ad61467f4022f7d4 SHA512 1ac623cb8462fc929a8ad1c014e92d319a3ebf5226ef07aa0777e4cbb77a9ee20adf570f39c960c9186ac2a477e861dfd5565d3364fdff22f9870f8c9ab30479
-EBUILD afflib-3.7.19-r1.ebuild 1614 BLAKE2B ffbefa9d7189c08cf9ce9d8b58c48aaafaae308a7874917d7c35d03b9f2cee92cf2b68bdddccee3761c48e03b38e319af3d4f65c28877cec52a7024a49d29e17 SHA512 71bdef8bb1ef8e2dadb8880e272f0eba3425a390a7065c56bf91842f559f553bb232ef2f1db7cbc363cb3da7ddf79ba623af81dc11c752c08835242de3081f71
-EBUILD afflib-3.7.20.ebuild 1659 BLAKE2B 7fb58e5bff061b995b1cec717deb6b28a0b245412f9c46f10aa7c7452acbc96fe46d2c44515415bc04306f9f1e2717d87787db09461e4babcfae1cd766987fc7 SHA512 70f48908737ee3fe51974ef1bd1406a0a27294ffa4e78b74291d913a0b5cbc26e3b98be049cda017c0f7dbf33537f319139ee6fdaeb20e1fa2e836e3b768dc96
+EBUILD afflib-3.7.20-r1.ebuild 1698 BLAKE2B 1febc786244efe5107e285f540b8be9189058d32c71f7274f95e1f865a3bbe28138599a015a51ef45757d6daf3e80764fc5e9767bddca06fd63f9fff3aebdfc8 SHA512 7b5c48ff387b726a8e1bf5c9c34c0364752510778691e4d5b3ff16bd500c83291ea66b4544a001990d0b5ffc6399c86e818ac48959bb5a9169b80a38975fb63c
 MISC metadata.xml 429 BLAKE2B be342119faa9c24cda33611a66e94a2bd2490b642fa3fcae47af7ae88690fd3059fa4df33fa7856179b8ce5704e042a2dfa831da6055d771f2dbef9b236fa3b1 SHA512 1240b7941d35a219be5adec75a3fae222dd17d1f5e9bb1a0476b779ac4869f9d7d1c985a60a20580d8cb375297ec9dea39e4597a4c462cac31faa5039be3d34a
diff --git a/app-forensics/afflib/afflib-3.7.19-r1.ebuild b/app-forensics/afflib/afflib-3.7.19-r1.ebuild
deleted file mode 100644
index 00cbc11a8892..000000000000
--- a/app-forensics/afflib/afflib-3.7.19-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-inherit autotools python-single-r1
-
-MY_PN=AFFLIBv3
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Library that implements the AFF image standard"
-HOMEPAGE="https://github.com/sshock/AFFLIBv3/"
-SRC_URI="https://github.com/sshock/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc x86 ~x64-macos"
-IUSE="fuse ncurses python qemu readline s3 static-libs threads"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-# Tests don't play well with sandbox
-RESTRICT="test"
-
-RDEPEND="
-	dev-libs/expat
-	sys-libs/zlib:=
-	fuse? ( sys-fs/fuse:0 )
-	dev-libs/openssl:=
-	ncurses? ( sys-libs/ncurses:= )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep 'dev-python/cython[${PYTHON_USEDEP}]')
-	)
-	readline? ( sys-libs/readline:= )
-	s3? ( net-misc/curl )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.7.19-search-path.patch"
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	sed -i '/FLAGS/s: -g::' configure.ac || die
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# Hacks for automagic dependencies
-	use ncurses || export ac_cv_lib_ncurses_initscr=no
-	use readline || export ac_cv_lib_readline_readline=no
-
-	local myeconfargs=(
-		$(use_enable fuse)
-		$(use_enable python)
-		$(use_enable qemu)
-		$(use_enable s3)
-		$(use_enable static-libs static)
-		$(use_enable threads threading)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/app-forensics/afflib/afflib-3.7.20.ebuild b/app-forensics/afflib/afflib-3.7.20-r1.ebuild
index a8d20b77ec2b..9c200d896a8f 100644
--- a/app-forensics/afflib/afflib-3.7.20.ebuild
+++ b/app-forensics/afflib/afflib-3.7.20-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit autotools python-single-r1
 
 MY_PN=AFFLIBv3
@@ -39,6 +39,7 @@ DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-3.7.19-search-path.patch"
+	"${FILESDIR}/${PN}-3.7.20-c99.patch"
 )
 
 pkg_setup() {
diff --git a/app-forensics/afflib/files/afflib-3.7.20-c99.patch b/app-forensics/afflib/files/afflib-3.7.20-c99.patch
new file mode 100644
index 000000000000..faee6c48dd82
--- /dev/null
+++ b/app-forensics/afflib/files/afflib-3.7.20-c99.patch
@@ -0,0 +1,33 @@
+https://bugs.gentoo.org/921727
+https://github.com/sshock/AFFLIBv3/issues/53
+https://github.com/sshock/AFFLIBv3/commit/01210f488410a23838c54fcc22297cf08ac7de66
+
+From 01210f488410a23838c54fcc22297cf08ac7de66 Mon Sep 17 00:00:00 2001
+From: Phillip Hellewell <sshock@gmail.com>
+Date: Wed, 14 Feb 2024 00:43:56 -0700
+Subject: [PATCH] Fix #53: incompatible pointer types in pyaff.c
+
+--- a/pyaff/afflib.pxd
++++ b/pyaff/afflib.pxd
+@@ -2,7 +2,8 @@ from libc.stdint cimport int64_t, uint32_t, uint64_t
+ from posix.fcntl cimport O_RDONLY
+ 
+ cdef extern from "afflib/afflib.h":
+-    struct AFFILE
++    struct _AFFILE
++    ctypedef _AFFILE AFFILE
+ 
+     enum: AF_MAX_NAME_LEN
+ 
+--- a/pyaff/pyaff.c
++++ b/pyaff/pyaff.c
+@@ -1478,7 +1478,7 @@ struct __pyx_obj_5pyaff_affile;
+  */
+ struct __pyx_obj_5pyaff_affile {
+   PyObject_HEAD
+-  struct AFFILE *af;
++  AFFILE *af;
+   int64_t size;
+ };
+ 
+