Merge updates from master

app-crypt/tpm2-openssl/tpm2-openssl-1.1.0.ebuild

@@ -13,18 +13,82 @@ LICENSE="BSD"
 
 SLOT="0/${PV}"
 KEYWORDS="~amd64"
-
+IUSE="test"
-# Needs IBM's software TPM simulator, which isn't in Portage
-RESTRICT="test"
 
 RDEPEND=">=app-crypt/tpm2-tss-3.2.0:=
 	=dev-libs/openssl-3.0*:0="
 
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	test? ( app-crypt/swtpm
+		app-crypt/tpm2-abrmd
+		app-crypt/tpm2-tools )"
 
 BDEPEND="sys-devel/autoconf-archive
 	 virtual/pkgconfig"
 
+RESTRICT="!test? ( test )"
+
+dbus_run() {
+	(
+		# start isolated dbus session bus
+		dbus_data=$(dbus-launch --sh-syntax) || exit
+		eval "${dbus_data}"
+
+		$@
+		ret=${?}
+
+		kill "${DBUS_SESSION_BUS_PID}"
+		exit "${ret}"
+	) || die
+}
+
+tpm2_run_with_emulator() {
+	export XDG_CONFIG_HOME="${T}/.config/swtpm"
+	"${BROOT}"/usr/share/swtpm/swtpm-create-user-config-files || die
+
+	mkdir -p "${XDG_CONFIG_HOME}/mytpm1" || die
+	swtpm_setup_args=(
+		--tpm2
+		--tpmstate "${XDG_CONFIG_HOME}/mytpm1"
+		--createek
+		--allow-signing
+		--decryption
+		--create-ek-cert
+		--create-platform-cert
+		--lock-nvram
+		--overwrite
+		--display
+	)
+	swtpm_setup "${swtpm_setup_args[@]}" || die
+
+	swtpm_socket_args=(
+		--tpm2
+		--tpmstate dir="${XDG_CONFIG_HOME}/mytpm1"
+		--flags startup-clear
+		--ctrl type=unixio,path="${XDG_CONFIG_HOME}/mytpm1/swtpm.socket.ctrl"
+		--server type=unixio,path="${XDG_CONFIG_HOME}/mytpm1/swtpm.socket"
+		--pid file="${XDG_CONFIG_HOME}/mytpm1/swtpm.pid"
+		--daemon
+	)
+	swtpm socket "${swtpm_socket_args[@]}" || die
+
+	tpm2_abrmd_args=(
+		--logger=stdout
+		--tcti=swtpm:path="${XDG_CONFIG_HOME}/mytpm1/swtpm.socket"
+		--session
+		--flush-all
+	)
+	tpm2-abrmd "${tpm2_abrmd_args[@]}" &
+
+	export TPM2OPENSSL_TCTI="tabrmd:bus_type=session"
+	export TPM2TOOLS_TCTI="tabrmd:bus_type=session"
+
+	$@ || die
+
+	# When swtpm dies, tmp2-abrmd will exit
+	kill $(< "${XDG_CONFIG_HOME}/mytpm1/swtpm.pid") || die
+}
+
 src_prepare() {
 	# See bug #833887 (and similar); eautoreconf means version information
 	# could be incorrectly embedded
@@ -42,3 +106,7 @@ src_install() {
 
 	# No libtool files are install, so nothing to check for bug #833887
 }
+
+src_test() {
+	dbus_run tpm2_run_with_emulator make check
+}

dev-lang/hare/Manifest

@@ -1 +1 @@
-DIST hare-0_pre20220827.tar.gz 683066 BLAKE2B 779fe0f2383274be26bb00ac9092d254e88be531cfd796b1cab07e648dc38a23f5a30c90abaa836d0a62f4f0bffd3117ab1c893ebf98075567f0891b4eef9e53 SHA512 49e7ae709e5272c635246ef0ca187e08697d58864c58fe8e619a7ff0a3ab38952375e504c152af406a41e6b4982ac70e1c2f13a5822c3bfb0c3153a3cf2efbb6
+DIST hare-82213191adc25137c704df4786a71bce40b6079f.tar.gz 696655 BLAKE2B aed07621b6f582ab717c2c12d5868962ae6186ac840ecf786726d6cf4cc8a38336da49dffb625fbd5d8e431b548257e2285213ae3a692d1a238b12fc34b13d7b SHA512 9a4e2efebaedd9ae7f516b6cbf9d1c5ea9f74caa2f04d5d624cc1e9aa7f62d2478e23e85d351bb2adf470f69dd6943d65a906c86bf9e734f6c68f381e1508c28

dev-lang/hare/hare-0_pre20220922-r1.ebuild

@@ -8,9 +8,10 @@ if [[ "${PV}" = 9999 ]]; then
 	EGIT_REPO_URI="https://git.sr.ht/~sircmpwn/hare"
 	SLOT="0"
 else
-	EGIT_COMMIT="21a3e430c87ebfdb5e12aad01306e85a25fdfb4c"
+	EGIT_COMMIT="82213191adc25137c704df4786a71bce40b6079f"
-	SRC_URI="https://git.sr.ht/~sircmpwn/hare/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	MY_P="${PN}-${EGIT_COMMIT}"
-	S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
+	SRC_URI="https://git.sr.ht/~sircmpwn/hare/archive/${EGIT_COMMIT}.tar.gz -> ${MY_P}.tar.gz"
+	S="${WORKDIR}/${MY_P}"
 	SLOT="0/${PV}"
 
 	KEYWORDS="~amd64 ~arm64 ~riscv"
@@ -29,8 +30,8 @@ BDEPEND="
 "
 RDEPEND="${DEPEND}"
 
-# hare and harec are built by hare
+# hare and haredoc are built by hare
-QA_FLAGS_IGNORED="usr/bin/harec?"
+QA_FLAGS_IGNORED="usr/bin/hare usr/bin/haredoc"
 
 src_configure() {
 	local target_arch
@@ -45,8 +46,8 @@ src_configure() {
 	sed -i \
 		-e 's;=aarch64-;=;' \
 		-e 's;=riscv64-;=;' \
-		-e "s;^ARCH =.*;ARCH=${target_arch};" \
+		-e "s;^ARCH =.*;ARCH = ${target_arch};" \
-		-e 's;^PREFIX=.*;PREFIX=/usr;' \
+		-e 's;^PREFIX =.*;PREFIX = /usr;' \
 		-e 's;^AS =;AS ?=;' \
 		-e 's;^LD =;LD ?=;' \
 		-e 's;^AR =;AR ?=;' \

dev-lang/hare/hare-9999.ebuild

@@ -8,9 +8,10 @@ if [[ "${PV}" = 9999 ]]; then
 	EGIT_REPO_URI="https://git.sr.ht/~sircmpwn/hare"
 	SLOT="0"
 else
-	EGIT_COMMIT="296925c91d79362d6b8ac94e0336a38e9af0f1c9"
+	EGIT_COMMIT="82213191adc25137c704df4786a71bce40b6079f"
-	SRC_URI="https://git.sr.ht/~sircmpwn/hare/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	MY_P="${PN}-${EGIT_COMMIT}"
-	S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
+	SRC_URI="https://git.sr.ht/~sircmpwn/hare/archive/${EGIT_COMMIT}.tar.gz -> ${MY_P}.tar.gz"
+	S="${WORKDIR}/${MY_P}"
 	SLOT="0/${PV}"
 
 	KEYWORDS="~amd64 ~arm64 ~riscv"
@@ -29,8 +30,8 @@ BDEPEND="
 "
 RDEPEND="${DEPEND}"
 
-# hare and harec are built by hare
+# hare and haredoc are built by hare
-QA_FLAGS_IGNORED="usr/bin/harec?"
+QA_FLAGS_IGNORED="usr/bin/hare usr/bin/haredoc"
 
 src_configure() {
 	local target_arch
@@ -45,8 +46,8 @@ src_configure() {
 	sed -i \
 		-e 's;=aarch64-;=;' \
 		-e 's;=riscv64-;=;' \
-		-e "s;^ARCH =.*;ARCH=${target_arch};" \
+		-e "s;^ARCH =.*;ARCH = ${target_arch};" \
-		-e 's;^PREFIX=.*;PREFIX=/usr;' \
+		-e 's;^PREFIX =.*;PREFIX = /usr;' \
 		-e 's;^AS =;AS ?=;' \
 		-e 's;^LD =;LD ?=;' \
 		-e 's;^AR =;AR ?=;' \

dev-lang/harec/Manifest

@@ -1 +1 @@
-DIST harec-0_pre20220827.tar.gz 166445 BLAKE2B d911387bbdabfe62004db27bba2d0579f8de25d093b2ce235b8833b69ef0fb97623429fea273cbe1019824ebc7732a7fd0ee8427fde3a1445507661e1cf632f2 SHA512 8dfd752e43ff41ebf61b201ad823fc6b59a6bf06d5bdd34a5f92d06580447e194748e81d8a0e03325a4d6f63c55792617780e5e5304fbdedf2bf4e9bd737909d
+DIST harec-dac4cd7c49c8d0539e8aefda4a812dff522c86a9.tar.gz 167008 BLAKE2B 264122d4dc18082e3f8bc3f310c192bd1aa3e956967160b812145c4e2896de13190f00d0ca218f762656a37417006f688f7cbf9d751893be8bbab790fefbb988 SHA512 1dcc7785ab663dce0313d40c0dd143e13ec62a9cd45c32a3631b31cdc70d42f29a942653b6f470a861133a6a3c46475d27435b3480d07edc4eea13ab4d319194

dev-lang/harec/harec-0_pre20220922.ebuild

@@ -8,9 +8,10 @@ if [[ "${PV}" = "9999" ]]; then
 	EGIT_REPO_URI="https://git.sr.ht/~sircmpwn/harec"
 	S="${WORKDIR}/${P}/build"
 else
-	EGIT_COMMIT="03744ea230c5064adf9820d6390b46ecb5e1e503"
+	EGIT_COMMIT="dac4cd7c49c8d0539e8aefda4a812dff522c86a9"
-	SRC_URI="https://git.sr.ht/~sircmpwn/harec/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	MY_P="${PN}-${EGIT_COMMIT}"
-	S="${WORKDIR}/${PN}-${EGIT_COMMIT}/build"
+	SRC_URI="https://git.sr.ht/~sircmpwn/harec/archive/${EGIT_COMMIT}.tar.gz -> ${MY_P}.tar.gz"
+	S="${WORKDIR}/${MY_P}/build"
 
 	KEYWORDS="~amd64 ~arm64 ~riscv"
 fi

dev-lang/harec/harec-9999.ebuild

@@ -8,9 +8,10 @@ if [[ "${PV}" = "9999" ]]; then
 	EGIT_REPO_URI="https://git.sr.ht/~sircmpwn/harec"
 	S="${WORKDIR}/${P}/build"
 else
-	EGIT_COMMIT="62d4204f21332d97ad7697f628eade9137e9c3bc"
+	EGIT_COMMIT="dac4cd7c49c8d0539e8aefda4a812dff522c86a9"
-	SRC_URI="https://git.sr.ht/~sircmpwn/harec/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	MY_P="${PN}-${EGIT_COMMIT}"
-	S="${WORKDIR}/${PN}-${EGIT_COMMIT}/build"
+	SRC_URI="https://git.sr.ht/~sircmpwn/harec/archive/${EGIT_COMMIT}.tar.gz -> ${MY_P}.tar.gz"
+	S="${WORKDIR}/${MY_P}/build"
 
 	KEYWORDS="~amd64 ~arm64 ~riscv"
 fi

dev-util/deblob/Manifest

@@ -0,0 +1 @@
+DIST deblob-0.1.tar.gz 10553 BLAKE2B 42253d68d2f424a5a40615b439d126a85ab66e1983e27b2e707ec8914452b2b1d263ee073a62ab5e96a3f3def59271a7301dbb85859c7f61851f7e67a88006ce SHA512 2979e676ebcc41c18a3fbcc041427b1e3515203c070da88bef63946c9449e2e3e7f7b26d563b9b8e11979673436fb05a355b5014496fc708eeffade1cea1ac3a

dev-util/deblob/deblob-0.1.ebuild

@@ -0,0 +1,27 @@
+# Copyright 2021-2022 Haelwenn (lanodan) Monnier <contact@hacktivis.me>
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ "$PV" == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.sr.ht/~lanodan/deblob"
+else
+	SRC_URI="https://hacktivis.me/releases/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~riscv"
+fi
+
+DESCRIPTION="remove binary executables from a directory"
+HOMEPAGE="https://git.sr.ht/~lanodan/deblob"
+LICENSE="BSD"
+SLOT="0"
+
+DEPEND="dev-lang/hare:="
+RDEPEND=""
+
+# built by hare
+QA_FLAGS_IGNORED="usr/bin/deblob"
+
+src_install() {
+	PREFIX="/usr" default
+}

dev-util/deblob/deblob-9999.ebuild

@@ -3,19 +3,24 @@
 
 EAPI=8
 
-inherit git-r3
+if [[ "$PV" == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.sr.ht/~lanodan/deblob"
+else
+	SRC_URI="https://hacktivis.me/releases/${P}.tar.gz"
+fi
 
 DESCRIPTION="remove binary executables from a directory"
 HOMEPAGE="https://git.sr.ht/~lanodan/deblob"
-EGIT_REPO_URI="https://git.sr.ht/~lanodan/deblob"
 LICENSE="BSD"
 SLOT="0"
 
-DEPEND="
+DEPEND="dev-lang/hare:="
-	dev-lang/hare:=
-"
 RDEPEND=""
 
+# built by hare
+QA_FLAGS_IGNORED="usr/bin/deblob"
+
 src_install() {
 	PREFIX="/usr" default
 }

net-im/nheko/Manifest

@@ -1,2 +1 @@
-DIST nheko-0.10.0.tar.gz 1587008 BLAKE2B 207622bcc0fcbf4f1760481d3bdf35d5c025d9aa7d553c2dc4649841426481c88292966c35d44944434c1628c34017bb76f84136b6bcc8f8c3f32478156ac713 SHA512 c0aaf0f9ea657c43867fbb6857db45cac30f0cbaeaf8ad6a20a1a3e1ab9e6cf15266444eada060666db5b94be5a72b95b371a4da62e6705eed49f9907c576954
+DIST nheko-0.10.2.tar.gz 1608905 BLAKE2B 10b7b7d1f3e7525ae5ec4b78af228382440c5c64a3716b530506346372856035435d6e2d4e1724f2580ee384852ab0dd4e4b728eed92df827dc5cb3f2853b30b SHA512 b00c45115ab52f9cce5958aa594f6d316bdb917004e284d28ba3003c815bdc532ff1e7bbd5e542bb89a43fd552af3fa44b70ce66eb26b0bcff65beaea1f6b3cd
-DIST nheko-0.10.1.tar.gz 1608578 BLAKE2B 328255d6ea8ce3fd0d1bbe9f20bb9608eba4c479b6969db7bebc67f3406ae8c6e9d69432d304b28e49b8547cf293e4f103d3f8257df4fbc676db9e6ca037ff48 SHA512 898582c1a09ad9cfac3285f0bc5e80bb5e69b1d744118822167bbe09e9aa44c2b28438db2d3b6e1fa88835de2b0e2f58726d3876661f28c5eb46475e2f54bc20

net-im/nheko/nheko-0.10.0.ebuild

@@ -1,88 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake optfeature xdg
-
-DESCRIPTION="Native desktop client for Matrix using Qt"
-HOMEPAGE="https://github.com/Nheko-Reborn/nheko"
-SRC_URI="https://github.com/Nheko-Reborn/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="X video voip"
-REQUIRED_USE="video? ( voip )"
-
-MY_GST_V="1.18"
-RDEPEND="
-	app-text/cmark:=
-	dev-cpp/qt-jdenticon
-	dev-db/lmdb:=
-	>=dev-db/lmdb++-1.0.0
-	dev-libs/libfmt:=
-	>=dev-libs/mtxclient-0.8.0:=
-	>=dev-libs/qtkeychain-0.12.0:=
-	dev-libs/spdlog:=
-	dev-qt/qtconcurrent:5
-	dev-qt/qtdeclarative:5[widgets]
-	dev-qt/qtgraphicaleffects:5
-	dev-qt/qtgui:5[dbus,gif,jpeg,png]
-	dev-qt/qtimageformats
-	dev-qt/qtmultimedia:5[gstreamer,qml,widgets]
-	dev-qt/qtquickcontrols2:5[widgets]
-	dev-qt/qtsvg:5
-	virtual/notification-daemon
-	voip? (
-		>=media-plugins/gst-plugins-dtls-${MY_GST_V}
-		media-plugins/gst-plugins-libnice
-		>=media-plugins/gst-plugins-meta-${MY_GST_V}[opus]
-		>=media-plugins/gst-plugins-srtp-${MY_GST_V}
-		>=media-plugins/gst-plugins-webrtc-${MY_GST_V}
-		video? (
-			>=media-libs/gst-plugins-base-${MY_GST_V}[opengl]
-			>=media-plugins/gst-plugins-meta-${MY_GST_V}[v4l,vpx]
-			>=media-plugins/gst-plugins-qt5-${MY_GST_V}
-			X? (
-				>=media-plugins/gst-plugins-ximagesrc-${MY_GST_V}
-				x11-libs/xcb-util-wm
-			)
-		)
-	)
-"
-DEPEND="
-	dev-cpp/nlohmann_json
-	${RDEPEND}
-"
-BDEPEND="
-	dev-qt/linguist-tools:5
-	|| (
-		app-text/asciidoc
-		dev-ruby/asciidoctor
-	)
-"
-
-src_configure() {
-	local -a mycmakeargs=(
-		"-DVOIP=$(usex voip)"
-	)
-	if use video && use X; then
-		mycmakeargs+=("-DSCREENSHARE_X11=yes")
-	else
-		mycmakeargs+=("-DSCREENSHARE_X11=no")
-	fi
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	optfeature "audio & video file playback support" \
-		"media-plugins/gst-plugins-meta[ffmpeg]"
-	optfeature "secrets storage support other than kwallet (for example gnome-keyring or keepassxc)" \
-		"dev-libs/qtkeychain[gnome-keyring]"
-	optfeature "additional, less common, image format support" \
-		"kde-frameworks/kimageformats"
-
-	xdg_pkg_postinst
-}

sys-fs/ddrescueview/Manifest

@@ -0,0 +1 @@
+DIST ddrescueview-0.4.5.tar.xz 211184 BLAKE2B bc4ef003b0df7a7059a9f3d738e294a527a039e04e84732b285497df60a575dfedcec3deea87166dd8136cb7745b8d821e18bd499cc2b059fa463e178bdeb892 SHA512 8791b0852fc9fa19a239300f4377adc072b4524e506807918284e935b00fe1c0fa2589acd645ea44a808881edfe77a0f8c8776c6dfc7bf54b283a92da1d7dccd

sys-fs/ddrescueview/ddrescueview-0.4.5.ebuild

@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P="${PN}-source-${PV}"
+
+inherit edo
+
+DESCRIPTION="Graphical viewer for GNU ddrescue mapfiles"
+HOMEPAGE="https://sourceforge.net/projects/ddrescueview/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz -> ${P}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="
+	dev-lang/lazarus
+"
+
+# I don't know yet how not to strip debug info during lazbuild build
+QA_PRESTRIPPED="usr/bin/ddrescueview"
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+	cd source || die
+	edo lazbuild \
+		--lazarusdir=/usr/share/lazarus \
+		--primary-config-path="${HOME}" \
+		--skip-dependencies \
+		--verbose \
+		ddrescueview.lpi
+	default
+}
+
+src_install() {
+	dobin source/ddrescueview
+	chmod +x "${D}/usr/bin/ddrescueview"
+
+	insinto /usr/share
+	doins -r resources/linux/applications
+	doins -r resources/linux/icons
+	doman resources/linux/man/man1/ddrescueview.1
+
+	dodoc changelog.txt
+	dodoc readme.txt
+	default
+}