Merge branch 'edge' into next

3 files changed, 2 insertions, 57 deletions

diff --git a/app-misc/bijiben/Manifest b/app-misc/bijiben/Manifest
index 9fa91fc51823..e930f2ae8f2f 100644
--- a/app-misc/bijiben/Manifest
+++ b/app-misc/bijiben/Manifest
@@ -1,5 +1,3 @@
-DIST bijiben-3.32.2.tar.xz 659988 BLAKE2B a155b3ad4d340b6efe039ae8458be6665f5ea37935b2040d8aa59f4b019a7ce2a9bb42c309fbc212b8f87cd2e3db533305b64d6987b3b527435ab9906165a7ff SHA512 71573ced01a5e984998fc5ce97ebbd4fcf04a91165465697ff29ea67076a31654b8f66a93c3ed79b30a8af2e38fad3ac4bfc3047106411078c6cbb67c20d5c5d
 DIST bijiben-3.34.2.tar.xz 663348 BLAKE2B 7736823334c5439f1da93e81940f6a433b48cf94173606b1985912b408ebaa05d14866b0bbdd0978c08456fe5a592829203aa7fdd31291748148d7973ab3d8ab SHA512 75e1286aabd5c0d5aca3d2150aa36f18873cc0bfeed24a1b6aa9f4d78318d37712df71929f453b2db871021f4df148af8a9ef64d563a2158db8c1dbb620e4538
-EBUILD bijiben-3.32.2.ebuild 1064 BLAKE2B 620d83c31ee5c3bed23deeb6014b0450dfbb8fc26dde69c66352b1047b281fa07ef18c2ba516e255ddb353276463aad6ad7f8a0f503d2ee634e5a1fbf3c45d8d SHA512 f37803a34b7abd2819591eafafa56b5a081cce5f43ae7dd6a575ea6653c4763747a191fc85af9a6ad1050b773fd6eb08dc35037a618592099baefaa216714023
-EBUILD bijiben-3.34.2.ebuild 1024 BLAKE2B acec0535a9ba6db7b3dc1704576b4acbacb76d7abc6a17a8c8da1d4f4fa42d357019f09558eaf04864b7419ccb65a9113a8155b8db4b79df2f8b1967435b43ee SHA512 e362a8383b2b34867ba6aac6c5e367e250be4943336d9c5fc971037340bf12fc5688ffa3cec67736ecb547f60ee4e371767b480a220f871d793482b7345b5a34
+EBUILD bijiben-3.34.2.ebuild 1022 BLAKE2B 759c55fda7d2cc300295130996a086b0bec250bcd69553eff6703e88ed00bf62c1850e9bb2154ddcf085205e0ba98cf0b63cef6006dadabbc2914969734f51d1 SHA512 55cd1b15ae716f62737f922fb9b99e357c6b805e7341d8441bd0719bda92748f73be85694a326761fb7f3ae95896e836e6c475041e44da04ea7ac72209f1a8d9
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-misc/bijiben/bijiben-3.32.2.ebuild b/app-misc/bijiben/bijiben-3.32.2.ebuild
deleted file mode 100644
index 61f2246946e1..000000000000
--- a/app-misc/bijiben/bijiben-3.32.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="Note editor designed to remain simple to use"
-HOMEPAGE="https://wiki.gnome.org/Apps/Notes"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	app-misc/tracker:0/2.0
-	>=dev-libs/glib-2.53.4:2
-	net-libs/gnome-online-accounts:=
-	>=x11-libs/gtk+-3.19.3:3
-	>=gnome-extra/evolution-data-server-3.13.90:=
-	<gnome-extra/evolution-data-server-3.33
-	dev-libs/libxml2:2
-	sys-apps/util-linux
-	>=net-libs/webkit-gtk-2.10:4
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	dev-libs/appstream-glib
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local emesonargs=(
-		-Dzeitgeist=false
-		-Dupdate_mimedb=false
-		-Dprivate_store=false # private store is mainly meant for flatpak builds
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/app-misc/bijiben/bijiben-3.34.2.ebuild b/app-misc/bijiben/bijiben-3.34.2.ebuild
index f83923e7b5fd..280d613753ec 100644
--- a/app-misc/bijiben/bijiben-3.34.2.ebuild
+++ b/app-misc/bijiben/bijiben-3.34.2.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Notes"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="