summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2015-04-04 11:09:53 +0000
committerPacho Ramos <pacho@gentoo.org>2015-04-04 11:09:53 +0000
commit8c6e75f9ee8436d9dde020977350b0a466a45f0d (patch)
tree8d15305859972842f08eba01cd883d6f3b338500 /sys-block
parentBump http-client to 0.4.9 (diff)
downloadgentoo-2-8c6e75f9ee8436d9dde020977350b0a466a45f0d.tar.gz
gentoo-2-8c6e75f9ee8436d9dde020977350b0a466a45f0d.tar.bz2
gentoo-2-8c6e75f9ee8436d9dde020977350b0a466a45f0d.zip
Fix dependencies (#531050 by Ian Delaney), add support for python 3.4
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
Diffstat (limited to 'sys-block')
-rw-r--r--sys-block/blocks/ChangeLog9
-rw-r--r--sys-block/blocks/blocks-0.1.4_pre131210-r1.ebuild12
-rw-r--r--sys-block/blocks/blocks-9999.ebuild12
3 files changed, 20 insertions, 13 deletions
diff --git a/sys-block/blocks/ChangeLog b/sys-block/blocks/ChangeLog
index aba013dcb08d..2002a1563349 100644
--- a/sys-block/blocks/ChangeLog
+++ b/sys-block/blocks/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-block/blocks
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/blocks/ChangeLog,v 1.2 2013/12/18 08:00:31 jlec Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-block/blocks/ChangeLog,v 1.3 2015/04/04 11:09:53 pacho Exp $
+
+ 04 Apr 2015; Pacho Ramos <pacho@gentoo.org> blocks-0.1.4_pre131210-r1.ebuild,
+ blocks-9999.ebuild:
+ Fix dependencies (#531050 by Ian Delaney), add support for python 3.4
*blocks-0.1.4_pre131210-r1 (18 Dec 2013)
@@ -14,4 +18,3 @@
10 Dec 2013; Justin Lecher <jlec@gentoo.org> +blocks-0.1.4_pre131210.ebuild,
+blocks-9999.ebuild, +metadata.xml:
New addition written by me, #492294
-
diff --git a/sys-block/blocks/blocks-0.1.4_pre131210-r1.ebuild b/sys-block/blocks/blocks-0.1.4_pre131210-r1.ebuild
index 9e6d5f245c7d..1e7547eab7b1 100644
--- a/sys-block/blocks/blocks-0.1.4_pre131210-r1.ebuild
+++ b/sys-block/blocks/blocks-0.1.4_pre131210-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/blocks/blocks-0.1.4_pre131210-r1.ebuild,v 1.1 2013/12/18 08:00:32 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/blocks/blocks-0.1.4_pre131210-r1.ebuild,v 1.2 2015/04/04 11:09:53 pacho Exp $
EAPI=5
-PYTHON_COMPAT=( python3_3 )
+PYTHON_COMPAT=( python3_{3,4} )
inherit distutils-r1
@@ -18,8 +18,10 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="+minimal"
DEPEND="
- dev-python/pyparted[${PYTHON_USEDEP}]
- dev-python/python-augeas[${PYTHON_USEDEP}]"
+ dev-python/maintboot
+ >=dev-python/pyparted-3.10[${PYTHON_USEDEP}]
+ >=dev-python/python-augeas-0.5.0[${PYTHON_USEDEP}]
+"
RDEPEND="${DEPEND}
>=sys-block/parted-2.3
!minimal? (
diff --git a/sys-block/blocks/blocks-9999.ebuild b/sys-block/blocks/blocks-9999.ebuild
index 1d93734b6391..d8db01e2a253 100644
--- a/sys-block/blocks/blocks-9999.ebuild
+++ b/sys-block/blocks/blocks-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/blocks/blocks-9999.ebuild,v 1.2 2013/12/18 08:00:32 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/blocks/blocks-9999.ebuild,v 1.3 2015/04/04 11:09:53 pacho Exp $
EAPI=5
-PYTHON_COMPAT=( python3_3 )
+PYTHON_COMPAT=( python3_{3,4} )
inherit distutils-r1 git-r3
@@ -19,8 +19,10 @@ KEYWORDS=""
IUSE="+minimal"
DEPEND="
- dev-python/pyparted[${PYTHON_USEDEP}]
- dev-python/python-augeas[${PYTHON_USEDEP}]"
+ dev-python/maintboot
+ >=dev-python/pyparted-3.10[${PYTHON_USEDEP}]
+ >=dev-python/python-augeas-0.5.0[${PYTHON_USEDEP}]
+"
RDEPEND="${DEPEND}
>=sys-block/parted-2.3
!minimal? (