Depend on subvertpy or subversion[python]. Bug 393269 by Micha Glave.

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

diff --git a/dev-vcs/hgsubversion/ChangeLog b/dev-vcs/hgsubversion/ChangeLog
index acb2dd8e6fa609398570d66a18a94ee71df138b8..e7b3887f9870f7054e04a9b794d9e7eac656c644 100644 (file)
--- a/dev-vcs/hgsubversion/ChangeLog
+++ b/dev-vcs/hgsubversion/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-vcs/hgsubversion
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/hgsubversion/ChangeLog,v 1.18 2011/11/15 03:12:00 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/hgsubversion/ChangeLog,v 1.19 2011/12/21 22:16:34 floppym Exp $
+
+  21 Dec 2011; Mike Gilbert <floppym@gentoo.org> hgsubversion-1.3.ebuild:
+  Depend on subvertpy or subversion[python]. Bug 393269 by Micha Glave.
 
 *hgsubversion-1.3 (15 Nov 2011)
 

diff --git a/dev-vcs/hgsubversion/Manifest b/dev-vcs/hgsubversion/Manifest
index b0ed92119261e1d312c30c6bdfac82d074dbbaf1..e74564f4e298c0788ba5225ab05cb1b9f0f92b69 100644 (file)
--- a/dev-vcs/hgsubversion/Manifest
+++ b/dev-vcs/hgsubversion/Manifest
@@ -4,13 +4,13 @@ Hash: SHA256
 DIST hgsubversion-1.2.1.tar.gz 122526 RMD160 9f1bda718d582da6615cd0b424115a662d17b61b SHA1 fd0cc97a4477316bed4915c8a5cf265ec8b4fcad SHA256 081d10fc36e42e963680750da2fbc48ef74e6f2223d73a9746a07955173ea8c8
 DIST hgsubversion-1.3.tar.gz 126413 RMD160 6ffa6ddb1407410cd3df731240714a1f60b20580 SHA1 2e1eeec8bb10d4c1882f14de8c5c48d6f1535893 SHA256 7e83fe6fc7f02ecfaa88579ca78cbed5b8afebfdfcfa27b76e66cd5f5ee3870a
 EBUILD hgsubversion-1.2.1.ebuild 1338 RMD160 7dc95815b56aed001f3ae6653a4555dd314c6873 SHA1 a74e3f4903b9d75a5b730ce75350e7b8324b2b59 SHA256 6421064ffc2f55b386982824153b8e54c87a9b4008eb56c1180597c4bc756981
-EBUILD hgsubversion-1.3.ebuild 928 RMD160 802d821b0ef0a2ace6bf2ab737ef034f3fdd8366 SHA1 52eed1ab0517e8240db404795af85696d8e68de3 SHA256 492361cf77fa1ae03f76494e4561e7610f2b6597b49cd14fda0bec638bacb235
-MISC ChangeLog 2782 RMD160 527f3aeec9628b3f2f51b6574af181be93077865 SHA1 eb94905e4ba7a39e60294c291f08aa129ba61b9d SHA256 2c6d55905e290f848b15e2dd07723f6b5ff5b2759a526c5745c2d41dff7ab823
+EBUILD hgsubversion-1.3.ebuild 961 RMD160 e1d3b469f5acaaf5b897896e88bb3ac0f064f508 SHA1 4bf2a61d09068c94ea033e32b6fdd809888d88a2 SHA256 b4c771565e7f0aa28cd3e4198fd24193f99fb029119a70de5d2795c55b2af2be
+MISC ChangeLog 2929 RMD160 c1eebfdbaa45e352da86e715f3343b08d52516b3 SHA1 38b181af8d7aed6d101e3a7799e3bf700253057f SHA256 55bdeafdf7ad3e90374f3970b53d422cf025efafdb4e324a567813372c2f3204
 MISC metadata.xml 259 RMD160 4b781a038008fac445e4154045f964b64ad59e75 SHA1 9809d89f3360f9f7537c2bb480d6bcbe942c6ea0 SHA256 0fb1da675767b69b5bd240d135effe2fc500e8b997a5f4eed212e5b26d027972
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk7B2IgACgkQC77qH+pIQ6SI8QEArqpzi4Uk4JFlf7dxB1RBu4HR
-iw8Mzdm5NQekbNbFD6wBAMVhwvXsxpBj0QtvKlOjO3Wt319tswXvSc7PX8CBpEG9
-=mRtK
+iF4EAREIAAYFAk7yWsgACgkQC77qH+pIQ6Q1DAD/VlGcYLe/nqjDwn7CgXUvECc2
+Lz6uc1etr5cwfGEEGvwA/Az/A6NsvDIF09aEK3mJdgqSr89R8yh4R7YH9vx8/tWb
+=r0fE
 -----END PGP SIGNATURE-----

diff --git a/dev-vcs/hgsubversion/hgsubversion-1.3.ebuild b/dev-vcs/hgsubversion/hgsubversion-1.3.ebuild
index bbf02df117d6f47e8edc8f156399180fb18279c3..dbfc3e5cae4c8bd1d6536259e7f4635de750adfb 100644 (file)
--- a/dev-vcs/hgsubversion/hgsubversion-1.3.ebuild
+++ b/dev-vcs/hgsubversion/hgsubversion-1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/hgsubversion/hgsubversion-1.3.ebuild,v 1.1 2011/11/15 03:12:00 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/hgsubversion/hgsubversion-1.3.ebuild,v 1.2 2011/12/21 22:16:34 floppym Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -19,7 +19,11 @@ KEYWORDS="~amd64 ~x86 ~ppc-macos ~x86-solaris"
 IUSE="test"
 
 RDEPEND=">=dev-vcs/mercurial-1.4
-               >=dev-vcs/subversion-1.5[python]"
+       || (
+               dev-python/subvertpy
+               >=dev-vcs/subversion-1.5[python]
+       )
+"
 DEPEND="test? ( dev-python/nose )"
 
 DOCS="README"