diff --git a/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-1.29.0-r1.ebuild b/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-1.29.0-r2.ebuild
similarity index 76%
rename from app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-1.29.0-r1.ebuild
rename to app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-1.29.0-r2.ebuild
index fb1a22fb0c..302d6a7dd1 100644
--- a/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-1.29.0-r1.ebuild
+++ b/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-1.29.0-r2.ebuild
@@ -18,6 +18,7 @@ if [[ "${PV}" == *9999 ]]; then
 	EGIT_SUBMODULES=()
 	EGIT_CHECKOUT_DIR="${WORKDIR}/${PARENT_PN}"
 else
+	# To rename with .gh.tar.gz extension once parent package also uses this naming.
 	SRC_URI="
 		https://github.com/certbot/certbot/archive/v${PV}.tar.gz
 			-> ${PARENT_P}.tar.gz
@@ -46,12 +47,20 @@ RDEPEND="
 
 distutils_enable_tests pytest
 
+# Same than PATCHES but from repository's root directory,
+# please see function `python_prepare_all` below.
+# Simplier for users IMHO.
+PARENT_PATCHES=(
+)
+
+# Here for patches within "${PN}" subdirectory.
 PATCHES=(
 )
 
 python_prepare_all() {
 	pushd "${WORKDIR}/${PARENT_P}" > /dev/null || die
-	default
+	[[ -n "${PARENT_PATCHES[@]}" ]] && eapply "${PARENT_PATCHES[@]}"
+	eapply_user
 	popd > /dev/null || die
 
 	distutils-r1_python_prepare_all
diff --git a/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-1.30.0.ebuild b/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-1.30.0-r1.ebuild
similarity index 76%
rename from app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-1.30.0.ebuild
rename to app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-1.30.0-r1.ebuild
index 425291d67b..c08c715c9b 100644
--- a/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-1.30.0.ebuild
+++ b/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-1.30.0-r1.ebuild
@@ -18,6 +18,7 @@ if [[ "${PV}" == *9999 ]]; then
 	EGIT_SUBMODULES=()
 	EGIT_CHECKOUT_DIR="${WORKDIR}/${PARENT_PN}"
 else
+	# To rename with .gh.tar.gz extension once parent package also uses this naming.
 	SRC_URI="
 		https://github.com/certbot/certbot/archive/v${PV}.tar.gz
 			-> ${PARENT_P}.tar.gz
@@ -46,12 +47,20 @@ RDEPEND="
 
 distutils_enable_tests pytest
 
+# Same than PATCHES but from repository's root directory,
+# please see function `python_prepare_all` below.
+# Simplier for users IMHO.
+PARENT_PATCHES=(
+)
+
+# Here for patches within "${PN}" subdirectory.
 PATCHES=(
 )
 
 python_prepare_all() {
 	pushd "${WORKDIR}/${PARENT_P}" > /dev/null || die
-	default
+	[[ -n "${PARENT_PATCHES[@]}" ]] && eapply "${PARENT_PATCHES[@]}"
+	eapply_user
 	popd > /dev/null || die
 
 	distutils-r1_python_prepare_all
diff --git a/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-9999.ebuild b/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-9999.ebuild
index 425291d67b..0879881259 100644
--- a/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-9999.ebuild
+++ b/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-9999.ebuild
@@ -20,7 +20,7 @@ if [[ "${PV}" == *9999 ]]; then
 else
 	SRC_URI="
 		https://github.com/certbot/certbot/archive/v${PV}.tar.gz
-			-> ${PARENT_P}.tar.gz
+			-> ${PARENT_P}.gh.tar.gz
 	"
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
@@ -46,12 +46,20 @@ RDEPEND="
 
 distutils_enable_tests pytest
 
+# Same than PATCHES but from repository's root directory,
+# please see function `python_prepare_all` below.
+# Simplier for users IMHO.
+PARENT_PATCHES=(
+)
+
+# Here for patches within "${PN}" subdirectory.
 PATCHES=(
 )
 
 python_prepare_all() {
 	pushd "${WORKDIR}/${PARENT_P}" > /dev/null || die
-	default
+	[[ -n "${PARENT_PATCHES[@]}" ]] && eapply "${PARENT_PATCHES[@]}"
+	eapply_user
 	popd > /dev/null || die
 
 	distutils-r1_python_prepare_all