7 files changed, 230 insertions, 1 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 9977d5659e80..388f26604609 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 8306f4b74c37..f4062e6313b9 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -9,6 +9,7 @@ DIST aws-cli-1.27.24.gh.tar.gz 2319169 BLAKE2B 6677fc6d09298fc37d5aae5e9b4addc87
 DIST aws-cli-1.27.25.gh.tar.gz 2319262 BLAKE2B 1207b7879a82c538be9d1ee3dc8a69f20c6334afdd8d35c63ca3d44f264316680aa4d7d01b19a216ca2693748977b83851a2b75f1fd55b85989f2749ab05e827 SHA512 e46f684b219d0bce61ffae0737b2c485a4fb359b7e3ad3ef6180d5378daa49bb049033073594c63f44150266041b4a78634aced1a34fc98f08f0ca8e371558e2
 DIST aws-cli-1.27.26.gh.tar.gz 2319897 BLAKE2B 65307b3c63656b751ad3d96ca6ffdb2e9778cdb11cb35c730dc22dad83ee4b0e1cb37afc4d1de7b2c1cbbabd4622610fc2385e7dbc21cfa2c9833a36d693b1ff SHA512 508f8ae1abe037786c3ee35204f4c84fb06bb7bb8471d75217bf914cf7c9aea897cbecb364554f8b39c75001769c894ede7a1b06dd761187aff468f19001708f
 DIST aws-cli-1.27.27.gh.tar.gz 2320454 BLAKE2B 5ac7c2b872d23173dd3c1d0c586389b558c43de4bd0c1e0e5e45fee574d3d952aafb5591165fdd9eb2d14435df1342b27526dbd7ec1b7d63c1291e2d4d14bf80 SHA512 f5b9cf61b5045775142ae9868b3fd3193d82b09c4b0d52f05dadd173cc8dbc97699a2df458b17a97a5bc4743e14252fd9e7b6583fc9e49d8f26b96eb2c5d5d08
+DIST aws-cli-1.27.29.gh.tar.gz 2325759 BLAKE2B 693131da782ce248a00560617d3d1cd57e1dcac20ba8a6a560b5a1c06c7f6b18576efd4e0a2151d538e28b3f59593ded609e8fea3d29bce9f91bc270f888e23a SHA512 828a3fdda0b3156c1b09ed53b5c2c6486857bdd1e4e3d5cfd77e817bc6c1e53e1ff3f7ddf83c55e8ca93b2944f37333244adffa0f3b9416b1c4197db9b364dde
 DIST aws-cli-1.27.8.gh.tar.gz 2301766 BLAKE2B 1873d92b8d2f6d3f29a65b4177927a1a14034da71dbc95ff6abf3f49df6cf3ee192412eeea15be14c8cf9fca0a5603f2c76b80b280f4feb95e661055abcd8b60 SHA512 e53828cac1b3e10e2ddd45312d71cdb748216dbc37c3e9833e7a1320b236c3bef6a13204a38b946d9182430f169fca1ddc77d3d06c1c2c6e05978dc61f675168
 EBUILD awscli-1.27.11.ebuild 2261 BLAKE2B 8db2f30612572dabd673c4b33fb8fcf3005bc3aa7762c3abbbf12ffe50bb51f9b46a043d4b849682bfb585e0638b9f8a0849b241807516b442e013085bf2f1ad SHA512 03816a71b8cf31f9bd659cace763b9143a8700290f3cee354ead69fa3333f6faa47a9769db433bbf17f5cd7a76f27bfd1a4df8bdfbdb5bd393eb4e69e7ee882a
 EBUILD awscli-1.27.16.ebuild 2279 BLAKE2B c4cc2e8705a7399cbb5b2a447e9c9bd044e0523dc46a67dcd0cbe68697bca3f7a4772392e1e7f8543a3f43a7631a4fd6fb3c2ef39a0ea24f7e6f290dbdbfe5bc SHA512 a12a8affe2d24309ff405469d35e817f9351d9f0ec17629f50fbae2729168b93a09a124a8103b92e3129924c9130f6ee1f57af46ed3e7260b82379d6630e4ad5
@@ -21,5 +22,6 @@ EBUILD awscli-1.27.24.ebuild 2261 BLAKE2B 8db2f30612572dabd673c4b33fb8fcf3005bc3
 EBUILD awscli-1.27.25.ebuild 2261 BLAKE2B 8db2f30612572dabd673c4b33fb8fcf3005bc3aa7762c3abbbf12ffe50bb51f9b46a043d4b849682bfb585e0638b9f8a0849b241807516b442e013085bf2f1ad SHA512 03816a71b8cf31f9bd659cace763b9143a8700290f3cee354ead69fa3333f6faa47a9769db433bbf17f5cd7a76f27bfd1a4df8bdfbdb5bd393eb4e69e7ee882a
 EBUILD awscli-1.27.26.ebuild 2261 BLAKE2B 8db2f30612572dabd673c4b33fb8fcf3005bc3aa7762c3abbbf12ffe50bb51f9b46a043d4b849682bfb585e0638b9f8a0849b241807516b442e013085bf2f1ad SHA512 03816a71b8cf31f9bd659cace763b9143a8700290f3cee354ead69fa3333f6faa47a9769db433bbf17f5cd7a76f27bfd1a4df8bdfbdb5bd393eb4e69e7ee882a
 EBUILD awscli-1.27.27.ebuild 2261 BLAKE2B 8db2f30612572dabd673c4b33fb8fcf3005bc3aa7762c3abbbf12ffe50bb51f9b46a043d4b849682bfb585e0638b9f8a0849b241807516b442e013085bf2f1ad SHA512 03816a71b8cf31f9bd659cace763b9143a8700290f3cee354ead69fa3333f6faa47a9769db433bbf17f5cd7a76f27bfd1a4df8bdfbdb5bd393eb4e69e7ee882a
+EBUILD awscli-1.27.29.ebuild 2261 BLAKE2B 8db2f30612572dabd673c4b33fb8fcf3005bc3aa7762c3abbbf12ffe50bb51f9b46a043d4b849682bfb585e0638b9f8a0849b241807516b442e013085bf2f1ad SHA512 03816a71b8cf31f9bd659cace763b9143a8700290f3cee354ead69fa3333f6faa47a9769db433bbf17f5cd7a76f27bfd1a4df8bdfbdb5bd393eb4e69e7ee882a
 EBUILD awscli-1.27.8.ebuild 2259 BLAKE2B 64d00480a8171f321e7feb58458293b942f7eb6d97b2bdc63f0ed7327d04e56ae15a274df4ce5a49199db2451f336e2ae2e49d20d5b9f57c26a347bc42ba9639 SHA512 cc067d10df0d454b0f7f184d336d98f39ee65dfc847289984f1158c679869852e4820736afc856cbbba1ffa128627778b3c1248897bdde9b799631b5cd24a6d8
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.27.29.ebuild b/app-admin/awscli/awscli-1.27.29.ebuild
new file mode 100644
index 000000000000..9bcb01ac11e2
--- /dev/null
+++ b/app-admin/awscli/awscli-1.27.29.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit bash-completion-r1 distutils-r1 multiprocessing
+
+MY_P=aws-cli-${PV}
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="
+	https://github.com/aws/aws-cli/
+	https://pypi.org/project/awscli/
+"
+SRC_URI="
+	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+# botocore is x.(y+2).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	!app-admin/awscli-bin
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	# strip overzealous upper bounds on requirements
+	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
+		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
+		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
+		tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
+	)
+
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/app-admin/testdisk/Manifest b/app-admin/testdisk/Manifest
index a9fa501f6fe0..ea36ae33f916 100644
--- a/app-admin/testdisk/Manifest
+++ b/app-admin/testdisk/Manifest
@@ -1,3 +1,5 @@
+AUX testdisk-7.1-backport-ntfs-3g-ioctl-prototype.patch 1268 BLAKE2B 9c57329b3576cef7f23177fe07d45cd49a449b4353a9abd3a3196a9ec2896a05e900b1d7785d087f4587642d786efb36ea655d8b2c35833c8736014fbdad9cfb SHA512 7325ff2d83350512acf2e0b3f2269cdc4a92f775eafeae62c0b337fa4f31dac0c4f56d9ed7397fbd8a29d7679eb259401ca934d48c51438bfc4e3d0e0bcf7e00
 DIST testdisk-7.1.tar.bz2 742006 BLAKE2B ad67cbef73e502df39cd04537bae9226d043a0f5ed824ed24d5a5ac7c3262060d0c78bfcf38159890ee0c270e1cd7690cbf276eb919e1b4721357fffc8679c61 SHA512 ad6531eec45c1ed8d4a0ce6132692bb609c4c269fbca57f788ce808214e0b00b5fb1187745a859c5da8a3cb8de18b29904792d3246b15cedfa24bf24cbfe3df5
 EBUILD testdisk-7.1-r1.ebuild 2354 BLAKE2B afc950294c018dbff1423bbfa67e07a9ba6de3166629d8c09bbaafd878071658c9e462d8cf9cdbc5fd85bfdf994050527d164dceee9c7c9f395f1d6d1d2162d6 SHA512 9f878e51186866e6b8d5621e629f020218f24544b611733fb581925fb8fa916cde3ffbf42a29dd5a77e4224e88a0be1029eaaaaf84ec716ebcbc7eb5ed5e4a64
-MISC metadata.xml 556 BLAKE2B db8777e1d66155225e309d519520fdbfbd47067879183478078571aae5efa75a5ad374af3c5791f306324f02143cb1ce437b9d819bc8665166fc0f0e1dd56a18 SHA512 f0d3184b6e36d4d829b75c44693895a28c216fc83db57d2deaa3a87175738f954e25b0d57fd89ebbc946a40ea2f6b627ca47e8ff09cb996679eda842018af929
+EBUILD testdisk-7.1-r2.ebuild 2488 BLAKE2B fce98752a6cea2713ff003d9b6140ed071142c6ad7896f8ca7813714fad5cee6f8e2059c7bc5a2523478d30560baf3da43f085c5f8b847c325f70cf3efee556e SHA512 f0d18b3f24b00075380a561a6aed75dbe43dcc28e567c6c3d65422a38a066274b878b631443716b9a5425548d4ced0a45f8cd439814575c74d0456b9e9b4b7c5
+MISC metadata.xml 640 BLAKE2B 2c906cdb19a874657ac6f51ea5ec0035b27b0644e73faac95b9234a888a991bc8d9026252a0bf1bd32841295519fe2a966f77101396ca8071dd96c3f742bfd24 SHA512 8996a1f5afaaf7cf18f088d342b717d43316737e92c7b891c63613f9698e4b60bcdc6c65d3d87e4ce4da129b40993e3a60c75544dd5503e9d104d2652460b58c
diff --git a/app-admin/testdisk/files/testdisk-7.1-backport-ntfs-3g-ioctl-prototype.patch b/app-admin/testdisk/files/testdisk-7.1-backport-ntfs-3g-ioctl-prototype.patch
new file mode 100644
index 000000000000..4ef379f0021f
--- /dev/null
+++ b/app-admin/testdisk/files/testdisk-7.1-backport-ntfs-3g-ioctl-prototype.patch
@@ -0,0 +1,46 @@
+From 2b0a0fcde875a89e2beffbe5c43c7518f682b482 Mon Sep 17 00:00:00 2001
+From: Christophe Grenier <grenier@cgsecurity.org>
+Date: Wed, 6 Apr 2022 07:43:45 +0200
+Subject: [PATCH] src/ntfs_io.c: fix ntfs_device_testdisk_io_ioctl() prototype
+ for ntfs-3g
+
+---
+Gentoo note: link to upstream commit:
+https://git.cgsecurity.org/cgit/testdisk/commit/?id=2b0a0fcde875a89e2beffbe5c43c7518f682b482
+
+ src/ntfs_io.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/src/ntfs_io.c b/src/ntfs_io.c
+index 5ca494a5..fa056724 100644
+--- a/src/ntfs_io.c
++++ b/src/ntfs_io.c
+@@ -159,6 +159,7 @@ static int ntfs_device_testdisk_io_stat(struct ntfs_device *dev, struct stat *bu
+ 	return -1;
+ }
+ 
++#ifdef HAVE_LIBNTFS
+ static int ntfs_device_testdisk_io_ioctl(struct ntfs_device *dev, int request,
+ 		void *argp)
+ {
+@@ -168,6 +169,17 @@ static int ntfs_device_testdisk_io_ioctl(struct ntfs_device *dev, int request,
+ #endif
+ 	return -1;
+ }
++#else
++static int ntfs_device_testdisk_io_ioctl(struct ntfs_device *dev, unsigned long request,
++		void *argp)
++{
++	log_warning( "ntfs_device_testdisk_io_ioctl() unimplemented\n");
++#ifdef ENOTSUP
++	errno = ENOTSUP;
++#endif
++	return -1;
++}
++#endif
+ 
+ /**
+  * Device operations for working with unix style devices and files.
+-- 
+2.37.4
+
diff --git a/app-admin/testdisk/metadata.xml b/app-admin/testdisk/metadata.xml
index 89a6073cc7db..adbd9697dcd6 100644
--- a/app-admin/testdisk/metadata.xml
+++ b/app-admin/testdisk/metadata.xml
@@ -14,4 +14,7 @@
 		<flag name="reiserfs">Include reiserfs reading ability</flag>
 		<flag name="ewf">Include ewf library</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">cgsecurity/testdisk</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-admin/testdisk/testdisk-7.1-r2.ebuild b/app-admin/testdisk/testdisk-7.1-r2.ebuild
new file mode 100644
index 000000000000..a891080e0dcc
--- /dev/null
+++ b/app-admin/testdisk/testdisk-7.1-r2.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic qmake-utils xdg-utils
+
+DESCRIPTION="Checks and undeletes partitions + PhotoRec, signature based recovery tool"
+HOMEPAGE="https://www.cgsecurity.org/wiki/TestDisk"
+SRC_URI="https://www.cgsecurity.org/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE="ewf jpeg ntfs gui reiserfs static zlib"
+
+REQUIRED_USE="static? ( !gui )"
+
+# WARNING: reiserfs support does NOT work with reiserfsprogs
+# you MUST use progsreiserfs-0.3.1_rc8 (the last version ever released).
+DEPEND="
+	static? (
+		sys-apps/util-linux[static-libs]
+		sys-fs/e2fsprogs[static-libs]
+		sys-libs/ncurses:0[static-libs]
+		jpeg? ( media-libs/libjpeg-turbo:=[static-libs] )
+		ntfs? ( sys-fs/ntfs3g[static-libs] )
+		reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8[static-libs] )
+		zlib? ( sys-libs/zlib[static-libs] )
+		!arm? ( ewf? ( app-forensics/libewf[static-libs] ) )
+	)
+	!static? (
+		sys-apps/util-linux
+		sys-fs/e2fsprogs
+		sys-libs/ncurses:0=
+		jpeg? ( media-libs/libjpeg-turbo:= )
+		ntfs? ( sys-fs/ntfs3g:= )
+		gui? (
+			dev-qt/qtcore:5
+			dev-qt/qtgui:5
+			dev-qt/qtwidgets:5
+		)
+		reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8 )
+		zlib? ( sys-libs/zlib )
+		!arm? ( ewf? ( app-forensics/libewf:= ) )
+	)
+"
+RDEPEND="!static? ( ${DEPEND} )"
+BDEPEND="gui? ( dev-qt/linguist-tools:5 )"
+
+DOCS=()
+
+PATCHES=(
+	"${FILESDIR}"/${P}-backport-ntfs-3g-ioctl-prototype.patch
+)
+
+src_configure() {
+	export MOC="$(qt5_get_bindir)/moc"
+	export PATH="$(qt5_get_bindir):${PATH}"
+
+	local myconf=(
+		--enable-sudo
+		--without-ntfs
+		$(use_with ewf)
+		$(use_with jpeg)
+		$(use_with ntfs ntfs3g)
+		$(use_enable gui qt)
+		$(use_with reiserfs)
+		$(use_with zlib)
+	)
+
+	# this static method is the same used by upstream for their 'static' make
+	# target, but better, as it doesn't break.
+	use static && append-ldflags -static
+
+	econf "${myconf[@]}"
+
+	# perform safety checks for NTFS, REISERFS and JPEG
+	if use ntfs && ! grep -E -q '^#define HAVE_LIBNTFS(3G)? 1$' "${S}"/config.h ; then
+		die "Failed to find either NTFS or NTFS-3G library."
+	fi
+	if use reiserfs && grep -E -q 'undef HAVE_LIBREISERFS\>' "${S}"/config.h ; then
+		die "Failed to find reiserfs library."
+	fi
+	if use jpeg && grep -E -q 'undef HAVE_LIBJPEG\>' "${S}"/config.h ; then
+		die "Failed to find jpeg library."
+	fi
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}