diff --git a/x11-misc/gpaste/Manifest b/x11-misc/gpaste/Manifest
index 337e282..566f2f6 100644
--- a/x11-misc/gpaste/Manifest
+++ b/x11-misc/gpaste/Manifest
@@ -2,7 +2,6 @@ AUX gpaste-3.32.0-detect-when-images-are-growing.patch 3827 BLAKE2B fb2eabd32799
 AUX gpaste-3.32.0-gnome-shel-only-var-should-be-exported.patch 6299 BLAKE2B d23fcc7257c04f3ac927ac47807bd9026bdedf90d21ce40c6d69403b5fe59792338c4a7c74d56d2d5a540d2c75843742c537ddb3705a80fc68d572cf0a2adb98 SHA512 a64a858d8b5aac40e7428eda98e7d38b937f91f75d4ebb5406e5f1a0fe5f3f24ec1b25bbc112f7df709dbaf51b9f1425325c5425e7a891b393a3a2c43eda8bc0
 DIST gpaste-3.32.0.tar.gz 181159 BLAKE2B 664151a5cb9653158ad8c137951fbfc402c400421bbd0324598804135aa654407ff0e67ccd8c4f9c025423aa609df3278e64ac50af09033933ef3f0e26d88032 SHA512 f60983c50742c05bf42347ffdaeb00ad1bb691f7d752d8773545dd59f7bf7485e095e26e799983261ee41180b66631e99fa4b6c196057c1ec47e2e138dfa8160
 DIST gpaste-3.34.1.tar.gz 184922 BLAKE2B 3498d949706d79ae59dc1dae6cf547a9c6a32d539b3ede737b243abe4eea057869d9c06ed7fa7f81741f901f80f44554502a00b1b047d957086eb86898fb0b88 SHA512 0560b7a0616eaf271d13e2db98f924894236e2714f97d80e6dce1bbb3589073b812b4c641d5fe0557a17e4e05b7506ab90418c7b45ddf953059b970fd4eac52e
-EBUILD gpaste-3.32.0-r1.ebuild 1779 BLAKE2B 76ff719cfb556df39b8e058afc994495c8240ae7b0755ebb5b0301b9a16e62cbbaf76ff6335106b4d3e2250d5711d51c6e945443e6414c5636a4570c262e1c97 SHA512 8dbd284efa6ff678d219d0a5673d4a28bd66a9a9a8bc5b16853c99f5a41256886d1a373ad3dec6df62d636f5e79399354b4ce0110a4d1977dda7e818cb068c25
-EBUILD gpaste-3.32.0.ebuild 1534 BLAKE2B 8a7afb1cdad5725e1b3f432998984a47784affe793156ce880044f9ec647656b78c7e3ccd94ff4a35f9a5d73a59756a8856edd72a4df194ab66548199ad49351 SHA512 23bde3de55c201bace9d7e6c60926e1d5fc87b4a39b6004a74e3d34b3e1040cb204bf432d9249360c94e050292c47d5d08b65a1a06ca6982c626647481c0415f
-EBUILD gpaste-3.34.1.ebuild 1633 BLAKE2B 33d5fcf90fce5b502159f3e3d53cef5306741efe626d4a988ba0701fdbe674b634c4a4cea5574ffee3c2dcc14b824191c51004532bf4f52fd08b776a3ed71bcb SHA512 0056579589f9be35676972d29b9fb8fac74daff3047680e737412569ba7a829dfbdd4da19319ead15b79308f00e16ae94128c882da78df68dd011f53144456e7
+EBUILD gpaste-3.32.0.ebuild 1778 BLAKE2B 4b11e34dd04f5e2b5b34afc11ac1417fbf7d7c43d1d4cb57ff1f690904a088a833ea4acc849af2491b6faea57d1b0e1b4b9df8bab64bcbf52faca8609088e70b SHA512 4233f15e49ff7d6858ce86fc7c471e7fd2e891a5ae63000c8c1771fc0856dbdec08c0dd0344d6a047d3fb92c5f9811eb2df1c4703467c2ab78c63b850f176aa9
+EBUILD gpaste-3.34.1.ebuild 1632 BLAKE2B 8ace530015910e60a996c733e91d0d85d44b45a3027f0dc6e3282cfc2e6ab6c5ac539e08c106eebc3765435a9d3b3d5e778d88baf4b1eaafd4ec29ba087bc277 SHA512 85bc518d7a99a86f9ad16fda3c022e3b0d357873c482ff4ff112910f527c90d6cdd21e80676d00b1d1c5a45db37859d35043ecd3e8ac490f0bbc66edf0d1500f
 MISC metadata.xml 595 BLAKE2B 7a8327f78e0e4cb106350051ff89a5677401e9ffa2d833e424da1f14a89c3147e59be124e6e0a26a3609f57c8a6078a00b6fce6a8f36889bafa5021539c0d89a SHA512 8fca7baa9d40775abe8ce7db98c5fc8e882d96e6200db5d84b6b1964369d6c499e344b30826c405368a18ca0f2caeab94d8dc44f648fe10f317075d82f60ca3d
diff --git a/x11-misc/gpaste/gpaste-3.32.0-r1.ebuild b/x11-misc/gpaste/gpaste-3.32.0-r1.ebuild
deleted file mode 100644
index 64dfcea..0000000
--- a/x11-misc/gpaste/gpaste-3.32.0-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VALA_MIN_API_VERSION="0.42"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2-utils meson vala vcs-snapshot xdg-utils
-
-DESCRIPTION="Clipboard management system"
-HOMEPAGE="https://github.com/Keruspe/GPaste"
-SRC_URI="https://github.com/Keruspe/GPaste/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X bash-completion gnome introspection systemd vala zsh-completion"
-
-DEPEND="dev-libs/appstream-glib
-	>=dev-libs/gjs-1.54.0
-	>=dev-libs/glib-2.58:2
-	>=dev-libs/gobject-introspection-1.58.0
-	sys-apps/dbus
-	>=x11-libs/gdk-pixbuf-2.38:2
-	>=x11-libs/gtk+-3.24:3
-	X? (
-		x11-libs/libX11
-		x11-libs/libXi
-	)
-	gnome? (
-		gnome-base/gnome-control-center:2
-		media-libs/clutter
-		x11-libs/pango
-		>=x11-wm/mutter-3.32.0:0/4
-	)
-	systemd? ( sys-apps/systemd )"
-RDEPEND="${DEPEND}
-	gnome? ( gnome-base/gnome-shell )"
-
-BDEPEND="vala? ( $(vala_depend) )
-	virtual/pkgconfig"
-
-REQUIRED_USE="vala? ( introspection )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-detect-when-images-are-growing.patch"
-	"${FILESDIR}/${P}-gnome-shel-only-var-should-be-exported.patch"
-)
-
-src_prepare() {
-	default
-	if use vala; then
-		vala_src_prepare
-	fi
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use X x-keybinder)
-		$(meson_use bash-completion)
-		$(meson_use gnome gnome-shell)
-		$(meson_use introspection)
-		$(meson_use systemd)
-		$(meson_use vala vapi)
-		$(meson_use zsh-completion)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	find "${D}" -name '*.la' -delete || die
-}
-
-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/x11-misc/gpaste/gpaste-3.32.0.ebuild b/x11-misc/gpaste/gpaste-3.32.0.ebuild
index 629cd40..59928ec 100644
--- a/x11-misc/gpaste/gpaste-3.32.0.ebuild
+++ b/x11-misc/gpaste/gpaste-3.32.0.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 VALA_MIN_API_VERSION="0.42"
 VALA_USE_DEPEND="vapigen"
 
-inherit autotools eutils gnome2-utils vala vcs-snapshot
+inherit gnome2-utils meson vala vcs-snapshot xdg-utils
 
 DESCRIPTION="Clipboard management system"
 HOMEPAGE="https://github.com/Keruspe/GPaste"
@@ -15,9 +15,9 @@ SRC_URI="https://github.com/Keruspe/GPaste/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="X bash-completion gnome vala zsh-completion"
+IUSE="X bash-completion gnome introspection systemd vala zsh-completion"
 
-CDEPEND="dev-libs/appstream-glib
+DEPEND="dev-libs/appstream-glib
 	>=dev-libs/gjs-1.54.0
 	>=dev-libs/glib-2.58:2
 	>=dev-libs/gobject-introspection-1.58.0
@@ -33,47 +33,54 @@ CDEPEND="dev-libs/appstream-glib
 		media-libs/clutter
 		x11-libs/pango
 		>=x11-wm/mutter-3.32.0:0/4
-	)"
-RDEPEND="${CDEPEND}
+	)
+	systemd? ( sys-apps/systemd )"
+RDEPEND="${DEPEND}
 	gnome? ( gnome-base/gnome-shell )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )"
+
+BDEPEND="vala? ( $(vala_depend) )
+	virtual/pkgconfig"
+
+REQUIRED_USE="vala? ( introspection )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-detect-when-images-are-growing.patch"
+	"${FILESDIR}/${P}-gnome-shel-only-var-should-be-exported.patch"
+)
 
 src_prepare() {
 	default
-	eautoreconf
-	vala_src_prepare
-
-	if ! use gnome ; then
-		echo "" > data/control-center.mk || die
+	if use vala; then
+		vala_src_prepare
 	fi
 }
 
 src_configure() {
-	econf \
-		$(use_enable X x-keybinder) \
-		$(use_enable bash-completion) \
-		$(use_enable vala) \
-		$(use_enable gnome gnome-shell-extension) \
-		$(use_enable zsh-completion) \
-		--disable-static \
-		--disable-schemas-compile
+	local emesonargs=(
+		$(meson_use X x-keybinder)
+		$(meson_use bash-completion)
+		$(meson_use gnome gnome-shell)
+		$(meson_use introspection)
+		$(meson_use systemd)
+		$(meson_use vala vapi)
+		$(meson_use zsh-completion)
+	)
+	meson_src_configure
 }
 
 src_install() {
-	default
+	meson_src_install
 	find "${D}" -name '*.la' -delete || die
 }
 
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
 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/x11-misc/gpaste/gpaste-3.34.1.ebuild b/x11-misc/gpaste/gpaste-3.34.1.ebuild
index d654974..a29fede 100644
--- a/x11-misc/gpaste/gpaste-3.34.1.ebuild
+++ b/x11-misc/gpaste/gpaste-3.34.1.ebuild
@@ -72,7 +72,6 @@ pkg_postinst() {
 	gnome2_schemas_update
 	xdg_desktop_database_update
 	xdg_icon_cache_update
-
 }
 
 pkg_postrm() {