diff --git a/mail-filter/pypolicyd-spf/pypolicyd-spf-1.3.2.ebuild b/mail-filter/pypolicyd-spf/pypolicyd-spf-1.3.2-r1.ebuild
similarity index 53%
rename from mail-filter/pypolicyd-spf/pypolicyd-spf-1.3.2.ebuild
rename to mail-filter/pypolicyd-spf/pypolicyd-spf-1.3.2-r1.ebuild
index 080046136cb28..cf6af6ad89085 100644
--- a/mail-filter/pypolicyd-spf/pypolicyd-spf-1.3.2.ebuild
+++ b/mail-filter/pypolicyd-spf/pypolicyd-spf-1.3.2-r1.ebuild
@@ -4,16 +4,13 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+# See bug #559364 before getting clever with this.
+PYTHON_COMPAT=( python{3_3,3_4} )
 
-# With >=python-3.3, the built-in ipaddress module handles the parsing
-# of IP addresses. If python is built without ipv6 support, then
-# ipaddress can't parse ipv6 addresses, and the daemon will crash if it
-# sees an ipv6 SPF record. In other words, it's completely broken.
-#
-# Ideally this would remain optional for python-2.x, but until there's
-# an easy way to do that, "maybe annoying" seems a better option than
-# "maybe broken."
+# The built-in ipaddress module handles the parsing of IP addresses. If
+# python is built without ipv6 support, then ipaddress can't parse ipv6
+# addresses, and the daemon will crash if it sees an ipv6 SPF record. In
+# other words, it's completely broken.
 PYTHON_REQ_USE="ipv6"
 
 inherit distutils-r1
@@ -27,15 +24,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-# ipaddr is only needed with <python-3.3.
-#
-# The lower bound on pyspf is not strictly necessary, but some features
-# are silently disabled with older versions of pyspf.
-#
-DEPEND="$(python_gen_cond_dep \
-			'>=dev-python/ipaddr-2.1.10[${PYTHON_USEDEP}]' \
-			'python2*')
-	>=dev-python/pyspf-2.0.9[${PYTHON_USEDEP}]"
+DEPEND=">=dev-python/pyspf-2.0.9[${PYTHON_USEDEP}]"
 
 RDEPEND="${DEPEND}
 	dev-python/authres[${PYTHON_USEDEP}]"