diff options
| -rw-r--r-- | dev-python/rpy/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-python/rpy/Manifest | 11 | ||||
| -rw-r--r-- | dev-python/rpy/files/rpy-1.0.2-R28.patch | 13 | ||||
| -rw-r--r-- | dev-python/rpy/rpy-1.0.2-r1.ebuild | 5 |
4 files changed, 27 insertions, 8 deletions
diff --git a/dev-python/rpy/ChangeLog b/dev-python/rpy/ChangeLog index 32c01ad03e19..36087abf1062 100644 --- a/dev-python/rpy/ChangeLog +++ b/dev-python/rpy/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-python/rpy # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/rpy/ChangeLog,v 1.27 2008/09/09 00:00:32 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/rpy/ChangeLog,v 1.28 2008/10/27 10:33:45 bicatali Exp $ + + 27 Oct 2008; Sébastien Fabbro <bicatali@gentoo.org> + +files/rpy-1.0.2-R28.patch, rpy-1.0.2-r1.ebuild: + Add a patch for compatibility with R-2.8.0 08 Sep 2008; Sébastien Fabbro <bicatali@gentoo.org> -rpy-0.4.6.ebuild: Removed older version diff --git a/dev-python/rpy/Manifest b/dev-python/rpy/Manifest index 457550b7e3b0..4c6c1e10c066 100644 --- a/dev-python/rpy/Manifest +++ b/dev-python/rpy/Manifest @@ -2,17 +2,18 @@ Hash: SHA1 AUX 90rpy 21 RMD160 67787b952b20da4e82a5cf761a63dd999283a24c SHA1 fdfba3081fee34551d46083d367e6a5d0b24e9d2 SHA256 6759a9579b9271d22e362979ea77cb2d5dac687ba8beaf007cc4214833205a49 +AUX rpy-1.0.2-R28.patch 335 RMD160 e1389f09e34fa99ce69318dd0cf6f9e33656317d SHA1 367f77a2bac17303065b50f7935aed44fa5f2552 SHA256 ca274cf2127fd19569785053da2342dbf51dfb6593817c9ab8d121e144858198 AUX rpy-1.0.2-rpymodule-R-2.7.patch 415 RMD160 f5ec70233673a983aff8433e56ad5907a614d41f SHA1 8efea983db9544528cd396436d5475b23ab59319 SHA256 939d08f700a73d4c982aaa1725da6049f2680a94d06b988f6727c2321f49cd63 AUX rpy-1.0_rc3-version-detect.patch 592 RMD160 536d493f0ad469c6c6508ef0860e92c98d71a948 SHA1 5d7959378426c1dbe76a5dab94f9f423ad56d60c SHA256 ab156087a1b8a631630c0dec0362fcfb1e6d8ca8e2deadc4447dbcc6047e44ad AUX rpy-testfiles.patch 2854 RMD160 e94af532950604f5efb68125239d0b938dd58231 SHA1 d7d4cca007f41df13c6aeed6a618efddf24d9cc3 SHA256 b5003de03dda9897ab4e0a26d8a5a9655e961d3129665f7e3999ac91a31c9288 DIST rpy-1.0.2.tar.gz 85458 RMD160 2814eb406ff167826df1bd2983035ac8d0968b40 SHA1 c3307c3a895c1ddcb3b4c67a6759f164cb2f667e SHA256 bae91fff8f4ee754b70d14d4f6e1f2c64c026c97eff75c3bc84c725d6de03d30 -EBUILD rpy-1.0.2-r1.ebuild 1382 RMD160 d857486347019ff96768f7fbf30e66f25a6bcfe3 SHA1 a11d11b43f1dbf126489a01e4b85087efbc908d5 SHA256 5768e8171c8c509a987609893f00df211b9f3d4f620b2e75b524245cfdfe9ba9 -MISC ChangeLog 4749 RMD160 c75b900c10a0dfb69e2656d936579f647e06d00d SHA1 359d0bb3ed5ce67ca1fdf8ff2369b68fcc9473b5 SHA256 16029b5d3d12529679ec9dea6301975fb1f4ea6e982dcf2d935628bcad5cb424 +EBUILD rpy-1.0.2-r1.ebuild 1412 RMD160 5f9bcabf93c6fd27d04d7d7727caa5786cf860b0 SHA1 796d30cd3b901c8335acffade1a1458d28979b02 SHA256 3c0bb0698900d104837b52e19f0cf733ff573d352d1929948b9fa9d1bc24bee5 +MISC ChangeLog 4901 RMD160 a572933dcf6d66849bed324ae972dbef487d800f SHA1 e0992302727043583924767d8276ebd6e400eead SHA256 1569fd72386faeef34f63d2ea02a6641fb06491efd1fb13b18e553e869baffc2 MISC metadata.xml 435 RMD160 b9de7bdc77c1d92f1ef787aa0891092ab37c38e8 SHA1 bb74a8f3c611f3f406b6343acb349d05e9765ad3 SHA256 cfbeb2f702e55ef46bef1a51dd78b7ceae7724a5ab5ccfd2daa65554e1a553de -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) -iEYEARECAAYFAkjFvKkACgkQ1ycZbhPLE2ANDwCfRYosug3TcBgX0PYIyFAvRNse -UEEAoLIai0fT/B4QZuZtmH88nN4Jp2DF -=HQKD +iEYEARECAAYFAkkFmbUACgkQ1ycZbhPLE2ArHgCfUv3U1ADkqNAD5a4Jk5uLuCM4 +L3UAn1+cU11dg2X78CBZOK/Gz+XqivJa +=tFTB -----END PGP SIGNATURE----- diff --git a/dev-python/rpy/files/rpy-1.0.2-R28.patch b/dev-python/rpy/files/rpy-1.0.2-R28.patch new file mode 100644 index 000000000000..47c4f5cf529e --- /dev/null +++ b/dev-python/rpy/files/rpy-1.0.2-R28.patch @@ -0,0 +1,13 @@ +--- src/RPy.h.orig 2008-10-25 14:37:50.000000000 +0100 ++++ src/RPy.h 2008-10-26 13:39:25.000000000 +0100 +@@ -74,8 +74,9 @@ + # endif + #endif /* _WIN32 */ + ++#if R_VERSION < 133120 + #include <Rdevices.h> /* must follow Graphics.h */ +- ++#endif + + /* Missing definitions from Rinterface.h or RStartup.h */ + # define CleanEd Rf_CleanEd diff --git a/dev-python/rpy/rpy-1.0.2-r1.ebuild b/dev-python/rpy/rpy-1.0.2-r1.ebuild index 797df23cb8da..4be15fa4c801 100644 --- a/dev-python/rpy/rpy-1.0.2-r1.ebuild +++ b/dev-python/rpy/rpy-1.0.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/rpy/rpy-1.0.2-r1.ebuild,v 1.5 2008/09/01 13:01:44 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/rpy/rpy-1.0.2-r1.ebuild,v 1.6 2008/10/27 10:33:45 bicatali Exp $ inherit distutils eutils @@ -13,7 +13,7 @@ SLOT="0" KEYWORDS="amd64 ia64 x86" IUSE="doc examples" -RDEPEND=">=dev-lang/R-2.6.1 +RDEPEND="dev-lang/R dev-python/numpy" DEPEND="${RDEPEND} doc? ( || ( virtual/texi2dvi ) )" @@ -23,6 +23,7 @@ src_unpack() { epatch "${FILESDIR}"/${PN}-1.0_rc3-version-detect.patch epatch "${FILESDIR}"/${PN}-testfiles.patch epatch "${FILESDIR}"/${P}-rpymodule-R-2.7.patch + epatch "${FILESDIR}"/${P}-R28.patch # this module should exist only if R was built with USE=lapack if [[ ! -e /usr/$(get_libdir)/R/lib/libRlapack.so ]]; then sed -i \ |