gentoo resync : 25.08.2020

7 files changed, 7 insertions, 119 deletions

diff --git a/sys-cluster/charliecloud/Manifest b/sys-cluster/charliecloud/Manifest
index 671d9ffbf85d..1c9296bcf2fc 100644
--- a/sys-cluster/charliecloud/Manifest
+++ b/sys-cluster/charliecloud/Manifest
@@ -1,9 +1,6 @@
-AUX charliecloud-0.10-fix-hardcoded-gcc.patch 1944 BLAKE2B 920697592b47f532a335c493ffa381b08852d628f76bf1e7abbdad299ca5d3431e2bb9d3713cb12dc6e532fc9e1a3a8bda3acc2639c6a0a309fe13347763a8cd SHA512 0c911ec270bdda5d2025faf09ce45961dfaf307b03e9d293630adc49747e1f750273a8ce5c0f46a2756d3ef97312684f7afbfc125c80cbd61384722437bc0dfd
-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.16.tar.gz 356118 BLAKE2B 72e7640feb23fbc55c515fd841cf90562b7800a83673b6a786c8162229b6714ed6a98d3c5066e42ce75a58935e085e86e42ae927cd5f14e6e54ffe6e9863629e SHA512 bf37b5ea2d139635f3207475497bd90595ce625ce9ad05eef5fcd19ec3252e4843eba2bd457587cd9c4ab860aa1e40ec01ac5cd073414bb5a4f89b5c4488bceb
-EBUILD charliecloud-0.10-r1.ebuild 1559 BLAKE2B e33fd6a6dcd8bf6823e9d79a005050c56ff40f4d86a63805997f15c0b2620fea00b726a9734f7c2d6ccc97132b3f83990a6cb5a3d5e16090f51ac8c4e7ba4a35 SHA512 c04634bbaa51798f5d969657608f11008af026781d6eddd1350bd98415dc38d5dadb4aff252fdfdbc3073b72a29e46209c2792675414749649ce8befd2ead13d
-EBUILD charliecloud-0.15.ebuild 1979 BLAKE2B dc1016a9437a8ce7219b5ee62eec43cc28c35dc514c7d51ef693140abe2a3626b3ce17b2d182ab705e067af3de0c60b2c991bf3b1c72da96b2828f7611943874 SHA512 919c24c2c48bdc7b2d46415dcc69c478f77502a0b4748a3d6f520376adbdaed5eda1d120496ecb89fb29cb81d7a2315763f4cf73b7a4d8093163264308bcd21b
-EBUILD charliecloud-0.16.ebuild 1979 BLAKE2B dc1016a9437a8ce7219b5ee62eec43cc28c35dc514c7d51ef693140abe2a3626b3ce17b2d182ab705e067af3de0c60b2c991bf3b1c72da96b2828f7611943874 SHA512 919c24c2c48bdc7b2d46415dcc69c478f77502a0b4748a3d6f520376adbdaed5eda1d120496ecb89fb29cb81d7a2315763f4cf73b7a4d8093163264308bcd21b
-EBUILD charliecloud-9999.ebuild 1979 BLAKE2B dc1016a9437a8ce7219b5ee62eec43cc28c35dc514c7d51ef693140abe2a3626b3ce17b2d182ab705e067af3de0c60b2c991bf3b1c72da96b2828f7611943874 SHA512 919c24c2c48bdc7b2d46415dcc69c478f77502a0b4748a3d6f520376adbdaed5eda1d120496ecb89fb29cb81d7a2315763f4cf73b7a4d8093163264308bcd21b
-MISC metadata.xml 937 BLAKE2B e57547bd213b476c45d79c716af07e58d5097637fe86f3a65215eea57348dd94b93176239b4275660c5a50d370937cd9cfb340205b0ad556163f8ec7c5896a51 SHA512 69b8c1bec13e3ab80a277c7e24070a707b72dc0cb82de2bd2f75236e06185489692da07bfd5504f61a2b096b77bf9ca10ee8b66252031e3587855559919ccd7d
+EBUILD charliecloud-0.15.ebuild 2022 BLAKE2B c1a239810992cfaa61c161217532f7f9f5843bdabd6268fdd6e2f8fc5e502987704673521ac23e9ece6ec2ec69906f8b3749a3b8a1a59df664660307a1684a9f SHA512 e7c520841250e501a6b7172dba590f74820b4b44faa3a7e8c521ff93f85ae59f6c5c5aeb4a5dfbdc6422f75b8ecb1dfe6ac3b7160fb58e25f4b9ace6297541ef
+EBUILD charliecloud-0.16.ebuild 2022 BLAKE2B c1a239810992cfaa61c161217532f7f9f5843bdabd6268fdd6e2f8fc5e502987704673521ac23e9ece6ec2ec69906f8b3749a3b8a1a59df664660307a1684a9f SHA512 e7c520841250e501a6b7172dba590f74820b4b44faa3a7e8c521ff93f85ae59f6c5c5aeb4a5dfbdc6422f75b8ecb1dfe6ac3b7160fb58e25f4b9ace6297541ef
+EBUILD charliecloud-9999.ebuild 2022 BLAKE2B c1a239810992cfaa61c161217532f7f9f5843bdabd6268fdd6e2f8fc5e502987704673521ac23e9ece6ec2ec69906f8b3749a3b8a1a59df664660307a1684a9f SHA512 e7c520841250e501a6b7172dba590f74820b4b44faa3a7e8c521ff93f85ae59f6c5c5aeb4a5dfbdc6422f75b8ecb1dfe6ac3b7160fb58e25f4b9ace6297541ef
+MISC metadata.xml 809 BLAKE2B 9dc29bca33e3a641ba5ddd913ee58d8c7703c55ca0e32db18a4f20ea70f871bf834637a1dab8934ef0034362dedf6b609acfcc5d534ac72d29b15ae32a56a17a SHA512 212cd70ac3e9fe0b91bc14feceef1f23e90c40c520ea8f9861847c93c6e341ca7f021a61d3608b3fd4a237c7681aa3fa7917c4ef1d849531eda0f3ca10ce4616
diff --git a/sys-cluster/charliecloud/charliecloud-0.10-r1.ebuild b/sys-cluster/charliecloud/charliecloud-0.10-r1.ebuild
deleted file mode 100644
index b1560f0ec968..000000000000
--- a/sys-cluster/charliecloud/charliecloud-0.10-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit 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 ~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 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 )
-	squashfuse? ( sys-fs/squashfuse )
-"
-DEPEND="
-	doc? (
-		$(python_gen_cond_dep '
-			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
-			dev-python/sphinx_rtd_theme[${PYTHON_MULTI_USEDEP}]
-		')
-		net-misc/rsync
-	)"
-
-PATCHES=(
-	# See upstream bug: https://github.com/hpc/charliecloud/pull/481/
-	"${FILESDIR}"/"${PN}-${PV}"-fix-hardcoded-gcc.patch
-)
-
-src_compile() {
-	emake
-	use doc && emake -C doc-src
-}
-
-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
-}
diff --git a/sys-cluster/charliecloud/charliecloud-0.15.ebuild b/sys-cluster/charliecloud/charliecloud-0.15.ebuild
index 54113d039cd4..b56fa3f93688 100644
--- a/sys-cluster/charliecloud/charliecloud-0.15.ebuild
+++ b/sys-cluster/charliecloud/charliecloud-0.15.ebuild
@@ -51,6 +51,7 @@ DEPEND="
 
 src_prepare() {
 	default
+	sed -i 's/ -Werror//' configure.ac || die
 	eautoreconf
 }
 
diff --git a/sys-cluster/charliecloud/charliecloud-0.16.ebuild b/sys-cluster/charliecloud/charliecloud-0.16.ebuild
index 54113d039cd4..b56fa3f93688 100644
--- a/sys-cluster/charliecloud/charliecloud-0.16.ebuild
+++ b/sys-cluster/charliecloud/charliecloud-0.16.ebuild
@@ -51,6 +51,7 @@ DEPEND="
 
 src_prepare() {
 	default
+	sed -i 's/ -Werror//' configure.ac || die
 	eautoreconf
 }
 
diff --git a/sys-cluster/charliecloud/charliecloud-9999.ebuild b/sys-cluster/charliecloud/charliecloud-9999.ebuild
index 54113d039cd4..b56fa3f93688 100644
--- a/sys-cluster/charliecloud/charliecloud-9999.ebuild
+++ b/sys-cluster/charliecloud/charliecloud-9999.ebuild
@@ -51,6 +51,7 @@ DEPEND="
 
 src_prepare() {
 	default
+	sed -i 's/ -Werror//' configure.ac || die
 	eautoreconf
 }
 
diff --git a/sys-cluster/charliecloud/files/charliecloud-0.10-fix-hardcoded-gcc.patch b/sys-cluster/charliecloud/files/charliecloud-0.10-fix-hardcoded-gcc.patch
deleted file mode 100644
index 07e72b2fbd3e..000000000000
--- a/sys-cluster/charliecloud/files/charliecloud-0.10-fix-hardcoded-gcc.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From bae9f01ed5ad0ef5d6c0b48cbc1a7fde73ae45ae Mon Sep 17 00:00:00 2001
-From: Oliver Freyermuth <o.freyermuth@googlemail.com>
-Date: Mon, 15 Jul 2019 18:36:24 +0200
-Subject: [PATCH] test/Makefile: Remove hardcoded call to gcc, error out if
- CC=icc.
-
----
- test/Makefile | 13 +++++++++----
- 1 file changed, 9 insertions(+), 4 deletions(-)
-
-diff --git a/test/Makefile b/test/Makefile
-index 97a9316b..7c28ce2a 100644
---- a/test/Makefile
-+++ b/test/Makefile
-@@ -10,7 +10,7 @@ images_eg := $(sort $(wildcard ../examples/*/*/Build)) \
-              $(sort $(wildcard ../examples/*/*/Docker_Pull)) \
-              $(sort $(wildcard ../examples/*/*/Docker_Pull.*))
- images := $(images_ch) $(images_eg)
--sotests := sotest/bin/sotest sotest/lib/libsotest.so.1.0
-+sotests := check-no-icc sotest/bin/sotest sotest/lib/libsotest.so.1.0
- 
- # Favor embedded Bats, if installed, over system Bats.
- export PATH := $(CURDIR)/bats/bin:$(PATH)
-@@ -76,13 +76,18 @@ sotest/bin/sotest: sotest/sotest
- sotest/lib/libsotest.so.1.0: sotest/libsotest.so.1.0
- 	cp -a $^ $@
- 
--# We hardcode gcc here because some other compilers (hello, Intel) link the
-+# We exclude icc here because it links the
- # resulting binaries with extra shared libraries that are then not copied into
- # the container. (Issue #227.)
- 
-+check-no-icc:
-+ifeq ($(patsubst %icc,,$(lastword $(CC))),)
-+	$(error ICC not supported since it overlinks extra shared libraries)
-+endif
-+
- sotest/sotest: sotest/sotest.c sotest/libsotest.so.1.0
--	gcc -o $@ $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -L./sotest -lsotest $^
-+	$(CC) -o $@ $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -L./sotest -lsotest $^
- sotest/libsotest.so.1.0: sotest/libsotest.c
--	gcc -o $@ $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -shared -fPIC -Wl,-soname,libsotest.so.1 -lc $^
-+	$(CC) -o $@ $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -shared -fPIC -Wl,-soname,libsotest.so.1 -lc $^
- 	ln -f -s libsotest.so.1.0 sotest/libsotest.so
- 	ln -f -s libsotest.so.1.0 sotest/libsotest.so.1
diff --git a/sys-cluster/charliecloud/metadata.xml b/sys-cluster/charliecloud/metadata.xml
index 61291d6ce81d..85cf8536faf3 100644
--- a/sys-cluster/charliecloud/metadata.xml
+++ b/sys-cluster/charliecloud/metadata.xml
@@ -5,10 +5,6 @@
     <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>