gentoo resync : 14.05.2020

7 files changed, 108 insertions, 16 deletions

diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest
index 2de8fa85f5a5..f2dfb3e9e022 100644
--- a/sys-apps/hwloc/Manifest
+++ b/sys-apps/hwloc/Manifest
@@ -3,8 +3,10 @@ DIST hwloc-1.11.10.tar.bz2 4102431 BLAKE2B 4caec6f1c1a5f0b571854127cc6fd808e778b
 DIST hwloc-1.11.13.tar.bz2 4120436 BLAKE2B a6a09f7d6abeaa9d23df555cfd2186ae61f0f67f83fa8f1aa4bc29376b233a8511f11745f35064f39545c7e62e9d271c1334b6906712028729e138e41d1f212f SHA512 dd38bcc9a5df2dcfd3bbd828ab13fdb1c1d21747a0b62e6c87df95d2835c0472590344ff5bda4f6c28e597eaba1ea11c0bc96907ad45f1215f51f95ac9f58138
 DIST hwloc-1.11.2.tar.bz2 4019136 BLAKE2B 29a959c48b3be347b5816333c3f9948ddafc6c4882d7c646c956ae08d72827dd4cef22da7842a034e3131e0044f9528573c6dfceb373869c326890f23651d967 SHA512 aa54b6389c303470a00dbbb3ae5f688244d0f1e0d84e661b739933ff9d86928869f2f3be04fe621cdf06c206defcd4ea1c9e8b72696f7cada9bb3243c3feba68
 DIST hwloc-2.0.4.tar.bz2 6057001 BLAKE2B 0d73c2ec544263bb36404d8112412b6b308935b9b8b4ba37cac05d8bdc525763fa862c63d387545cb0e02e1bd8f1c931e034381dede83b7119f30928f4e54bf4 SHA512 c7bb69f0e536188921138d003f3854a12f942a4f625e665d5ce6d32c1c4a884e0a91f9125de33dd292f522032b759e6240df3f3e53534033567ea0d829feefce
-EBUILD hwloc-1.11.10.ebuild 2195 BLAKE2B 4cfd04182449a5d01d3ba48d029bba8a514e6b559c829681d63c303a8dae91ebd628df48e8db4c4a33ed1ad8654d16a1122848a9d6f579fd90ae6e6660e21c19 SHA512 ee00586fe98f049ce09ab15a4b97644982c9630c44cc569717682eb76451ff558592ae7fb6b5908ca8957e655fd949a8969977b8845932f10f825032eccc2b73
-EBUILD hwloc-1.11.13.ebuild 2176 BLAKE2B 5492e4cc844737ffd61a07791e83494c0b9061c3e0c261c23c812b3b35b9708d91138fce18e85dbf0883795454259292877b762debb8ed0066a7be14947b5af6 SHA512 2a61fd7b84d9686a84236f8aea65e3f2f00536a2cbcf32accbb62d67b73627fbb70035e929a757420f5099b773bbaee3e74984e93796c61bf3f0180d7a6bb599
-EBUILD hwloc-1.11.2-r1.ebuild 2140 BLAKE2B c316557e57e307aa899230ca27014e65bf51c858781c7e8962993c3f6178f3773afcb630e2fa32add96ccb75799709845729ae6a75b29ea347b6ac74958b82eb SHA512 e495310756420847db75334266cd8d3cb247f5922bc66cfeb1f947cc5dc029a7879b00746fd0da84298c8710eea4e7384bfae282e1987e28d7e0fbb256b1832a
-EBUILD hwloc-2.0.4.ebuild 2047 BLAKE2B fdabf052b4b9ac1c5f4c3f7192eb12894f6eb2ff1a48baaf7c652df7840bfbcbc01c99225e3b600516e26f1b4a63d0fe84f59eed9deb5d7bbe06f666f916bd1b SHA512 e4e6d67475fcd51e569571c0cab0bc678d79e75825dff3e511bf26bd43ff4b7b757f0038aaf248bebfd6d6cef1a6c5f0b098d5736d8590c18ae5271d1bd61e79
-MISC metadata.xml 1263 BLAKE2B 31a2da3a73430d956f12a029941ee5439ab374be53be55a505f9de83735eab843cd60ca48230bdefa0e8dd3f53b8276dccb62df847364bb79e737f8770fa2553 SHA512 9c21fd25ba0f5046ab051e58884c67d3627040bf66b58d114fa504e411aefe3411c591e356a419e955269e74cafba06ac9fe335b1bb9c43253c029accef1d166
+DIST hwloc-2.1.0.tar.bz2 6272755 BLAKE2B 3ab13bd5cd00c4c19a1c4b1de21fb799038bd0afaa86520696478eada8d0ac11a4f4de11b96b0d92495b431f4b49ccb4185b176ad5abb9372ba6c5c9794ef21c SHA512 3fda7c4152c3f1b701c3da0fcbbe7e1dffb502042cb86e9a44ce6df8e227c005333e61d5459407f88efbd56816db0ab90b19f75d047e0c77b3b7f5c6405ea501
+EBUILD hwloc-1.11.10.ebuild 2197 BLAKE2B 2cc8b6519ea866167cbdd58145472354c8859da5017f932fa866017dbdb2a767312b90e4941b6cf88cd7eff9e05ac80b2b56d8b62121a805ee259ba1f62334fe SHA512 054ced91ae7819579dff0091f116c2ce09400202a23a2e2936c5bb8ed9469151035c724a3ac5b550f6b434825e35de9f4d43ad6a8c63aacb2af6bc5e0a562466
+EBUILD hwloc-1.11.13.ebuild 2178 BLAKE2B 293f6b2a4235d0d52fd05b0a301b0aba23bd544871cbab2b74cc2298ab4154efe509a0789e7533a66a8a82b335ffa3bf642082b8d3cf0f07eff40751f20a9153 SHA512 985d07ca0b35a9510273d490b1a81a0f874aa45182b9acd62767e245e1a0d8f68063c8d1279f12349c98f05665d62a6d4578aeea4e6a558e6068891267122a36
+EBUILD hwloc-1.11.2-r1.ebuild 2142 BLAKE2B c0276f7d2e8500896e855958f173e08cfb87242570a60d46de7c2e575d7b94349505b5a5377bd2c805fee60c4a9be29cc6d8aff4f034afe8b06e0e3c9b7bde85 SHA512 78faaccd2f66eccca1e4c72603786c9161e43b6a76f11cf6dd01b292e67a116ff1649076494065713d0b52b123495982efef9110d35d7aff32e34d83ca81c0b3
+EBUILD hwloc-2.0.4.ebuild 2049 BLAKE2B c243ba4020853c7c0be9d7a8e2cd5b8fa9889b5e8d7c15bdf2fe24fb72124704be6c8d0484fd33d600e2cb43bfb5e2f3116aa312e8e8f98743b537c0ab63d80b SHA512 95b962abb0200bc1f51867734e80cb0d8caf959655fcc757dfcf1865721f69797adfe53c1e06d3fedfd840f903c97b6a0537b1be438b8422cb6ecfa5625bf672
+EBUILD hwloc-2.1.0.ebuild 2422 BLAKE2B a0956a2487709b564c4b31f7313469a3ee48019304465a53871f3180871b11ce10ab3001a1fc2ef0e48de2f1e422bf4f2068b844360c0c627a331230774aa714 SHA512 a09771460a4143a20f758ea6f8d5ce44cd59cd1c1ae177c4215f6c440f971c6c5a39e65e21a31fc6ad78e25741ef40e4239d3c5502a1fd69f229f0c295b9921e
+MISC metadata.xml 1758 BLAKE2B ba3810fe4f1739add73deff3e6557d5a4c8efae8ab855c587f506c3079b97a1eae245ab7c3fab984540b5bd2e8be4e72fa2e3a33fa1dbb8be296dd2ed5ec1d30 SHA512 bff4e0dbac83c2c1a1e01ad284936f56f79580f3c1dde11bbe75276dd6dda13490cbfad6183b7ad6a4962a4875488a291f090e8e05816973836fce5c257dae8a
diff --git a/sys-apps/hwloc/hwloc-1.11.10.ebuild b/sys-apps/hwloc/hwloc-1.11.10.ebuild
index fdf1744dfe1a..6eb8bb41080b 100644
--- a/sys-apps/hwloc/hwloc-1.11.10.ebuild
+++ b/sys-apps/hwloc/hwloc-1.11.10.ebuild
@@ -8,8 +8,8 @@ inherit autotools cuda flag-o-matic toolchain-funcs versionator multilib-minimal
 MY_PV=v$(get_version_component_range 1-2)
 
 DESCRIPTION="displays the hardware topology in convenient formats"
-HOMEPAGE="http://www.open-mpi.org/projects/hwloc/"
-SRC_URI="http://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2"
+HOMEPAGE="https://www.open-mpi.org/projects/hwloc/"
+SRC_URI="https://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0/5"
diff --git a/sys-apps/hwloc/hwloc-1.11.13.ebuild b/sys-apps/hwloc/hwloc-1.11.13.ebuild
index e16d3cf3a0cc..5ea06899c88e 100644
--- a/sys-apps/hwloc/hwloc-1.11.13.ebuild
+++ b/sys-apps/hwloc/hwloc-1.11.13.ebuild
@@ -8,8 +8,8 @@ inherit autotools cuda flag-o-matic eapi7-ver multilib-minimal toolchain-funcs
 MY_PV=v$(ver_cut 1-2)
 
 DESCRIPTION="displays the hardware topology in convenient formats"
-HOMEPAGE="http://www.open-mpi.org/projects/hwloc/"
-SRC_URI="http://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2"
+HOMEPAGE="https://www.open-mpi.org/projects/hwloc/"
+SRC_URI="https://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0/5"
diff --git a/sys-apps/hwloc/hwloc-1.11.2-r1.ebuild b/sys-apps/hwloc/hwloc-1.11.2-r1.ebuild
index acb852ae7cd2..48b8f6e46a3a 100644
--- a/sys-apps/hwloc/hwloc-1.11.2-r1.ebuild
+++ b/sys-apps/hwloc/hwloc-1.11.2-r1.ebuild
@@ -8,8 +8,8 @@ inherit flag-o-matic cuda autotools-multilib multilib toolchain-funcs versionato
 MY_PV=v$(get_version_component_range 1-2)
 
 DESCRIPTION="displays the hardware topology in convenient formats"
-HOMEPAGE="http://www.open-mpi.org/projects/hwloc/"
-SRC_URI="http://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2"
+HOMEPAGE="https://www.open-mpi.org/projects/hwloc/"
+SRC_URI="https://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0/5"
diff --git a/sys-apps/hwloc/hwloc-2.0.4.ebuild b/sys-apps/hwloc/hwloc-2.0.4.ebuild
index e62701d2393a..b70355bd1d6a 100644
--- a/sys-apps/hwloc/hwloc-2.0.4.ebuild
+++ b/sys-apps/hwloc/hwloc-2.0.4.ebuild
@@ -8,8 +8,8 @@ inherit autotools cuda flag-o-matic eapi7-ver multilib-minimal toolchain-funcs
 MY_PV=v$(ver_cut 1-2)
 
 DESCRIPTION="displays the hardware topology in convenient formats"
-HOMEPAGE="http://www.open-mpi.org/projects/hwloc/"
-SRC_URI="http://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2"
+HOMEPAGE="https://www.open-mpi.org/projects/hwloc/"
+SRC_URI="https://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0/15"
diff --git a/sys-apps/hwloc/hwloc-2.1.0.ebuild b/sys-apps/hwloc/hwloc-2.1.0.ebuild
new file mode 100644
index 000000000000..ebd907937810
--- /dev/null
+++ b/sys-apps/hwloc/hwloc-2.1.0.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools cuda flag-o-matic systemd toolchain-funcs multilib-minimal
+
+MY_PV="v$(ver_cut 1-2)"
+
+DESCRIPTION="displays the hardware topology in convenient formats"
+HOMEPAGE="http://www.open-mpi.org/projects/hwloc/"
+SRC_URI="http://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0/15"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="cairo +cpuid cuda debug gl libudev netloc nvml +pci plugins static-libs svg xml X"
+
+# opencl support dropped with x11-drivers/ati-drivers being removed (#582406).
+# Anyone with hardware is welcome to step up and help test to get it re-added.
+
+RDEPEND=">=sys-libs/ncurses-5.9-r3:0[${MULTILIB_USEDEP}]
+
+	cairo?		( >=x11-libs/cairo-1.12.14-r4[X?,svg?,${MULTILIB_USEDEP}] )
+	cuda?		( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= )
+	gl?		( x11-drivers/nvidia-drivers[static-libs,tools] )
+	libudev?	( virtual/libudev )
+	netloc?		( !sys-apps/netloc )
+	pci?		(
+				>=sys-apps/pciutils-3.3.0-r2[${MULTILIB_USEDEP}]
+				>=x11-libs/libpciaccess-0.13.1-r1[${MULTILIB_USEDEP}]
+			)
+	plugins?	( dev-libs/libltdl:0[${MULTILIB_USEDEP}] )
+	xml?		( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
+
+PATCHES=( "${FILESDIR}/${PN}-1.8.1-gl.patch" )
+DOCS=( AUTHORS NEWS README VERSION )
+
+src_prepare() {
+	default
+	eautoreconf
+
+	if use cuda ; then
+		append-cflags "-I${EPREFIX}/opt/cuda/include"
+		append-cppflags "-I${EPREFIX}/opt/cuda/include"
+	fi
+}
+
+multilib_src_configure() {
+	export HWLOC_PKG_CONFIG="$(tc-getPKG_CONFIG)" #393467
+
+	if use cuda ; then
+		local -x LDFLAGS="${LDFLAGS}"
+		append-ldflags "-L${EPREFIX}/opt/cuda/$(get_libdir)"
+	fi
+
+	local myconf=(
+		--disable-opencl
+		--enable-shared
+		$(multilib_native_use_enable cuda)
+		$(multilib_native_use_enable gl)
+		$(use_enable cairo)
+		$(use_enable cpuid)
+		$(use_enable debug)
+		$(use_enable libudev)
+		$(use_enable netloc)
+		$(use_enable nvml)
+		$(use_enable pci)
+		$(use_enable plugins)
+		$(use_enable static-libs static)
+		$(use_enable xml libxml2)
+		$(use_with X x)
+	)
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_install_all() {
+	default
+	systemd_dounit "${D}/usr/share/hwloc/hwloc-dump-hwdata.service"
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/sys-apps/hwloc/metadata.xml b/sys-apps/hwloc/metadata.xml
index baae6b031db9..b84a415e26af 100644
--- a/sys-apps/hwloc/metadata.xml
+++ b/sys-apps/hwloc/metadata.xml
@@ -7,17 +7,24 @@
 </maintainer>
 <longdescription> 
   The Portable Hardware Locality (hwloc) software package provides a portable abstraction 
-  (across OS, versions, architectures, ...) of the hierarchical topology of modern architectures, 
+  (across OS, versions, architectures, ...) of the hierarchical topology of modern architectures,
   including NUMA memory nodes, sockets, shared caches, cores and simultaneous multithreading. 
   It also gathers various system attributes such as cache and memory information. 
   It primarily aims at helping applications with gathering information about modern computing 
   hardware so as to exploit it accordingly and efficiently.
 </longdescription>
 <use>
-  <flag name="cuda">Enable CUDA device discovery</flag>
-  <flag name="gl">Enable GL display device discovery (NVCtrl)</flag>
+  <flag name="cairo">Enable the Cairo back-end of hwloc's lstopo command</flag>
+  <flag name="cpuid">Enable the cpuid-based architecture specific support (x86 component)</flag>
+  <flag name="cuda">Enable CUDA device discovery using libcudart</flag>
+  <flag name="gl">Enable GL display device discovery (NVCtrl)</flag> 
+  <flag name="libudev">Enable the Linux libudev</flag>
+  <flag name="netloc">Enable Netloc</flag>
   <flag name="numa">Add support for numa memory allocation</flag>
+  <flag name="nvml">Enable the NVML device discovery</flag>
   <flag name="pci">Enable PCI device discovery using libpci</flag>
   <flag name="plugins">Build hwloc components as plugins so that the hwloc core library does not directly depend on their dependencies (for instance the libpci library)</flag>
+  <flag name="xml">use libxml2 for XML support, instead of a custom minimalistic support</flag>
+  <flag name="X">use the X Window System</flag>
 </use>
 </pkgmetadata>