From 38423c67c8a23f6a1bc42038193182e2da3116eb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 25 Apr 2020 11:37:10 +0100 Subject: gentoo resync : 25.04.2020 --- sys-cluster/charliecloud/Manifest | 6 +- sys-cluster/charliecloud/charliecloud-0.15.ebuild | 77 +++++++++++++++++++++++ sys-cluster/charliecloud/charliecloud-9999.ebuild | 49 ++++++++++----- sys-cluster/charliecloud/metadata.xml | 2 + 4 files changed, 117 insertions(+), 17 deletions(-) create mode 100644 sys-cluster/charliecloud/charliecloud-0.15.ebuild (limited to 'sys-cluster/charliecloud') diff --git a/sys-cluster/charliecloud/Manifest b/sys-cluster/charliecloud/Manifest index 472c6d9547ce..9d76bb595fb9 100644 --- a/sys-cluster/charliecloud/Manifest +++ b/sys-cluster/charliecloud/Manifest @@ -2,10 +2,12 @@ AUX charliecloud-0.10-fix-hardcoded-gcc.patch 1944 BLAKE2B 920697592b47f532a335c AUX charliecloud-0.9.10-fix-flags.patch 1471 BLAKE2B 637d7fc18126a5842006233468da626a9e26c9e66c1efbf5112c0c391795a27885a28f90035894d6d529ad58926c59a9fb4ee50d8759a5d259b2e59ffef749f1 SHA512 6dae473e0583f3a167f88d1dc7006dfa0120d6f2a3508ca63e499dbbb9e1e2ef78041093144efa350d6a9653ac2de1d5b36f71b071af7577f467933d590a0379 AUX charliecloud-0.9.10-fix-hardcoded-gcc.patch 708 BLAKE2B 78b73bf527f7d9be0aa9de06eb023557bd9934708dda8ff5d948fc8240484b5cb2a0404fd2184da2759c2c08e6dd4842e5dd60b6d9af92f12a4734557df49f13 SHA512 5dfab73c4242bad9620dca71737d69215f43c8b109d25bcd2156166d2bd83d328011c6d448ee87d5f54908ea7946283ba200a865c61500912da95b7acf6c13ad DIST charliecloud-0.10.tar.gz 301083 BLAKE2B be0c650bebc12fd047b1afc61588b4b9cfc0d0addfddb808765d8e125c70329d6c06a86144b4167e5abaf64392ad1891319aabd2ba8fb528de2d9789d040fc0c SHA512 681e2f30f730b42b55b4097dba78e41924b17990354b866e04e09e6d2e4bb584211c130f9a04619dcdd38f2a3eaaad7615ee5ec20a266ee2332b0a512492331f +DIST charliecloud-0.15.tar.gz 346718 BLAKE2B a3710814864904c5db282d092f64faf9a11aeea016c788ee4be62f11257b5b5200d0c1887150b93f18446034d7919df933d3badcf33907a81c0b33e65a5e9f78 SHA512 70f6c9a18f613d05396eda5d41044ec699cf6366ae1bf43839275e62ac317231bb1c3278469040faa03af007260d84e2d718c0fb3fb45e6ace8fb733c6275a84 DIST charliecloud-0.9.10.tar.gz 275687 BLAKE2B e03c3358dd4e5eb88f9c5a3002366c79563e15d5d7792dd55f2800a001b847c13443fce0689a850aa7e6a0aa510c3f6b53d93a88a6f79326eac27acc9cbe2c57 SHA512 93a6f0c6bcceb54fabbc179b960a0d03f1b3547786ce8d502552ddc571475ea2110d6aa290ce5c245be6e2c7cdc47d3f23ff7e74558f684b4a27358aa0971a61 DIST charliecloud-0.9.6.tar.gz 205380 BLAKE2B 2e95f5486ea6d2306512378290cd29114bc688717741436ae9cc8c1dd2679c22ab21059574d62222cd14063bacecc6a7005b216cd9e2ed01fe1593a3b69871b0 SHA512 55af3e57ef6c2b81ae10bd50d149872af50d508392b271bdaa75cf3b655659ec7da5016a9deeea15aaa20e265e8066d1ed982c122cb5e62ee6d47f25d367410f EBUILD charliecloud-0.10-r1.ebuild 1559 BLAKE2B e33fd6a6dcd8bf6823e9d79a005050c56ff40f4d86a63805997f15c0b2620fea00b726a9734f7c2d6ccc97132b3f83990a6cb5a3d5e16090f51ac8c4e7ba4a35 SHA512 c04634bbaa51798f5d969657608f11008af026781d6eddd1350bd98415dc38d5dadb4aff252fdfdbc3073b72a29e46209c2792675414749649ce8befd2ead13d +EBUILD charliecloud-0.15.ebuild 1979 BLAKE2B dc1016a9437a8ce7219b5ee62eec43cc28c35dc514c7d51ef693140abe2a3626b3ce17b2d182ab705e067af3de0c60b2c991bf3b1c72da96b2828f7611943874 SHA512 919c24c2c48bdc7b2d46415dcc69c478f77502a0b4748a3d6f520376adbdaed5eda1d120496ecb89fb29cb81d7a2315763f4cf73b7a4d8093163264308bcd21b EBUILD charliecloud-0.9.10.ebuild 1554 BLAKE2B a5255254ef542ed3ac8d2233af32dffb2be2cf75578891ca66ecac4283657bb453d7fbbd50914f93399d996cafe6694f4efab855bf5a151f5db0225cded66e7d SHA512 a44da8749ee859b459a211d92838d8e5886eeb58e8927d44c9014d0c15a24d20d2531c0a994ecf9513ef509cafb1d8086e5ab556f8549c46731534d4bd28d674 EBUILD charliecloud-0.9.6.ebuild 1502 BLAKE2B b7dee3131b106eaa6ef4ec023339efcf33b24d9e684e0f3b0b9e246676f4868394e6a4a7e23cb66296c355de32cee0cc2425c8ca7241a3743787849bfdf80f4b SHA512 ad33df1b66ffab1b882b5799c89df2f03a3458c0bfc5e172eed3da9f37490db535c447ba9e4b177bdb747b43e3b042b9f88fac5021d7a1356bd70f32d1d18344 -EBUILD charliecloud-9999.ebuild 1426 BLAKE2B 15d6b088b608f19fea30aec3ae1e81f6c26a7da0e36c2dba234754fcfc8c51a19b90d6e33c27b249984f2217a965ed9699816b2c5356ea8341ce805eedd20835 SHA512 ffddb1be0a052eddc178cf50c587c1f966e18ff88d78089702f5e7f996e481e482f3612517cf0c4f8fc15116f20b73e4cdb72f2e47e8b1804f5cba1f57fe3d48 -MISC metadata.xml 782 BLAKE2B 8eb3cbbd39486b78ffaf3b932804536d900cbbded17dc41437bece7f47f6edbe8fe76d99b695f220c7477356e93ffad16a137a902a026ded8ab5098b7a44ade6 SHA512 775f7de9e4f296a5d13bf66df50b935866d4ca87b2d13678ba03ee5ee72f2740d17c9c2ba69e221efef7ca4038129d7704f1e13c738227e87cd7b869cd7d63db +EBUILD charliecloud-9999.ebuild 1979 BLAKE2B dc1016a9437a8ce7219b5ee62eec43cc28c35dc514c7d51ef693140abe2a3626b3ce17b2d182ab705e067af3de0c60b2c991bf3b1c72da96b2828f7611943874 SHA512 919c24c2c48bdc7b2d46415dcc69c478f77502a0b4748a3d6f520376adbdaed5eda1d120496ecb89fb29cb81d7a2315763f4cf73b7a4d8093163264308bcd21b +MISC metadata.xml 937 BLAKE2B e57547bd213b476c45d79c716af07e58d5097637fe86f3a65215eea57348dd94b93176239b4275660c5a50d370937cd9cfb340205b0ad556163f8ec7c5896a51 SHA512 69b8c1bec13e3ab80a277c7e24070a707b72dc0cb82de2bd2f75236e06185489692da07bfd5504f61a2b096b77bf9ca10ee8b66252031e3587855559919ccd7d diff --git a/sys-cluster/charliecloud/charliecloud-0.15.ebuild b/sys-cluster/charliecloud/charliecloud-0.15.ebuild new file mode 100644 index 000000000000..54113d039cd4 --- /dev/null +++ b/sys-cluster/charliecloud/charliecloud-0.15.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7} ) + +inherit autotools eutils python-single-r1 + +if [[ ${PV} == "9999" ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/hpc/${PN}.git" + S="${WORKDIR}/${P}" +else + SRC_URI="https://github.com/hpc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86 ~x86-linux" +fi + +DESCRIPTION="Lightweight user-defined software stacks for high-performance computing" +HOMEPAGE="https://hpc.github.io/charliecloud/" + +SLOT="0" +LICENSE="Apache-2.0" +IUSE="ch-grow doc examples +pv +squashfs squashfuse" + +# Extensive test suite exists, but downloads container images +# directly and via Docker and installs packages inside using apt/yum. +# Additionally, clashes with portage namespacing and sandbox. +RESTRICT="test" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND="${PYTHON_DEPS} + pv? ( sys-apps/pv ) + squashfs? ( sys-fs/squashfs-tools ) + squashfuse? ( sys-fs/squashfuse )" +DEPEND=" + ch-grow? ( + $(python_gen_cond_dep ' + dev-python/lark-parser[${PYTHON_MULTI_USEDEP}] + dev-python/requests[${PYTHON_MULTI_USEDEP}] + ') + ) + doc? ( + $(python_gen_cond_dep ' + dev-python/sphinx[${PYTHON_MULTI_USEDEP}] + dev-python/sphinx_rtd_theme[${PYTHON_MULTI_USEDEP}] + ') + net-misc/rsync + )" + +src_prepare() { + default + eautoreconf +} + +src_configure() { + local econf_args=() + econf_args+=( + $(use_enable doc html) + $(use_enable ch-grow) + # Libdir is used as a libexec-style destination. + --libdir="${EPREFIX}"/usr/lib + # Attempts to call python-exec directly otherwise. + --with-sphinx-python=${PYTHON} + ) + econf "${econf_args[@]}" +} + +pkg_postinst() { + elog "Various builders are supported, as alternative " + elog "to the internal ch-grow. The following packages " + elog "can be installed to get the corresponding support." + + optfeature "Building with Buildah" app-emulation/buildah + optfeature "Building with Docker" app-emulation/docker +} diff --git a/sys-cluster/charliecloud/charliecloud-9999.ebuild b/sys-cluster/charliecloud/charliecloud-9999.ebuild index c838d73e90e9..54113d039cd4 100644 --- a/sys-cluster/charliecloud/charliecloud-9999.ebuild +++ b/sys-cluster/charliecloud/charliecloud-9999.ebuild @@ -5,7 +5,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{6,7} ) -inherit python-single-r1 +inherit autotools eutils python-single-r1 if [[ ${PV} == "9999" ]] ; then inherit git-r3 @@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then S="${WORKDIR}/${P}" else SRC_URI="https://github.com/hpc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="~amd64 ~x86 ~x86-linux" fi DESCRIPTION="Lightweight user-defined software stacks for high-performance computing" @@ -21,7 +21,7 @@ HOMEPAGE="https://hpc.github.io/charliecloud/" SLOT="0" LICENSE="Apache-2.0" -IUSE="doc examples +pv squashfuse" +IUSE="ch-grow doc examples +pv +squashfs squashfuse" # Extensive test suite exists, but downloads container images # directly and via Docker and installs packages inside using apt/yum. @@ -32,9 +32,15 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND="${PYTHON_DEPS} pv? ( sys-apps/pv ) - squashfuse? ( sys-fs/squashfuse ) -" + squashfs? ( sys-fs/squashfs-tools ) + squashfuse? ( sys-fs/squashfuse )" DEPEND=" + ch-grow? ( + $(python_gen_cond_dep ' + dev-python/lark-parser[${PYTHON_MULTI_USEDEP}] + dev-python/requests[${PYTHON_MULTI_USEDEP}] + ') + ) doc? ( $(python_gen_cond_dep ' dev-python/sphinx[${PYTHON_MULTI_USEDEP}] @@ -43,16 +49,29 @@ DEPEND=" net-misc/rsync )" -src_compile() { - emake - use doc && emake -C doc-src +src_prepare() { + default + eautoreconf } -src_install() { - emake install PREFIX="${EPREFIX}/usr" DESTDIR="${D}" DOCDIR="${ED}/usr/share/doc/${PF}" LIBEXEC_DIR="libexec/${PF}" - if use examples; then - docompress -x "/usr/share/doc/${PF}/examples" - dodoc -r examples - fi - einstalldocs +src_configure() { + local econf_args=() + econf_args+=( + $(use_enable doc html) + $(use_enable ch-grow) + # Libdir is used as a libexec-style destination. + --libdir="${EPREFIX}"/usr/lib + # Attempts to call python-exec directly otherwise. + --with-sphinx-python=${PYTHON} + ) + econf "${econf_args[@]}" +} + +pkg_postinst() { + elog "Various builders are supported, as alternative " + elog "to the internal ch-grow. The following packages " + elog "can be installed to get the corresponding support." + + optfeature "Building with Buildah" app-emulation/buildah + optfeature "Building with Docker" app-emulation/docker } diff --git a/sys-cluster/charliecloud/metadata.xml b/sys-cluster/charliecloud/metadata.xml index 584c30766905..61291d6ce81d 100644 --- a/sys-cluster/charliecloud/metadata.xml +++ b/sys-cluster/charliecloud/metadata.xml @@ -17,7 +17,9 @@ hpc/charliecloud + Build the internal builder ch-grow Use sys-apps/pv to enable progress bar functionality + Use sys-fs/squashfs-tools for creating SquashFS images Use sys-fs/squashfuse for the SquashFS workflow -- cgit v1.2.3