From c230d59a71ddbcd028747534ebde81ec59e9019c Mon Sep 17 00:00:00 2001 From: Ian Delaney Date: Tue, 11 Nov 2014 04:44:28 +0000 Subject: [PATCH] bump; tidy deps, add patch to correct broken build (in setup.py), remove old Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0xB8072B0D --- dev-python/rpy/ChangeLog | 9 +++- dev-python/rpy/Manifest | 21 ++++----- dev-python/rpy/files/2.5.0-setup.patch | 45 +++++++++++++++++++ dev-python/rpy/rpy-2.3.10.ebuild | 36 --------------- dev-python/rpy/rpy-2.4.0.ebuild | 36 --------------- dev-python/rpy/rpy-2.4.2.ebuild | 45 ------------------- .../{rpy-2.4.3.ebuild => rpy-2.5.0.ebuild} | 15 ++++--- 7 files changed, 71 insertions(+), 136 deletions(-) create mode 100644 dev-python/rpy/files/2.5.0-setup.patch delete mode 100644 dev-python/rpy/rpy-2.3.10.ebuild delete mode 100644 dev-python/rpy/rpy-2.4.0.ebuild delete mode 100644 dev-python/rpy/rpy-2.4.2.ebuild rename dev-python/rpy/{rpy-2.4.3.ebuild => rpy-2.5.0.ebuild} (68%) diff --git a/dev-python/rpy/ChangeLog b/dev-python/rpy/ChangeLog index d01cd0da742a..13b360469c16 100644 --- a/dev-python/rpy/ChangeLog +++ b/dev-python/rpy/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-python/rpy # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/rpy/ChangeLog,v 1.82 2014/10/16 09:53:25 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/rpy/ChangeLog,v 1.83 2014/11/11 04:43:59 idella4 Exp $ + +*rpy-2.5.0 (11 Nov 2014) + + 11 Nov 2014; Ian Delaney +files/2.5.0-setup.patch, + +rpy-2.5.0.ebuild, -rpy-2.3.10.ebuild, -rpy-2.4.0.ebuild, -rpy-2.4.2.ebuild, + -rpy-2.4.3.ebuild: + bump; tidy deps, add patch to correct broken build (in setup.py), remove old *rpy-2.4.4 (16 Oct 2014) diff --git a/dev-python/rpy/Manifest b/dev-python/rpy/Manifest index aa6d33d4b0f9..b6a482cab9e3 100644 --- a/dev-python/rpy/Manifest +++ b/dev-python/rpy/Manifest @@ -1,22 +1,17 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -DIST rpy2-2.3.10.tar.gz 187420 SHA256 728326d6d13107f7156f1f3d6ad3a7d6a19ae4d6801e56708e794196d5b0a509 SHA512 58013019bb71c28b0c890a599687628d94fc0a59f7071177618d8494eca485eb08ae9f7d27cf529fe973b01254c00373130b68c8ce863b69f8dcfa54bd5bf9f8 WHIRLPOOL bf8e8c19b75622eb5c923496d0ae1625f3196d3e760fbf60558f692847f0a35a3a1f2112951cb48fa5c9c111fdc145e0babe99f489aa29033b9e21edf0b6180e -DIST rpy2-2.4.0.tar.gz 160914 SHA256 3cb6360d4d0af7996979f50d0347f5f74fc3fcf98e3ee8057c4c886b358d17e1 SHA512 cd6432ba2f5c4f0e8e0a49e473efd917cfd279f435dc4fa31e417a725085937126ea2435f43f2a9fdd01f2d4f53698f1684375885525fba095ad657e7890facf WHIRLPOOL f67c5ddb7fd3576bf3cc143d6be4b803e49f3b56154c2ad7689a0c90511e7d037b370fa76b64a7d8b72dd49b5850c96382bdd3f67b0145afd68959a8112150b0 -DIST rpy2-2.4.2.tar.gz 161135 SHA256 c88f961e6ea8bbb24dbffab6738a0bc090ca8597ae8292731ae3362e64c839c8 SHA512 e939504d8907772d203e9f999cb31951e4803e125ada8cc1c8103185ec9bbb8a1aa65324aa843f0bfa6686b2a76be66b536d04ee992e18fa1bd3db85970e09e9 WHIRLPOOL 831d5d9ca2b54622731b3d0d65b34f21d3f275c7686060a24b5bf2121e191e11dad264327f6132cba6d634e35851f22d51ace62912233e520080659ca4fb7ef9 -DIST rpy2-2.4.3.tar.gz 159655 SHA256 1d7970d1723d52c4bbd510ee88c0a6b8273a3bba8a05c124fb8be35d75616906 SHA512 03920dd045cccd58f5254035fcb1b49c2eb8fdf046281ecbbe687ac273f2b304fa9c574d9f247830dedec35f5bd18a22cc11cf18790e029e3942878442a1e874 WHIRLPOOL bf1f238228c399f3cb3554805ff3d734733f9d740f82e2e67366118285e29d1a8bc91a7d37a149dc6776a8a7adf14f0be59abcd928e0d25646e354c078a8cfcc +AUX 2.5.0-setup.patch 1540 SHA256 9b245b87962105868a61278fa6d07858367a89384c8b1032823223300825bc10 SHA512 74b65d28ae6dd936a6aa783f10c0d5e7aa967f980869f8abe9eb757fd35c312b5deb200bd0635237b1485cffbc261c4cc951eb6a5c9416a5521df3b8f597b97e WHIRLPOOL 0afc49ea59aa5a0a4ddcb310e7922765aab62ef20f6efa56b1372c8033988725dd9a53817ea7df54f1f9e24e817f6c2797a2b441ba5afaa4dd4ae319f272e9d8 DIST rpy2-2.4.4.tar.gz 160264 SHA256 50ed7510ebf7e6a5dfb67090daca17eb63ed0300cc0b36c6cf7d39e45f58690f SHA512 992c1cf6284d488d33ae8e8446523acd89309de08ea05c5da512bdd810f1047c510bdd052daff7affad1f45ab33e52eb0239cbbf27ed5823119f0f55f15cd251 WHIRLPOOL c7b13699b341ec7994ad5d6eac6ef200ed5cd7ee9d1508307ba929726e1a7a6743747266c79875d743773824f60ca0649b18f9fafcdf9fed0914d7c3a58bafd1 -EBUILD rpy-2.3.10.ebuild 905 SHA256 eca2695fb63dbc9256d93790f17bb931a9f5ddaf7191d8fca20b90df45166e76 SHA512 48b3ffdce6a5f1e0042efed7113d01a770a0737150a14eb4542a7e6970c7f92f721de23308397ea93ede29c03764c04b8442e9de86dd74c623d6047e6d81e54d WHIRLPOOL 28bc101647d94994c9c823ef20ba14e0ef8bc89bb349c976c6129779e13e571d79388af53b76c2c198570450513ba4a72a208300a044b572dfd87eda3a30879c -EBUILD rpy-2.4.0.ebuild 907 SHA256 4ce83df4379f67c50903fb6a5dad43a38e165b8e6608060bdd59d8d44009c612 SHA512 c470931ac4e5b6c790b5a7ea294a66855547d486c207de239ee569f4f5613e531d936da431d193702e755616e8301e581f00432c951c03bbd38ac167e8a401e0 WHIRLPOOL 0afb16045746feb1db6f546c860596fe1df030714a49c313f7106131df066a7e3d87169eb5bb638dbfec22fde53be4ec546331e8c8e1927bc27f4b8111188e79 -EBUILD rpy-2.4.2.ebuild 1112 SHA256 c050da1988403bde35c8bc283b5f0f21c6728ae7d644b5672223a8db41006759 SHA512 42cb811ea2780b62d5964e1f4a288ef3e6ef1526064048922a80cee8376d7b29ca0f25886ebc2714bf5f51c626e11cdf5c95de0be939b086259646afe9face4c WHIRLPOOL 45c5ae9b1657505b1e56f6a2fc5323b6d9de6e3b619aef0769031c15a8bbf6e270cd216fe6f489510ce8fc0fe6742d388b041f167570d57de3681f873bb0008e -EBUILD rpy-2.4.3.ebuild 1164 SHA256 b7d897dda68af67c5f8f0426f65e706fbbab7f658ba5cdc55d40e575961ace80 SHA512 79232dcc9aad3764f5939eb02d840b6349df44879e7f583692a611cdc8c87436c870a3c97b69ba5f8145d3a8a008e99a35c3e41a87ffd190a027cd9d0ca01bfc WHIRLPOOL a7ba09b0052aff4d08670a296744f5a11a661ba9107e1173b9edd6080665ab11a9e15afe04f605064f85bd539b272d442c071b97f8501667d598e44ce32ca3a9 +DIST rpy2-2.5.0.tar.gz 163867 SHA256 3e39bd649e21f320ff773ef08e0db193b231126f5922ea4f5f54aaf28508638f SHA512 5ee245ed3db3a1374207644a9d9d5228cea9562a24378612d34d46647803667d80447cecd3184a08c81df12b72de0bcb5b4b6c5a832519bf4cdb7b302b954de0 WHIRLPOOL 77faf45584ee289b20de53373f607e70ce68952efa21742cb4bb357f095c1fb5ba42add887674d1a7876d306f02a5a280e83927a1c618546edee760cc18e318f EBUILD rpy-2.4.4.ebuild 1298 SHA256 2df2ba05d264894ece49b95c1b661f822397cf5af19de72b51705b863140f1bf SHA512 d1ae004c18034598eb586252601b1068dc2b29b9dd4327c04cd50fe3819215bb78139fccd17e250bcf067681b52ceba2c4357be19f872b7b9ee0f395e93f51be WHIRLPOOL ef72903ff105aa5bee868a5d1f41d4a5b7dc38d6f001697c830ebb875940e0fa79848f76353dfd9a7cc37d3ff75414713a99e552233ac4c495c1f9cda1af7432 -MISC ChangeLog 12310 SHA256 774372ea57b88d04afc0ec0a939b0eca53cc4716ae2706e58cba96b1546c3734 SHA512 25ca97de840692998811ce9cd104cfc449baae6d2c6695ab5c931882390e7f6e9f969e0172d4a77180ceebc66d1f458c3be2c0d5aea49691d0b68664ab20b2d8 WHIRLPOOL d19a647f4267e915bcf7e837b6a5d88b85e945c09248b7d87a3464ae6d084b26733f92599d28c8f422cf1400615d3a3a261e33bc340ba40174df8e6ff24162e6 +EBUILD rpy-2.5.0.ebuild 1340 SHA256 fc206698de64bd87fab3653d2d2fa7eca0632a6b68e865bb4fa225461b1bd716 SHA512 237d8a51b2c0ca03a99d1fc8bb410c6a00898d5a99beebfc6284019368d24473f2437bd2339c4fd11f9ff685dfb9d438c5d44b86f5103d61ada55b6984d7856c WHIRLPOOL 16fedfc96a4bb2478f11524f9b8275f6e40ca9210071ba4853b2d36fb8eb8c6542e76e9bc89477c376263a6801c4867276e3a5f9df181e4448df34b67e4b29bd +MISC ChangeLog 12590 SHA256 a6ec7f42eb52bf968dc63d50812a3bb1b5aeb9197b6220afd663119be452111e SHA512 8de94e8368be51cc837c23acb439ba1419806cc68269e5929f41c94d0e370b08e190e1ba8a1105a0ab399168715c9d9449b18ebdb0fa885c3ba373c3431bb6b5 WHIRLPOOL b6fd8962675e2a1dc04234b9b78d8165b929347aa688ca03d86547e75bda7907c46a63fe34c6ca45fd096c725433f327b1ed2fa7825afca0bc481e3a014af580 MISC metadata.xml 512 SHA256 03c293717594aa787019e8716891d2eea067135a4e77d7f0a53317979087e695 SHA512 c25e12c24dd9cd06122e64975fb9760cd50dfda61f0fe808e780c466fd1b105bdba09cdebd0d4d0f529570c2cc6fac3334296bdf12208a8ff74535552af63e4d WHIRLPOOL 52b27f13223e5e1e9805913369a69ee947a295ba109e29e0c2a53b4b183c1580d56b34f83c8b96de91693d228f117d36a3b6e79bb3c02501cefea1d801d4a17a -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) +Version: GnuPG v2 -iEYEAREIAAYFAlQ/lakACgkQso7CE7gHKw0ovwCeMnPolb7fXymynRbwNSGhisQq -LVoAoMJA/z6BwAH4Y7uQfw5/uCSntWSn -=jyW5 +iEYEAREIAAYFAlRhlCMACgkQso7CE7gHKw1W7gCgwLOROKHGAf3t4U2hvcmxMckH +Ey8An0Ia0lgyqtZXkdxT0+nDrnn9MNC9 +=t6jq -----END PGP SIGNATURE----- diff --git a/dev-python/rpy/files/2.5.0-setup.patch b/dev-python/rpy/files/2.5.0-setup.patch new file mode 100644 index 000000000000..2454c313e677 --- /dev/null +++ b/dev-python/rpy/files/2.5.0-setup.patch @@ -0,0 +1,45 @@ +https://bitbucket.org/lgautier/rpy2/commits/bf38fa9960aa +# HG changeset patch +# User Laurent Gautier +# Date 1415656651 18000 +# Node ID bf38fa9960aacf7ba24a20cfae631aa695fea986 +# Parent 9c1212066f5c980a211b21943f62fd69743ca4bd +Should fix issue #234 + +diff --git a/setup.py b/setup.py +--- a/setup.py ++++ b/setup.py +@@ -136,8 +136,6 @@ + return output + + def getRinterface_ext(): +- #r_libs = [os.path.join(RHOME, 'lib'), os.path.join(RHOME, 'modules')] +- r_libs = [] + extra_link_args = [] + extra_compile_args = [] + include_dirs = [] +@@ -250,9 +248,9 @@ + include_dirs = [os.path.join(package_prefix, + 'rpy', 'rinterface'),] + include_dirs, + libraries = libraries, +- library_dirs = r_libs, ++ library_dirs = library_dirs, + define_macros = define_macros, +- runtime_library_dirs = r_libs, ++ runtime_library_dirs = library_dirs, + extra_compile_args=extra_compile_args, + extra_link_args = extra_link_args + ) +@@ -266,9 +264,9 @@ + include_dirs = include_dirs + + [os.path.join('rpy', 'rinterface'), ], + libraries = libraries, +- library_dirs = r_libs, ++ library_dirs = library_dirs, + define_macros = define_macros, +- runtime_library_dirs = r_libs, ++ runtime_library_dirs = library_dirs, + extra_compile_args=extra_compile_args, + extra_link_args = extra_link_args + ) + diff --git a/dev-python/rpy/rpy-2.3.10.ebuild b/dev-python/rpy/rpy-2.3.10.ebuild deleted file mode 100644 index f1d576cc62b4..000000000000 --- a/dev-python/rpy/rpy-2.3.10.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/rpy/rpy-2.3.10.ebuild,v 1.2 2014/04/30 11:48:07 jlec Exp $ - -EAPI=5 - -PYTHON_COMPAT=( python{2_7,3_3} ) -PYTHON_REQ_USE="sqlite" - -inherit distutils-r1 - -MYSLOT=2 -MY_PN=${PN}${MYSLOT} -MY_P=${MY_PN}-${PV} - -DESCRIPTION="Python interface to the R Programming Language" -HOMEPAGE="http://rpy.sourceforge.net/ https://pypi.python.org/pypi/rpy2" -SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" - -LICENSE="AGPL-3 GPL-2 LGPL-2.1 MPL-1.1" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="test" - -RDEPEND=" - >=dev-lang/R-3 - dev-python/numpy[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - test? ( >=dev-python/pandas-0.13[${PYTHON_USEDEP}] )" - -S="${WORKDIR}/${MY_P}" - -python_test() { - cd "${BUILD_DIR}"/lib || die - ${PYTHON} -m 'rpy2.tests' -v || die -} diff --git a/dev-python/rpy/rpy-2.4.0.ebuild b/dev-python/rpy/rpy-2.4.0.ebuild deleted file mode 100644 index 85db4e1f15f5..000000000000 --- a/dev-python/rpy/rpy-2.4.0.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/rpy/rpy-2.4.0.ebuild,v 1.1 2014/06/03 05:42:56 idella4 Exp $ - -EAPI=5 - -PYTHON_COMPAT=( python{2_7,3_3} ) -PYTHON_REQ_USE="sqlite" - -inherit distutils-r1 - -MYSLOT=2 -MY_PN=${PN}${MYSLOT} -MY_P=${MY_PN}-${PV} - -DESCRIPTION="Python interface to the R Programming Language" -HOMEPAGE="http://rpy.sourceforge.net/ https://pypi.python.org/pypi/rpy2" -SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" - -LICENSE="AGPL-3 GPL-2 LGPL-2.1 MPL-1.1" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="test" - -RDEPEND=" - >=dev-lang/R-3 - dev-python/numpy[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - test? ( >=dev-python/pandas-0.13[${PYTHON_USEDEP}] )" - -S="${WORKDIR}/${MY_P}" - -python_test() { - cd "${BUILD_DIR}"/lib || die - ${PYTHON} -m 'rpy2.tests' -v || die -} diff --git a/dev-python/rpy/rpy-2.4.2.ebuild b/dev-python/rpy/rpy-2.4.2.ebuild deleted file mode 100644 index 5acdda1eaa0a..000000000000 --- a/dev-python/rpy/rpy-2.4.2.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/rpy/rpy-2.4.2.ebuild,v 1.1 2014/06/24 01:58:44 idella4 Exp $ - -EAPI=5 - -PYTHON_COMPAT=( python{2_7,3_3,3_4} ) -PYTHON_REQ_USE="sqlite" - -inherit distutils-r1 flag-o-matic - -MYSLOT=2 -MY_PN=${PN}${MYSLOT} -MY_P=${MY_PN}-${PV} - -DESCRIPTION="Python interface to the R Programming Language" -HOMEPAGE="http://rpy.sourceforge.net/ https://pypi.python.org/pypi/rpy2" -SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" - -LICENSE="AGPL-3 GPL-2 LGPL-2.1 MPL-1.1" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="test" - -RDEPEND=" - >=dev-lang/R-3 - dev-python/numpy[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( >=dev-python/pandas-0.13[${PYTHON_USEDEP}] )" - -S="${WORKDIR}/${MY_P}" - -python_compile() { - if ! python_is_python3; then - local CFLAGS=${CFLAGS} - append-cflags -fno-strict-aliasing - fi - distutils-r1_python_compile -} - -python_test() { - cd "${BUILD_DIR}"/lib || die - ${PYTHON} -m 'rpy2.tests' -v || die -} diff --git a/dev-python/rpy/rpy-2.4.3.ebuild b/dev-python/rpy/rpy-2.5.0.ebuild similarity index 68% rename from dev-python/rpy/rpy-2.4.3.ebuild rename to dev-python/rpy/rpy-2.5.0.ebuild index 85b83c19fef8..a20e8b304abb 100644 --- a/dev-python/rpy/rpy-2.4.3.ebuild +++ b/dev-python/rpy/rpy-2.5.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/rpy/rpy-2.4.3.ebuild,v 1.1 2014/08/20 10:00:16 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/rpy/rpy-2.5.0.ebuild,v 1.1 2014/11/11 04:43:59 idella4 Exp $ EAPI=5 @@ -20,17 +20,21 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" LICENSE="AGPL-3 GPL-2 LGPL-2.1 MPL-1.1" SLOT="0" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="test" +IUSE="" RDEPEND=" >=dev-lang/R-3 - dev-python/numpy[${PYTHON_USEDEP}]" + dev-python/numpy[${PYTHON_USEDEP}] + >=dev-python/pandas-0.13.1[${PYTHON_USEDEP}]" DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( >=dev-python/pandas-0.13[${PYTHON_USEDEP}] )" + dev-python/setuptools[${PYTHON_USEDEP}]" # ggplot2 is an optional test dep but not in portage S="${WORKDIR}/${MY_P}" +PATCHES=( "${FILESDIR}"/${PV}-setup.patch ) + +# Tarball absent of doc files in doc folder +# https://bitbucket.org/lgautier/rpy2/issue/229/ python_compile() { if ! python_is_python3; then local CFLAGS=${CFLAGS} @@ -40,6 +44,7 @@ python_compile() { } python_test() { + # https://bitbucket.org/lgautier/rpy2/issue/235/ cd "${BUILD_DIR}"/lib || die ${PYTHON} -m 'rpy2.tests' -v || die } -- 2.26.2