From 505083a43ff1068dc92083426fae6c17288a8cd8 Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Sun, 25 Sep 2022 03:16:41 +0200 Subject: [PATCH 01/13] dev-lang/harec: add 0_pre20220922 Signed-off-by: Haelwenn (lanodan) Monnier --- dev-lang/harec/Manifest | 1 + dev-lang/harec/harec-0_pre20220922.ebuild | 43 +++++++++++++++++++++++ dev-lang/harec/harec-9999.ebuild | 7 ++-- 3 files changed, 48 insertions(+), 3 deletions(-) create mode 100644 dev-lang/harec/harec-0_pre20220922.ebuild diff --git a/dev-lang/harec/Manifest b/dev-lang/harec/Manifest index e1abd02e5c..df755ed4cb 100644 --- a/dev-lang/harec/Manifest +++ b/dev-lang/harec/Manifest @@ -1 +1,2 @@ DIST harec-0_pre20220827.tar.gz 166445 BLAKE2B d911387bbdabfe62004db27bba2d0579f8de25d093b2ce235b8833b69ef0fb97623429fea273cbe1019824ebc7732a7fd0ee8427fde3a1445507661e1cf632f2 SHA512 8dfd752e43ff41ebf61b201ad823fc6b59a6bf06d5bdd34a5f92d06580447e194748e81d8a0e03325a4d6f63c55792617780e5e5304fbdedf2bf4e9bd737909d +DIST harec-dac4cd7c49c8d0539e8aefda4a812dff522c86a9.tar.gz 167008 BLAKE2B 264122d4dc18082e3f8bc3f310c192bd1aa3e956967160b812145c4e2896de13190f00d0ca218f762656a37417006f688f7cbf9d751893be8bbab790fefbb988 SHA512 1dcc7785ab663dce0313d40c0dd143e13ec62a9cd45c32a3631b31cdc70d42f29a942653b6f470a861133a6a3c46475d27435b3480d07edc4eea13ab4d319194 diff --git a/dev-lang/harec/harec-0_pre20220922.ebuild b/dev-lang/harec/harec-0_pre20220922.ebuild new file mode 100644 index 0000000000..c5906be8e6 --- /dev/null +++ b/dev-lang/harec/harec-0_pre20220922.ebuild @@ -0,0 +1,43 @@ +# Copyright 2021-2022 Gentoo Authors +# 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/~sircmpwn/harec" + S="${WORKDIR}/${P}/build" +else + EGIT_COMMIT="dac4cd7c49c8d0539e8aefda4a812dff522c86a9" + MY_P="${PN}-${EGIT_COMMIT}" + 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 + +DESCRIPTION="The Hare compiler" +HOMEPAGE="https://harelang.org/" +LICENSE="GPL-3" +SLOT="0" + +DEPEND="sys-devel/qbe" +RDEPEND="${DEPEND}" + +src_unpack() { + default + + [[ "${PV}" = "9999" ]] && git-r3_src_unpack + + mkdir "${S}" || die +} + +src_prepare() { + default + + sed -i 's; -Werror ; ;' ../config.sh || die +} + +src_configure() { + ../configure --prefix="/usr" --libdir="/usr/$(get_libdir)" || die +} diff --git a/dev-lang/harec/harec-9999.ebuild b/dev-lang/harec/harec-9999.ebuild index 49227e54b6..c5906be8e6 100644 --- a/dev-lang/harec/harec-9999.ebuild +++ b/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" - SRC_URI="https://git.sr.ht/~sircmpwn/harec/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${PN}-${EGIT_COMMIT}/build" + EGIT_COMMIT="dac4cd7c49c8d0539e8aefda4a812dff522c86a9" + MY_P="${PN}-${EGIT_COMMIT}" + 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 From 40d71282d9ef27c34908a69550d7f8629ee0eb3a Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Tue, 27 Sep 2022 22:35:42 +0200 Subject: [PATCH 02/13] dev-lang/hare: add 0_pre20220922 Signed-off-by: Haelwenn (lanodan) Monnier --- dev-lang/hare/Manifest | 1 + dev-lang/hare/hare-0_pre20220922.ebuild | 57 +++++++++++++++++++++++++ dev-lang/hare/hare-9999.ebuild | 7 +-- 3 files changed, 62 insertions(+), 3 deletions(-) create mode 100644 dev-lang/hare/hare-0_pre20220922.ebuild diff --git a/dev-lang/hare/Manifest b/dev-lang/hare/Manifest index 7283bce3e8..4c56e8398f 100644 --- a/dev-lang/hare/Manifest +++ b/dev-lang/hare/Manifest @@ -1 +1,2 @@ DIST hare-0_pre20220827.tar.gz 683066 BLAKE2B 779fe0f2383274be26bb00ac9092d254e88be531cfd796b1cab07e648dc38a23f5a30c90abaa836d0a62f4f0bffd3117ab1c893ebf98075567f0891b4eef9e53 SHA512 49e7ae709e5272c635246ef0ca187e08697d58864c58fe8e619a7ff0a3ab38952375e504c152af406a41e6b4982ac70e1c2f13a5822c3bfb0c3153a3cf2efbb6 +DIST hare-82213191adc25137c704df4786a71bce40b6079f.tar.gz 696655 BLAKE2B aed07621b6f582ab717c2c12d5868962ae6186ac840ecf786726d6cf4cc8a38336da49dffb625fbd5d8e431b548257e2285213ae3a692d1a238b12fc34b13d7b SHA512 9a4e2efebaedd9ae7f516b6cbf9d1c5ea9f74caa2f04d5d624cc1e9aa7f62d2478e23e85d351bb2adf470f69dd6943d65a906c86bf9e734f6c68f381e1508c28 diff --git a/dev-lang/hare/hare-0_pre20220922.ebuild b/dev-lang/hare/hare-0_pre20220922.ebuild new file mode 100644 index 0000000000..2497ea2c17 --- /dev/null +++ b/dev-lang/hare/hare-0_pre20220922.ebuild @@ -0,0 +1,57 @@ +# Copyright 2021-2022 Gentoo Authors +# 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/~sircmpwn/hare" + SLOT="0" +else + EGIT_COMMIT="82213191adc25137c704df4786a71bce40b6079f" + MY_P="${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" +fi + +DESCRIPTION="The Hare systems programming language" +HOMEPAGE="https://harelang.org/" +LICENSE="MPL-2.0 GPL-3" + +DEPEND=" + sys-devel/qbe + >=dev-lang/harec-0_pre20220702 +" +BDEPEND=" + app-text/scdoc +" +RDEPEND="${DEPEND}" + +# hare and harec are built by hare +QA_FLAGS_IGNORED="usr/bin/harec?" + +src_configure() { + local target_arch + case ${ARCH} in + amd64 ) target_arch=x86_64 ;; + arm64 ) target_arch=aarch64 ;; + riscv ) target_arch=riscv64 ;; + * ) die "unsupported architecture: ${ARCH}" ;; + esac + + cp config.example.mk config.mk || die + sed -i \ + -e 's;=aarch64-;=;' \ + -e 's;=riscv64-;=;' \ + -e "s;^ARCH =.*;ARCH=${target_arch};" \ + -e 's;^PREFIX=.*;PREFIX=/usr;' \ + -e 's;^AS =;AS ?=;' \ + -e 's;^LD =;LD ?=;' \ + -e 's;^AR =;AR ?=;' \ + config.mk || die + + sed -i 's; $(DESTDIR)$(LOCALSRCDIR);;' Makefile || die +} diff --git a/dev-lang/hare/hare-9999.ebuild b/dev-lang/hare/hare-9999.ebuild index 1fe1e819db..2497ea2c17 100644 --- a/dev-lang/hare/hare-9999.ebuild +++ b/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" - SRC_URI="https://git.sr.ht/~sircmpwn/hare/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${PN}-${EGIT_COMMIT}" + EGIT_COMMIT="82213191adc25137c704df4786a71bce40b6079f" + MY_P="${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" From f88636ec782b0a2a7c76c18dcf5543d16455e2b7 Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Tue, 27 Sep 2022 22:47:43 +0200 Subject: [PATCH 03/13] dev-lang/harec: drop 0_pre20220827 Signed-off-by: Haelwenn (lanodan) Monnier --- dev-lang/harec/Manifest | 1 - dev-lang/harec/harec-0_pre20220827.ebuild | 42 ----------------------- 2 files changed, 43 deletions(-) delete mode 100644 dev-lang/harec/harec-0_pre20220827.ebuild diff --git a/dev-lang/harec/Manifest b/dev-lang/harec/Manifest index df755ed4cb..35127272a1 100644 --- a/dev-lang/harec/Manifest +++ b/dev-lang/harec/Manifest @@ -1,2 +1 @@ -DIST harec-0_pre20220827.tar.gz 166445 BLAKE2B d911387bbdabfe62004db27bba2d0579f8de25d093b2ce235b8833b69ef0fb97623429fea273cbe1019824ebc7732a7fd0ee8427fde3a1445507661e1cf632f2 SHA512 8dfd752e43ff41ebf61b201ad823fc6b59a6bf06d5bdd34a5f92d06580447e194748e81d8a0e03325a4d6f63c55792617780e5e5304fbdedf2bf4e9bd737909d DIST harec-dac4cd7c49c8d0539e8aefda4a812dff522c86a9.tar.gz 167008 BLAKE2B 264122d4dc18082e3f8bc3f310c192bd1aa3e956967160b812145c4e2896de13190f00d0ca218f762656a37417006f688f7cbf9d751893be8bbab790fefbb988 SHA512 1dcc7785ab663dce0313d40c0dd143e13ec62a9cd45c32a3631b31cdc70d42f29a942653b6f470a861133a6a3c46475d27435b3480d07edc4eea13ab4d319194 diff --git a/dev-lang/harec/harec-0_pre20220827.ebuild b/dev-lang/harec/harec-0_pre20220827.ebuild deleted file mode 100644 index a0048326b6..0000000000 --- a/dev-lang/harec/harec-0_pre20220827.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 2021-2022 Gentoo Authors -# 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/~sircmpwn/harec" - S="${WORKDIR}/${P}/build" -else - EGIT_COMMIT="03744ea230c5064adf9820d6390b46ecb5e1e503" - SRC_URI="https://git.sr.ht/~sircmpwn/harec/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${PN}-${EGIT_COMMIT}/build" - - KEYWORDS="~amd64 ~arm64 ~riscv" -fi - -DESCRIPTION="The Hare compiler" -HOMEPAGE="https://harelang.org/" -LICENSE="GPL-3" -SLOT="0" - -DEPEND="sys-devel/qbe" -RDEPEND="${DEPEND}" - -src_unpack() { - default - - [[ "${PV}" = "9999" ]] && git-r3_src_unpack - - mkdir "${S}" || die -} - -src_prepare() { - default - - sed -i 's; -Werror ; ;' ../config.sh || die -} - -src_configure() { - ../configure --prefix="/usr" --libdir="/usr/$(get_libdir)" || die -} From 0a324bf425394144a285cfb7e981c4b7873a8069 Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Tue, 27 Sep 2022 22:48:00 +0200 Subject: [PATCH 04/13] dev-lang/hare: drop 0_pre20220827 Signed-off-by: Haelwenn (lanodan) Monnier --- dev-lang/hare/Manifest | 1 - dev-lang/hare/hare-0_pre20220827.ebuild | 56 ------------------------- 2 files changed, 57 deletions(-) delete mode 100644 dev-lang/hare/hare-0_pre20220827.ebuild diff --git a/dev-lang/hare/Manifest b/dev-lang/hare/Manifest index 4c56e8398f..41271015ea 100644 --- a/dev-lang/hare/Manifest +++ b/dev-lang/hare/Manifest @@ -1,2 +1 @@ -DIST hare-0_pre20220827.tar.gz 683066 BLAKE2B 779fe0f2383274be26bb00ac9092d254e88be531cfd796b1cab07e648dc38a23f5a30c90abaa836d0a62f4f0bffd3117ab1c893ebf98075567f0891b4eef9e53 SHA512 49e7ae709e5272c635246ef0ca187e08697d58864c58fe8e619a7ff0a3ab38952375e504c152af406a41e6b4982ac70e1c2f13a5822c3bfb0c3153a3cf2efbb6 DIST hare-82213191adc25137c704df4786a71bce40b6079f.tar.gz 696655 BLAKE2B aed07621b6f582ab717c2c12d5868962ae6186ac840ecf786726d6cf4cc8a38336da49dffb625fbd5d8e431b548257e2285213ae3a692d1a238b12fc34b13d7b SHA512 9a4e2efebaedd9ae7f516b6cbf9d1c5ea9f74caa2f04d5d624cc1e9aa7f62d2478e23e85d351bb2adf470f69dd6943d65a906c86bf9e734f6c68f381e1508c28 diff --git a/dev-lang/hare/hare-0_pre20220827.ebuild b/dev-lang/hare/hare-0_pre20220827.ebuild deleted file mode 100644 index f268f24d81..0000000000 --- a/dev-lang/hare/hare-0_pre20220827.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 2021-2022 Gentoo Authors -# 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/~sircmpwn/hare" - SLOT="0" -else - EGIT_COMMIT="21a3e430c87ebfdb5e12aad01306e85a25fdfb4c" - SRC_URI="https://git.sr.ht/~sircmpwn/hare/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${PN}-${EGIT_COMMIT}" - SLOT="0/${PV}" - - KEYWORDS="~amd64 ~arm64 ~riscv" -fi - -DESCRIPTION="The Hare systems programming language" -HOMEPAGE="https://harelang.org/" -LICENSE="MPL-2.0 GPL-3" - -DEPEND=" - sys-devel/qbe - >=dev-lang/harec-0_pre20220702 -" -BDEPEND=" - app-text/scdoc -" -RDEPEND="${DEPEND}" - -# hare and harec are built by hare -QA_FLAGS_IGNORED="usr/bin/harec?" - -src_configure() { - local target_arch - case ${ARCH} in - amd64 ) target_arch=x86_64 ;; - arm64 ) target_arch=aarch64 ;; - riscv ) target_arch=riscv64 ;; - * ) die "unsupported architecture: ${ARCH}" ;; - esac - - cp config.example.mk config.mk || die - sed -i \ - -e 's;=aarch64-;=;' \ - -e 's;=riscv64-;=;' \ - -e "s;^ARCH =.*;ARCH=${target_arch};" \ - -e 's;^PREFIX=.*;PREFIX=/usr;' \ - -e 's;^AS =;AS ?=;' \ - -e 's;^LD =;LD ?=;' \ - -e 's;^AR =;AR ?=;' \ - config.mk || die - - sed -i 's; $(DESTDIR)$(LOCALSRCDIR);;' Makefile || die -} From a60141e8e553f43b7735cd733906f0222632843a Mon Sep 17 00:00:00 2001 From: Andrii Pravorskyi Date: Wed, 28 Sep 2022 00:22:34 +0300 Subject: [PATCH 05/13] sys-fs/ddrescueview: new package, add 0.4.5 Signed-off-by: Andrii Pravorskyi --- sys-fs/ddrescueview/Manifest | 1 + sys-fs/ddrescueview/ddrescueview-0.4.5.ebuild | 50 +++++++++++++++++++ 2 files changed, 51 insertions(+) create mode 100644 sys-fs/ddrescueview/Manifest create mode 100644 sys-fs/ddrescueview/ddrescueview-0.4.5.ebuild diff --git a/sys-fs/ddrescueview/Manifest b/sys-fs/ddrescueview/Manifest new file mode 100644 index 0000000000..5ecf9b5db6 --- /dev/null +++ b/sys-fs/ddrescueview/Manifest @@ -0,0 +1 @@ +DIST ddrescueview-0.4.5.tar.xz 211184 BLAKE2B bc4ef003b0df7a7059a9f3d738e294a527a039e04e84732b285497df60a575dfedcec3deea87166dd8136cb7745b8d821e18bd499cc2b059fa463e178bdeb892 SHA512 8791b0852fc9fa19a239300f4377adc072b4524e506807918284e935b00fe1c0fa2589acd645ea44a808881edfe77a0f8c8776c6dfc7bf54b283a92da1d7dccd diff --git a/sys-fs/ddrescueview/ddrescueview-0.4.5.ebuild b/sys-fs/ddrescueview/ddrescueview-0.4.5.ebuild new file mode 100644 index 0000000000..6b4771b539 --- /dev/null +++ b/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 +} From f967da3dc0d646f757b7a7807ee89f7e0181dbc7 Mon Sep 17 00:00:00 2001 From: Christopher Byrne Date: Tue, 27 Sep 2022 17:05:33 -0500 Subject: [PATCH 06/13] app-crypt/tpm2-openssl: Enable tests Signed-off-by: Christopher Byrne --- .../tpm2-openssl/tpm2-openssl-1.1.0.ebuild | 76 ++++++++++++++++++- 1 file changed, 72 insertions(+), 4 deletions(-) diff --git a/app-crypt/tpm2-openssl/tpm2-openssl-1.1.0.ebuild b/app-crypt/tpm2-openssl/tpm2-openssl-1.1.0.ebuild index bce9e94a49..2cb1195892 100644 --- a/app-crypt/tpm2-openssl/tpm2-openssl-1.1.0.ebuild +++ b/app-crypt/tpm2-openssl/tpm2-openssl-1.1.0.ebuild @@ -13,18 +13,82 @@ LICENSE="BSD" SLOT="0/${PV}" KEYWORDS="~amd64" - -# Needs IBM's software TPM simulator, which isn't in Portage -RESTRICT="test" +IUSE="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 +} From 7140548ab56fa6eb363fd702bcbea370712abf56 Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Wed, 28 Sep 2022 00:28:03 +0200 Subject: [PATCH 07/13] dev-lang/hare: Fix PREFIX and QA_FLAGS_IGNORED Closes: https://bugs.gentoo.org/866473 Signed-off-by: Haelwenn (lanodan) Monnier --- ...-0_pre20220922.ebuild => hare-0_pre20220922-r1.ebuild} | 8 ++++---- dev-lang/hare/hare-9999.ebuild | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) rename dev-lang/hare/{hare-0_pre20220922.ebuild => hare-0_pre20220922-r1.ebuild} (87%) diff --git a/dev-lang/hare/hare-0_pre20220922.ebuild b/dev-lang/hare/hare-0_pre20220922-r1.ebuild similarity index 87% rename from dev-lang/hare/hare-0_pre20220922.ebuild rename to dev-lang/hare/hare-0_pre20220922-r1.ebuild index 2497ea2c17..d8353170ce 100644 --- a/dev-lang/hare/hare-0_pre20220922.ebuild +++ b/dev-lang/hare/hare-0_pre20220922-r1.ebuild @@ -30,8 +30,8 @@ BDEPEND=" " RDEPEND="${DEPEND}" -# hare and harec are built by hare -QA_FLAGS_IGNORED="usr/bin/harec?" +# hare and haredoc are built by hare +QA_FLAGS_IGNORED="usr/bin/hare usr/bin/haredoc" src_configure() { local target_arch @@ -46,8 +46,8 @@ src_configure() { sed -i \ -e 's;=aarch64-;=;' \ -e 's;=riscv64-;=;' \ - -e "s;^ARCH =.*;ARCH=${target_arch};" \ - -e 's;^PREFIX=.*;PREFIX=/usr;' \ + -e "s;^ARCH =.*;ARCH = ${target_arch};" \ + -e 's;^PREFIX =.*;PREFIX = /usr;' \ -e 's;^AS =;AS ?=;' \ -e 's;^LD =;LD ?=;' \ -e 's;^AR =;AR ?=;' \ diff --git a/dev-lang/hare/hare-9999.ebuild b/dev-lang/hare/hare-9999.ebuild index 2497ea2c17..d8353170ce 100644 --- a/dev-lang/hare/hare-9999.ebuild +++ b/dev-lang/hare/hare-9999.ebuild @@ -30,8 +30,8 @@ BDEPEND=" " RDEPEND="${DEPEND}" -# hare and harec are built by hare -QA_FLAGS_IGNORED="usr/bin/harec?" +# hare and haredoc are built by hare +QA_FLAGS_IGNORED="usr/bin/hare usr/bin/haredoc" src_configure() { local target_arch @@ -46,8 +46,8 @@ src_configure() { sed -i \ -e 's;=aarch64-;=;' \ -e 's;=riscv64-;=;' \ - -e "s;^ARCH =.*;ARCH=${target_arch};" \ - -e 's;^PREFIX=.*;PREFIX=/usr;' \ + -e "s;^ARCH =.*;ARCH = ${target_arch};" \ + -e 's;^PREFIX =.*;PREFIX = /usr;' \ -e 's;^AS =;AS ?=;' \ -e 's;^LD =;LD ?=;' \ -e 's;^AR =;AR ?=;' \ From f22145f23c651bb467b00b0268e940636384a98c Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Wed, 28 Sep 2022 00:33:06 +0200 Subject: [PATCH 08/13] dev-util/deblob: Fix QA_FLAGS_IGNORED Signed-off-by: Haelwenn (lanodan) Monnier --- dev-util/deblob/deblob-9999.ebuild | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dev-util/deblob/deblob-9999.ebuild b/dev-util/deblob/deblob-9999.ebuild index 6aa1709b66..3c186d3a6f 100644 --- a/dev-util/deblob/deblob-9999.ebuild +++ b/dev-util/deblob/deblob-9999.ebuild @@ -16,6 +16,9 @@ DEPEND=" " RDEPEND="" +# built by hare +QA_FLAGS_IGNORED="usr/bin/deblob" + src_install() { PREFIX="/usr" default } From c8dd634f37b462cba0b748d1c7855af9229a79e4 Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Wed, 28 Sep 2022 02:27:21 +0200 Subject: [PATCH 09/13] dev-util/deblob: add 0.1 Signed-off-by: Haelwenn (lanodan) Monnier --- dev-util/deblob/Manifest | 1 + dev-util/deblob/deblob-0.1.ebuild | 26 ++++++++++++++++++++++++++ dev-util/deblob/deblob-9999.ebuild | 12 +++++++----- 3 files changed, 34 insertions(+), 5 deletions(-) create mode 100644 dev-util/deblob/Manifest create mode 100644 dev-util/deblob/deblob-0.1.ebuild diff --git a/dev-util/deblob/Manifest b/dev-util/deblob/Manifest new file mode 100644 index 0000000000..d534dd7269 --- /dev/null +++ b/dev-util/deblob/Manifest @@ -0,0 +1 @@ +DIST deblob-0.1.tar.gz 10553 BLAKE2B 42253d68d2f424a5a40615b439d126a85ab66e1983e27b2e707ec8914452b2b1d263ee073a62ab5e96a3f3def59271a7301dbb85859c7f61851f7e67a88006ce SHA512 2979e676ebcc41c18a3fbcc041427b1e3515203c070da88bef63946c9449e2e3e7f7b26d563b9b8e11979673436fb05a355b5014496fc708eeffade1cea1ac3a diff --git a/dev-util/deblob/deblob-0.1.ebuild b/dev-util/deblob/deblob-0.1.ebuild new file mode 100644 index 0000000000..c7aef7e2ee --- /dev/null +++ b/dev-util/deblob/deblob-0.1.ebuild @@ -0,0 +1,26 @@ +# Copyright 2021-2022 Haelwenn (lanodan) Monnier +# 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" +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 +} diff --git a/dev-util/deblob/deblob-9999.ebuild b/dev-util/deblob/deblob-9999.ebuild index 3c186d3a6f..c7aef7e2ee 100644 --- a/dev-util/deblob/deblob-9999.ebuild +++ b/dev-util/deblob/deblob-9999.ebuild @@ -3,17 +3,19 @@ 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=" - dev-lang/hare:= -" +DEPEND="dev-lang/hare:=" RDEPEND="" # built by hare From 5e9a63e40949496356ab83d99da0023b3f76375d Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Wed, 28 Sep 2022 02:46:44 +0200 Subject: [PATCH 10/13] dev-util/deblob: keyword 0.1 for ~amd64, ~arm64, ~riscv Signed-off-by: Haelwenn (lanodan) Monnier --- dev-util/deblob/deblob-0.1.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/dev-util/deblob/deblob-0.1.ebuild b/dev-util/deblob/deblob-0.1.ebuild index c7aef7e2ee..2d639a50a0 100644 --- a/dev-util/deblob/deblob-0.1.ebuild +++ b/dev-util/deblob/deblob-0.1.ebuild @@ -8,6 +8,7 @@ if [[ "$PV" == 9999 ]]; then 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" From ce5b974bb8de3f14c9902669998e6ad8eb8901cb Mon Sep 17 00:00:00 2001 From: Christopher Byrne Date: Wed, 28 Sep 2022 10:45:53 -0500 Subject: [PATCH 11/13] app-crypt/tpm2-openssl: Add missing quoting Signed-off-by: Christopher Byrne --- .../tpm2-openssl/tpm2-openssl-1.1.0.ebuild | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/app-crypt/tpm2-openssl/tpm2-openssl-1.1.0.ebuild b/app-crypt/tpm2-openssl/tpm2-openssl-1.1.0.ebuild index 2cb1195892..7ac127f02b 100644 --- a/app-crypt/tpm2-openssl/tpm2-openssl-1.1.0.ebuild +++ b/app-crypt/tpm2-openssl/tpm2-openssl-1.1.0.ebuild @@ -43,13 +43,13 @@ dbus_run() { } tpm2_run_with_emulator() { - export XDG_CONFIG_HOME=${T}/.config/swtpm + export XDG_CONFIG_HOME="${T}/.config/swtpm" "${BROOT}"/usr/share/swtpm/swtpm-create-user-config-files || die - mkdir -p ${XDG_CONFIG_HOME}/mytpm1 || die + mkdir -p "${XDG_CONFIG_HOME}/mytpm1" || die swtpm_setup_args=( --tpm2 - --tpmstate ${XDG_CONFIG_HOME}/mytpm1 + --tpmstate "${XDG_CONFIG_HOME}/mytpm1" --createek --allow-signing --decryption @@ -63,18 +63,18 @@ tpm2_run_with_emulator() { swtpm_socket_args=( --tpm2 - --tpmstate dir=${XDG_CONFIG_HOME}/mytpm1 + --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 + --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 + --tcti=swtpm:path="${XDG_CONFIG_HOME}/mytpm1/swtpm.socket" --session --flush-all ) @@ -86,7 +86,7 @@ tpm2_run_with_emulator() { $@ || die # When swtpm dies, tmp2-abrmd will exit - kill $(< ${XDG_CONFIG_HOME}/mytpm1/swtpm.pid) || die + kill $(< "${XDG_CONFIG_HOME}/mytpm1/swtpm.pid") || die } src_prepare() { From 0fbfa0c18d5707d49fac4838101c2feec1648cca Mon Sep 17 00:00:00 2001 From: "Ronny (tastytea) Gutbrod" Date: Wed, 28 Sep 2022 17:40:10 +0200 Subject: [PATCH 12/13] net-im/nheko: add 0.10.2 fixes a security issue: Signed-off-by: Ronny (tastytea) Gutbrod --- net-im/nheko/Manifest | 1 + net-im/nheko/nheko-0.10.2.ebuild | 88 ++++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+) create mode 100644 net-im/nheko/nheko-0.10.2.ebuild diff --git a/net-im/nheko/Manifest b/net-im/nheko/Manifest index 5734fb8321..5e1165ff79 100644 --- a/net-im/nheko/Manifest +++ b/net-im/nheko/Manifest @@ -1,2 +1,3 @@ DIST nheko-0.10.0.tar.gz 1587008 BLAKE2B 207622bcc0fcbf4f1760481d3bdf35d5c025d9aa7d553c2dc4649841426481c88292966c35d44944434c1628c34017bb76f84136b6bcc8f8c3f32478156ac713 SHA512 c0aaf0f9ea657c43867fbb6857db45cac30f0cbaeaf8ad6a20a1a3e1ab9e6cf15266444eada060666db5b94be5a72b95b371a4da62e6705eed49f9907c576954 DIST nheko-0.10.1.tar.gz 1608578 BLAKE2B 328255d6ea8ce3fd0d1bbe9f20bb9608eba4c479b6969db7bebc67f3406ae8c6e9d69432d304b28e49b8547cf293e4f103d3f8257df4fbc676db9e6ca037ff48 SHA512 898582c1a09ad9cfac3285f0bc5e80bb5e69b1d744118822167bbe09e9aa44c2b28438db2d3b6e1fa88835de2b0e2f58726d3876661f28c5eb46475e2f54bc20 +DIST nheko-0.10.2.tar.gz 1608905 BLAKE2B 10b7b7d1f3e7525ae5ec4b78af228382440c5c64a3716b530506346372856035435d6e2d4e1724f2580ee384852ab0dd4e4b728eed92df827dc5cb3f2853b30b SHA512 b00c45115ab52f9cce5958aa594f6d316bdb917004e284d28ba3003c815bdc532ff1e7bbd5e542bb89a43fd552af3fa44b70ce66eb26b0bcff65beaea1f6b3cd diff --git a/net-im/nheko/nheko-0.10.2.ebuild b/net-im/nheko/nheko-0.10.2.ebuild new file mode 100644 index 0000000000..5e4e00a927 --- /dev/null +++ b/net-im/nheko/nheko-0.10.2.ebuild @@ -0,0 +1,88 @@ +# 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.1:= + >=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 +} From f5e96389050f587b972d8da07c3b5079a7188ac4 Mon Sep 17 00:00:00 2001 From: "Ronny (tastytea) Gutbrod" Date: Wed, 28 Sep 2022 17:44:10 +0200 Subject: [PATCH 13/13] net-im/nheko: drop 0.10.0, 0.10.1 Signed-off-by: Ronny (tastytea) Gutbrod --- net-im/nheko/Manifest | 2 - net-im/nheko/nheko-0.10.0.ebuild | 88 -------------------------------- net-im/nheko/nheko-0.10.1.ebuild | 88 -------------------------------- 3 files changed, 178 deletions(-) delete mode 100644 net-im/nheko/nheko-0.10.0.ebuild delete mode 100644 net-im/nheko/nheko-0.10.1.ebuild diff --git a/net-im/nheko/Manifest b/net-im/nheko/Manifest index 5e1165ff79..0a3ca069d7 100644 --- a/net-im/nheko/Manifest +++ b/net-im/nheko/Manifest @@ -1,3 +1 @@ -DIST nheko-0.10.0.tar.gz 1587008 BLAKE2B 207622bcc0fcbf4f1760481d3bdf35d5c025d9aa7d553c2dc4649841426481c88292966c35d44944434c1628c34017bb76f84136b6bcc8f8c3f32478156ac713 SHA512 c0aaf0f9ea657c43867fbb6857db45cac30f0cbaeaf8ad6a20a1a3e1ab9e6cf15266444eada060666db5b94be5a72b95b371a4da62e6705eed49f9907c576954 -DIST nheko-0.10.1.tar.gz 1608578 BLAKE2B 328255d6ea8ce3fd0d1bbe9f20bb9608eba4c479b6969db7bebc67f3406ae8c6e9d69432d304b28e49b8547cf293e4f103d3f8257df4fbc676db9e6ca037ff48 SHA512 898582c1a09ad9cfac3285f0bc5e80bb5e69b1d744118822167bbe09e9aa44c2b28438db2d3b6e1fa88835de2b0e2f58726d3876661f28c5eb46475e2f54bc20 DIST nheko-0.10.2.tar.gz 1608905 BLAKE2B 10b7b7d1f3e7525ae5ec4b78af228382440c5c64a3716b530506346372856035435d6e2d4e1724f2580ee384852ab0dd4e4b728eed92df827dc5cb3f2853b30b SHA512 b00c45115ab52f9cce5958aa594f6d316bdb917004e284d28ba3003c815bdc532ff1e7bbd5e542bb89a43fd552af3fa44b70ce66eb26b0bcff65beaea1f6b3cd diff --git a/net-im/nheko/nheko-0.10.0.ebuild b/net-im/nheko/nheko-0.10.0.ebuild deleted file mode 100644 index 40d6f8c736..0000000000 --- a/net-im/nheko/nheko-0.10.0.ebuild +++ /dev/null @@ -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 -} diff --git a/net-im/nheko/nheko-0.10.1.ebuild b/net-im/nheko/nheko-0.10.1.ebuild deleted file mode 100644 index 5e4e00a927..0000000000 --- a/net-im/nheko/nheko-0.10.1.ebuild +++ /dev/null @@ -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.1:= - >=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 -}