Revbump fixing bugs #503270 (python-3.x support) and #503124.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x6F48D3DA05C2DADB!

4 files changed, 79 insertions, 49 deletions

diff --git a/mail-filter/pypolicyd-spf/ChangeLog b/mail-filter/pypolicyd-spf/ChangeLog
index f815bdfea307..48ff87f22415 100644
--- a/mail-filter/pypolicyd-spf/ChangeLog
+++ b/mail-filter/pypolicyd-spf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-filter/pypolicyd-spf
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/pypolicyd-spf/ChangeLog,v 1.31 2014/03/03 00:17:11 mjo Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/pypolicyd-spf/ChangeLog,v 1.32 2014/05/10 03:28:18 mjo Exp $
+
+*pypolicyd-spf-1.2-r1 (10 May 2014)
+
+  10 May 2014; Michael Orlitzky <mjo@gentoo.org> +pypolicyd-spf-1.2-r1.ebuild,
+  -pypolicyd-spf-1.2.ebuild:
+  Revbump fixing bugs #503270 (python-3.x support) and #503124.
 
 *pypolicyd-spf-1.2 (03 Mar 2014)
 
diff --git a/mail-filter/pypolicyd-spf/Manifest b/mail-filter/pypolicyd-spf/Manifest
index acb1030aeebd..35954aed0e28 100644
--- a/mail-filter/pypolicyd-spf/Manifest
+++ b/mail-filter/pypolicyd-spf/Manifest
@@ -6,25 +6,25 @@ DIST pypolicyd-spf-1.1.tar.gz 469687 SHA256 93ca747e1e62d05a3e3fa54b9415f6c6da7f
 DIST pypolicyd-spf-1.2.tar.gz 30783 SHA256 e1a94c79ad91cfea17b9c8b19b035536f06d75ff9ee2e8478191e7c27fe69f74 SHA512 266dc129f0d0bf59b809d3ec6f47369c73d6c5287b1505f0762a9e92ab9dbc3b6afc14ff59d8298012dc4c8b2e7c05d85bab227e71592bc0ee47b0a88cf4df45 WHIRLPOOL 8817c0357aa6850010f144d66408048edf569977eb65f733bedbc3f996273a1d636948ce86ec38cf4b81df66d5546acc2d8dced0185ec93f469d919242405e8e
 EBUILD pypolicyd-spf-1.1.2.ebuild 735 SHA256 c26b093d6f81223a1e78547aca5bab63d9409fe875989c5773abbd17e2d3a70b SHA512 8cae7689b837e53f8c1f8f9bb6c73ec9a7a4aea7d8b6d443a66c23032302a77c7026342d938435c3f12dd7b1cb4f1c2b252f749311247f4376c3b502690e9494 WHIRLPOOL b0f744cfa8f7e029fe3f9727dcba6850930a87df725dd4463ecd4a054f5e296325075973c9afc66c1d9e914d4738a89394cf1b816312f7de72f544a4464c916b
 EBUILD pypolicyd-spf-1.1.ebuild 754 SHA256 b48347ed874e91f56b4fb8cc776c5f3103321de93dd5ed95651fc68600823507 SHA512 c7ccaeb291be77bfd8007ba70444cc895204842e4d85c605c07ae72c52908dbd6f70c786beccf4cf01daaa6ccbc59afaad0b68eb1480c6253256f533000e7661 WHIRLPOOL 9e084a8220f91700eaf921b6f956f7d2067180767fa3c9eb9b6b4a6c990adbafc34298ecf2ac3a5137630256de6b0b78b5c123d7e9ec7bae40035d551c6a7a45
-EBUILD pypolicyd-spf-1.2.ebuild 971 SHA256 42075f762d78d4ffc8ff8f77c6dd3be49365b86682b0c71ea15413d95662a86e SHA512 702d13d0fac33aae540d466fba3d9c544c1b6eee574176d36c28c1c680c5b778ebc30056e994ffbcfde6d6d1074fb7a5f4b0fdf8222609a1b784fa9bc4cff9e2 WHIRLPOOL 17ca9837f3c34c8151079cc98b4bddebb0734809b2ce0a38cf86df8c98a464fd057540407d92d21c0c0f0a0263677e7cb75cc31568968fc74670a984afe31219
-MISC ChangeLog 5286 SHA256 fed9070b11ec622070969db3376157f2d4027eb24d53f479db15c53d0b33442f SHA512 29d25cad88ca03a9b631f3e4f78873d6045aba7b9b323642d75edcbef09b4fa8296512b17c42e23597ed99b6d81a5ff8dcb58a10b0b621d40457bd99a383b7fb WHIRLPOOL d2c125c4dbcc9d987f436fb540918c32c5f99b6a43951f7f81bc39171c90e05d0170799584e750346bf138115b222700c0f43d91eec12eea55ef42b294665605
+EBUILD pypolicyd-spf-1.2-r1.ebuild 1842 SHA256 806d6fc061777ec5b005148a716631eaa78e6937fb35bc2a7248797a3f602946 SHA512 624cb5220e1568ed2e65ede0edc3486880b68c9be919d3a7798d3708b11fc5813317594fd4122677b6d3a3d64a53bdf376def52dc511baf05d2044c534c60a12 WHIRLPOOL fa09f752ef514f914844b61537c3010bd04ec0d40428b991df59fcc9cba719e00c26035603ff0332a3545907b2a51d29f267640a607011aa17233ec0eeb17743
+MISC ChangeLog 5496 SHA256 074890c0d9a07fb539294f302a86c6af9d1272d5bd2f733537c9e1854254e4c3 SHA512 3a4a6b99653235bfaf748cfa0710dd636e8b4a301e26b2ed6d08fb945117155cba49c73e1441e4a10ef331fe68e5ab89c8420a15783f455265069d0977fc2af7 WHIRLPOOL 324819c42f71deb72517e9e421c7510e5ebc60b0ef6d2e3916b8d31b6865088867078458d0ab7d51186fabc58f108361d7e32ac3ac62d92517cbc9d1d993e212
 MISC metadata.xml 198 SHA256 179c6f13a84c31ea7305a54d0be4bb4056895a6372049a8a0a51aeeaa01c35d8 SHA512 2057381d2aea02f2c9fb8479b2881b00968950c99ab78b5516c574f05cae99d75a9219e28f208473a89332a6fe05a63a84bd93baf9e6a811e7dc5c5f73f38b7f WHIRLPOOL 0b13d7bc793e33311bd81958b6eb15934f432ff463d9a1a1928ab6a7b3c554aadaa05590126367ef378e98110e42bfbbe28261d9cbc296d82af8dd57a987adb6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJTE8oLXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJTbZzXXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQxNEU5RDcyRDdCMUFGREVGQzBCNDFDMUY2
-RjQ4RDNEQTA1QzJEQURCAAoJEG9I09oFwtrbXmcQAKazU0EQUWQ5k2EDxtn0jnub
-WTaxhPBsx3zrijBajHwWNyR9EVdqnLYICNlF2Xv8SNnDnkoYLLGkekTtskoQ3sr2
-BfGxFTv109I2TIwukdlOsWxw/F4pHYsuS2d/Uzgr8fJBLW7tXTuX2OfxDZs3QVQH
-fnpqOEy5m6VstG+H3exWJgMgeNVQ9pAb1cPKMCYWdit3y5eZWRTQZM2ZgWRv/Vrv
-RNAl+XSLbQpcOK7x41VAIV2RaOfjkB8IEg2CwGvSel9LKREdxAQACWKOCK/r/VOR
-QQjXF6CjcesQ3ekrNozgGWgXHe4Bwl9rMGY90uQEOD7Zzkc7KUwUh3qxDa2Tha69
-/CZsSBEpaTlPlyb0UsfGPIrrCXQIu3h8uvDx4JVE+5sKSuYkIuw3aaupjqUWkUau
-Jm/RNLKy36mGAF0OibsdAat9H0PSShmRNvw+dATeRD7vAizcQ62IwisFhmVCQmGp
-XBjMR6M+Eo2tRwl73naB5pq4TwtUOc6W1E07kKNcQP2c3erxya06oAJldm7dXjw9
-xH6ES+HJlZNBP8m4uxADJ5ViOIZYxSB0cLWnq/ojH4Ze3MhU0FSk1o53wLj9XX4D
-t2jD7u1LImckVNrOLdKGpdi9K9pbcgCgm9hMVOD6bRFYEQqQj8MQzjV/7ad4NI+y
-hDSp+31zyNhXupz3iwMR
-=zCvS
+RjQ4RDNEQTA1QzJEQURCAAoJEG9I09oFwtrbC3sP/0LiTkH1qsbrj36lB5l7Bd7T
+EFMdoKXZ5NPgr4WG2rnapgdqWlHLzjrG+xZ/cQeDNky2XJ983mAJQeutZVD3Fsfj
+arSLdcMnpN4CtQ0E5eYxrEL95LA0ePWpR7BB87cObX29HuV01h+wXzy46OZb9m2B
+VNjAsL8Gy1eAOeX5eCuNiCHv1P4+jdvhLjDpepZswdyT+MgdGLTtN/oCHtchbcMr
+VkPiIWBASMd96RBj040z8v3AVzBZ9JTZnMPl6vrunogLAyFUv0diTwEE93FhmCGx
+STFovRe75dTw8Fhw+eL14P5M1OnABCTgiWGhjBcgr90rB+QqwJd7P67f0xQK7ZEa
+UC1/czvAUWH/61Xt2iDk61uYQqtP1WeXxZu/fGOMmVgDS0adV5Jrd7U23RyIzIML
+0ZzGwxC60kAxvWuuIdyp7SvqJ8NnbI7eN82sUHxGvHXfqh1XZSrNSrwHSQ9H1p+s
+TcAIZTMUGjAbY/KJ/Sc46/ar18dLoXAc+YJ6tQpLdghTnKscfDondaCcoH8uFVA7
+78lEMcoc7avvarFp9UIwtIZe7h2OZaRlr1qWbhXDPQTgNRHlmmm89Uol6A3En3gT
+KDG1XRT2Yqa3cFesvGrRjaKXbruxg50iFPvAuixnAxf7gV4ybAi3s9FYvseSvj/G
+1HfJDvATMJZIAaU5nVGA
+=9mdP
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/pypolicyd-spf/pypolicyd-spf-1.2-r1.ebuild b/mail-filter/pypolicyd-spf/pypolicyd-spf-1.2-r1.ebuild
new file mode 100644
index 000000000000..987a5c1a4005
--- /dev/null
+++ b/mail-filter/pypolicyd-spf/pypolicyd-spf-1.2-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/pypolicyd-spf/pypolicyd-spf-1.2-r1.ebuild,v 1.1 2014/05/10 03:28:18 mjo Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,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."
+PYTHON_REQ_USE="ipv6"
+
+inherit distutils-r1 versionator
+
+DESCRIPTION="Python-based policy daemon for Postfix SPF verification"
+HOMEPAGE="https://launchpad.net/pypolicyd-spf"
+SRC_URI="http://launchpad.net/pypolicyd-spf/$(get_version_component_range 1-2)/${PV}/+download/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# ipaddr is only needed with <python-3.3.
+#
+# The lower version bound is reported at,
+#
+#   https://bugs.launchpad.net/pypolicyd-spf/+bug/1229862
+#
+DEPEND="$(python_gen_cond_dep \
+			'>=dev-python/ipaddr-2.1.10[${PYTHON_USEDEP}]' \
+			'python2*')
+	dev-python/pyspf[${PYTHON_USEDEP}]"
+
+RDEPEND="${DEPEND}
+	dev-python/authres[${PYTHON_USEDEP}]"
+
+DOCS=( CHANGES policyd-spf.conf.commented README README.per_user_whitelisting )
+
+src_prepare() {
+	# The "real" config file mentions the commented one, so we point
+	# users in the right direction.
+	local oldconf="policyd-spf.conf.commented"
+	local newconf="/usr/share/doc/${PF}/${oldconf}"
+
+	sed -i "1 s~ ${oldconf}~,\n#  ${newconf}~" policyd-spf.conf \
+		|| die 'failed to update commented config file path'
+
+	distutils-r1_src_prepare
+}
diff --git a/mail-filter/pypolicyd-spf/pypolicyd-spf-1.2.ebuild b/mail-filter/pypolicyd-spf/pypolicyd-spf-1.2.ebuild
deleted file mode 100644
index 6c7ca47da42b..000000000000
--- a/mail-filter/pypolicyd-spf/pypolicyd-spf-1.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/pypolicyd-spf/pypolicyd-spf-1.2.ebuild,v 1.1 2014/03/03 00:17:11 mjo Exp $
-
-EAPI=5
-
-# >= python-3.2 are also supported, but not until the pyspf ebuilds are
-# updated.
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit distutils-r1 versionator
-
-DESCRIPTION="Python based policy daemon for Postfix SPF checking"
-HOMEPAGE="https://launchpad.net/pypolicyd-spf"
-SRC_URI="http://launchpad.net/pypolicyd-spf/$(get_version_component_range 1-2)/${PV}/+download/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# ipaddr is only needed with <python-3.3.
-#
-# The lower version bound is reported at,
-#
-#   https://bugs.launchpad.net/pypolicyd-spf/+bug/1229862
-#
-DEPEND=">=dev-python/ipaddr-2.1.10[${PYTHON_USEDEP}]
-	dev-python/pyspf[${PYTHON_USEDEP}]"
-
-RDEPEND="${DEPEND}
-	dev-python/authres[${PYTHON_USEDEP}]"