Merge updates from master

8 files changed, 103 insertions, 90 deletions

diff --git a/app-portage/mgorny-dev-scripts/Manifest b/app-portage/mgorny-dev-scripts/Manifest
index 37219b1b7f35..fc28e297af8b 100644
--- a/app-portage/mgorny-dev-scripts/Manifest
+++ b/app-portage/mgorny-dev-scripts/Manifest
@@ -1,3 +1,4 @@
 DIST mgorny-dev-scripts-21.tar.gz 11674 BLAKE2B cb3c217df259a6ef48f8e11da8d42c3dcba6c50cbed7e9006d0a02520b0f4bd54a7ea330c680f8570a93d799accfd7f93f410e8fc085cd544fb9f09168a47f84 SHA512 be49f0f5392817cf881ec9bcbca78da525f8170b0f9babdfcc0f7c2b9fdd3a0bd31db332498e98c937b22b3b6a5b6325ec2f7150548847cbbdc915d589a99b06
 DIST mgorny-dev-scripts-22.tar.gz 11684 BLAKE2B 6a17ecec290d761df650d8607f246411d85e80e8511ef1073d671878544785c055dfc4e35bb9e8d937747eac731e4c18075dcbc95044fff3bfe3e8567ed9300b SHA512 597505fe6d27fb0f21308a4966714bc9161e976abe66ac5437d4705a161d960a4beeaa9d3dc36346e69221b1dc912a5957a6ad537ae0f7b4b96f33a419d6933b
 DIST mgorny-dev-scripts-24.tar.gz 11691 BLAKE2B bfc81908b4769a111eee3ad12c931f8d3c1b60715d6b9828ff091da19a7df8258878105cfb402f7b1f4760f27e746db5e65e452bc5a727366cdd51be442e5bd2 SHA512 f2fd31f1a8c9de6b7310c7cc24bf861836948a9d88adb389ebdde9fc0d365efafae908f7fdba556a83c6de607587c55a90fd96116c48e78d39900e8b6dfb15b7
+DIST mgorny-dev-scripts-25.tar.gz 11688 BLAKE2B 224234844956e0adfad6d731e3693d5741405b41f454f570fd431cc126520b35ed3d34beb12368ac5977b76138c88e7843b92c1d89e35a2bad766342ead5a7ec SHA512 b6423b080e6931aef8ddd7f9dd8a10ba4939793b9837b218742dc9c4357448b161cba8d9798af510db13cccc5912080e2a05f8f2c9173f828907bdce6fc7141e
diff --git a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-25.ebuild b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-25.ebuild
new file mode 100644
index 000000000000..2838be105fd2
--- /dev/null
+++ b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-25.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Handy scripts for ebuild development and more"
+HOMEPAGE="https://github.com/projg2/mgorny-dev-scripts/"
+SRC_URI="
+	https://github.com/projg2/mgorny-dev-scripts/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	app-portage/gentoolkit
+	app-portage/portage-utils
+	dev-perl/URI
+	dev-util/pkgcheck
+	dev-vcs/git
+	net-misc/wget
+	sys-apps/portage
+	x11-misc/xdg-utils
+	!dev-util/pkgdiff
+"
+
+src_install() {
+	dodoc README.rst
+	rm -f COPYING README.rst || die
+	dobin *
+}
diff --git a/dev-lua/luasec/Manifest b/dev-lua/luasec/Manifest
index 3ec2a2485bfd..f2802314e044 100644
--- a/dev-lua/luasec/Manifest
+++ b/dev-lua/luasec/Manifest
@@ -1,2 +1 @@
-DIST luasec-1.1.0.tar.gz 53060 BLAKE2B c89e8feea3cb66108ed72c81e1525397bd3c58a25372661b49cbc7bb0fa1f4ab81e39b6065d99fc3e376333f36f9290b136c31e654a30248a6a1d30beaa5d5b2 SHA512 ce08be2c62e97ebfab30e867790874030d404d195ce336b149d9501d652e9b8efe201cc2d0bcbb3be16214d7e4763b5871e45cbc22db758724baab9f7cd78568
 DIST luasec-1.2.0.tar.gz 53379 BLAKE2B dad93b341565b602fa02a5551a127bce42e76cee5abb0314f9cc4a98f162d23b0f8b4b9c0f16423095e4b54ec5ab260ee06bef5993ad46f559ad1295dcc28856 SHA512 5564f73495bef7c5683285ff7648c7b82a3a3dfdce96e88c77cc8835427b6595a694e5a2bf0a4f6332fe52b8aed3d94531607df81260d7597458a6fb0465d3fe
diff --git a/dev-lua/luasec/luasec-1.1.0.ebuild b/dev-lua/luasec/luasec-1.1.0.ebuild
deleted file mode 100644
index b96cb6076757..000000000000
--- a/dev-lua/luasec/luasec-1.1.0.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..4} luajit )
-
-inherit lua toolchain-funcs
-
-DESCRIPTION="Lua binding for OpenSSL library to provide TLS/SSL communication"
-HOMEPAGE="https://github.com/brunoos/luasec"
-SRC_URI="https://github.com/brunoos/luasec/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
-
-RDEPEND="
-	>=dev-lua/luasocket-3.0_rc1_p20200328-r103[${LUA_USEDEP}]
-	dev-libs/openssl:0=
-	${LUA_DEPS}
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-lua_src_prepare() {
-	pushd "${BUILD_DIR}" || die
-
-	${ELUA} src/options.lua -g /usr/include/openssl/ssl.h > src/options.c || die
-
-	popd
-}
-
-src_prepare() {
-	default
-
-	# Respect users CFLAGS
-	sed -e 's/-O2//g' -i src/Makefile || die
-
-	# Allow to redefine libraries linking
-	sed -e 's/LIBS=/LIBS?=/g' -i src/Makefile || die
-
-	lua_copy_sources
-
-	lua_foreach_impl lua_src_prepare
-}
-
-lua_src_compile() {
-	pushd "${BUILD_DIR}" || die
-
-	local myemakeargs=(
-		"CC=$(tc-getCC)"
-		"CCLD=$(tc-getCC)"
-		"INC_PATH=-I$(lua_get_include_dir)"
-		"LIB_PATH=-L$(lua_get_cmod_dir)/socket"
-		"LIBS=$($(tc-getPKG_CONFIG) --libs openssl) $(lua_get_cmod_dir)/socket/core.so"
-		"MYLDFLAGS=-Wl,-rpath,$(lua_get_cmod_dir)/socket -Wl,-soname=socket/core.so"
-		"EXTRA="
-		"DEFS="
-	)
-
-	emake "${myemakeargs[@]}" linux
-
-	popd
-}
-
-src_compile() {
-	lua_foreach_impl lua_src_compile
-}
-
-lua_src_install() {
-	pushd "${BUILD_DIR}" || die
-
-	local emakeargs=(
-		"DESTDIR=${ED}"
-		"LUAPATH=$(lua_get_lmod_dir)"
-		"LUACPATH=$(lua_get_cmod_dir)"
-	)
-
-	emake "${emakeargs[@]}" install
-
-	popd
-}
-
-src_install() {
-	lua_foreach_impl lua_src_install
-
-	einstalldocs
-}
diff --git a/dev-util/ROPgadget/Manifest b/dev-util/ROPgadget/Manifest
index d82573574e06..739d23feaaaa 100644
--- a/dev-util/ROPgadget/Manifest
+++ b/dev-util/ROPgadget/Manifest
@@ -2,3 +2,4 @@ DIST ROPgadget-6.6.tar.gz 9349424 BLAKE2B b1f1e5fbc76329f64122e65161ab188e9f7260
 DIST ROPgadget-6.7.tar.gz 9348558 BLAKE2B 004f28993e3567b8bf78853c83b60fa17ff7dc8eb82867eabec33aee247283938ed522883bcf62a11f27a70fa10c4afbdd2636d613770bc8fa0ee7dd3667e859 SHA512 81bebafc1ba9cb18e017487395dacdaae044d6f1383604a0183b41d2210651c9a6870755f741cd7a3e2dc38ee5c004b0aeac52cc1082fa352c06c0598ac7e87b
 DIST ROPgadget-6.8.tar.gz 9348922 BLAKE2B f7278ea0934e61f6afcd95f3c3047a34cf07bfaa52b67514ad2c63aa06104ee1c3c13bf77275ae89a406e2db5f238b95353d2cef7b696b3b53769434775183f3 SHA512 9e14d5a180a2d2d974bf69fb6456d9a68f197d4d4dda1de16374a2c81b0b2780b220d6a73d155be65d5eee03273fdc94f76235fe645511646bc3b29c07e6e828
 DIST ROPgadget-6.9.gh.tar.gz 9903435 BLAKE2B de20400cc4b247a080ead3060c8790447e0d543e757975a17b5638ba9d5e44ff437a1f4a43731308427e92f9062c72b3e5bcdab68816f4e3ce19a849efc7d384 SHA512 c844a856e4185261fbd2b550c95439a7cfedf41c15fd988497b43c559264d266ebd3c684af705b539ed64f56526080313e1802f3cc6486a17d69439e0aa2a394
+DIST ROPgadget-7.0.gh.tar.gz 9903868 BLAKE2B 0e63dbffe6686ca0f92d8899e467f1e0db96d3c713711e8e4b8e6fb75ec9d9a37098d9192821f47ee30f4ed8ce58751ad1718f41685036a6e5d373d8b14bd197 SHA512 f4f6e0176b34a565bbdf7f720c1f937295c49d1b88485cfb9f2c1d48971b2a45bc32a6e50b372f959e5a2afe437a083f76abe9854ff66847c1e62c2d2499bfa1
diff --git a/dev-util/ROPgadget/ROPgadget-7.0.ebuild b/dev-util/ROPgadget/ROPgadget-7.0.ebuild
new file mode 100644
index 000000000000..50c40c36f4b9
--- /dev/null
+++ b/dev-util/ROPgadget/ROPgadget-7.0.ebuild
@@ -0,0 +1,35 @@
+# 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_{8..11} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+DESCRIPTION="Search for gadgets in binaries to facilitate your ROP exploitation"
+HOMEPAGE="https://shell-storm.org/project/ROPgadget/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/JonathanSalwan/ROPgadget"
+else
+	SRC_URI="https://github.com/JonathanSalwan/ROPgadget/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-libs/capstone-5[python,${PYTHON_USEDEP}]
+"
+
+src_test() {
+	pushd test-suite-binaries || die
+	./test.sh || die
+	popd || die
+}
diff --git a/media-video/libva-utils/files/libva-utils-2.15.0-fix-threads-option.patch b/media-video/libva-utils/files/libva-utils-2.15.0-fix-threads-option.patch
new file mode 100644
index 000000000000..4683dcbdd557
--- /dev/null
+++ b/media-video/libva-utils/files/libva-utils-2.15.0-fix-threads-option.patch
@@ -0,0 +1,29 @@
+https://bugs.gentoo.org/835508
+https://github.com/intel/libva-utils/pull/261
+
+From 83fb9c9bbda86f1bd224b20b082aff6e9f3d6ff6 Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Fri, 18 Mar 2022 10:52:29 -0700
+Subject: [PATCH] meson: Search for threads in top-level meson.build
+
+In Gentoo we allow disabling the tools and putsuface separately, so
+moving the threads check out of the encode subdirectory helps.
+--- a/encode/meson.build
++++ b/encode/meson.build
+@@ -1,4 +1,3 @@
+-threads = dependency('threads')
+ m = c.find_library('m')
+ 
+ 
+--- a/meson.build
++++ b/meson.build
+@@ -10,6 +10,8 @@ project('libva-utils', 'c', 'cpp',
+ 
+ c = meson.get_compiler('c')
+ 
++threads = dependency('threads')
++
+ libva_dep = dependency('libva', version: '>= 1.1.0')
+ 
+ libva_utils_flags = [ '-Wno-unused-parameter',
+
diff --git a/media-video/libva-utils/libva-utils-2.15.0.ebuild b/media-video/libva-utils/libva-utils-2.15.0.ebuild
index 428cc77cbc2d..19188e469b1f 100644
--- a/media-video/libva-utils/libva-utils-2.15.0.ebuild
+++ b/media-video/libva-utils/libva-utils-2.15.0.ebuild
@@ -38,6 +38,10 @@ fi
 RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-threads-option.patch
+)
+
 src_prepare() {
 	default