diff --git a/dev-lang/php/php-5.6.15-r1.ebuild b/dev-lang/php/php-5.6.15-r2.ebuild
similarity index 97%
rename from dev-lang/php/php-5.6.15-r1.ebuild
rename to dev-lang/php/php-5.6.15-r2.ebuild
index 726c56adaee8b..434d12758758f 100644
--- a/dev-lang/php/php-5.6.15-r1.ebuild
+++ b/dev-lang/php/php-5.6.15-r2.ebuild
@@ -81,21 +81,15 @@ DEPEND="
 	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
 		<www-servers/apache-2.4[threads=] ) )"
 
-# This wacky berkdb dependency really means "any 4.x or 5.x version of
-# sys-libs/db". The ./configure flag is called --with-db4, but this is a
-# misnomer since db5 also works (bug #521222). We really want to say
-# "any 4.x or 5.x slot", but that's not possible. The safest thing to
-# do is list all 4.x and 5.x slots in order of preference.
+# The supported (that is, autodetected) versions of BDB are listed in
+# the ./configure script. Other versions *work*, but we need to stick to
+# the ones that can be detected to avoid a repeat of bug #564824.
 DEPEND="${DEPEND}
-	berkdb? ( || ( sys-libs/db:5.3
-					sys-libs/db:5.1
+	berkdb? ( || ( 	sys-libs/db:5.1
 					sys-libs/db:4.8
 					sys-libs/db:4.7
 					sys-libs/db:4.6
-					sys-libs/db:4.5
-					sys-libs/db:4.4
-					sys-libs/db:4.3
-					sys-libs/db:4.2 ) )
+					sys-libs/db:4.5 ) )
 	bzip2? ( app-arch/bzip2 )
 	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
 	cjk? ( !gd? (
diff --git a/dev-lang/php/php-7.0.0_rc6.ebuild b/dev-lang/php/php-7.0.0_rc6-r1.ebuild
similarity index 97%
rename from dev-lang/php/php-7.0.0_rc6.ebuild
rename to dev-lang/php/php-7.0.0_rc6-r1.ebuild
index 933cebed567df..db4cc42ff8734 100644
--- a/dev-lang/php/php-7.0.0_rc6.ebuild
+++ b/dev-lang/php/php-7.0.0_rc6-r1.ebuild
@@ -81,21 +81,15 @@ DEPEND="
 	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
 		<www-servers/apache-2.4[threads=] ) )"
 
-# This wacky berkdb dependency really means "any 4.x or 5.x version of
-# sys-libs/db". The ./configure flag is called --with-db4, but this is a
-# misnomer since db5 also works (bug #521222). We really want to say
-# "any 4.x or 5.x slot", but that's not possible. The safest thing to
-# do is list all 4.x and 5.x slots in order of preference.
+# The supported (that is, autodetected) versions of BDB are listed in
+# the ./configure script. Other versions *work*, but we need to stick to
+# the ones that can be detected to avoid a repeat of bug #564824.
 DEPEND="${DEPEND}
-	berkdb? ( || ( sys-libs/db:5.3
-					sys-libs/db:5.1
+	berkdb? ( || ( 	sys-libs/db:5.1
 					sys-libs/db:4.8
 					sys-libs/db:4.7
 					sys-libs/db:4.6
-					sys-libs/db:4.5
-					sys-libs/db:4.4
-					sys-libs/db:4.3
-					sys-libs/db:4.2 ) )
+					sys-libs/db:4.5 ) )
 	bzip2? ( app-arch/bzip2 )
 	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
 	cjk? ( !gd? (