summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Dolbec <dolsen@gentoo.org>2014-01-07 02:54:58 +0000
committerBrian Dolbec <dolsen@gentoo.org>2014-01-07 02:54:58 +0000
commitc2136ea4f4eb9d98e19276e04008166d764c6c7b (patch)
tree295b3ce44e2d5060ec16b1a7ce51ecff05a455c4 /app-portage
parentAdd dev-vcs/subversion[http] to the || dep in DEPEND. Patch by Arfrever. (diff)
downloadgentoo-2-c2136ea4f4eb9d98e19276e04008166d764c6c7b.tar.gz
gentoo-2-c2136ea4f4eb9d98e19276e04008166d764c6c7b.tar.bz2
gentoo-2-c2136ea4f4eb9d98e19276e04008166d764c6c7b.zip
Fix subversion dep for the new http use flag
(Portage version: 2.2.8/cvs/Linux x86_64, signed Manifest commit with key 0x65E309F2189DB0B8)
Diffstat (limited to 'app-portage')
-rw-r--r--app-portage/layman/ChangeLog9
-rw-r--r--app-portage/layman/layman-1.4.2-r3.ebuild5
-rw-r--r--app-portage/layman/layman-2.0.0.ebuild5
-rw-r--r--app-portage/layman/layman-9999.ebuild5
4 files changed, 16 insertions, 8 deletions
diff --git a/app-portage/layman/ChangeLog b/app-portage/layman/ChangeLog
index 7ae63cdb6d1e..8ba946a87fc3 100644
--- a/app-portage/layman/ChangeLog
+++ b/app-portage/layman/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for app-portage/layman
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/ChangeLog,v 1.182 2013/09/14 23:49:08 floppym Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/ChangeLog,v 1.183 2014/01/07 02:54:58 dolsen Exp $
+
+ 07 Jan 2014; Brian Dolbec <dolsen@gentoo.org> layman-1.4.2-r3.ebuild,
+ layman-2.0.0.ebuild, layman-9999.ebuild:
+ Update the subversion dep as per bug #497324. Subversion-185's new
+ "http" use flag.
14 Sep 2013; Mike Gilbert <floppym@gentoo.org> layman-2.0.0.ebuild:
Call distutils-r1_python_prepare_all.
diff --git a/app-portage/layman/layman-1.4.2-r3.ebuild b/app-portage/layman/layman-1.4.2-r3.ebuild
index b725d1eb39d3..229e882d0baa 100644
--- a/app-portage/layman/layman-1.4.2-r3.ebuild
+++ b/app-portage/layman/layman-1.4.2-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-1.4.2-r3.ebuild,v 1.9 2012/11/06 07:17:09 dolsen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-1.4.2-r3.ebuild,v 1.10 2014/01/07 02:54:58 dolsen Exp $
EAPI="2"
PYTHON_DEPEND="2:2.5"
@@ -29,6 +29,7 @@ RDEPEND="${COMMON_DEPS}
mercurial? ( dev-vcs/mercurial )
subversion? (
|| (
+ >=dev-vcs/subversion-1.5.4[http]
>=dev-vcs/subversion-1.5.4[webdav-neon]
>=dev-vcs/subversion-1.5.4[webdav-serf]
)
diff --git a/app-portage/layman/layman-2.0.0.ebuild b/app-portage/layman/layman-2.0.0.ebuild
index 69a39d6588b4..082b4fb4916c 100644
--- a/app-portage/layman/layman-2.0.0.ebuild
+++ b/app-portage/layman/layman-2.0.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-2.0.0.ebuild,v 1.15 2013/09/14 23:49:08 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-2.0.0.ebuild,v 1.16 2014/01/07 02:54:58 dolsen Exp $
EAPI="5"
@@ -28,6 +28,7 @@ RDEPEND="
mercurial? ( dev-vcs/mercurial )
subversion? (
|| (
+ >=dev-vcs/subversion-1.5.4[http]
>=dev-vcs/subversion-1.5.4[webdav-neon]
>=dev-vcs/subversion-1.5.4[webdav-serf]
)
diff --git a/app-portage/layman/layman-9999.ebuild b/app-portage/layman/layman-9999.ebuild
index c8f8780aea3f..c949bd81ff92 100644
--- a/app-portage/layman/layman-9999.ebuild
+++ b/app-portage/layman/layman-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-9999.ebuild,v 1.31 2013/08/10 17:14:01 dolsen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-9999.ebuild,v 1.32 2014/01/07 02:54:58 dolsen Exp $
EAPI="5"
@@ -30,6 +30,7 @@ RDEPEND="
mercurial? ( dev-vcs/mercurial )
subversion? (
|| (
+ >=dev-vcs/subversion-1.5.4[http]
>=dev-vcs/subversion-1.5.4[webdav-neon]
>=dev-vcs/subversion-1.5.4[webdav-serf]
)