From 0d5cc8f434dfe01296c8ee11d5207164ce652854 Mon Sep 17 00:00:00 2001 From: Sora Lee Date: Wed, 25 Apr 2018 19:50:25 +1200 Subject: [PATCH 1/6] Fix typo. --- eclass/R-packages.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclass/R-packages.eclass b/eclass/R-packages.eclass index 7d2afc61b04e..1fcb5b6afcb0 100644 --- a/eclass/R-packages.eclass +++ b/eclass/R-packages.eclass @@ -29,7 +29,7 @@ R-packages_src_compile() { R-packages_src_install() { insinto /usr/$(get_libdir)/R/site-library - doins -r "${WORKDIR}"/${PN//_/.}y + doins -r "${WORKDIR}"/${PN//_/.} } R-packages_pkg_postinst() { From f8b0d04ed8447e925b3b4d9f4e3763b94678eb38 Mon Sep 17 00:00:00 2001 From: Sora Lee Date: Wed, 25 Apr 2018 19:54:21 +1200 Subject: [PATCH 2/6] Fix error due to directory name mismatch. --- sci-R/IRkernel/IRkernel-0.8.8.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/sci-R/IRkernel/IRkernel-0.8.8.ebuild b/sci-R/IRkernel/IRkernel-0.8.8.ebuild index cb1279b9ec87..2247433517bc 100644 --- a/sci-R/IRkernel/IRkernel-0.8.8.ebuild +++ b/sci-R/IRkernel/IRkernel-0.8.8.ebuild @@ -16,6 +16,7 @@ RDEPEND="${DEPEND-} ${R_SUGGESTS-} sci-R/IRdisplay dev-python/jupyter_client" src_install() { + mv ${WORKDIR}/${P} ${WORKDIR}/${PN} || die R-packages_src_install dosym "${EPREFIX}"/usr/$(get_libdir)/R/site-library/IRkernel/kernelspec \ /usr/share/jupyter/kernels/ir From bca9b93b0ab7771ef2761541b8b551cb6329a46f Mon Sep 17 00:00:00 2001 From: Sora Lee Date: Wed, 25 Apr 2018 19:57:09 +1200 Subject: [PATCH 3/6] Add missing runtime dependencies. --- sci-R/IRkernel/IRkernel-0.8.8.ebuild | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sci-R/IRkernel/IRkernel-0.8.8.ebuild b/sci-R/IRkernel/IRkernel-0.8.8.ebuild index 2247433517bc..2a5d0aa44a34 100644 --- a/sci-R/IRkernel/IRkernel-0.8.8.ebuild +++ b/sci-R/IRkernel/IRkernel-0.8.8.ebuild @@ -13,6 +13,11 @@ LICENSE='GPL-2+' R_SUGGESTS="" DEPEND="sci-CRAN/uuid" RDEPEND="${DEPEND-} ${R_SUGGESTS-} + sci-CRAN/crayon + sci-CRAN/digest + sci-CRAN/evaluate + sci-CRAN/jsonlite + sci-CRAN/pbdZMQ sci-R/IRdisplay dev-python/jupyter_client" src_install() { From 8da445e913a549589bd7fa5c33ee5c747ffbaa22 Mon Sep 17 00:00:00 2001 From: Sora Lee Date: Wed, 25 Apr 2018 19:57:35 +1200 Subject: [PATCH 4/6] Remove obsolete ebuild. The source code for this version is no longer available. --- sci-CRAN/pbdZMQ/pbdZMQ-0.2.6.ebuild | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 sci-CRAN/pbdZMQ/pbdZMQ-0.2.6.ebuild diff --git a/sci-CRAN/pbdZMQ/pbdZMQ-0.2.6.ebuild b/sci-CRAN/pbdZMQ/pbdZMQ-0.2.6.ebuild deleted file mode 100644 index ecccdf343aaa..000000000000 --- a/sci-CRAN/pbdZMQ/pbdZMQ-0.2.6.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -inherit R-packages - -DESCRIPTION='Programming with Big Data -- Interface to ZeroMQ' -SRC_URI="http://cran.r-project.org/src/contrib/pbdZMQ_0.2-6.tar.gz" -LICENSE='GPL-3' - -DEPEND=">=dev-lang/R-3.2.0 - sci-CRAN/R6 -" -RDEPEND="${DEPEND-} - net-libs/zeromq - ${R_SUGGESTS-} -" - -_UNRESOLVED_PACKAGES=( 'sci-CRAN/pbdRPC' ) From 278dd9fa7c086c61024b7ebaefec6047e17a2257 Mon Sep 17 00:00:00 2001 From: Sora Lee Date: Wed, 25 Apr 2018 19:58:50 +1200 Subject: [PATCH 5/6] Bump to the latest version. The source code for the previous version is no longer available. --- sci-CRAN/pbdZMQ/{pbdZMQ-0.3.0.ebuild => pbdZMQ-0.3.2.ebuild} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename sci-CRAN/pbdZMQ/{pbdZMQ-0.3.0.ebuild => pbdZMQ-0.3.2.ebuild} (82%) diff --git a/sci-CRAN/pbdZMQ/pbdZMQ-0.3.0.ebuild b/sci-CRAN/pbdZMQ/pbdZMQ-0.3.2.ebuild similarity index 82% rename from sci-CRAN/pbdZMQ/pbdZMQ-0.3.0.ebuild rename to sci-CRAN/pbdZMQ/pbdZMQ-0.3.2.ebuild index 76e594527c14..8edad4792c1e 100644 --- a/sci-CRAN/pbdZMQ/pbdZMQ-0.3.0.ebuild +++ b/sci-CRAN/pbdZMQ/pbdZMQ-0.3.2.ebuild @@ -7,7 +7,7 @@ EAPI=5 inherit R-packages DESCRIPTION='Programming with Big Data -- Interface to ZeroMQ' -SRC_URI="http://cran.r-project.org/src/contrib/pbdZMQ_0.3-0.tar.gz" +SRC_URI="http://cran.r-project.org/src/contrib/pbdZMQ_0.3-2.tar.gz" LICENSE='GPL-3' DEPEND=">=dev-lang/R-3.2.0" From ecee5ac692506e6ce0cccebd30209f26b27d788c Mon Sep 17 00:00:00 2001 From: Sora Lee Date: Wed, 25 Apr 2018 20:00:26 +1200 Subject: [PATCH 6/6] Update manifests. --- sci-CRAN/pbdZMQ/Manifest | 6 ++---- sci-R/IRkernel/Manifest | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/sci-CRAN/pbdZMQ/Manifest b/sci-CRAN/pbdZMQ/Manifest index a961103f8a51..c81d36a1bc37 100644 --- a/sci-CRAN/pbdZMQ/Manifest +++ b/sci-CRAN/pbdZMQ/Manifest @@ -1,5 +1,3 @@ -DIST pbdZMQ_0.2-6.tar.gz 963382 SHA256 c1f837b72a65f36d532855c8a524e793f1de1f4e8b9b02271635a9523ca217cf SHA512 00f3aff228c1d0be97359bf8a897f19d673688843456609fc988b2ac6b887d0db84f4e1f63fc7a0520db074a2998e27d8c196dfb6a2eba15f690d5f398c5a21c WHIRLPOOL c55734c504991515416a384b51ed9e4e7aff8637f421988cce0ef28627b8d014da5d7d212486c710130ca36f9c0f1aa633515b71fc4786de8dee51dd2a66dd7f -DIST pbdZMQ_0.3-0.tar.gz 1048133 SHA256 e73f882ba2f882ef6ef2280cd19fc4e2010701cff1ae3ebab2ebb29c16f63fbb SHA512 2bbef6d3fcee1a5cef79265be28dbabd827329bb59bbce3596f2fb6277a974886b87edc54697495394143542f88cb6effcd7905641ff2730e2bf3eba3e0f4bb1 WHIRLPOOL 324aceb69c752d5c7c990c7461e2faf2e1f70ef53ad8b1abb96af7040cb00c0b9080202c2f39b3a15ec30909d92219b09960def2a8fbba2fdc1f659168b84c1f -EBUILD pbdZMQ-0.2.6.ebuild 438 SHA256 735027e298c3de43d4e83317cbf0286ea946ea1dfa04a828309f9e639bc53d07 SHA512 a786bfbd2bf26eb1d0a2aa4e147ec86e0da59e7145a831fb65b7bfa0c00e6b4dbec806b80ab540269349b7c05189dbe77c8afc4f412ca8292719cad85eb82ecb WHIRLPOOL 0f6da9c82979ec69b4d80b9896bd527c0c1ce9e1e805af9af362b18a4370c18458438bbe586c01d9807e08e2c5cfa56255395a2c9b7e1bc1393090a5c8c77df3 -EBUILD pbdZMQ-0.3.0.ebuild 362 SHA256 e80b2b2c8f3ee3a7c398264741e3d206e621aeb0761be8226b4c15e23ff5f281 SHA512 e866b5921490fc529e45968e25049a50410777056dd0a9c60c4b97c8771897f1b07a2053043c3019d705a77f26d936a89bb30fdac94061befabf6d8f9134680e WHIRLPOOL a18225913fbfa48d0fc43b72e27ab7af0ca63b4f4e5b13c513f5e427415cfe9e7516b42ad072aee598c2748de9c2a86f1c23619a2900724aa94c49b2ae58830e +DIST pbdZMQ_0.3-2.tar.gz 1052241 SHA256 ece2a2881c662f77126e4801ba4e01c991331842b0d636ce5a2b591b9de3fc37 SHA512 a4d88279f46ae648a2d7e0a563a9e43c53656f4d855b6e73221c04a852383b03d25d722bb3a42363b375e93996a50a4ae7d88444763cf82f1405fb7298239286 WHIRLPOOL f0cb33fd002e2dd8005a60b6987b7fde1b2671b92c3c6a65b066385b3008d8f7e997a24fb7f222324167c184c0bc17e30635061d3fabaeb82a7dfe08de9f111c +EBUILD pbdZMQ-0.3.2.ebuild 362 SHA256 5df544328226367b07059a7faf908efed1e520598961d2f045f2fae8c2ec3247 SHA512 b469f820ce4d94d087900ffb70d8f20d3a76cb173a9572f1fbc619ae880c3bb2efbef3c963bbece2a8431099f27a9782af6b7bd89c02003109f322c01128ab77 WHIRLPOOL 9136ba51154991ca83f83179a455268e33853c4a7d03e5848e976d86e1225c6d908a67115f4501c9ac539b51fed99525b01982650b3d156c597caade8556ebf2 MISC metadata.xml 730 SHA256 175c3b98610d3bb5b7d9776bca207eb6607e0a1ae867910ae1e18d8f18a5e42e SHA512 4c17c221afa382af147c77344b0ed878cacee01c4c9cc75dfbcc2744325e96ec6a58afd36f9e9f53a26f8089d74d9639004b7b951d8653680ce6be37d597e1ff WHIRLPOOL 1533b48c5bcf051122f74ec6ee3cc2b763aa3b06958f2bf54224b2259c3d239f25a2c42a38854611c5bc9478c362e273e070b37676a6c168707340042c85dd7c diff --git a/sci-R/IRkernel/Manifest b/sci-R/IRkernel/Manifest index 7590ba9701f4..78690c6f9d15 100644 --- a/sci-R/IRkernel/Manifest +++ b/sci-R/IRkernel/Manifest @@ -1,2 +1,2 @@ DIST IRkernel-0.8.8.tar.gz 74401 SHA256 4f33f622202daf8ba5b034a38fa129dadc01bdb44d852982bc177f2b41877046 SHA512 e2c2dcdacb835dcdeb308cc8da2f91df0f4c9bef7bd32f596f8a62da4ee67cf9757413e04dd5bcee7cdf7d34709a3781450102715339ed6e337040e8216bc0bd WHIRLPOOL 15fda9a08d2454e0829459b54dea4886f104f6b5823a8729566a4261f3d83013b4bd7991c90a9a32180b4c9c46baf6eec3c35fdee57e8b82dd17b79bcb41798d -EBUILD IRkernel-0.8.8.ebuild 591 SHA256 e77c3cd1d3b83eb2053127ebf7946a52ce935ad738a3cf4da6826d7882d63c73 SHA512 05ff89c462527204c696248ca9371307b22a775f3aa8cf3678f4929877546419f1e82c61a5d8ea95075ac2a3431104976271274740a205d2c8e6e759afd51ef9 WHIRLPOOL f9f3a226cbab769438d9226437498133cac80317ecd54188ae62ebeb750a045eb537797136f34fdbd68b57f0b5bbfbb43caf7fffcf0d69ea8e19a4361f6afcfe +EBUILD IRkernel-0.8.8.ebuild 724 SHA256 cfb6348e3c3437c999ec94a8ab915d1e3ceb691fdefcbf5032b74e0d75867411 SHA512 44ec3e205fa963d7f9a75dcaec3ab7d5200ccc4a812c8079eccce502242cd7c98d1c59e682acdf81016accfe995bccb5265502326f6e0291224acc79d533774b WHIRLPOOL 9e03d4a5c7cfe1e578cb243b0a52b7253dee76b95a3196b88e114f599b9db33cfb934f8785e8db85dfdf5a5949e5a999641056875b7b77ff59c22a7e12fd20da