diff --git a/mail-filter/maildrop/maildrop-3.0.2-r1.ebuild b/mail-filter/maildrop/maildrop-3.0.2-r1.ebuild
index e84b6576659eb..9fc28210b51b8 100644
--- a/mail-filter/maildrop/maildrop-3.0.2-r1.ebuild
+++ b/mail-filter/maildrop/maildrop-3.0.2-r1.ebuild
@@ -10,6 +10,8 @@ DESCRIPTION="Mail delivery agent/filter"
 [[ -z ${SRC_URI}   ]] && SRC_URI="https://www.courier-mta.org/beta/${PN}/${P%%_pre}.tar.bz2"
 HOMEPAGE="https://www.courier-mta.org/maildrop/"
 
+S=${WORKDIR}/${P%%_pre}
+
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
@@ -46,8 +48,6 @@ REQUIRED_USE="
 	postgres? ( authlib )
 	ldap? ( authlib )"
 
-S=${WORKDIR}/${P%%_pre}
-
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.0.0-testsuite.patch
 	"${FILESDIR}"/${P}-makedat.patch
diff --git a/mail-filter/maildrop/maildrop-3.0.2.ebuild b/mail-filter/maildrop/maildrop-3.0.2.ebuild
index fb3bf94cabfcd..dcced262f55f4 100644
--- a/mail-filter/maildrop/maildrop-3.0.2.ebuild
+++ b/mail-filter/maildrop/maildrop-3.0.2.ebuild
@@ -10,6 +10,8 @@ DESCRIPTION="Mail delivery agent/filter"
 [[ -z ${SRC_URI}   ]] && SRC_URI="https://www.courier-mta.org/beta/${PN}/${P%%_pre}.tar.bz2"
 HOMEPAGE="https://www.courier-mta.org/maildrop/"
 
+S=${WORKDIR}/${P%%_pre}
+
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ppc ppc64 ~s390 sparc x86"
@@ -44,8 +46,6 @@ REQUIRED_USE="
 	postgres? ( authlib )
 	ldap? ( authlib )"
 
-S=${WORKDIR}/${P%%_pre}
-
 src_prepare() {
 	# Prefer gdbm over berkdb
 	if use gdbm ; then
diff --git a/mail-filter/maildrop/maildrop-3.1.4.ebuild b/mail-filter/maildrop/maildrop-3.1.4.ebuild
index 4cbac45ac77e4..376f072416c1e 100644
--- a/mail-filter/maildrop/maildrop-3.1.4.ebuild
+++ b/mail-filter/maildrop/maildrop-3.1.4.ebuild
@@ -10,6 +10,8 @@ DESCRIPTION="Mail delivery agent/filter"
 [[ -z ${SRC_URI}   ]] && SRC_URI="https://www.courier-mta.org/beta/${PN}/${P%%_pre}.tar.bz2"
 HOMEPAGE="https://www.courier-mta.org/maildrop/"
 
+S=${WORKDIR}/${P%%_pre}
+
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
@@ -45,8 +47,6 @@ REQUIRED_USE="
 	postgres? ( authlib )
 	ldap? ( authlib )"
 
-S=${WORKDIR}/${P%%_pre}
-
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.1.1-testsuite.patch
 	"${FILESDIR}"/${PN}-3.0.2-makedat.patch
diff --git a/mail-filter/maildrop/maildrop-3.1.5.ebuild b/mail-filter/maildrop/maildrop-3.1.5.ebuild
index 3e6dad361c2ad..baeb0fa6fe86d 100644
--- a/mail-filter/maildrop/maildrop-3.1.5.ebuild
+++ b/mail-filter/maildrop/maildrop-3.1.5.ebuild
@@ -10,6 +10,8 @@ DESCRIPTION="Mail delivery agent/filter"
 [[ -z ${SRC_URI}   ]] && SRC_URI="https://www.courier-mta.org/beta/${PN}/${P%%_pre}.tar.bz2"
 HOMEPAGE="https://www.courier-mta.org/maildrop/"
 
+S=${WORKDIR}/${P%%_pre}
+
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
@@ -46,8 +48,6 @@ REQUIRED_USE="
 	postgres? ( authlib )
 	ldap? ( authlib )"
 
-S=${WORKDIR}/${P%%_pre}
-
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.1.1-testsuite.patch
 	"${FILESDIR}"/${P}-common.patch
diff --git a/mail-filter/maildrop/maildrop-3.1.6-r2.ebuild b/mail-filter/maildrop/maildrop-3.1.6-r2.ebuild
index 4755387a54d8f..7fe9f18ddd49b 100644
--- a/mail-filter/maildrop/maildrop-3.1.6-r2.ebuild
+++ b/mail-filter/maildrop/maildrop-3.1.6-r2.ebuild
@@ -10,6 +10,8 @@ DESCRIPTION="Mail delivery agent/filter"
 [[ -z ${SRC_URI}   ]] && SRC_URI="https://www.courier-mta.org/beta/${PN}/${P%%_pre}.tar.bz2"
 HOMEPAGE="https://www.courier-mta.org/maildrop/"
 
+S=${WORKDIR}/${P%%_pre}
+
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ppc ppc64 ~s390 sparc x86"
@@ -46,8 +48,6 @@ REQUIRED_USE="
 	postgres? ( authlib )
 	ldap? ( authlib )"
 
-S=${WORKDIR}/${P%%_pre}
-
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.1.1-testsuite.patch
 	"${FILESDIR}"/${P}-valgrind.patch