gentoo resync : 25.11.2020

2 files changed, 100 insertions, 0 deletions

diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest
index 2c317a684131..03e85cb94cc4 100644
--- a/sys-apps/hwloc/Manifest
+++ b/sys-apps/hwloc/Manifest
@@ -4,9 +4,11 @@ DIST hwloc-1.11.13.tar.bz2 4120436 BLAKE2B a6a09f7d6abeaa9d23df555cfd2186ae61f0f
 DIST hwloc-1.11.2.tar.bz2 4019136 BLAKE2B 29a959c48b3be347b5816333c3f9948ddafc6c4882d7c646c956ae08d72827dd4cef22da7842a034e3131e0044f9528573c6dfceb373869c326890f23651d967 SHA512 aa54b6389c303470a00dbbb3ae5f688244d0f1e0d84e661b739933ff9d86928869f2f3be04fe621cdf06c206defcd4ea1c9e8b72696f7cada9bb3243c3feba68
 DIST hwloc-2.0.4.tar.bz2 6057001 BLAKE2B 0d73c2ec544263bb36404d8112412b6b308935b9b8b4ba37cac05d8bdc525763fa862c63d387545cb0e02e1bd8f1c931e034381dede83b7119f30928f4e54bf4 SHA512 c7bb69f0e536188921138d003f3854a12f942a4f625e665d5ce6d32c1c4a884e0a91f9125de33dd292f522032b759e6240df3f3e53534033567ea0d829feefce
 DIST hwloc-2.1.0.tar.bz2 6272755 BLAKE2B 3ab13bd5cd00c4c19a1c4b1de21fb799038bd0afaa86520696478eada8d0ac11a4f4de11b96b0d92495b431f4b49ccb4185b176ad5abb9372ba6c5c9794ef21c SHA512 3fda7c4152c3f1b701c3da0fcbbe7e1dffb502042cb86e9a44ce6df8e227c005333e61d5459407f88efbd56816db0ab90b19f75d047e0c77b3b7f5c6405ea501
+DIST hwloc-2.3.0.tar.bz2 6414781 BLAKE2B 60bc80ae73d0ae9ff9a438474efe682dfff28149b843645c928d4c5531f25c7763311816d5c86028efa9e07aa86935dbb6cff56ec429ee607ce4e5b5b88d4bbe SHA512 ecb0950cd08eab7d97f7cbef9db0dc31cb5b4debedaae6f48814625ee5da0153fdc1f863fa84c5d59b76634e877a348fa556f3c8c29fc43bc6ae7211c313906c
 EBUILD hwloc-1.11.10.ebuild 2170 BLAKE2B 60cdea9ee071aa1610a48085e9b6dcb2f38a8cd473095df9d6db3d804f8d84a82e5d576d90687c09a224274999e652bff2e153b513c948bd83f4be11ad6512df SHA512 bf49f0c3c7d95de2ff4d707655e87f13b64848e19f5db9f46eaa0f015c13dd9272c357fad4bffb220eed964f439fd655b43a21e2ca731a49dd9ce7ed4b6988a4
 EBUILD hwloc-1.11.13.ebuild 2143 BLAKE2B ae73d12b60c54e7160e789cb72e3cf939135dad7f22b17443e6093b58c6bc8dfe2f27df7bdcca4cbe70e58ff965c8d0860fea2a81461eaf485e1bff08e0a2240 SHA512 41bd54a082baf04b224abffaf420af5760da2d1eeea68968bc21715c70537ab67e9d1de937435e57e4d7f9bfd817a596377e888d0985949988d90e659e3479dc
 EBUILD hwloc-1.11.2-r1.ebuild 2115 BLAKE2B d79a58930fc0bc95065af6d3f2344ae2678f61e87d962668400a00f7118697e13e49d58c8a48215518af17dd477c282ea9551ad5d31d6f17e329e7006cb050d6 SHA512 775dc6c380f2bd41ef012abd1fb7efbe486f6e7489d08cdda3e79da3d640248950349120d699b19651d60eeb61dd05ca4a0a9a3e8c76535746a6390064eedc2b
 EBUILD hwloc-2.0.4.ebuild 2022 BLAKE2B 81e1daf91440f2cff13e3301915b0a2069396b98ff5ba33a06ea418d07ae606e0b6de85632e356a81b142978143d22e1fe11fb9d33343cf6da99d551d116d286 SHA512 bcbb4c5e522983c39ede9b6ee5723d359118a599a2b2c22351d80d59fbe67987a592a82d04513ac5e78e37847187dbc20bd903ddd94204c60bf0de8a9b733f77
 EBUILD hwloc-2.1.0.ebuild 2399 BLAKE2B 962fac7338357c0a66e239f0ceb05f7906cdc2dddd459f48191cd998c2d79f2666a5f1356443fb4d13922e5448c7ebb70f2b498e98a80a30fb931ccda946d9dc SHA512 62575ccd7482649ac50f78b6bddfe19016d8f7387d8f3de603f374e7cdef29d7babc2066be26c5386c5f2f7b91fddae22ebaca17aca9c7758991dafd49192bb1
+EBUILD hwloc-2.3.0.ebuild 2924 BLAKE2B e3606ad4868f9efe244c7766c4a91ed373a51eebd37ceb97f4570796c38e9b5586341d9c3237030c77a1a7ac9ce31828084065bb58ff7e2c9368aa87f738a919 SHA512 78152bd3110ab168dcb067c875e8161001cdfc47825baa224fa6f3ba9dd5147d424bdc8e11dc14c3d9780577adaaff01573f2a171696330f645d626dc7becfea
 MISC metadata.xml 1758 BLAKE2B ba3810fe4f1739add73deff3e6557d5a4c8efae8ab855c587f506c3079b97a1eae245ab7c3fab984540b5bd2e8be4e72fa2e3a33fa1dbb8be296dd2ed5ec1d30 SHA512 bff4e0dbac83c2c1a1e01ad284936f56f79580f3c1dde11bbe75276dd6dda13490cbfad6183b7ad6a4962a4875488a291f090e8e05816973836fce5c257dae8a
diff --git a/sys-apps/hwloc/hwloc-2.3.0.ebuild b/sys-apps/hwloc/hwloc-2.3.0.ebuild
new file mode 100644
index 000000000000..6167e28c6bfc
--- /dev/null
+++ b/sys-apps/hwloc/hwloc-2.3.0.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools bash-completion-r1 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="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"
+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 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 )
+	nvml?		( x11-drivers/nvidia-drivers[${MULTILIB_USEDEP}] )
+	pci?		(
+				>=sys-apps/pciutils-3.3.0-r2[${MULTILIB_USEDEP}]
+				>=x11-libs/libpciaccess-0.13.1-r1[${MULTILIB_USEDEP}]
+			)
+	xml?		( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+
+# 2.69-r5 for --runstatedir
+BDEPEND="
+	>=sys-devel/autoconf-2.69-r5
+	virtual/pkgconfig
+"
+
+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
+		--disable-plugin-ltdl
+		--enable-plugins
+		--enable-shared
+		--runstatedir="${EPREFIX}/run"
+		$(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 static-libs static)
+		$(use_enable xml libxml2)
+		$(use_with X x)
+	)
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_install_all() {
+	default
+	case ${ARCH} in
+	# hwloc-dump-hwdata binary only built on those arches, so don't install non-working unit.
+		amd64|x86)
+			systemd_dounit "${ED}/usr/share/hwloc/hwloc-dump-hwdata.service" ;;
+	esac
+	mv "${ED}"/usr/share/bash-completion/completions/hwloc{,-annotate} || die
+	bashcomp_alias hwloc-annotate \
+		hwloc-{diff,ps,compress-dir,gather-cpuid,distrib,info,bind,patch,calc,ls,gather-topology}
+	bashcomp_alias hwloc-annotate lstopo{,-no-graphics}
+	find "${ED}" -name '*.la' -delete || die
+}