gentoo resync : 15.05.2018

4 files changed, 92 insertions, 24 deletions

diff --git a/sys-cluster/charliecloud/Manifest b/sys-cluster/charliecloud/Manifest
index 9b762fa00a2d..5111366281ac 100644
--- a/sys-cluster/charliecloud/Manifest
+++ b/sys-cluster/charliecloud/Manifest
@@ -1,4 +1,6 @@
 DIST charliecloud-0.2.3_pre20171121.tar.gz 82636 BLAKE2B 6eb8465da39dc628d8cf65b475263b6ff12757fec00ede16025c126bc861ab07969fb8a815fbdfa48424911905d59e1290f6281a8d804d069cf940b7a0e66b47 SHA512 1828651d18cd8246e0d462fa966052be21a18f0a7a6bdb76040740dd97b271723c317ed764296cf2d0e554cec527612a02e733ec7bf3e6f4ac73139fed968c83
+DIST charliecloud-0.2.4.tar.gz 178589 BLAKE2B 45330f67e4b116150219a2753f341248878e8fa540583a97c5cd55e42498825e749c5ca9133580c180438898e25dd22bbcec37c31c31258ccf1fa0ffb5814375 SHA512 456b45d071a18562d914e70b141de55950fcf4a5e2aa882b85bdd8c4abab3a62ab1e413c0524a31be2e278328aab67a898f319bd640e9d9a84163efe24e5a872
 EBUILD charliecloud-0.2.3_pre20171121.ebuild 1802 BLAKE2B ed9e88d7923b3a871109c378e50c822236f62ef343ce7881be3c3cb58f0635c9bad41c44857a79722ad12190c6d3c95a76eb25771b47d406a75cc976c033e6ed SHA512 df7e51cd6bced3ccd80ce405c210e6ac338afb983f767ea437a07242cf31922391149a07df8df9d00dee2d283ae3a75fac92341380e1561a4727f72b8f83db75
-EBUILD charliecloud-9999.ebuild 1709 BLAKE2B 57976a5aa46b34ec25532421f010caabe241ea145559606b01abb701a92b61e01ad1e30bf0f543c922827202f280c47b2a6c7651a5879fa399e5c3acf839754f SHA512 cb5039a397b21106592df5ec8dc4a3d57fdd83c9e553e93346bd7bd276765fdeb81bcb6307853db7003742259bea8ca0983f798c95927f91360e534e6da51d94
-MISC metadata.xml 474 BLAKE2B 6d4ce1fbfe8c43528784c0776ef8923a0b5e765d9fe08fe9923f2f1d3b9bc206fb42a87d76da855c43bc870489a2fe437e9d2aa067a5e73177595871b3d03b3d SHA512 f7020c66c50b9cc77c8b631dd97d4a76ae2979661543aa391d1ef12319f34fe545c04f60c474d6bc3fc72d2e32eac2924dc151b0618b09b47550bd7678833ab4
+EBUILD charliecloud-0.2.4.ebuild 1505 BLAKE2B 6b84d37c066ef552272760ab0e635d23dfaaee7db75b462e42da32699580f08940c75362de64c5d864cb3e88d5751f75386ed2ce68982ae59adcd46ea7c8c01d SHA512 80edeab864fc47f0f634edafa4bcf3c9ceed3e9ad4451f48974ed2a3c5a9cc432b5b1fe7c2391e88f2de74c94016ca3788cc40e58408a0a7491217052621a7da
+EBUILD charliecloud-9999.ebuild 1505 BLAKE2B 6b84d37c066ef552272760ab0e635d23dfaaee7db75b462e42da32699580f08940c75362de64c5d864cb3e88d5751f75386ed2ce68982ae59adcd46ea7c8c01d SHA512 80edeab864fc47f0f634edafa4bcf3c9ceed3e9ad4451f48974ed2a3c5a9cc432b5b1fe7c2391e88f2de74c94016ca3788cc40e58408a0a7491217052621a7da
+MISC metadata.xml 699 BLAKE2B 778ae447db939c0593dd147ad669e07fe8de217079988f82bd21ca545f1afe8056347173028056a9f0407a72b435dfc021dccbed1d860491712351ae727906b3 SHA512 2b19c7878b104128f537b3b5ab2070a3f643ae536af3f91ab52284aa13ae5752e4e8c012a51fa4261e140154f0c2c49f1aa480b22ace552fdab5067174247515
diff --git a/sys-cluster/charliecloud/charliecloud-0.2.4.ebuild b/sys-cluster/charliecloud/charliecloud-0.2.4.ebuild
new file mode 100644
index 000000000000..f7d1882d07be
--- /dev/null
+++ b/sys-cluster/charliecloud/charliecloud-0.2.4.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# User namespaces don't play well with the sandbox.
+RESTRICT="test"
+
+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 ~amd64-linux ~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="doc examples +pv test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	pv? ( sys-apps/pv )
+	doc? ( dev-python/sphinx
+	       dev-python/sphinx_rtd_theme
+	       net-misc/rsync )
+	test? ( app-arch/pigz )"
+
+DOCS=(
+	README.rst
+)
+
+src_compile() {
+	emake
+	use doc && emake -C doc-src
+}
+
+src_install() {
+	emake install PREFIX="${EPREFIX}/usr" DESTDIR="${ED}"
+	if use doc; then
+		mv doc html || die
+		local HTML_DOCS=(html/.)
+	fi
+	if use examples; then
+		docompress -x "${EPREFIX}/usr/share/doc/${PF}/examples"
+		DOCS+=(examples)
+	fi
+	rm -rf "${ED}/usr/share/doc/charliecloud" || die
+	einstalldocs
+}
+
+src_test() {
+	cd "${S}/test" || die
+	export CH_TEST_TARDIR="${T}/tarballs"
+	export CH_TEST_IMGDIR="${T}/images"
+
+	# Do not run tests requiring root.
+	export CH_TEST_PERMDIRS="skip"
+	export CH_TEST_SKIP_DOCKER=yes
+	sed -i 's/CHTEST_HAVE_SUDO=yes/CHTEST_HAVE_SUDO=no/' "${S}/test/common.bash" || die
+
+	emake test-quick
+}
diff --git a/sys-cluster/charliecloud/charliecloud-9999.ebuild b/sys-cluster/charliecloud/charliecloud-9999.ebuild
index 31d3d0f93db0..f7d1882d07be 100644
--- a/sys-cluster/charliecloud/charliecloud-9999.ebuild
+++ b/sys-cluster/charliecloud/charliecloud-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 # User namespaces don't play well with the sandbox.
 RESTRICT="test"
@@ -13,7 +13,6 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	SRC_URI="https://github.com/hpc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-	S="${WORKDIR}/${P}"
 fi
 
 DESCRIPTION="Lightweight user-defined software stacks for high-performance computing"
@@ -21,44 +20,37 @@ HOMEPAGE="https://hpc.github.io/charliecloud/"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-IUSE="doc examples suid test"
+IUSE="doc examples +pv test"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
+	pv? ( sys-apps/pv )
 	doc? ( dev-python/sphinx
 	       dev-python/sphinx_rtd_theme
 	       net-misc/rsync )
 	test? ( app-arch/pigz )"
 
+DOCS=(
+	README.rst
+)
+
 src_compile() {
-	if use suid; then
-		export SETUID=1
-	fi
 	emake
-	if use doc && ! use suid; then
-		emake -C doc-src
-	fi
+	use doc && emake -C doc-src
 }
 
 src_install() {
-	if use suid; then
-		export SETUID=1
-	fi
 	emake install PREFIX="${EPREFIX}/usr" DESTDIR="${ED}"
-	dodoc README.rst COPYRIGHT
-	if use doc && ! use suid; then
-		if ! use suid; then
-			mv doc html || die
-			dodoc -r html
-		else
-			ewarn "Building documentation with SUID not supported yet!"
-		fi
+	if use doc; then
+		mv doc html || die
+		local HTML_DOCS=(html/.)
 	fi
 	if use examples; then
 		docompress -x "${EPREFIX}/usr/share/doc/${PF}/examples"
-		dodoc -r examples
+		DOCS+=(examples)
 	fi
 	rm -rf "${ED}/usr/share/doc/charliecloud" || die
+	einstalldocs
 }
 
 src_test() {
diff --git a/sys-cluster/charliecloud/metadata.xml b/sys-cluster/charliecloud/metadata.xml
index 101def06620c..6db8cc60e6a4 100644
--- a/sys-cluster/charliecloud/metadata.xml
+++ b/sys-cluster/charliecloud/metadata.xml
@@ -5,6 +5,10 @@
     <email>o.freyermuth@googlemail.com</email>
     <name>Oliver Freyermuth</name>
   </maintainer>
+  <maintainer type="person">
+    <email>junghans@gentoo.org</email>
+    <name>Christoph Junghans (proxy)</name>
+  </maintainer>
   <maintainer type="project">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
@@ -12,4 +16,7 @@
   <upstream>
     <remote-id type="github">hpc/charliecloud</remote-id>
   </upstream>
+  <use>
+    <flag name='pv'>Use sys-apps/pv to enable progress bar functionality</flag>
+  </use>
 </pkgmetadata>