Merge updates from master

8 files changed, 65 insertions, 6 deletions

diff --git a/app-backup/deja-dup/Manifest b/app-backup/deja-dup/Manifest
index c6a74d33b9a5..ce5f20b2f4dc 100644
--- a/app-backup/deja-dup/Manifest
+++ b/app-backup/deja-dup/Manifest
@@ -1 +1,2 @@
 DIST deja-dup-44.2.tar.bz2 1010512 BLAKE2B b61eb474a4cc874ceea48a88f8f83e8a329b252248dc4630dd9dd7895ea4782b0e9b6751e795e208fc84127754da226d6a4257a783ffb23d88df59058e28576e SHA512 b1fae58d76aa5a2097bb94f6e5196ed5a3d5131562fe088a9f81155a3bb96ef9e726f83ae04ba8e361a671bce8aa2ea4b053f04f1e57a194fe88c2f06c3e6335
+DIST deja-dup-48.4.tar.bz2 1107899 BLAKE2B 2c23e151f3159810f4bfcf1fde8853b75d7af2be41c3cea0ed7dd0098769651900b8228402800b83891b4aadc6f6f8ea60121fc1b6ef26f4168e95169bc68d06 SHA512 590611803526cefcb23d759a9fb43fee12f59e5373a9da509b11f93a9e8ca9bea177a61004ca73b949753924df1312ed697a180e31b6cfa1f435b50db0ea338d
diff --git a/app-backup/deja-dup/deja-dup-48.4.ebuild b/app-backup/deja-dup/deja-dup-48.4.ebuild
new file mode 100644
index 000000000000..1fa718fb85cd
--- /dev/null
+++ b/app-backup/deja-dup/deja-dup-48.4.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson gnome2-utils vala xdg
+
+DESCRIPTION="Simple backup tool using duplicity back-end"
+HOMEPAGE="https://apps.gnome.org/DejaDup/"
+SRC_URI="https://gitlab.gnome.org/World/deja-dup/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	$(vala_depend)
+	dev-util/itstool
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? ( dev-libs/appstream-glib )
+"
+
+DEPEND="
+	>=gui-libs/libadwaita-1.0:1
+	>=dev-libs/glib-2.70.0:2
+	>=dev-libs/libgpg-error-1.33
+	>=gui-libs/gtk-4.6:4
+	>=dev-libs/json-glib-1.2
+	>=dev-libs/glib-2.64:2[dbus]
+	>=app-crypt/libsecret-0.18.6[vala]
+	>=net-libs/libsoup-3.0:3.0
+	>=app-backup/duplicity-0.8.21
+"
+
+RDEPEND="${DEPEND}
+	gnome-base/dconf
+	gnome-base/gvfs[fuse]
+"
+
+src_prepare() {
+	default
+	vala_setup
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/dev-java/diffutils/diffutils-1.3.0.ebuild b/dev-java/diffutils/diffutils-1.3.0.ebuild
index 609dbc0e8955..4c43e20ab41f 100644
--- a/dev-java/diffutils/diffutils-1.3.0.ebuild
+++ b/dev-java/diffutils/diffutils-1.3.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://repo1.maven.org/maven2/com/googlecode/java-diff-utils/diffutils
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 
 BDEPEND="app-arch/unzip"
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/pdfbox/pdfbox-3.0.6.ebuild b/dev-java/pdfbox/pdfbox-3.0.6.ebuild
index 4cf36ba2c5af..c64223f31c7b 100644
--- a/dev-java/pdfbox/pdfbox-3.0.6.ebuild
+++ b/dev-java/pdfbox/pdfbox-3.0.6.ebuild
@@ -73,7 +73,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="+tools"
 
 BDEPEND="
diff --git a/media-libs/kimageannotator/kimageannotator-0.7.2.ebuild b/media-libs/kimageannotator/kimageannotator-0.7.2.ebuild
index 5595b652b008..7d8adbcb0ba9 100644
--- a/media-libs/kimageannotator/kimageannotator-0.7.2.ebuild
+++ b/media-libs/kimageannotator/kimageannotator-0.7.2.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
diff --git a/media-libs/kquickimageeditor/kquickimageeditor-0.6.0.ebuild b/media-libs/kquickimageeditor/kquickimageeditor-0.6.0.ebuild
index b616ccfb7b74..7d7eddbef507 100644
--- a/media-libs/kquickimageeditor/kquickimageeditor-0.6.0.ebuild
+++ b/media-libs/kquickimageeditor/kquickimageeditor-0.6.0.ebuild
@@ -15,7 +15,7 @@ https://api.kde.org/kquickimageeditor/html/index.html"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/media-libs/mlt/mlt-7.34.1-r1.ebuild b/media-libs/mlt/mlt-7.34.1-r1.ebuild
index 8a41c2b2f98f..463ef53ec008 100644
--- a/media-libs/mlt/mlt-7.34.1-r1.ebuild
+++ b/media-libs/mlt/mlt-7.34.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mltframework/${PN}/releases/download/v${PV}/${P}.tar
 
 LICENSE="GPL-3"
 SLOT="0/7"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug ffmpeg frei0r gtk jack libsamplerate opencv opengl python qt6
 rtaudio rubberband sdl test vdpau vidstab vorbis xine xml"
 
diff --git a/media-plugins/frei0r-plugins/frei0r-plugins-2.4.1.ebuild b/media-plugins/frei0r-plugins/frei0r-plugins-2.4.1.ebuild
index 353cf44b6504..d02f3b9c2818 100644
--- a/media-plugins/frei0r-plugins/frei0r-plugins-2.4.1.ebuild
+++ b/media-plugins/frei0r-plugins/frei0r-plugins-2.4.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/frei0r-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv x86"
 IUSE="doc +facedetect +scale0tilt"
 
 RDEPEND="x11-libs/cairo[${MULTILIB_USEDEP}]