summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Delaney <idella4@gentoo.org>2015-07-30 09:35:17 +0000
committerIan Delaney <idella4@gentoo.org>2015-07-30 09:35:17 +0000
commitf3c4090fef5b25a2dd398288fe5c5de4f902cb21 (patch)
treef4e79cf1a9c676e9a5f6ccf042455ac9f12f5273 /dev-python/rpy
parentWhitespace (diff)
downloadgentoo-2-f3c4090fef5b25a2dd398288fe5c5de4f902cb21.tar.gz
gentoo-2-f3c4090fef5b25a2dd398288fe5c5de4f902cb21.tar.bz2
gentoo-2-f3c4090fef5b25a2dd398288fe5c5de4f902cb21.zip
bump one remove one
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)
Diffstat (limited to 'dev-python/rpy')
-rw-r--r--dev-python/rpy/ChangeLog8
-rw-r--r--dev-python/rpy/rpy-2.6.1.ebuild (renamed from dev-python/rpy/rpy-2.5.6.ebuild)8
2 files changed, 12 insertions, 4 deletions
diff --git a/dev-python/rpy/ChangeLog b/dev-python/rpy/ChangeLog
index 73f5781be6d5..3a39023b503f 100644
--- a/dev-python/rpy/ChangeLog
+++ b/dev-python/rpy/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for dev-python/rpy
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/rpy/ChangeLog,v 1.93 2015/06/18 08:02:38 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/rpy/ChangeLog,v 1.94 2015/07/30 09:35:17 idella4 Exp $
+
+*rpy-2.6.1 (30 Jul 2015)
+
+ 30 Jul 2015; Ian Delaney <idella4@gentoo.org> +rpy-2.6.1.ebuild,
+ -rpy-2.5.6.ebuild:
+ bump one remove one
*rpy-2.6.0 (18 Jun 2015)
diff --git a/dev-python/rpy/rpy-2.5.6.ebuild b/dev-python/rpy/rpy-2.6.1.ebuild
index 9d180ba07d0a..0e9596238b08 100644
--- a/dev-python/rpy/rpy-2.5.6.ebuild
+++ b/dev-python/rpy/rpy-2.6.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/rpy/rpy-2.5.6.ebuild,v 1.2 2015/04/28 03:52:02 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/rpy/rpy-2.6.1.ebuild,v 1.1 2015/07/30 09:35:17 idella4 Exp $
EAPI=5
@@ -27,7 +27,8 @@ RDEPEND="
dev-python/numpy[${PYTHON_USEDEP}]
>=dev-python/pandas-0.13.1[${PYTHON_USEDEP}]
dev-python/ipython[${PYTHON_USEDEP}]
- virtual/python-singledispatch[${PYTHON_USEDEP}]"
+ virtual/python-singledispatch[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]"
DEPEND="${RDEPEND}
dev-python/setuptools[${PYTHON_USEDEP}]
test? ( $(python_gen_cond_dep 'dev-python/singledispatch[${PYTHON_USEDEP}]' python2_7 python3_3) )"
@@ -36,7 +37,8 @@ DEPEND="${RDEPEND}
S="${WORKDIR}/${MY_P}"
# Tarball absent of doc files in doc folder
-# https://bitbucket.org/lgautier/rpy2/issue/229/
+# https://bitbucket.org/rpy2/rpy2/issues/229
+
python_compile() {
if ! python_is_python3; then
local CFLAGS=${CFLAGS}