gentoo resync 08.09.2018

3 files changed, 144 insertions, 0 deletions

diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest
index b3b62fa50570..2c7447b7bf65 100644
--- a/sys-apps/hwloc/Manifest
+++ b/sys-apps/hwloc/Manifest
@@ -1,8 +1,12 @@
 AUX hwloc-1.8.1-gl.patch 542 BLAKE2B d0264d6ef139add1b76befd8f8b440dd6c4b994bea6187c4339eaf47b3fccfebc9598230914db17e21997f8d70c6a94dbfceaa01234a3090d68df35c4cf6f931 SHA512 1f281f338cef379963b374d7e656f90be98dfd0b0768fe12dc8e6d366b1c386c2ed50ed405d5dcd0b00c2bb57b12849a3b918712e38214fca45e2a3b1c584f33
 DIST hwloc-1.11.10.tar.bz2 4102431 BLAKE2B 4caec6f1c1a5f0b571854127cc6fd808e778b3b2bcf7ded7edfe99100ac4ccc05c893f3df0a56119234510aa5256e5da84cfa15dddb7d15e49eca2936baa7f41 SHA512 9e2cf5cc43f8c21cfd0bf09a58fda09ba832908eca5a211d164eb106f090609b6351bc934e572200530284fbfc5c460db29a49ec7974dbd298d757ed8aaf32b3
+DIST hwloc-1.11.11.tar.bz2 4114437 BLAKE2B 57666c4a0a49898f55eba991a52954bb9dbc84202cd3e4d7db832a55efc09bb7477593bfa903cadc9e58ac5ba298cbdce3469926f16b8ed65dfa15e2ebb38d5d SHA512 cac1283c603ebe58e6e2c35d3122f349f3251da6b4f4671bdc8a335b2dd7cc2131107fe239dcc25915b07e193784dbf1b86561433acaeef4e4c3ea103f7d54c5
 DIST hwloc-1.11.2.tar.bz2 4019136 BLAKE2B 29a959c48b3be347b5816333c3f9948ddafc6c4882d7c646c956ae08d72827dd4cef22da7842a034e3131e0044f9528573c6dfceb373869c326890f23651d967 SHA512 aa54b6389c303470a00dbbb3ae5f688244d0f1e0d84e661b739933ff9d86928869f2f3be04fe621cdf06c206defcd4ea1c9e8b72696f7cada9bb3243c3feba68
 DIST hwloc-1.11.7.tar.bz2 4187754 BLAKE2B 9d55c35ee328eddbdb9364f4330d157eeefb53fd01b3d0cba23423515302ab0f43aac6c6aaec3a96277411883e3806888aa1c55d2312e102d00302305279f044 SHA512 f3afd123f917d07fe987b8a16dba9f1aa9a9112fc4bdc806417c942b5fbd3b7f31067550048258814b4ba08d4ac7bd45c1fd477457d817bf9453735e0b82f04e
+DIST hwloc-2.0.2.tar.bz2 6032384 BLAKE2B 868c57b434f7722202ec07747dcc62b320ed265ff8334347d824151eb0d37ff626a90f8b66828f82e9ea9e17b95f41f4ffe509f00e7aa9c822bb5080fb4edbd8 SHA512 b3bbf56bea99e3c381f72989aa18bc2329f15d7d12d9386ea7049fc875be4b5f89f2476a3c6cbaea562d1c91f147a3a2c80a50e93b824c7ef6323eed1d6126ef
 EBUILD hwloc-1.11.10.ebuild 2239 BLAKE2B 33eb03ed6ce9de352f53602c6e687e409b63cec0a4141c2e7e416be4f98dde7d867e7a8158d09168a563bb39c19578b44397c1a8f3a08662d4e375ca80456d48 SHA512 006165b38fa9c332b4cd24aef0876555ba5e4cfd5d4dcae22a82beb0fd5f253197dc87e691291eb2e9b3e7e681c7d504d4df4e44ccd8e537b7008aefb2f34563
+EBUILD hwloc-1.11.11.ebuild 2220 BLAKE2B d7f1c3ebdff8a23587a59330fc67a9498e9e2d7094561018978e604c54d5ed70c1dbf6f463419a63732c3efea042dae052cf176dcea5e117fecfeb2eb5cf3fd1 SHA512 9b8e6dab069f5b31f13f6ff68464d932c4eec9dcd5c17307b3ed29e3313170ad0a2e0df3f4582936fa503f44232b4e014fe8d438a97754b691895a1c9e82b345
 EBUILD hwloc-1.11.2-r1.ebuild 2207 BLAKE2B 56a2d0b7383b173cc389a22b3a3ee68a867db2339bad083720bb6c1a8f5e8879e414a87039164b019140f959d742519d5d5cc9126a8712e4ddb9af2dffedd964 SHA512 ec68dd2534e19ef77a0bd4fd87b357d8dc05bddc6a361ee320fe7b9145ed0a6988d219ec8c56c6ea66036db61e1cbd2ade9f34e4470b997684f95309287fce6d
 EBUILD hwloc-1.11.7.ebuild 2218 BLAKE2B e085ef7ca3e0d275b5e59b4e14206450bc4c820addef6931547247037862072d988e70f37f900a9a6bf66d478c48b97500ae1d5cbba1b405e5321e7841c217ab SHA512 984bb91ccc20ee9afeee0cc474141a7c967deb8e4cc02235a095161721e16aeec43901fb9fcd1eff0b3dd05e5f3a46691711a64a838d90423ecded36e900baf5
+EBUILD hwloc-2.0.2.ebuild 2220 BLAKE2B d7f1c3ebdff8a23587a59330fc67a9498e9e2d7094561018978e604c54d5ed70c1dbf6f463419a63732c3efea042dae052cf176dcea5e117fecfeb2eb5cf3fd1 SHA512 9b8e6dab069f5b31f13f6ff68464d932c4eec9dcd5c17307b3ed29e3313170ad0a2e0df3f4582936fa503f44232b4e014fe8d438a97754b691895a1c9e82b345
 MISC metadata.xml 1263 BLAKE2B 31a2da3a73430d956f12a029941ee5439ab374be53be55a505f9de83735eab843cd60ca48230bdefa0e8dd3f53b8276dccb62df847364bb79e737f8770fa2553 SHA512 9c21fd25ba0f5046ab051e58884c67d3627040bf66b58d114fa504e411aefe3411c591e356a419e955269e74cafba06ac9fe335b1bb9c43253c029accef1d166
diff --git a/sys-apps/hwloc/hwloc-1.11.11.ebuild b/sys-apps/hwloc/hwloc-1.11.11.ebuild
new file mode 100644
index 000000000000..99b6fa5187f1
--- /dev/null
+++ b/sys-apps/hwloc/hwloc-1.11.11.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools cuda flag-o-matic eapi7-ver 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/5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="cairo cuda debug gl +numa +pci plugins svg static-libs 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.
+
+# dev-util/nvidia-cuda-toolkit is always multilib
+
+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] media-video/nvidia-settings ) )
+	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}] )
+	numa? ( >=sys-process/numactl-2.0.10-r1[${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
+
+	ECONF_SOURCE=${S} econf \
+		$(use_enable static-libs static) \
+		$(use_enable cairo) \
+		$(multilib_native_use_enable cuda) \
+		$(use_enable debug) \
+		$(multilib_native_use_enable gl) \
+		$(use_enable pci) \
+		$(use_enable plugins) \
+		$(use_enable numa libnuma) \
+		$(use_enable xml libxml2) \
+		$(use_with X x)
+}
diff --git a/sys-apps/hwloc/hwloc-2.0.2.ebuild b/sys-apps/hwloc/hwloc-2.0.2.ebuild
new file mode 100644
index 000000000000..99b6fa5187f1
--- /dev/null
+++ b/sys-apps/hwloc/hwloc-2.0.2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools cuda flag-o-matic eapi7-ver 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/5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="cairo cuda debug gl +numa +pci plugins svg static-libs 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.
+
+# dev-util/nvidia-cuda-toolkit is always multilib
+
+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] media-video/nvidia-settings ) )
+	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}] )
+	numa? ( >=sys-process/numactl-2.0.10-r1[${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
+
+	ECONF_SOURCE=${S} econf \
+		$(use_enable static-libs static) \
+		$(use_enable cairo) \
+		$(multilib_native_use_enable cuda) \
+		$(use_enable debug) \
+		$(multilib_native_use_enable gl) \
+		$(use_enable pci) \
+		$(use_enable plugins) \
+		$(use_enable numa libnuma) \
+		$(use_enable xml libxml2) \
+		$(use_with X x)
+}