4 files changed, 67 insertions, 9 deletions
diff --git a/app-misc/bijiben/bijiben-40.1.ebuild b/app-misc/bijiben/bijiben-40.1-r2.ebuild
index d0fada65c229..5ffca96a130d 100644
--- a/app-misc/bijiben/bijiben-40.1.ebuild
+++ b/app-misc/bijiben/bijiben-40.1-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{9..11} )
 inherit gnome.org gnome2-utils meson python-any-r1 xdg
 
 DESCRIPTION="Note editor designed to remain simple to use"
@@ -13,17 +13,17 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 
 DEPEND="
-	app-misc/tracker:3=
+	>=app-misc/tracker-3.4.0-r1:3=
 	>=dev-libs/glib-2.53.4:2
 	net-libs/gnome-online-accounts:=
 	>=x11-libs/gtk+-3.19.3:3
 	dev-libs/json-glib
-	>=gnome-extra/evolution-data-server-3.33.2:=
+	>=gnome-extra/evolution-data-server-3.46.0:=
 	>=gui-libs/libhandy-1.0.0:1=
 	dev-libs/libxml2:2
 	net-misc/curl
 	sys-apps/util-linux
-	>=net-libs/webkit-gtk-2.26:4
+	>=net-libs/webkit-gtk-2.26:4.1
 "
 RDEPEND="${DEPEND}"
 BDEPEND="
@@ -36,6 +36,11 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-40.1-meson-0.61.patch
+	"${FILESDIR}"/${PN}-40.1-webkit-gtk-libsoup.patch
+)
+
 src_configure() {
 	local emesonargs=(
 		-Dupdate_mimedb=false
diff --git a/app-misc/bijiben/files/bijiben-40.1-meson-0.61.patch b/app-misc/bijiben/files/bijiben-40.1-meson-0.61.patch
new file mode 100644
index 000000000000..63584fc81464
--- /dev/null
+++ b/app-misc/bijiben/files/bijiben-40.1-meson-0.61.patch
@@ -0,0 +1,38 @@
+https://gitlab.gnome.org/GNOME/gnome-notes/-/merge_requests/158.patch
+https://bugs.gentoo.org/831929
+
+From 01ccae2ccb640b2d33fd09c3dfb7d605830b5b0f Mon Sep 17 00:00:00 2001
+From: Michal Vasilek <michal@vasilek.cz>
+Date: Sat, 22 Jan 2022 23:16:37 +0100
+Subject: [PATCH] meson: fix build with meson 0.61
+
+i18n.merge_file doesn't accept positional arguments
+--- a/data/appdata/meson.build
++++ b/data/appdata/meson.build
+@@ -1,7 +1,6 @@
+ info = 'org.gnome.Notes.appdata.xml'
+ 
+ i18n.merge_file(
+-  info,
+   input: info + '.in',
+   output: info,
+   po_dir: po_dir,
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -4,7 +4,6 @@ subdir('appdata')
+ mime = 'org.gnome.Notes.xml'
+ 
+ i18n.merge_file(
+-  mime,
+   input: mime + '.in',
+   output: mime,
+   po_dir: po_dir,
+@@ -18,7 +17,6 @@ desktop_conf = configuration_data()
+ desktop_conf.set ('icon', application_id)
+ 
+ i18n.merge_file(
+-  desktop,
+   type: 'desktop',
+   input: configure_file(
+     input: files (desktop + '.in'),
+GitLab
diff --git a/app-misc/bijiben/files/bijiben-40.1-webkit-gtk-libsoup.patch b/app-misc/bijiben/files/bijiben-40.1-webkit-gtk-libsoup.patch
new file mode 100644
index 000000000000..150f97010686
--- /dev/null
+++ b/app-misc/bijiben/files/bijiben-40.1-webkit-gtk-libsoup.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/878109
+
+--- a/meson.build
++++ b/meson.build
+@@ -126,7 +126,7 @@ bijiben_deps = [
+   dependency('libxml-2.0'),
+   dependency('libcurl'),
+   dependency('uuid'),
+-  dependency('webkit2gtk-4.0', version: '>= 2.26'),
++  dependency('webkit2gtk-4.1', version: '>= 2.26'),
+   cc.find_library('m')
+ ]
diff --git a/app-misc/bijiben/metadata.xml b/app-misc/bijiben/metadata.xml
index 7b343b06be8a..4de392269fc0 100644
--- a/app-misc/bijiben/metadata.xml
+++ b/app-misc/bijiben/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
+  <maintainer type="project">
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="gnome-gitlab">GNOME/gnome-notes</remote-id>
+  </upstream>
 </pkgmetadata>