Add slot to dev-python/pydns dependency. #411035 by Lutz Schildt.

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

4 files changed, 25 insertions, 11 deletions

diff --git a/dev-python/pyspf/ChangeLog b/dev-python/pyspf/ChangeLog
index 1d78eea843b3..71d89bc395c4 100644
--- a/dev-python/pyspf/ChangeLog
+++ b/dev-python/pyspf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/pyspf
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyspf/ChangeLog,v 1.16 2012/02/08 06:05:03 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyspf/ChangeLog,v 1.17 2012/04/08 19:47:52 floppym Exp $
+
+  08 Apr 2012; Mike Gilbert <floppym@gentoo.org> pyspf-2.0.5.ebuild,
+  pyspf-2.0.6.ebuild:
+  Add slot to dev-python/pydns dependency. #411035 by Lutz Schildt.
 
   08 Feb 2012; Patrick Lauer <patrick@gentoo.org> Manifest:
   Manifest fix
diff --git a/dev-python/pyspf/Manifest b/dev-python/pyspf/Manifest
index 055f9f0014e4..d4eb87dcf359 100644
--- a/dev-python/pyspf/Manifest
+++ b/dev-python/pyspf/Manifest
@@ -1,6 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST pyspf-2.0.5.tar.gz 38818 RMD160 83fa42570bffbf1ec1934db2d534fad1f4b3b8c6 SHA1 8401e96afe6a141a24286f24108f40adcdd3b4f8 SHA256 a9e143fefc6bafd9f6e39b1b62eaaafae8bf96bdc25961ff1d55d01b173bf0b0
 DIST pyspf-2.0.6.tar.gz 43448 RMD160 920847c0166c0ae1c4ac8a992128d6cd3dcaf372 SHA1 6d678e6e31eaa59c00cb19d4a28e4b59f7cf6792 SHA256 ed20f35d8c1d60516b195ec08ce7c8479d450be28fd37baaab58dbf570ceb429
-EBUILD pyspf-2.0.5.ebuild 631 RMD160 87ebf9941d52c5d7d847f31e4e729c0061665ae8 SHA1 971bb7a5ced61d23e55e2934d1ee420a708738ba SHA256 872c195456a4ff2e0e933b0cfdb96f9254d70a3d48cbef466a1bb3212f8e0312
-EBUILD pyspf-2.0.6.ebuild 632 RMD160 0a7c2e323c4c877629c57b9a970d298d72d6c53b SHA1 f56e02f66d816d3acd1a84fb6ca156753a9a3ed7 SHA256 98a86d3c5ed10bd80d7124f2f8858220ff0c84d6079976312415c801c91539ff
-MISC ChangeLog 1726 RMD160 73b391b65bd254a8b16633a7e5e3960f5aec6476 SHA1 46849046c2531053bfcf4336de63c4775d908849 SHA256 734c14562740c5a97e28f1bc6ac4bd010a9c14482dee4168ee734f340022b54c
+EBUILD pyspf-2.0.5.ebuild 651 RMD160 e15fe9e84cf9eadc247a6de59519b8e23299d7fd SHA1 e778eb348c1caf5fee9bf3571209401565928fe1 SHA256 e450d77884e3882e53160e7a557cc74d0c753b5692ed4082417e99000cb9407a
+EBUILD pyspf-2.0.6.ebuild 653 RMD160 8270aa363161ba76d3de398b73e882ac8dfa13ee SHA1 cb5aefb8bb5188a1d38dd84c9a15c210e282f53e SHA256 6dd56c9cc117bcd3ad26545781a3e176bd27ea02244a6df3cb62ba310d2324c6
+MISC ChangeLog 1886 RMD160 38df6de7464a291ae258d2a676f42f9ea7b3a720 SHA1 6769b008c4675aa26947dec63384e8ab254c0acc SHA256 da099419df10d267d0fb02be400328731545b8f207fca78120bd2326bc648fbc
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk+B624ACgkQC77qH+pIQ6QXvQD+OmIP4NosRooL4MQnGXM/3HBk
+ERcS3eIbePZ4l3RLanQA/0Eh8r4NjouUkKcBKK6mF+L8IFD7tM0HyIpz8LuIjYOa
+=ULak
+-----END PGP SIGNATURE-----
diff --git a/dev-python/pyspf/pyspf-2.0.5.ebuild b/dev-python/pyspf/pyspf-2.0.5.ebuild
index 88a0c2a4348f..998b79b91679 100644
--- a/dev-python/pyspf/pyspf-2.0.5.ebuild
+++ b/dev-python/pyspf/pyspf-2.0.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyspf/pyspf-2.0.5.ebuild,v 1.4 2011/11/04 22:21:38 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyspf/pyspf-2.0.5.ebuild,v 1.5 2012/04/08 19:47:51 floppym Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -18,7 +18,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-DEPEND="dev-python/pydns"
-RDEPEND="dev-python/pydns"
+DEPEND="|| ( dev-python/pydns:2 dev-python/pydns:0 )"
+RDEPEND="${DEPEND}"
 
 PYTHON_MODNAME="spf.py"
diff --git a/dev-python/pyspf/pyspf-2.0.6.ebuild b/dev-python/pyspf/pyspf-2.0.6.ebuild
index 4ea35362054e..90159c5dff25 100644
--- a/dev-python/pyspf/pyspf-2.0.6.ebuild
+++ b/dev-python/pyspf/pyspf-2.0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyspf/pyspf-2.0.6.ebuild,v 1.1 2012/02/08 06:00:48 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyspf/pyspf-2.0.6.ebuild,v 1.2 2012/04/08 19:47:51 floppym Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -18,7 +18,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="dev-python/pydns"
-RDEPEND="dev-python/pydns"
+DEPEND="|| ( dev-python/pydns:2 dev-python/pydns:0 )"
+RDEPEND="${DEPEND}"
 
 PYTHON_MODNAME="spf.py"