diff --git a/x11-misc/gpaste/Manifest b/x11-misc/gpaste/Manifest
index 1694c98..1b0054d 100644
--- a/x11-misc/gpaste/Manifest
+++ b/x11-misc/gpaste/Manifest
@@ -1,5 +1,2 @@
 DIST gpaste-44.1.tar.gz 352808 BLAKE2B f73fd3c12ebe44cba1a6fd6a63a2724dc823cda17d22ff95e7e3a7393d15eacec3d9378d6aecb7e9687db63a7812c4a77eedf98bffa760851c52922f236491bf SHA512 50cf65b1f89415d6bef8e2c7bcde5d775b2b3c05e9e296df23a2913efd13fa678adb543393d536ee9e7682dc604498f943babc840d821a6c8fbebbdcc6c2d39a
 DIST gpaste-45.tar.gz 362576 BLAKE2B f65f78197dd52c3ff86a95992b67c86317909f5da94f2986f76890543206392d240803bfed6dd925b391674aa2508247d56cedf7ddd3e082d7577c14d939f1b6 SHA512 0fc5d89b8921c5ba74dbd83227687e43485144dc06457b04198565c0971c87c0ceb9641186d619bb3c1167c27d7aadd2061dc927884cb1153cda12ee20c2412d
-EBUILD gpaste-44.1.ebuild 1662 BLAKE2B c8dd6aa461721213f7a431048620d9e0aaaded759f22dceffda4dbc47401976e5b595fc77966ea92cebc0e6fa1152a1dc40d7f37e4a929aca19b4d183e4ca3a0 SHA512 7375457ff5148935756392ff0088bbdf431248ae9adf8b77f975322d269843dd2a5a81cf399e4c370d9cd2ec8b1272dadc31c71f7f47d9c43afd920c9f45865f
-EBUILD gpaste-45.ebuild 1662 BLAKE2B c8dd6aa461721213f7a431048620d9e0aaaded759f22dceffda4dbc47401976e5b595fc77966ea92cebc0e6fa1152a1dc40d7f37e4a929aca19b4d183e4ca3a0 SHA512 7375457ff5148935756392ff0088bbdf431248ae9adf8b77f975322d269843dd2a5a81cf399e4c370d9cd2ec8b1272dadc31c71f7f47d9c43afd920c9f45865f
-MISC metadata.xml 677 BLAKE2B 79d617528e62670788eda4ba64b9698d04b3255f10f8baf2fdce7c7a3708a247b1b839bdf419053b61bc4a6a6200d79033c799c30b6aa29786e6d4b19ebf0954 SHA512 46348240699731847dbb0c55e89386c6ecd5ee9ccc32114eb41a1007cb21e9eaa25930b92a0e470083d64f854b8c5aff055af90f52e4f55dbb36299f6c8b32d2
diff --git a/x11-misc/gpaste/gpaste-44.1.ebuild b/x11-misc/gpaste/gpaste-44.1.ebuild
index eb38c18..9e6fcf1 100644
--- a/x11-misc/gpaste/gpaste-44.1.ebuild
+++ b/x11-misc/gpaste/gpaste-44.1.ebuild
@@ -12,10 +12,13 @@ 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"
 
+S="${WORKDIR}/GPaste-${PV}"
+
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+gnome +introspection systemd vala"
+
 REQUIRED_USE="
 	gnome? ( introspection )
 	vala? ( introspection )
@@ -59,10 +62,8 @@ RDEPEND="${DEPEND}
 	)
 "
 
-S="${WORKDIR}/GPaste-${PV}"
-
 src_prepare() {
-	use vala && vala_src_prepare
+	use vala && vala_setup
 	default
 }
 
diff --git a/x11-misc/gpaste/gpaste-45.ebuild b/x11-misc/gpaste/gpaste-45.ebuild
index eb38c18..9e6fcf1 100644
--- a/x11-misc/gpaste/gpaste-45.ebuild
+++ b/x11-misc/gpaste/gpaste-45.ebuild
@@ -12,10 +12,13 @@ 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"
 
+S="${WORKDIR}/GPaste-${PV}"
+
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+gnome +introspection systemd vala"
+
 REQUIRED_USE="
 	gnome? ( introspection )
 	vala? ( introspection )
@@ -59,10 +62,8 @@ RDEPEND="${DEPEND}
 	)
 "
 
-S="${WORKDIR}/GPaste-${PV}"
-
 src_prepare() {
-	use vala && vala_src_prepare
+	use vala && vala_setup
 	default
 }