summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Delaney <idella4@gentoo.org>2015-08-20 14:11:35 +0800
committerIan Delaney <idella4@gentoo.org>2015-08-20 14:12:13 +0800
commit0f7359277e1750aeb505b50d6ea835b16f6cb21e (patch)
treebd61f8e53db5f50790e5b6e733d7a4ce866701a2
parentnet-libs/webkit-gtk: add 2.8.5 (diff)
downloadgentoo-0f7359277e1750aeb505b50d6ea835b16f6cb21e.tar.gz
gentoo-0f7359277e1750aeb505b50d6ea835b16f6cb21e.tar.bz2
gentoo-0f7359277e1750aeb505b50d6ea835b16f6cb21e.zip
dev-python/rpy: bump; update key dep dev-lang/R
Package-Manager: portage-2.2.20
-rw-r--r--dev-python/rpy/Manifest2
-rw-r--r--dev-python/rpy/rpy-2.6.2.ebuild (renamed from dev-python/rpy/rpy-2.6.0.ebuild)8
2 files changed, 6 insertions, 4 deletions
diff --git a/dev-python/rpy/Manifest b/dev-python/rpy/Manifest
index 4abff86e189a..a03dd7c26fc8 100644
--- a/dev-python/rpy/Manifest
+++ b/dev-python/rpy/Manifest
@@ -1,3 +1,3 @@
DIST rpy2-2.5.4.tar.gz 164830 SHA256 d521ecdd05cd0c31ab017cb63e9f63c29b524e46ec9063a920f640b5875f8a90 SHA512 e40ae81be19acf5008eed088c10fef3824cc712c0175414c1899bf45b24c35e2ef7d8808fae75d156064e82d1cd5939c50d5291c190030ae2050c6dffa9a36db WHIRLPOOL 2769adccaa6a634b964d4712e4bcc4d4161f8aef17d38a235bf5a3646fd166a01749fcc1852954996a00b695617597617f0dfb43f73744948a55f2eba07d9ba2
-DIST rpy2-2.6.0.tar.gz 171190 SHA256 53e295f3018a781008bffb97cc0c9a7cd361a3d191939f197157827d21a2e4b6 SHA512 16012a8a634538ba61e392dc811615a870b94b348c7ece885f8c0d146419b9689a08d5901ed2a694754cc220664797d530f75ba35e395f5857a0f25c3170f3ce WHIRLPOOL 1f33e99f1997ffbc1e9711bb667ba07db024099bdf7e460a13efe311419b872095128b2d59ffb732384ca19b77dac97822bbcf8e77ff45b0b093d7b5cfbc83e5
DIST rpy2-2.6.1.tar.gz 171635 SHA256 39f15d7f5d51646a6cbf9d5cd1c817d2880301dbb95141947f93361685453e28 SHA512 14c6c47d6ace40ac26bf89d3efdbf5c5a68f74096fec74897877be312d3ffb03c30f4ca13ed1531ccf094ac33672fa550264fe980788bc4eca12d02089475f63 WHIRLPOOL dda6a0a2abe33f8d7e3a489c6bbaa03335a47d5fa474409883773a52be315f0920347a38f76f94e9e16c680e08cd8e7a18d27a6a2ffd4af35a779a305836bdd5
+DIST rpy2-2.6.2.tar.gz 171655 SHA256 2e28886b2a6a138cfc057f9b7cddade253e61c9abb43f0eae20dace58b6dfced SHA512 7a060ccc26a03dc93d75edb85d92f1ab31af96ba140932ff8e699cd5855e6078b1e0ffceed135d32deb6c8f273ebcc8b02be38e9b8fc66778cc2adab5745f542 WHIRLPOOL 26d9a9c13e4efa22a232507cfff0b13d650e0528f635dfa9fe464cde50462d2d94a668d1566b537bafaa5462eb66e96005296c6295308b1e3d1c5639da2879b6
diff --git a/dev-python/rpy/rpy-2.6.0.ebuild b/dev-python/rpy/rpy-2.6.2.ebuild
index ea9c6e695eec..521031d20b63 100644
--- a/dev-python/rpy/rpy-2.6.0.ebuild
+++ b/dev-python/rpy/rpy-2.6.2.ebuild
@@ -23,11 +23,12 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="test"
RDEPEND="
- >=dev-lang/R-3
+ >=dev-lang/R-3.1
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}