14 files changed, 152 insertions, 59 deletions
diff --git a/dev-util/difftastic/Manifest b/dev-util/difftastic/Manifest
index 2f173860f1fa..22bce9aa5f80 100644
--- a/dev-util/difftastic/Manifest
+++ b/dev-util/difftastic/Manifest
@@ -15,7 +15,7 @@ DIST crossbeam-epoch-0.9.5.crate 43883 BLAKE2B c0ee0879c583bd1051b63d29eccac37ce
 DIST crossbeam-utils-0.8.7.crate 39751 BLAKE2B 79e1d6454887e8c61f498be0f4475726529e1c45d5b24bb0799cebedacc8d92db735bbc0ececf2d64a9601dfffd142b372bd2802fd0aa0e98dd4994158846a3e SHA512 b9c999f570640513c38c95fe5e50d0e89adfd27a9370952a8ee441118ffc0f092d21f6dbe7c68f653a6e766e5c1aeb209145d49542f1bdaa1f561e6707ad482b
 DIST ctor-0.1.21.crate 9303 BLAKE2B 8feeaacd3d870b721ecfed7c8df60a27005de1f2a099eef816bd6df2d7b07dbfa00badeef44027398ff4505871a69814d7d4ec90b07d36e371099e4d0aebfae6 SHA512 18a914f5bd55172e5ff199778babad9a20dd4214f36f24cc00531db5e169af66f77eacab425e8e64d053907366ebd3b448a0c3275ee1f8244822778b62c4cb71
 DIST diff-0.1.12.crate 10223 BLAKE2B 369f305661f1da31207f3801ed1841dbce12451ac9c3e9d3736f7158ece433af9b2e42c29063e5d93bb86b1d300e503caa9c3ce7dd0b25553f91d72a9eea5298 SHA512 0e81331c0424e9369963e23894a6412b65a3ed4f3154ccc184fc84cf1c5985b81c586a6b34e8c6c0e5c3afba38fb15277cfd89e7f50c85bd5d8d4d24ba670d16
-DIST difftastic-0.25.0.tar.gz 8645342 BLAKE2B 2e7b72881849c655b838e20a64c477f0c2763e345b54979a052b14ff35c1adee0edd9b9ee03a6109416397c3eed9bbd1d49f9a2ad4b32b8c05f9066b68a15032 SHA512 b421a591cbd896cacff832ce0e39cb9fc952690f2e334969bdd2722ff17b43f5c6fd81a4223490e38e0a9c5b639a558c6c3682123d5280ba5f29950072626473
+DIST difftastic-0.26.3.tar.gz 10100584 BLAKE2B 9121a9747f761f13830028d8ae01655d6d15ceb846f966b92d905224f54280a354873afb19419fb3a496e67ebca12df1cf15369e69588a1066d7682bea0fee93 SHA512 91ef6c359e709f0f63d3627621ed6a03627248cb31ef90ce1a617294425d5ca8803f3f7608d1b2c1326fd1247ee89a8fc200f1188c659028d9af43bc69fa9467
 DIST either-1.6.1.crate 13641 BLAKE2B e5f40c40a5edb6dcb07a10bf79183cbe42438f1f70f3932dce72f6f6e91f75f24d17d82bc447507def4dad4345ffc9dd9162dde778afb253bdb1218e91887949 SHA512 4bfe56920e30cbc8eb4f90162db618f7dca653b42db35ab6a7045d3fd9a24ceb1778b1f79613850bdb1a87ad3794fa0d73015e46c48d513f368d8c3776fc9ddf
 DIST env_logger-0.7.1.crate 32281 BLAKE2B 6f1894c64f301ca4b687270c911dbe230f674662aa0561b97c4d2537886e404664b5773d4e223e2018047c222a951232c3cb52ec5bddbfb6665e34c3e7ea52f5 SHA512 604060d2ee83ab337a2d20d6784d1b7541534d2fd9e1662fc5c709fa681672a9db5e34d00face864b56ae321962e644ebe29fbb6d68a0d556419cf5d71c6149f
 DIST hashbrown-0.11.2.crate 85713 BLAKE2B 402f9f1bdcb92631206f9b72923ee35e28db8623e87469c0f1496664bc7185077013ab3c8aea68268241e5b2504f10cddc613a350abd4291050deda6c112e559 SHA512 c21ca68fd49bbb741901f59fed04cc124b8da99e2a4dfc26e2e5e1140637872b344612a01691bd30cc771575c571be15f756c84dde225441699cd2322af2ad6c
diff --git a/dev-util/difftastic/difftastic-0.25.0.ebuild b/dev-util/difftastic/difftastic-0.26.3.ebuild
index e1b4ece14a37..cfca879d4a2f 100644
--- a/dev-util/difftastic/difftastic-0.25.0.ebuild
+++ b/dev-util/difftastic/difftastic-0.26.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 2017-2022 Gentoo Authors
+# Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Auto-Generated by cargo-ebuild 0.3.2-alpha.0
+# Auto-Generated by cargo-ebuild 0.5.1
 
 EAPI=8
 
@@ -93,7 +93,7 @@ RESTRICT="mirror"
 QA_FLAGS_IGNORED="usr/bin/difft"
 
 PATCHES=(
-	"${FILESDIR}/difftastic-0.24.0-regex-dep.patch"
+	"${FILESDIR}/difftastic-0.26.3-regex-dep.patch"
 )
 
 DOCS=(
diff --git a/dev-util/difftastic/files/difftastic-0.24.0-regex-dep.patch b/dev-util/difftastic/files/difftastic-0.26.3-regex-dep.patch
index 20a8c60e273c..e5f25935074b 100644
--- a/dev-util/difftastic/files/difftastic-0.24.0-regex-dep.patch
+++ b/dev-util/difftastic/files/difftastic-0.26.3-regex-dep.patch
@@ -1,5 +1,5 @@
 diff --git a/Cargo.lock b/Cargo.lock
-index d1c2f2d11..7a80ce5f8 100644
+index b31dab30f..a3e7795aa 100644
 --- a/Cargo.lock
 +++ b/Cargo.lock
 @@ -418,9 +418,9 @@ dependencies = [
@@ -14,3 +14,16 @@ index d1c2f2d11..7a80ce5f8 100644
  dependencies = [
   "aho-corasick",
   "memchr",
+diff --git a/Cargo.toml b/Cargo.toml
+index f5916fa44..8d7cf3ea2 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -21,7 +21,7 @@ include = [
+ ]
+ 
+ [dependencies]
+-regex = "1.5.4"
++regex = "1.5.5"
+ clap = { version = "3.0.13", features = ["cargo"] }
+ itertools = "0.10.1"
+ typed-arena = "2.0.1"
diff --git a/dev-util/flatpak-builder/files/flatpak-builder-1.0.11-musl.patch b/dev-util/flatpak-builder/files/flatpak-builder-1.0.11-musl.patch
new file mode 100644
index 000000000000..b5ef0ec15504
--- /dev/null
+++ b/dev-util/flatpak-builder/files/flatpak-builder-1.0.11-musl.patch
@@ -0,0 +1,18 @@
+--- a/libglnx/glnx-macros.h
++++ b/libglnx/glnx-macros.h
+@@ -28,6 +28,16 @@
+
+ G_BEGIN_DECLS
+
++/* taken from glibc unistd.h and fixes musl */
++#ifndef TEMP_FAILURE_RETRY
++#define TEMP_FAILURE_RETRY(expression) \
++  (__extension__                                                              \
++    ({ long int __result;                                                     \
++       do __result = (long int) (expression);                                 \
++       while (__result == -1L && errno == EINTR);                             \
++       __result; }))
++#endif
++
+ /* All of these are for C only. */
+ #ifndef __GI_SCANNER__
diff --git a/dev-util/flatpak-builder/files/flatpak-builder-1.2.2-musl.patch b/dev-util/flatpak-builder/files/flatpak-builder-1.2.2-musl.patch
index db207e0e353c..626fbddd0352 100644
--- a/dev-util/flatpak-builder/files/flatpak-builder-1.2.2-musl.patch
+++ b/dev-util/flatpak-builder/files/flatpak-builder-1.2.2-musl.patch
@@ -1,9 +1,59 @@
+diff --git a/subprojects/debugedit/tools/debugedit.c b/subprojects/debugedit/tools/debugedit.c
+index 668777a..b3ba5cb 100644
+--- a/subprojects/debugedit/tools/debugedit.c
++++ b/subprojects/debugedit/tools/debugedit.c
+@@ -25,7 +25,11 @@
+ #include <byteswap.h>
+ #include <endian.h>
+ #include <errno.h>
++#ifdef __GLIBC__
+ #include <error.h>
++#else
++#include "error.h"
++#endif
+ #include <limits.h>
+ #include <string.h>
+ #include <stdlib.h>
+diff --git a/subprojects/debugedit/tools/error.h b/subprojects/debugedit/tools/error.h
+new file mode 100644
+index 0000000..c330dc3
+--- /dev/null
++++ b/subprojects/debugedit/tools/error.h
+@@ -0,0 +1,26 @@
++#ifndef _ERROR_H
++#define _ERROR_H
++#include <stdarg.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <errno.h>
++
++static unsigned int error_message_count = 0;
++
++static inline void error(int status, int errnum, const char* format, ...)
++{
++  va_list ap;
++  fprintf(stderr, "%s: ", program_invocation_name);
++  va_start(ap, format);
++  vfprintf(stderr, format, ap);
++  va_end(ap);
++  if (errnum)
++    fprintf(stderr, ": %s", strerror(errnum));
++  fprintf(stderr, "\n");
++  error_message_count++;
++  if (status)
++    exit(status);
++}
++
++#endif
+diff --git a/subprojects/libglnx/glnx-macros.h b/subprojects/libglnx/glnx-macros.h
+index 6d8aca9..e3e4e33 100644
 --- a/subprojects/libglnx/glnx-macros.h
 +++ b/subprojects/libglnx/glnx-macros.h
 @@ -28,6 +28,16 @@
-
+ 
  G_BEGIN_DECLS
-
+ 
 +/* taken from glibc unistd.h and fixes musl */
 +#ifndef TEMP_FAILURE_RETRY
 +#define TEMP_FAILURE_RETRY(expression) \
@@ -16,3 +66,4 @@
 +
  /* All of these are for C only. */
  #ifndef __GI_SCANNER__
+ 
diff --git a/dev-util/flatpak-builder/flatpak-builder-1.0.11.ebuild b/dev-util/flatpak-builder/flatpak-builder-1.0.11.ebuild
index c03752b1e61a..6461108028c5 100644
--- a/dev-util/flatpak-builder/flatpak-builder-1.0.11.ebuild
+++ b/dev-util/flatpak-builder/flatpak-builder-1.0.11.ebuild
@@ -33,6 +33,8 @@ BDEPEND="
 	)
 "
 
+PATCHES=("${FILESDIR}/flatpak-builder-1.0.11-musl.patch")
+
 src_configure() {
 	econf \
 		$(use_enable doc documentation) \
diff --git a/dev-util/pycharm-professional/pycharm-professional-2021.1.2-r1.ebuild b/dev-util/pycharm-professional/pycharm-professional-2021.1.2-r1.ebuild
index e720741472c2..7f49ff573948 100644
--- a/dev-util/pycharm-professional/pycharm-professional-2021.1.2-r1.ebuild
+++ b/dev-util/pycharm-professional/pycharm-professional-2021.1.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,8 +6,8 @@ EAPI=7
 inherit desktop readme.gentoo-r1 wrapper xdg-utils
 
 DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
-HOMEPAGE="http://www.jetbrains.com/pycharm/"
-SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
+HOMEPAGE="https://www.jetbrains.com/pycharm/"
+SRC_URI="https://download.jetbrains.com/python/${P}.tar.gz"
 
 LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
 SLOT="0"
diff --git a/dev-util/pycharm-professional/pycharm-professional-2021.3.2.ebuild b/dev-util/pycharm-professional/pycharm-professional-2021.3.2.ebuild
index 6812ec1659ec..75ca0a7db25d 100644
--- a/dev-util/pycharm-professional/pycharm-professional-2021.3.2.ebuild
+++ b/dev-util/pycharm-professional/pycharm-professional-2021.3.2.ebuild
@@ -7,8 +7,8 @@ inherit desktop readme.gentoo-r1 wrapper
 
 MY_PN=${PN/-professional/}
 DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
-HOMEPAGE="http://www.jetbrains.com/pycharm/"
-SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
+HOMEPAGE="https://www.jetbrains.com/pycharm/"
+SRC_URI="https://download.jetbrains.com/python/${P}.tar.gz"
 S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
diff --git a/dev-util/pycharm-professional/pycharm-professional-2021.3.3.ebuild b/dev-util/pycharm-professional/pycharm-professional-2021.3.3.ebuild
index 6812ec1659ec..75ca0a7db25d 100644
--- a/dev-util/pycharm-professional/pycharm-professional-2021.3.3.ebuild
+++ b/dev-util/pycharm-professional/pycharm-professional-2021.3.3.ebuild
@@ -7,8 +7,8 @@ inherit desktop readme.gentoo-r1 wrapper
 
 MY_PN=${PN/-professional/}
 DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
-HOMEPAGE="http://www.jetbrains.com/pycharm/"
-SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
+HOMEPAGE="https://www.jetbrains.com/pycharm/"
+SRC_URI="https://download.jetbrains.com/python/${P}.tar.gz"
 S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
diff --git a/dev-util/sel/Manifest b/dev-util/sel/Manifest
deleted file mode 100644
index 6134dc363aaa..000000000000
--- a/dev-util/sel/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST sel-0.08.4.tar.gz 22188 BLAKE2B ff965c1e6296482d14e09109932165524f666486d37239edc2c30f268080750de2b20e40fe5dfc65eeb1c52009db139e2b7a47c9f8011b70eb5ae561466c19a3 SHA512 5550f1b78fef10c2ac7c132f752db4e0f7a3318419bf5751a4f812c1da04b07b3fcac341076d32f6ea436a0216ad6746e9cf29c4bcef630b76e307ded6237e52
diff --git a/dev-util/sel/metadata.xml b/dev-util/sel/metadata.xml
deleted file mode 100644
index 83d00b14c8d4..000000000000
--- a/dev-util/sel/metadata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- 
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-util/sel/sel-0.08.4-r2.ebuild b/dev-util/sel/sel-0.08.4-r2.ebuild
deleted file mode 100644
index 08560fb423e2..000000000000
--- a/dev-util/sel/sel-0.08.4-r2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="A filemanager for shell scripts"
-SRC_URI="http://www.rninet.de/darkstar/files/${P}.tar.gz"
-HOMEPAGE="http://www.rninet.de/darkstar/sel.html"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc ~s390 sparc x86"
-
-RDEPEND="sys-libs/ncurses:0="
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( "help.txt" README.GER whatsnew )
-
-src_prepare() {
-	default
-	sed -i \
-		-e "s:/usr/local/share/sel/help\.txt:/usr/share/sel/help\.txt:" \
-		"${PN}.c" || die 'sed failed'
-}
-
-src_compile() {
-	local PKGCONFIG="$(tc-getPKG_CONFIG)"
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDLIBS="$(${PKGCONFIG} --libs ncurses)"
-}
-
-src_install() {
-	dobin "${PN}"
-	doman "${PN}.1"
-	einstalldocs
-}
diff --git a/dev-util/umockdev/Manifest b/dev-util/umockdev/Manifest
index eb580a622d7e..2a3c86777e57 100644
--- a/dev-util/umockdev/Manifest
+++ b/dev-util/umockdev/Manifest
@@ -1,3 +1,4 @@
 DIST umockdev-0.17.6.tar.xz 486668 BLAKE2B 973c195b8fccd1c080665b65ffd47f8fe110118de9c541d5dda383e51e4dbcc36f77eeda6af5c774f4570a7b839190130fe95559fb3148e9937dae19dace6331 SHA512 05a86e2a583972d02fb3cfa26b017d44600831b6ed1415769d7cc7344357f484d34228b1593de2cfbfcce302611c0c22f045ee9fbd7fea76d8ae0b4ccd28d6ef
 DIST umockdev-0.17.7.tar.xz 486964 BLAKE2B f3c4021198c8adea47383f3d0c111f921c35550ca9b70c0711e71799ba89a44031356a687b88cc80aa51b1bf4606cfcf48a1d24d16501b0ea08f805e4e30cf83 SHA512 6fc611787c9679f450ce7cdf7dccb93a5d7435470b0b5f5cb1803036cf3c8ce73521af9e7777bec68485834cddfddba0ed9379a0818bfb072bb643cf6419c17d
 DIST umockdev-0.17.8.tar.xz 487220 BLAKE2B 6a5cb31462ef5836f6a4329fe0e612dd6bb6f00ecc899cb3d1b093771727361bfbc952c7cf7acb7943b78989cacb1faa2d7a2ee62d9c752ed959ac7b1931333c SHA512 e5e6ba2934e1df9323a4e64ee1fc066ab4abeaf75ad0d7f1f6d387b06315f30877f48664e5992f4b138fe1b76d08860359599249d5b9de516777cf8bdb1b228f
+DIST umockdev-0.17.9.tar.xz 487592 BLAKE2B 9b96ab26d31d927de240fcbbc3139f86ca3108240cbcc4d330a7793472b8b716aa3a573a7ee6a899562411192a6cffed707118a4e648802c84089c211dd870c3 SHA512 f56cc9a1513d05747eda2d36cd7c632502d7f70ccc612e11bdcd1610c96a2be9cf8e883282d024406485c44fb3cedc80dc803a12216ed61f593030d12ece21c9
diff --git a/dev-util/umockdev/umockdev-0.17.9.ebuild b/dev-util/umockdev/umockdev-0.17.9.ebuild
new file mode 100644
index 000000000000..c4bf2f1470cf
--- /dev/null
+++ b/dev-util/umockdev/umockdev-0.17.9.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit meson-multilib python-any-r1 vala
+
+DESCRIPTION="Mock hardware devices for creating unit tests"
+HOMEPAGE="https://github.com/martinpitt/umockdev/"
+SRC_URI="https://github.com/martinpitt/umockdev/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	net-libs/libpcap[${MULTILIB_USEDEP}]
+	virtual/libudev:=[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.32:2[${MULTILIB_USEDEP}]
+	>=dev-libs/gobject-introspection-1.32:=
+"
+DEPEND="${RDEPEND}
+	test? (
+		${PYTHON_DEPS}
+		dev-libs/libgudev:=[${MULTILIB_USEDEP}]
+	)
+"
+BDEPEND="
+	$(vala_depend)
+	app-arch/xz-utils
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	vala_setup
+}
+
+multilib_src_configure() {
+	export VALAC="$(type -P valac-$(vala_best_api_version))"
+	meson_src_configure
+}
+
+multilib_src_test() {
+	meson_src_test --no-suite fails-valgrind
+}